diff --git a/src/main/java/rsmm/fabric/client/gui/MultimeterHudRenderer.java b/src/main/java/rsmm/fabric/client/gui/MultimeterHudRenderer.java index b89e3c40..8e0966a4 100644 --- a/src/main/java/rsmm/fabric/client/gui/MultimeterHudRenderer.java +++ b/src/main/java/rsmm/fabric/client/gui/MultimeterHudRenderer.java @@ -177,10 +177,10 @@ private void renderTicksTable(MatrixStack matrices, int x, int y, int width, int long firstTick = getSelectedTick() - SELECTED_COLUMN; long currentTick = client.getLastServerTick() + 1; - int markerColumn = (currentTick < firstTick || currentTick > (firstTick + COLUMN_COUNT)) ? -1 : (int)(currentTick - firstTick); + int markedColumn = (currentTick < firstTick || currentTick > (firstTick + COLUMN_COUNT)) ? -1 : (int)(currentTick - firstTick); drawBackground(matrices, x, y, width, height); - drawGridLines(matrices, x, y, height, COLUMN_COUNT, markerColumn); + drawGridLines(matrices, x, y, height, COLUMN_COUNT, markedColumn); int rowX = x; int rowY = y; diff --git a/src/main/java/rsmm/fabric/client/gui/MultimeterScreen.java b/src/main/java/rsmm/fabric/client/gui/MultimeterScreen.java index c629b821..995a4e25 100644 --- a/src/main/java/rsmm/fabric/client/gui/MultimeterScreen.java +++ b/src/main/java/rsmm/fabric/client/gui/MultimeterScreen.java @@ -24,7 +24,7 @@ public class MultimeterScreen extends RSMMScreen { private static double lastScrollAmount; - private boolean isPauseScreen; + private final boolean isPauseScreen; private double scrollAmount = -1; private int scrollSpeed = 7; diff --git a/src/main/java/rsmm/fabric/client/gui/element/IParentElement.java b/src/main/java/rsmm/fabric/client/gui/element/IParentElement.java index ccef488e..ba6b2dc8 100644 --- a/src/main/java/rsmm/fabric/client/gui/element/IParentElement.java +++ b/src/main/java/rsmm/fabric/client/gui/element/IParentElement.java @@ -12,8 +12,10 @@ public interface IParentElement extends IElement { @Override default void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - for (IElement child : getChildren()) { - child.render(matrices, mouseX, mouseY, delta); + List children = getChildren(); + + for (int index = 0; index < children.size(); index++) { + children.get(index).render(matrices, mouseX, mouseY, delta); } } @@ -49,13 +51,14 @@ default boolean mouseClick(double mouseX, double mouseY, int button) { @Override default boolean mouseRelease(double mouseX, double mouseY, int button) { + boolean released = false; + if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) { setDraggingMouse(false); } - boolean released = false; - List children = getChildren(); + for (int index = 0; index < children.size(); index++) { IElement child = children.get(index); @@ -147,7 +150,11 @@ default void clearChildren() { default IElement getHoveredElement(double mouseX, double mouseY) { if (isHovered(mouseX, mouseY)) { - for (IElement child : getChildren()) { + List children = getChildren(); + + for (int index = 0; index < children.size(); index++) { + IElement child = children.get(index); + if (child.isHovered(mouseX, mouseY)) { return child; } diff --git a/src/main/java/rsmm/fabric/client/gui/element/meter/MeterControlsElement.java b/src/main/java/rsmm/fabric/client/gui/element/meter/MeterControlsElement.java index 95dbf2ea..c7bae964 100644 --- a/src/main/java/rsmm/fabric/client/gui/element/meter/MeterControlsElement.java +++ b/src/main/java/rsmm/fabric/client/gui/element/meter/MeterControlsElement.java @@ -478,8 +478,6 @@ private void updateCoordinates() { y += ROW_HEIGHT; } - - } this.height = y - this.y; diff --git a/src/main/java/rsmm/fabric/client/gui/widget/Button.java b/src/main/java/rsmm/fabric/client/gui/widget/Button.java index 14debe2f..3223b9c1 100644 --- a/src/main/java/rsmm/fabric/client/gui/widget/Button.java +++ b/src/main/java/rsmm/fabric/client/gui/widget/Button.java @@ -11,6 +11,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.math.MathHelper; + import rsmm.fabric.client.MultimeterClient; import rsmm.fabric.client.gui.element.IElement;