LiteLoader 1.6.2 - register class path entries with mods as resource packs as we…

…ll, so that mods work in Eclipse

LiteLoader 1.6.2 - register class path entries with mods as resource packs as we…
…ll, so that mods work in Eclipse
Mumfrey
1 parent 2bf580ed
Showing 4 changed files with 123 additions and 14 deletions
java/com/mumfrey/liteloader/core/ClassPathMod.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/ModFile.java
java/com/mumfrey/liteloader/resources/ModResourcePackDir.java
+package com.mumfrey.liteloader.core;
+
+import java.io.File;
+
+import com.mumfrey.liteloader.resources.ModResourcePack;
+import com.mumfrey.liteloader.resources.ModResourcePackDir;
+
+/**
+ * Mod file reference for a file loaded from class path
+ *
+ * @author Adam Mummery-Smith
+ */
+public class ClassPathMod extends ModFile
+{
+	private static final long serialVersionUID = -4759310661966590773L;
+
+	public ClassPathMod(File file, String name, String version)
+	{
+		super(file, "");
+
+		this.modName = name;
+		this.version = version;
+	}
+
+	@Override
+	protected void parseVersionFile(String strVersionData)
+	{
+		// Nope
+	}
+	
+	@Override
+	public boolean registerAsResourcePack(String name)
+	{
+		if (this.resourcePack == null)
+		{
+			if (this.isDirectory())
+			{
+				this.resourcePack = new ModResourcePackDir(name, this);
+			}
+			else
+			{
+				this.resourcePack = new ModResourcePack(name, this);
+			}
+			
+			return LiteLoader.getInstance().registerModResourcePack(this.resourcePack);
+		}
+		
+		return false;
+	}
+}
@@ -55,7 +55,6 @@ 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;
  
@@ -613,7 +612,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * @param resourcePack
 	 * @return
 	 */
-	public boolean registerModResourcePack(ModResourcePack resourcePack)
+	public boolean registerModResourcePack(ResourcePack resourcePack)
 	{
 		if (!this.registeredResourcePacks.containsKey(resourcePack.func_130077_b())) // TODO adamsrc -> getName()
 		{
@@ -633,7 +632,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * @param name
 	 * @return
 	 */
-	public boolean unRegisterModResourcePack(ModResourcePack resourcePack)
+	public boolean unRegisterModResourcePack(ResourcePack resourcePack)
 	{
 		if (this.registeredResourcePacks.containsValue(resourcePack))
 		{
@@ -1127,6 +1126,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				}
  
 				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
+				this.modFiles.put(mod.getSimpleName(), new ClassPathMod(packagePath, mod.getSimpleName().substring(7), LiteLoader.getVersion()));
 			}
  
 			if (modClasses.size() > 0)
@@ -4,6 +4,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
  
+import net.minecraft.src.ResourcePack;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.mumfrey.liteloader.resources.ModResourcePack;
@@ -22,52 +24,52 @@ public class ModFile extends File
 	/**
 	 * Gson parser for JSON
 	 */
-	private static Gson gson = new Gson();
+	protected static Gson gson = new Gson();
  
 	/**
 	 * True if the metadata information is parsed successfully, the mod will be added
 	 */
-	private boolean valid = false;
+	protected boolean valid = false;
  
 	/**
 	 * True if parsed from JSON, false if fallback mode using legacy version.txt
 	 */
-	private boolean json = false;
+	protected boolean json = false;
  
 	/**
 	 * Name of the mod specified in the JSON file, this can be any string but should be the same between mod versions
 	 */
-	private String modName;
+	protected String modName;
  
 	/**
 	 * Loader version
 	 */
-	private String version;
+	protected String version;
  
 	/**
 	 * File time stamp, used as sorting criteria when no revision information is found
 	 */
-	private long timeStamp;
+	protected long timeStamp;
  
 	/**
 	 * Revision number from the json file
 	 */
-	private float revision = 0.0F;
+	protected float revision = 0.0F;
  
 	/**
 	 * True if the revision number was successfully read, used as a semaphore so that we know when revision is a valid number
 	 */
-	private boolean hasRevision = false;
+	protected boolean hasRevision = false;
  
 	/**
 	 * Resource pack we have registered with minecraft
 	 */
-	private ModResourcePack resourcePack = null;
+	protected ResourcePack 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>();
+	protected HashMap<String, String> metaData = new HashMap<String, String>();
  
 	/**
 	 * @param file
@@ -83,7 +85,7 @@ public class ModFile extends File
 	}
  
 	@SuppressWarnings("unchecked")
-	private void parseVersionFile(String strVersionData)
+	protected void parseVersionFile(String strVersionData)
 	{
 		// Assume that it's json if the file starts with a brace
 		if (strVersionData.trim().startsWith("{"))
+package com.mumfrey.liteloader.resources;
+
+import java.io.File;
+import java.io.IOException;
+
+import net.minecraft.src.FolderResourcePack;
+import net.minecraft.src.MetadataSection;
+import net.minecraft.src.MetadataSerializer;
+
+/**
+ * Resource pack which wraps a mod directory on the classpath
+ *
+ * @author Adam Mummery-Smith
+ */
+public class ModResourcePackDir extends FolderResourcePack
+{
+	/**
+	 * Display name, only shows up in debug output 
+	 */
+	private final String name;
+	
+	/**
+	 * @param name Friendly name
+	 * @param modFile
+	 */
+	public ModResourcePackDir(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;
+	}
+}