LiteLoader 1.6.2 - register mod files as resource packs

Mumfrey
1 parent a1377b8d
Showing 5 changed files with 161 additions and 21 deletions
.classpath
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/ModFile.java
java/com/mumfrey/liteloader/resources/ModResourcePack.java
java/com/mumfrey/liteloader/util/PrivateFields.java
@@ -5,7 +5,8 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/Client"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/versions/1.6.2/1.6.2.jar"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -38,20 +38,7 @@ import java.util.zip.ZipInputStream;
 import javax.activity.InvalidActivityException;
-import net.minecraft.src.ChatMessageComponent;
-import net.minecraft.src.Minecraft;
-import net.minecraft.src.GuiControls;
-import net.minecraft.src.GuiNewChat;
-import net.minecraft.src.GuiScreen;
-import net.minecraft.src.ILogAgent;
-import net.minecraft.src.IPlayerUsage;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet1Login;
-import net.minecraft.src.Packet3Chat;
-import net.minecraft.src.PlayerUsageSnooper;
-import net.minecraft.src.Profiler;
-import net.minecraft.src.ScaledResolution;
-import net.minecraft.src.Timer;
+import net.minecraft.src.*;
 import com.mumfrey.liteloader.ChatFilter;
 import com.mumfrey.liteloader.ChatListener;
@@ -68,6 +55,7 @@ import com.mumfrey.liteloader.RenderListener;
 import com.mumfrey.liteloader.Tickable;
 import com.mumfrey.liteloader.gui.GuiControlsPaginated;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
+import com.mumfrey.liteloader.resources.ModResourcePack;
 import com.mumfrey.liteloader.util.ModUtilities;
 import com.mumfrey.liteloader.util.PrivateFields;
@@ -194,6 +182,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private Map<String, ModFile> modFiles = new HashMap<String, ModFile>();
 	/**
+	 * Registered resource packs 
+	 */
+	private Map<String, ResourcePack> registeredResourcePacks = new HashMap<String, ResourcePack>();
+	
+	/**
 	 * List of loaded mods, for crash reporting
 	 */
 	private String loadedModsList = "none";
