Update 1.2.32

Author: Fox2Code

.gitignore

@@ -8,6 +8,7 @@
 /*/build
 /run
 /run2
+/crash-reports
 
 /.project
 /.classpath

common/src/main/java/com/fox2code/foxloader/launcher/FoxClassLoader.java

@@ -1,5 +1,7 @@
 package com.fox2code.foxloader.launcher;
 
+import com.fox2code.foxloader.launcher.utils.Enumerations;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -24,6 +26,7 @@ public final class FoxClassLoader extends URLClassLoader {
     private ArrayList<URL> coreMods;
     private boolean didPrintedTransformFail = false;
     private boolean patchedExclusiveSource = false;
+    private URL minecraftURL;
     static URL earlyMinecraftURL;
 
     FoxClassLoader() {
@@ -146,7 +149,7 @@ private Class<?> findClassImpl(String name, URL resource) throws ClassNotFoundEx
                     throw new ClassTransformException("Can't compute frames for "+name, e);
                 }
             } else switch (name) {
-                // We need to apply some patches to mixins to make the actually work.
+                // We need to apply some patches to mixins to make them actually work.
                 case MIXIN_CONFIG:
                     if (wrappedExtensions == null)
                         throw new ClassTransformException("wrappedExtensions not initialized yet");
@@ -208,6 +211,26 @@ public URL getResource(String name) {
         return this.getParent().getResource(name);
     }
 
+    @Override
+    public URL findResource(String name) {
+        if (isGamePath(name)) {
+            if (gameExclusiveSource != null) {
+                return gameExclusiveSource.findResource(name);
+            } else {
+                return this.getParent().getResource(name);
+            }
+        }
+        return super.findResource(name);
+    }
+
+    @Override
+    public Enumeration<URL> findResources(String name) throws IOException {
+        if (isGamePath(name)) {
+            return Enumerations.optional(this.findResource(name));
+        }
+        return super.findResources(name);
+    }
+
     public boolean isClassLoaded(String className) {
         return this.findLoadedClass(className) != null;
     }
@@ -263,17 +286,25 @@ public void addCoreModURL(URL url) {
     }
 
     public void setMinecraftURL(URL url) {
-        if (allowLoadingGame)
+        if (this.allowLoadingGame)
             throw new IllegalStateException("Minecraft jar already loaded!");
-        gameExclusiveSource = new URLClassLoader(makeURLClassPathForSource(url), null);
-        patchedExclusiveSource = false;
+        this.gameExclusiveSource = new URLClassLoader(makeURLClassPathForSource(url), null);
+        this.patchedExclusiveSource = false;
+        this.minecraftURL = url;
     }
 
     public void setPatchedMinecraftURL(URL url) {
-        if (allowLoadingGame)
+        if (this.allowLoadingGame)
             throw new IllegalStateException("Minecraft jar already loaded!");
-        gameExclusiveSource = new URLClassLoader(new URL[]{url}, null);
-        patchedExclusiveSource = true;
+        URL minecraftURL;
+        try {
+            minecraftURL = this.getOriginalMinecraftSource();
+        } catch (IOException e) {
+            throw new IllegalStateException("Original Minecraft jar not set", e);
+        }
+        this.gameExclusiveSource = new URLClassLoader(new URL[]{url, minecraftURL}, null);
+        this.patchedExclusiveSource = true;
+        this.minecraftURL = minecraftURL;
     }
 
     public URL[] makeURLClassPathForSource(URL source) {
@@ -290,7 +321,7 @@ public void allowLoadingGame() {
         if (coreMods != null) {
             try {
                 if (!patchedExclusiveSource) {
-                    setMinecraftURL(getMinecraftSource());
+                    setMinecraftURL(getOriginalMinecraftSource());
                 }
                 coreMods = null;
                 allowLoadingGame = true;
@@ -305,11 +336,15 @@ public URL getMinecraftSource() throws IOException {
                 this.getResource("font.txt")).openConnection();
         if (urlConnection instanceof JarURLConnection) {
           return ((JarURLConnection) urlConnection).getJarFileURL();
-        } else if (earlyMinecraftURL != null) {
-            return earlyMinecraftURL;
+        } else if (this.minecraftURL != null) {
+            return this.minecraftURL;
         } else throw new IOException("Invalid reindev.jar source...");
     }
 
+    public URL getOriginalMinecraftSource() throws IOException {
+        return this.minecraftURL != null ? this.minecraftURL : this.getMinecraftSource();
+    }
+
     public boolean isAllowLoadingGame() {
         return allowLoadingGame;
     }
@@ -348,14 +383,14 @@ public static boolean isGameClassName(String cls) {
                 cls.startsWith("com.jcraft.");
     }
 
-    public static boolean isGamePath(String cls) {
+    public static boolean isGamePath(String path) {
         // Only allow core-mods to modify these files
-        return cls.startsWith("net/minecraft/") ||
-                cls.startsWith("com/indigo3d/") ||
-                cls.startsWith("paulscode/sound/") ||
-                cls.startsWith("com/jcraft/") ||
+        return path.startsWith("net/minecraft/") ||
+                path.startsWith("com/indigo3d/") ||
+                path.startsWith("paulscode/sound/") ||
+                path.startsWith("com/jcraft/") ||
                 // font.txt is a protected game file
-                cls.equals("font.txt");
+                path.equals("font.txt");
     }
 
     private static class ClassTransformException extends Exception {

common/src/main/java/com/fox2code/foxloader/launcher/utils/Enumerations.java

@@ -0,0 +1,64 @@
+package com.fox2code.foxloader.launcher.utils;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+public class Enumerations {
+    public static <E> Enumeration<E> empty() {
+        return Collections.emptyEnumeration();
+    }
+
+    public static <E> Enumeration<E> singleton(E e) {
+        return e == null ? new Null<>() : new Singleton<>(e);
+    }
+
+    public static <E> Enumeration<E> optional(E e) {
+        return e == null ? empty() : singleton(e);
+    }
+
+    private static final class Singleton<E> implements Enumeration<E> {
+        private E element;
+
+        private Singleton(E element) {
+            this.element = element;
+        }
+
+        @Override
+        public boolean hasMoreElements() {
+            return this.element != null;
+        }
+
+        @Override
+        public E nextElement() {
+            E element = this.element;
+            this.element = null;
+            if (element == null) {
+                throw new NoSuchElementException();
+            }
+            return element;
+        }
+    }
+
+    private static final class Null<E> implements Enumeration<E> {
+        private boolean hasMoreElements;
+
+        private Null() {
+            this.hasMoreElements = true;
+        }
+
+        @Override
+        public boolean hasMoreElements() {
+            return this.hasMoreElements;
+        }
+
+        @Override
+        public E nextElement() {
+            if (!this.hasMoreElements) {
+                throw new NoSuchElementException();
+            }
+            this.hasMoreElements = false;
+            return null;
+        }
+    }
+}

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 
 # FoxLoader properties
-foxloader.version=1.2.31
+foxloader.version=1.2.32
 foxloader.lastReIndevTransformerChanges=1.2.31
 # https://www.jitpack.io/#com.fox2code/FoxLoader