Merge remote-tracking branch 'origin/1.11.2-forge' into 1.10.2-forge

Author: Goldenfield192

src/main/java/cam72cam/mod/ModCore.java

@@ -175,19 +175,15 @@ public static class ClientProxy extends Proxy {
         public void event(ModEvent event, Mod m) {
             if (event == ModEvent.CONSTRUCT) {
                 Config.getMaxTextureSize(); //populate
-
+                List<IResourcePack> packs = Minecraft.getMinecraft().defaultResourcePacks;
+                BuiltinPack.loadModResource(m);
+                IResourcePack modPack = BuiltinPack.attach(Loader.instance().activeModContainer().getSource());
+                // Ensure people will get our result first via getResourceStream() and getLastResourceStream()
+                // (Also injects last modified time access)
+                // BUG: sounds can still be overridden by resource packs
+                packs.add(1, modPack);
+                packs.add(modPack);
                 if (!constructed) {
-                    for (Mod mod : instance.mods) {
-                        BuiltinPack.loadModResource(mod);
-                    }
-
-                    List<IResourcePack> packs = Minecraft.getMinecraft().defaultResourcePacks;
-                    IResourcePack modPack = BuiltinPack.attach(Loader.instance().activeModContainer().getSource());
-                    // Ensure people will get our result first via getResourceStream() and getLastResourceStream()
-                    // (Also injects last modified time access)
-                    // BUG: sounds can still be overridden by resource packs
-                    packs.add(1, modPack);
-                    packs.add(modPack);
                     BuiltinPack.onConstruct(packs);
 
                     constructed = true;

src/main/java/cam72cam/mod/gui/screen/TextField.java

@@ -14,12 +14,12 @@ public TextField(IScreenBuilder builder, int x, int y, int width, int height) {
         this(builder,
              //Offset x&y by 1 and minus width&height by 2 to let border be within the range specified
              new GuiTextField(-1, Minecraft.getMinecraft().fontRendererObj, builder.getWidth() / 2 + x + 1, builder.getHeight() / 4 + y + 1, width - 2, height - 2));
-        internal.setMaxStringLength(256);
     }
 
     /** Internal, can be overridden to support custom GuiTextFields */
     protected TextField(IScreenBuilder builder, GuiTextField internal) {
         this.internal = internal;
+        internal.setMaxStringLength(256);
         builder.addTextField(this);
     }