@@ -614,6 +607,46 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
+	 * Register a 
+	 * 
+	 * @param name
+	 * @param resourcePack
+	 * @return
+	 */
+	public boolean registerModResourcePack(ModResourcePack resourcePack)
+	{
+		if (!this.registeredResourcePacks.containsKey(resourcePack.func_130077_b())) // TODO adamsrc -> getName()
+		{
+			List<ResourcePack> defaultResourcePacks = PrivateFields.defaultResourcePacks.get(this.minecraft);
+			if (!defaultResourcePacks.contains(resourcePack))
+			{
+				defaultResourcePacks.add(resourcePack);
+				this.registeredResourcePacks.put(resourcePack.func_130077_b(), resourcePack); // TODO adamsrc -> getName()
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * @param name
+	 * @return
+	 */
+	public boolean unRegisterModResourcePack(ModResourcePack resourcePack)
+	{
+		if (this.registeredResourcePacks.containsValue(resourcePack))
+		{
+			List<ResourcePack> defaultResourcePacks = PrivateFields.defaultResourcePacks.get(this.minecraft);
+			this.registeredResourcePacks.remove(resourcePack.func_130077_b()); // TODO adamsrc -> getName()
+			defaultResourcePacks.remove(resourcePack);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
 	 * Get the "mods" folder
 	 */
 	public File getModsFolder()
@@ -811,6 +844,16 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
+	 * @param mod
+	 * @return
+	 */
+	private ModFile getModFile(LiteMod mod)
+	{
+		String modClassName = mod.getClass().getSimpleName();
+		return this.modFiles.containsKey(modClassName) ? this.modFiles.get(modClassName) : null;
+	}
+	
+	/**
 	 * Enumerate the java class path and "mods" folder to find mod classes, then
 	 * load the classes
 	 */
@@ -1135,6 +1178,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		logger.info("Discovered " + this.modsToLoad.size() + " total mod(s)");
+		boolean addedResources = false;
+		
 		for (Class<? extends LiteMod> mod : this.modsToLoad.values())
 		{
 			try
@@ -1147,6 +1192,14 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				{
 					this.mods.add(newMod);
 					logger.info("Successfully added mod " + newMod.getName() + " version " + newMod.getVersion());
+					
+					// Get the mod file and register it as a resource pack if it exists
+					ModFile modFile = this.getModFile(newMod);
+					if (modFile != null && modFile.registerAsResourcePack(newMod.getName()))
+					{
+						logger.info("Adding " + modFile.getAbsolutePath() + " to resources list");
+						addedResources = true;
+					}
 				}
 				else
 				{
@@ -1159,6 +1212,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				th.printStackTrace();
 			}
 		}
+		
+		if (addedResources)
+		{
+			this.minecraft.func_110436_a(); // TODO adamsrc -> refreshResourcePacks
+		}
 	}
 	/**
@@ -6,6 +6,7 @@ import java.util.Map;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
+import com.mumfrey.liteloader.resources.ModResourcePack;
 /**
  * Wrapper for file which represents a mod file to load with associated version information and
@@ -59,6 +60,11 @@ public class ModFile extends File
 	private boolean hasRevision = false;
 	/**
+	 * Resource pack we have registered with minecraft
+	 */
+	private ModResourcePack resourcePack = null;
+	
+	/**
 	 * ALL of the parsed metadata from the file, associated with the mod later on for retrieval via the loader
 	 */
 	private HashMap<String, String> metaData = new HashMap<String, String>();
@@ -162,6 +168,23 @@ public class ModFile extends File
 		return this.metaData;
 	}
+	/**
+	 * Registers this file as a minecraft resource pack 
+	 * 
+	 * @param name
+	 * @return true if the pack was added
+	 */
+	public boolean registerAsResourcePack(String name)
+	{
+		if (this.resourcePack == null)
+		{
+			this.resourcePack = new ModResourcePack(name, this);
+			return LiteLoader.getInstance().registerModResourcePack(this.resourcePack);
+		}
+		
+		return false;
+	}
+	
 	@Override
 	public int compareTo(File other)
 	{
+package com.mumfrey.liteloader.resources;
+
+import java.io.File;
+import java.io.IOException;
+
+import net.minecraft.src.FileResourcePack;
+import net.minecraft.src.MetadataSection;
+import net.minecraft.src.MetadataSerializer;
+
+/**
+ * Resource pack which wraps a mod file
+ *
+ * @author Adam Mummery-Smith
+ */
+public class ModResourcePack extends FileResourcePack
+{
+	/**
+	 * Display name, only shows up in debug output 
+	 */
+	private final String name;
+	
+	/**
+	 * @param name Friendly name
+	 * @param modFile
+	 */
+	public ModResourcePack(String name, File modFile)
+	{
+		super(modFile);
+		this.name = name;
+	}
+    
+    /* (non-Javadoc)
+     * @see net.minecraft.src.AbstractResourcePack#getMetadataSection(net.minecraft.src.MetadataSerializer, java.lang.String)
+     */
+    @Override
+    public MetadataSection func_135058_a(MetadataSerializer metadataSerializer, String metadataSectionName) throws IOException // TODO adamsrc -> getMetadataSection
+    {
+    	try
+		{
+    		// This will fail when fetching pack.mcmeta if there isn't one in the mod file, since we don't care we
+    		// just catch the exception and return null instead
+			return super.func_135058_a(metadataSerializer, metadataSectionName); // TODO adamsrc -> getMetadataSection
+		}
+		catch (Exception ex) {}
+    	
+    	return null;
+    }
+
+	/* (non-Javadoc)
+	 * @see net.minecraft.src.AbstractResourcePack#getName()
+	 */
+	@Override
+	public String func_130077_b() // TODO adamsrc -> getName()
+	{
+		return this.name;
+	}
+}
@@ -2,9 +2,9 @@ package com.mumfrey.liteloader.util;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.List;
 import java.util.Map;
-import net.minecraft.src.Minecraft;
 import net.minecraft.src.*;
 /**
@@ -141,10 +141,11 @@ public class PrivateFields&lt;P, T&gt;
 		public static final StaticFields<TileEntity, Map> tileEntityNameToClassMap = new StaticFields<TileEntity, Map> (TileEntity.class, "nameToClassMap",     "a", "field_70326_a"); // TileEntity/nameToClassMap
 	}
-	public static final PrivateFields<Minecraft, Timer>                       minecraftTimer = new PrivateFields<Minecraft, Timer>                (Minecraft.class,          "timer",                "S", "field_71428_T");  // Minecraft/timer
-	public static final PrivateFields<Minecraft, Profiler>                 minecraftProfiler = new PrivateFields<Minecraft, Profiler>             (Minecraft.class,          "mcProfiler",           "C", "field_71424_I");  // Minecraft/mcProfiler
-	public static final PrivateFields<RenderManager, Map>                    entityRenderMap = new PrivateFields<RenderManager, Map>              (RenderManager.class,      "entityRenderMap",      "q", "field_78729_o");  // RenderManager/entityRenderMap
-	public static final PrivateFields<GuiControls, GuiScreen>        guiControlsParentScreen = new PrivateFields<GuiControls, GuiScreen>          (GuiControls.class,        "parentScreen",         "b", "field_73909_b");  // GuiControls/parentScreen
-	public static final PrivateFields<PlayerUsageSnooper, IPlayerUsage> playerStatsCollector = new PrivateFields<PlayerUsageSnooper, IPlayerUsage>(PlayerUsageSnooper.class, "playerStatsCollector", "d", "field_76478_d");  // PlayerUsageSnooper/playerStatsCollector
+	public static final PrivateFields<Minecraft, Timer>                       minecraftTimer = new PrivateFields<Minecraft, Timer>                (Minecraft.class,          "timer",                "S",  "field_71428_T");   // Minecraft/timer
+	public static final PrivateFields<Minecraft, Profiler>                 minecraftProfiler = new PrivateFields<Minecraft, Profiler>             (Minecraft.class,          "mcProfiler",           "C",  "field_71424_I");   // Minecraft/mcProfiler
+	public static final PrivateFields<Minecraft, List<ResourcePack>>    defaultResourcePacks = new PrivateFields<Minecraft, List<ResourcePack>>   (Minecraft.class,          "field_110449_ao",      "aq", "field_110449_ao"); // Minecraft/field_110449_ao
+	public static final PrivateFields<RenderManager, Map>                    entityRenderMap = new PrivateFields<RenderManager, Map>              (RenderManager.class,      "entityRenderMap",      "q",  "field_78729_o");   // RenderManager/entityRenderMap
+	public static final PrivateFields<GuiControls, GuiScreen>        guiControlsParentScreen = new PrivateFields<GuiControls, GuiScreen>          (GuiControls.class,        "parentScreen",         "b",  "field_73909_b");   // GuiControls/parentScreen
+	public static final PrivateFields<PlayerUsageSnooper, IPlayerUsage> playerStatsCollector = new PrivateFields<PlayerUsageSnooper, IPlayerUsage>(PlayerUsageSnooper.class, "playerStatsCollector", "d",  "field_76478_d");   // PlayerUsageSnooper/playerStatsCollector
 }