diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/ComponentHolder.java b/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/ComponentHolder.java index af7de22e..18351054 100644 --- a/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/ComponentHolder.java +++ b/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/ComponentHolder.java @@ -174,9 +174,9 @@ public void setHeight(double h, boolean percent) { } public void setWidth(double w, boolean percent) { - if (this.size.getY() == w && percent == PERCENT.HAS_SIZE_X(percentFlag)) return; + if (this.size.getX() == w && percent == PERCENT.HAS_SIZE_X(percentFlag)) return; percentFlag = PERCENT.SET_SIZE_X(percentFlag, percent); - this.size.setY(PERCENT.HAS_SIZE_Y(percentFlag) ? MathUtil.constrain01(w) : w); + this.size.setX(PERCENT.HAS_SIZE_X(percentFlag) ? MathUtil.constrain01(w) : w); updatePosAndSize(); } diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/InputField.java b/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/InputField.java index e1948828..59722784 100644 --- a/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/InputField.java +++ b/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/InputField.java @@ -203,10 +203,6 @@ public void clear() { content = ""; } - public void setWidth(double width) { - this.size.setX(width); - } - @Override public boolean handleMouseInput(Mouse.State state, Vector2D mousePos, Mouse.Button button) { if (button == Mouse.Button.LEFT) { diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/gui/screens/LandingBlockGuiScreen.java b/common/src/main/java/io/github/kurrycat/mpkmod/gui/screens/LandingBlockGuiScreen.java index 2fc473c5..bb7b90e9 100644 --- a/common/src/main/java/io/github/kurrycat/mpkmod/gui/screens/LandingBlockGuiScreen.java +++ b/common/src/main/java/io/github/kurrycat/mpkmod/gui/screens/LandingBlockGuiScreen.java @@ -210,14 +210,6 @@ public int getHeight() { public void render(int index, Vector2D pos, Vector2D size, Vector2D mouse) { Renderer2D.drawRectWithEdge(pos, size, 1, lbListColorBg, lbListColorItemEdge); - for (int i = 0; i < fields.length; i++) { - fields[i].setPos(pos.add( - size.getX() / 12 + size.getX() / 5 * 2 * (((int) (i / 3))), - size.getY() / 4 * (1 + (i % 3)) - fields[i].getDisplayedSize().getY() / 2 - )); - fields[i].setWidth(size.getX() / 3); - } - if (collapsed) FontRenderer.drawString( landingBlock.boundingBox.getMin() + " - " + landingBlock.boundingBox.getMax(), @@ -234,7 +226,7 @@ public void render(int index, Vector2D pos, Vector2D size, Vector2D mouse) { size.getX() / 12 + size.getX() / 5 * 2 * (((int) (i / 3))), size.getY() / 4 * (1 + (i % 3)) - fields[i].getDisplayedSize().getY() / 2 )); - fields[i].setWidth(size.getX() / 3); + fields[i].setWidth(size.getX() / 3, false); fields[i].render(mouse); }