Merge remote-tracking branch 'origin/1.16.5-forge' into 1.17.1-forge

Author: Goldenfield192

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

@@ -143,6 +143,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,
                           new TextComponent("")));
     }