Update 0.3.3

Author: Fox2Code

common/src/main/java/com/fox2code/foxloader/loader/Mod.java

@@ -16,6 +16,20 @@ public final ModContainer getModContainer() {
         return Objects.requireNonNull(modContainer == null ? ModContainer.tmp : modContainer);
     }
 
+    /**
+     * @param configObject to use for the config screen.
+     */
+    protected final void setConfigObject(Object configObject) {
+        this.getModContainer().configObject = configObject;
+    }
+
+    /**
+     * @return Object to use for the config screen.
+     */
+    public final Object getConfigObject() {
+        return this.getModContainer().configObject;
+    }
+
     /**
      * @return mod logger
      */

common/src/main/java/com/fox2code/foxloader/loader/ModContainer.java

@@ -43,6 +43,7 @@ public final class ModContainer {
     Mod clientMod;
     String clientModCls;
     String clientMixins;
+    Object configObject;
 
     ModContainer(File file, String id, String name, String version, String description, String jitpack) {
         this(file, id, name, version, Semver.coerce(version), description, jitpack, false);
@@ -86,6 +87,10 @@ public String getFileName() {
         return this.file == null ? "built-in" : this.file.getName();
     }
 
+    public Object getConfigObject() {
+        return configObject;
+    }
+
     void applyPrePatch() throws ReflectiveOperationException {
         if (prePatch != null) {
             PreClassTransformer preClassTransformer =
@@ -151,16 +156,17 @@ void loadLanguageTo(String lang, Properties target) {
 
     private Mod initializeMod(String clsName) throws ReflectiveOperationException {
         if (clsName == null) return null;
-        tmp = this;
         Mod mod;
+        Class<? extends Mod> cls = Class.forName(clsName, false,
+                FoxLauncher.getFoxClassLoader()).asSubclass(Mod.class);
         try {
-            mod = Class.forName(clsName, false, FoxLauncher.getFoxClassLoader())
-                    .asSubclass(Mod.class).newInstance();
-            LifecycleListener.register(mod);
-            mod.modContainer = this;
+            tmp = this;
+            mod = cls.newInstance();
         } finally {
             tmp = null;
         }
+        LifecycleListener.register(mod);
+        mod.modContainer = this;
         return mod;
     }
 

final/src/main/java/com/fox2code/foxloader/installer/InstallerGUI.java

@@ -320,7 +320,9 @@ public void extractMMCInstance() {
             copy(Files.newInputStream(Main.currentInstallerFile.toPath()), zipOutputStream);
             zipOutputStream.closeEntry();
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            for (String entry : new String[]{"patches/com.fox2code.foxloader.json", "instance.cfg", "mmc-pack.json"}) {
+            for (String entry : new String[]{"patches/com.fox2code.foxloader.json",
+                    "patches/net.minecraft.json", "patches/net.minecraftforge.json",
+                    "instance.cfg", "mmc-pack.json"}) {
                 zipOutputStream.putNextEntry(new ZipEntry(entry));
                 byteArrayOutputStream.reset();
                 copyAndClose(InstallerGUI.class.getResourceAsStream(

final/src/main/resources/mmc/mmc-pack.json

@@ -20,6 +20,30 @@
             "important": true,
             "uid": "com.fox2code.foxloader",
             "version": "#version#"
+        },
+        {
+            "cachedName": "Workaround to prevent MultiMC Crash",
+            "cachedRequires": [
+                {
+                    "uid": "com.fox2code.foxloader"
+                }
+            ],
+            "cachedVersion": "no-op",
+            "disabled": true,
+            "uid": "net.minecraft",
+            "version": "no-op"
+        },
+        {
+            "cachedName": "Workaround to display CoreMods tab",
+            "cachedRequires": [
+                {
+                    "uid": "com.fox2code.foxloader"
+                }
+            ],
+            "cachedVersion": "no-op",
+            "disabled": true,
+            "uid": "net.minecraftforge",
+            "version": "no-op"
         }
     ],
     "formatVersion": 1

final/src/main/resources/mmc/patches/net.minecraft.json

@@ -0,0 +1,13 @@
+{
+  "formatVersion": 1,
+  "name": "Workaround to prevent MultiMC Crash",
+  "releaseTime": "2011-07-08T00:00:00+02:00",
+  "requires": [
+    {
+      "uid": "com.fox2code.foxloader"
+    }
+  ],
+  "type": "old_beta",
+  "uid": "net.minecraft",
+  "version": "no-op"
+}

final/src/main/resources/mmc/patches/net.minecraftforge.json

@@ -0,0 +1,13 @@
+{
+  "formatVersion": 1,
+  "name": "Workaround to display CoreMods tab",
+  "releaseTime": "2011-07-08T00:00:00+02:00",
+  "requires": [
+    {
+      "uid": "com.fox2code.foxloader"
+    }
+  ],
+  "type": "old_beta",
+  "uid": "net.minecraftforge",
+  "version": "no-op"
+}

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 
 # FoxLoader properties
-foxloader.version=0.3.2
+foxloader.version=0.3.3
 foxloader.lastReIndevTransformerChanges=0.3.0
 
 # ReIndev properties