Merge remote-tracking branch 'origin/1.20.1-forge' into 1.21.1-neoforge

Author: Goldenfield192

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

@@ -153,6 +153,14 @@ public boolean keyPressed(int typedChar, int keyCode, int mods) {
         return true;
     }
 
+    @Override
+    public boolean charTyped(char p_charTyped_1_, int p_charTyped_2_) {
+        if (active != null) {
+            return active.internal.charTyped(p_charTyped_1_, p_charTyped_2_);
+        }
+        return super.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;

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

@@ -12,7 +12,8 @@ public class TextField implements IWidget{
     /** Standard constructor */
     public TextField(IScreenBuilder builder, int x, int y, int width, int height) {
         this(builder,
-              new EditBox(Minecraft.getInstance().font, builder.getWidth() / 2 + x, builder.getHeight() / 4 + y, width, height,
+              //Offset x&y by 1 and minus width&height by 2 to let border be within the range specified
+              new EditBox(Minecraft.getInstance().font, builder.getWidth() / 2 + x + 1, builder.getHeight() / 4 + y + 1, width - 2, height - 2,
                           Component.literal("")));
     }
 

src/main/java/cam72cam/mod/resource/BuiltinPack.java

@@ -26,6 +26,8 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -286,7 +288,7 @@ && handleRedirect(ident, entry.getKey(), entry.getValue()).canLoad()) {
         }
 
         @Override
-        public void listResources(PackType type, String pathIn, String namespace, PackResources.ResourceOutput output) {
+        public void listResources(PackType type, String namespace, String pathIn, PackResources.ResourceOutput output) {
             //TODO list all redirect/conditional resources, may need new parameters in API?
             final String folder = pathIn + "/"; // Ensure folders
             DIRECT_RESOURCES.forEach((k, v) -> {