Merge remote-tracking branch 'origin/1.12.2-forge' into 1.14.4-forge

Author: Goldenfield192

README.md

@@ -24,8 +24,8 @@ In the past UMC has been packaged directly with ImmersiveRailroading as it is wa
 | [1.19.4-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.19.4-fabric)     | ![Universal Mod Core 1.19.4-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/actions/workflows/build.yml/badge.svg?branch=1.19.4-fabric)     |
 | [1.20.1-forge](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.20.1-forge)       | ![Universal Mod Core 1.20.1-forge](https://github.com/TeamOpenIndustry/UniversalModCore/actions/workflows/build.yml/badge.svg?branch=1.20.1-forge)       |
 | [1.20.1-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.20.1-fabric)     | ![Universal Mod Core 1.20.1-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/actions/workflows/build.yml/badge.svg?branch=1.20.1-fabric)     |
-| [1.20.4-neoforge](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.20.4-neoforge) | ![Universal Mod Core 1.20.4-neoforge](https://github.com/TeamOpenIndustry/UniversalModCore/actions/workflows/build.yml/badge.svg?branch=1.20.4-neoforge) |
-| [1.20.4-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.20.4-fabric)     | ![Universal Mod Core 1.20.4-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/actions/workflows/build.yml/badge.svg?branch=1.20.4-fabric)     |
+| [1.20.4-neoforge](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.20.4-neoforge) | EOL                                                                                                                                                      |
+| [1.20.4-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.20.4-fabric)     | EOL                                                                                                                                                      |
 | [1.21.1-neoforge](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.21.1-neoforge) | ![Universal Mod Core 1.21.1-neoforge](https://github.com/TeamOpenIndustry/UniversalModCore/actions/workflows/build.yml/badge.svg?branch=1.21.1-neoforge) |
 | [1.21.1-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/tree/1.21.1-fabric)     | ![Universal Mod Core 1.21.1-fabric](https://github.com/TeamOpenIndustry/UniversalModCore/actions/workflows/build.yml/badge.svg?branch=1.21.1-fabric)     |
 

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

@@ -1,17 +1,13 @@
 package cam72cam.mod;
 
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 
 import net.minecraft.client.resources.ClientResourcePackInfo;
 import net.minecraft.resources.*;
-import net.minecraft.resources.data.IMetadataSectionSerializer;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraftforge.fml.ModList;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -23,6 +19,7 @@
 import cam72cam.mod.net.Packet;
 import cam72cam.mod.net.PacketDirection;
 import cam72cam.mod.render.Light;
+import cam72cam.mod.resource.BuiltinPack;
 import cam72cam.mod.resource.Identifier;
 import cam72cam.mod.text.Command;
 import cam72cam.mod.util.MinecraftFiles;
@@ -45,13 +42,10 @@
 import org.apache.commons.lang3.SystemUtils;
 import org.lwjgl.opengl.GL11;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 /** UMC Mod, do not touch... */
 @net.minecraftforge.fml.common.Mod(ModCore.MODID)
@@ -163,6 +157,10 @@ public static void catching(Throwable ex) {
         }
     }
 
+    public List<Mod> getLoadedMods() {
+        return mods;
+    }
+
     private static Proxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
     /** Hooked into forge's proxy system and fires off corresponding events */
     public static class Proxy {
@@ -209,39 +207,24 @@ public void setup() {
             }
             Config.getMaxTextureSize(); //populate
 
-            List<ResourcePack> packs = new ArrayList<>();
-            packs.add(new TranslationResourcePack());
-
-            for (Mod m : mods) {
-                ResourcePack modPack = createPack(ModList.get().getModFileById(m.modID()).getFile().getFilePath().toFile());
-                packs.add(modPack);
-                String configDir = FMLPaths.CONFIGDIR.get().toString();
-                new File(configDir).mkdirs();
-
-                File folder = new File(configDir + File.separator + m.modID());
-                if (folder.exists()) {
-                    if (folder.isDirectory()) {
-                        File[] files = folder.listFiles((dir, name) -> name.endsWith(".zip"));
-                        for (File file : files) {
-                            packs.add(createPack(file));
-                        }
-
-                        File[] folders = folder.listFiles((dir, name) -> dir.isDirectory());
-                        for (File dir : folders) {
-                            packs.add(createPack(dir));
-                        }
-                    }
-                } else {
-                    folder.mkdirs();
-                }
-                packs.add(modPack);
+            List<IResourcePack> packs = new ArrayList<>();
+
+            for (Mod mod : instance.mods) {
+                BuiltinPack.loadModResource(mod);
             }
 
-            // Force first and last (and inject mod time) BUG: sounds can still be overridden by resource packs
+            IResourcePack modPack = BuiltinPack.attach();
+            // 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);
+
             Minecraft.getInstance().getResourcePackList().addPackFinder(new IPackFinder() {
                 @Override
                 public <T extends ResourcePackInfo> void addPackInfosToMap(Map<String, T> nameToPackMap, ResourcePackInfo.IFactory<T> packInfoFactory) {
-                    for (ResourcePack pack : packs) {
+                    for (IResourcePack pack : packs) {
                         //noinspection unchecked
                         nameToPackMap.put(pack.getName(), (T) new ClientResourcePackInfo(pack.getName(),
                                 true,
@@ -264,108 +247,6 @@ public void event(ModEvent event, Mod m) {
             m.clientEvent(event);
         }
 
-        private static class TranslationResourcePack extends ResourcePack  {
-            public TranslationResourcePack() {
-                super(null);
-            }
-
-            private ResourceLocation toLang(String path) {
-                // assets/mod/location
-                //return String.format("%s/%s/%s", type.getDirectoryName(), location.getNamespace(), location.getPath());
-                String[] parts = path.split("/");
-                String type = parts[0];
-                String namespace = parts[1];
-                String prefix = String.format("%s/%s/", type, namespace);
-                path = path.replace(prefix, "").replace(".json", ".lang");
-                String lang = path.split("_")[1].replace(".lang", "");
-                path = path.replace("_" + lang, "_" + lang.toUpperCase(Locale.ROOT));
-                return new ResourceLocation(namespace, path.toLowerCase(Locale.ROOT)) {
-                    @Override
-                    public String getPath() {
-                        // Very evil...
-                        return path;
-                    }
-                };
-            }
-
-            @Override
-            public boolean resourceExists(String resourcePath) {
-                if (resourcePath.contains("/lang/") && resourcePath.endsWith(".json")) {
-                    ResourceLocation lang = toLang(resourcePath);
-                    return Minecraft.getInstance().getResourceManager().hasResource(lang);
-                }
-                return false;
-            }
-
-            @Override
-            public InputStream getInputStream(String resourcePath) throws IOException {
-                if (resourcePath.contains("/lang/") && resourcePath.endsWith(".json")) {
-                    // Magical Translations!
-                    ResourceLocation lang = toLang(resourcePath);
-                    if (Minecraft.getInstance().getResourceManager().hasResource(lang)) {
-                        Map<String, String> translationMap = new HashMap<>();
-                        for (IResource resource : Minecraft.getInstance().getResourceManager().getAllResources(lang)) {
-                            try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8))) {
-                                String line;
-                                while ((line = reader.readLine()) != null) {
-                                    //Remove comment
-                                    line = line.trim();
-                                    int comment = line.indexOf("#");
-                                    if (line.isEmpty() || comment == 0) {
-                                        continue;
-                                    }
-
-                                    String[] splits = line.split("=", 2);
-                                    if (splits.length == 2) {
-                                        translationMap.put(splits[0].trim(), splits[1].trim());
-                                    }
-                                }
-                            }
-                        }
-
-                        Set<String> translations = new HashSet<>();
-                        translationMap.forEach((key, value) -> {
-                            if (!key.isEmpty()) {
-                                translations.add(String.format("\"%s\": \"%s\"", key, value));
-                                translations.add(String.format("\"%s\": \"%s\"", key.replace(":", "."), value));
-                                translations.add(String.format("\"%s\": \"%s\"", key.replace(".name", ""), value));
-                                translations.add(String.format("\"%s\": \"%s\"", key.replace(".name", "").replace(":", "."), value));
-                            }
-                        });
-                        String output = "{" + String.join(",", translations) + "}";
-                        return new ByteArrayInputStream(output.getBytes(StandardCharsets.UTF_8));
-                    }
-                }
-                return null;
-            }
-
-            @Override
-            public Collection<ResourceLocation> getAllResourceLocations(ResourcePackType type, String pathIn, int maxDepth, Predicate<String> filter) {
-                return Collections.emptyList();
-            }
-
-            @Override
-            public Set<String> getResourceNamespaces(ResourcePackType type) {
-                return mods.stream().map(Mod::modID).collect(Collectors.toSet());
-            }
-
-            @Override
-            public void close() throws IOException {
-
-            }
-
-            @Override
-            public String getName() {
-                return "Translation Hackery";
-            }
-
-            @Nullable
-            @Override
-            public <T> T getMetadata(IMetadataSectionSerializer<T> p_195760_1_) throws IOException {
-                return getResourceMetadata(p_195760_1_, new ByteArrayInputStream("{}".getBytes()));
-            }
-        }
-
         private static class UMCFolderPack extends FolderPack  {
             public UMCFolderPack(File folder) {
                 super(folder);
@@ -458,7 +339,7 @@ public void clientEvent(ModEvent event) {
                     // Instance can be null during data gen
                     if (Minecraft.getInstance() != null) {
                         ((IReloadableResourceManager) Minecraft.getInstance().getResourceManager()).addReloadListener((stage, resourceManager, preparationsProfiler, reloadProfiler, backgroundExecutor, gameExecutor) ->
-                                stage.markCompleteAwaitingOthers(Unit.INSTANCE).thenRun(ClientEvents::fireReload));
+                                stage.markCompleteAwaitingOthers(Unit.INSTANCE).thenRun(ClientEvents::fireReload).thenRun(BuiltinPack::reload));
                         Light.register();
                     }
                     break;

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

@@ -20,7 +20,8 @@
 public class ScreenBuilder extends Screen implements IScreenBuilder {
     private final IScreen screen;
     private final Map<Widget, Button> buttonMap = new HashMap<>();
-    private final Map<TextFieldWidget, TextField> textFieldMap = new HashMap<>();
+    private final List<TextField> textFields = new ArrayList<>();
+    private TextField active = null;
     private final Supplier<Boolean> valid;
 
     public ScreenBuilder(IScreen screen, Supplier<Boolean> valid) {
@@ -63,7 +64,7 @@ public void addButton(Button btn) {
     @Override
     public void addTextField(TextField textField) {
         super.addButton(textField.internal());
-        this.textFieldMap.put(textField.internal(), textField);
+        this.textFields.add(textField);
     }
 
     @Override
@@ -101,7 +102,7 @@ public void show() {
     @Override
     public void init() {
         buttonMap.clear();
-        textFieldMap.clear();
+        textFields.clear();
         screen.init(this);
     }
 
@@ -135,20 +136,13 @@ public boolean keyPressed(int typedChar, int keyCode, int mods) {
             return true;
         }
 
-        if (this.textFieldMap.keySet().stream()
-                             .noneMatch(txt -> txt.keyPressed(typedChar, keyCode, mods))) {
-            screen.onKeyType(this, Keyboard.KeyCode.of(typedChar));
+        if (this.active != null && !active.internal.keyPressed(typedChar, keyCode, mods)) {
+            screen.onKeyType(this, Keyboard.KeyCode.of(keyCode));
         }
 
         return true;
     }
 
-    @Override
-    public boolean charTyped(char p_charTyped_1_, int p_charTyped_2_) {
-        return this.textFieldMap.keySet().stream()
-                             .anyMatch(txt -> txt.charTyped(p_charTyped_1_, p_charTyped_2_));
-    }
-
     @Override
     public boolean mouseClicked(double x, double y, int button) {
         Player.Hand hand = button == 0 ? Player.Hand.PRIMARY : Player.Hand.SECONDARY;
@@ -157,15 +151,16 @@ public boolean mouseClicked(double x, double y, int button) {
             return true;
         }
 
-        if (this.textFieldMap.keySet().stream().noneMatch(txt -> {
-            if (txt.mouseClicked(x, y, button)) {
-                txt.setFocused2(true);
+        for (TextField field : textFields) {
+            if (field.isVisible() && field.internal.mouseClicked(x, y, hand == Player.Hand.PRIMARY ? 0 : 1)) {
+                active = field;
+                field.setFocused(true);
                 return true;
             }
-            return false;
-        })) {
-            screen.onMouseClick((int) x, (int) y, hand);
+            field.setFocused(false);
         }
+
+        screen.onMouseClick((int) x, (int) y, hand);
         return true;
     }
 

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

@@ -6,8 +6,8 @@
 import java.util.function.Predicate;
 
 /** Base text field */
-public class TextField implements IWidget{
-    protected final TextFieldWidget textfield;
+public class TextField implements IWidget {
+    protected final TextFieldWidget internal;
     /** Standard constructor */
     public TextField(IScreenBuilder builder, int x, int y, int width, int height) {
         this(builder,
@@ -16,28 +16,29 @@ public TextField(IScreenBuilder builder, int x, int y, int width, int height) {
 
     /** Internal, can be overridden to support custom GuiTextFields */
     protected TextField(IScreenBuilder builder, TextFieldWidget internal) {
-        this.textfield = internal;
+        this.internal = internal;
+        this.internal.setMaxStringLength(256);
         builder.addTextField(this);
     }
 
     TextFieldWidget internal() {
-        return textfield;
+        return internal;
     }
 
     @Override
     public void setText(String s) {
-        textfield.setText(s);
+        internal.setText(s);
     }
 
     @Override
     public String getText() {
-        return textfield.getText();
+        return internal.getText();
     }
 
     @Override
     public void setVisible(boolean visible) {
-        textfield.setVisible(visible);
-        textfield.setEnabled(visible);
+        internal.setVisible(visible);
+        internal.setEnabled(visible);
     }
 
     @Deprecated
@@ -47,17 +48,17 @@ public void setVisible(Boolean visible) {
 
     @Override
     public boolean isVisible() {
-        return textfield.getVisible();
+        return internal.getVisible();
     }
 
     @Override
     public void setEnabled(boolean enabled) {
-        textfield.setEnabled(enabled);
+        internal.setEnabled(enabled);
     }
 
     @Override
     public boolean isEnabled() {
-        return textfield.active;
+        return internal.active;
     }
 
     /** Validator that can block a string from being entered */

src/main/java/cam72cam/mod/render/EntityRenderer.java

@@ -55,9 +55,11 @@ public static void register(Class<? extends Entity> type, IEntityRender render)
 
     /**
      * Sooo this is a fun one...
-     *
+     * <p>
      * MC culls out entities in chunks that are not in view, which breaks when entities span chunk boundaries
+     * <p>
      * For 1-2 block entities, this is barely noticeable.  For large entities it's a problem.
+     * <p>
      * We try to detect entities in this edge case and render them here to prevent the issue.
      */
     private static void renderLargeEntities(RenderState state, float partialTicks) {
@@ -85,6 +87,7 @@ private static void renderLargeEntities(RenderState state, float partialTicks) {
             AxisAlignedBB chunk = new AxisAlignedBB(min.internal(), max.internal());
             if (!camera.isBoundingBoxInFrustum(chunk) && camera.isBoundingBoxInFrustum(entity.internal.getRenderBoundingBox())) {
                 Minecraft.getInstance().getRenderManager().renderEntityStatic(entity.internal, partialTicks, true);
+                Minecraft.getInstance().getRenderManager().renderMultipass(entity.internal, partialTicks);
             }
         }