LiteLoader 1.6.4 - fixed NPE when no --version is specified, moved debug to alte…

…rnate src tree to avoid having to exclude it from all downstream build scripts

LiteLoader 1.6.4 - fixed NPE when no --version is specified, moved debug to alte…
…rnate src tree to avoid having to exclude it from all downstream build scripts
Mumfrey
1 parent b36a1152
Showing 6 changed files with 62 additions and 2 deletions
.classpath
java/com/mumfrey/liteloader/debug/AuthenticationRequest.java → debug/com/mumfrey/liteloader/debug/AuthenticationRequest.java
java/com/mumfrey/liteloader/debug/Start.java → debug/com/mumfrey/liteloader/debug/Start.java
res/minecraft.key → debug/minecraft.key
java/com/mumfrey/liteloader/core/EnabledModsList.java
java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="java"/>
 	<classpathentry kind="src" path="res"/>
+	<classpathentry kind="src" path="debug"/>
 	<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"/>
@@ -11,20 +11,47 @@ import java.util.TreeMap;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+/**
+ * Serialisable (via GSON) object which stores list of enabled/disabled mods for each profile
+ *
+ * @author Adam Mummery-Smith
+ */
 public class EnabledModsList
 {
+	@SuppressWarnings("unused")
+	private static transient final long serialVersionUID = -6449451105617763769L;
+
+	/**
+	 * Gson object for serialisation/deserialisation
+	 */
 	private static transient Gson gson = new GsonBuilder().setPrettyPrinting().create();
+	/**
+	 * This is the node which gets serialised
+	 */
 	private TreeMap<String, TreeMap<String, Boolean>> mods;
+	/**
+	 * By default, when we discover a mod which is NOT in the list for the current profile, we will ENABLE the
+	 * mod and add it to the list. However, when we receive a list of mods on the command line, we instead want
+	 * to DISABLE any additional unlisted mods, we also don't want to save the mods list because the command line
+	 * is supposed to be an override rather than a new mask. These two values provide this behaviour. 
+	 */
 	private transient Boolean defaultEnabledValue = Boolean.TRUE;
-	
 	private transient boolean allowSave = true;
 	private EnabledModsList()
 	{
+		// Private because we are always instanced by the static createFrom() method below
 	}
+	/**
+	 * Check whether a particular mod is enabled
+	 * 
+	 * @param profileName
+	 * @param name
+	 * @return
+	 */
 	public boolean isEnabled(String profileName, String name)
 	{
 		Map<String, Boolean> profile = this.getProfile(profileName);
@@ -38,6 +65,13 @@ public class EnabledModsList
 		return profile.get(name);
 	}
+	/**
+	 * Set the enablement state of a mod in the specified profile
+	 * 
+	 * @param profileName
+	 * @param name
+	 * @param enabled
+	 */
 	public void setEnabled(String profileName, String name, boolean enabled)
 	{
 		Map<String, Boolean> profile = this.getProfile(profileName);
@@ -46,6 +80,12 @@ public class EnabledModsList
 		this.allowSave = true;
 	}
+	/**
+	 * Reads the mods list passed in on the command line
+	 * 
+	 * @param profileName
+	 * @param modNameFilter
+	 */
 	public void processModsList(String profileName, List<String> modNameFilter)
 	{
 		Map<String, Boolean> profile = this.getProfile(profileName);
@@ -75,8 +115,15 @@ public class EnabledModsList
 		}
 	}
+	/**
+	 * Internal method which returns the map for the specified profile
+	 * 
+	 * @param profileName
+	 * @return
+	 */
 	private Map<String, Boolean> getProfile(String profileName)
 	{
+		if (profileName == null) profileName = "default";
 		if (this.mods == null) this.mods = new TreeMap<String, TreeMap<String,Boolean>>();
 		if (!this.mods.containsKey(profileName))
@@ -87,6 +134,13 @@ public class EnabledModsList
 		return this.mods.get(profileName);
 	}
+	/**
+	 * Factory method which tries to deserialise the enablement list from the file or if failing creates
+	 * and returns a new instance.
+	 * 
+	 * @param file
+	 * @return
+	 */
 	public static EnabledModsList createFrom(File file)
 	{
 		if (file.exists())
@@ -120,6 +174,11 @@ public class EnabledModsList
 		return new EnabledModsList();
 	}
+	/**
+	 * Save the enablement list to the specified file
+	 * 
+	 * @param file
+	 */
 	public void saveTo(File file)
 	{
 		if (!this.allowSave) return;
@@ -48,7 +48,7 @@ public class LiteLoaderTweaker implements ITweaker
 		LiteLoaderTransformer.gameDirectory = gameDirectory;
 		LiteLoaderTransformer.assetsDirectory = assetsDirectory;
-		LiteLoaderTransformer.profile = profile;
+		LiteLoaderTransformer.profile = profile != null ? profile : VERSION;
 		OptionParser optionParser = new OptionParser();
 		this.modsOption = optionParser.accepts("mods", "Comma-separated list of mods to load").withRequiredArg().ofType(String.class).withValuesSeparatedBy(',');