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

Author: Goldenfield192

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

@@ -22,7 +22,8 @@
 public class ScreenBuilder extends GuiScreen implements IScreenBuilder {
     private final IScreen screen;
     private final Map<GuiButton, Button> buttonMap = new HashMap<>();
-    private final List<GuiTextField> textFields = new ArrayList<>();
+    private final List<TextField> textFields = new ArrayList<>();
+    private TextField active = null;
     private final Supplier<Boolean> valid;
     private GuiButton selectedButton;
 
@@ -88,7 +89,7 @@ public void show() {
 
     @Override
     public void addTextField(TextField textField) {
-        this.textFields.add(textField.textfield);
+        this.textFields.add(textField);
     }
 
     // GuiScreen
@@ -110,7 +111,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 
         screen.draw(this, new RenderState().stage(RenderContext.Stage.GUI));
 
-        textFields.forEach(GuiTextField::drawTextBox);
+        textFields.stream().map(t -> t.internal).forEach(GuiTextField::drawTextBox);
 
         // draw buttons
         super.drawScreen(mouseX, mouseY, partialTicks);
@@ -129,7 +130,7 @@ protected void keyTyped(char typedChar, int keyCode) throws IOException {
             close();
         }
 
-        if (this.textFields.stream().noneMatch(x -> x.textboxKeyTyped(typedChar, keyCode))) {
+        if (this.active != null && !active.internal.textboxKeyTyped(typedChar, keyCode)) {
             screen.onKeyType(this, Keyboard.KeyCode.of(keyCode));
         }
     }
@@ -146,9 +147,16 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOEx
             }
         }
 
-        if (this.textFields.stream().noneMatch(x -> AGuiTextField.from(x).mouseClicked(mouseX, mouseY, mouseButton))) {
-            screen.onMouseClick(mouseX, mouseY, hand);
+        for (TextField field : textFields) {
+            if (field.isVisible() && AGuiTextField.from(field.internal).mouseClicked(mouseX, mouseY, mouseButton)) {
+                active = field;
+                field.setFocused(true);
+                return;
+            }
+            field.setFocused(false);
         }
+
+        screen.onMouseClick(mouseX, mouseY, hand);
     }
 
     protected void mouseReleased(int p_mouseReleased_1_, int p_mouseReleased_2_, int p_mouseReleased_3_) {

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

@@ -7,35 +7,36 @@
 
 /** Base text field */
 public class TextField implements IWidget {
-    protected final GuiTextField textfield;
+    protected final GuiTextField internal;
 
     /** Standard constructor */
     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.textfield = internal;
+        this.internal = internal;
         builder.addTextField(this);
     }
 
     @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
@@ -45,26 +46,26 @@ 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.isEnabled;
+        return internal.isEnabled;
     }
 
     /** Validator that can block a string from being entered */
     public void setValidator(Predicate<String> filter) {
-        textfield.setValidator(filter::test);
+        internal.setValidator(filter::test);
     }
 
     /** Move cursor to this text field */
     public void setFocused(boolean b) {
-        textfield.setFocused(b);
+        internal.setFocused(b);
     }
 }

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

@@ -56,9 +56,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) {
@@ -86,6 +88,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.getMinecraft().getRenderManager().renderEntityStatic(entity.internal, partialTicks, true);
+                Minecraft.getMinecraft().getRenderManager().renderMultipass(entity.internal, partialTicks);
             }
         }
 

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

@@ -109,7 +109,8 @@ public static ItemRenderType from(TransformType cameraTransformType) {
                     return type;
                 }
             }
-            return null;
+            //We're facing enums added by other mods, use NONE as fallback
+            return NONE;
         }
     }