Revert "Fix resource packs being reset on startup (symlink packs included) (#31)"

This reverts commit 265814d.

Author: Eldrinn-Elantey

gradle.properties

@@ -95,7 +95,7 @@ apiPackage =
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile = bls_at.cfg
+accessTransformersFile =
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false

src/main/java/alexiil/mods/load/MinecraftDisplayer.java

@@ -14,6 +14,7 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -208,8 +209,19 @@ public MinecraftDisplayer(boolean preview) {
     }
 
     @SuppressWarnings("unchecked")
-    private List<IResourcePack> getDefaultResourcePackList() {
-        return mc.defaultResourcePacks;
+    private List<IResourcePack> getOnlyList() {
+        Field[] flds = mc.getClass().getDeclaredFields();
+        for (Field f : flds) {
+            if (f.getType().equals(List.class) && !Modifier.isStatic(f.getModifiers())) {
+                f.setAccessible(true);
+                try {
+                    return (List<IResourcePack>) f.get(mc);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return null;
     }
 
     public void openPreview(ImageRender[] renders) {
@@ -691,10 +703,8 @@ public void open(Configuration cfg) {
             if (!ProgressDisplayer.coreModLocation.isDirectory())
                 myPack = new FMLFileResourcePack(ProgressDisplayer.modContainer);
             else myPack = new FMLFolderResourcePack(ProgressDisplayer.modContainer);
-            List<IResourcePack> defaultPacks = getDefaultResourcePackList();
-            if (!defaultPacks.contains(myPack)) {
-                defaultPacks.add(myPack);
-            }
+            getOnlyList().add(myPack);
+            mc.refreshResources();
         }
 
         handleTips();
@@ -1212,6 +1222,7 @@ private FontRenderer fontRenderer(String fontTexture) {
         font.onResourceManagerReload(mc.getResourceManager());
         font.setUnicodeFlag(mc.func_152349_b());
         if (!preview) {
+            mc.refreshResources();
             font.onResourceManagerReload(mc.getResourceManager());
         }
         fontRenderers.put(fontTexture, font);
@@ -1443,6 +1454,7 @@ private void preDisplayScreen() {
                 textureManager = mc.renderEngine;
             } else {
                 textureManager = mc.renderEngine = new TextureManager(mc.getResourceManager());
+                mc.refreshResources();
                 textureManager.onResourceManagerReload(mc.getResourceManager());
                 mc.fontRenderer = new FontRenderer(
                         mc.gameSettings,
@@ -1517,7 +1529,7 @@ public void close() {
         if (backgroundExec != null) {
             backgroundExec.shutdown();
         }
-        getDefaultResourcePackList().remove(myPack);
+        getOnlyList().remove(myPack);
 
         if (imgurCacheManager != null) {
             imgurCacheManager.cleanUp();