diff --git a/src/main/java/shit/zen/gui/newclickgui/BooleanSettingElement.java b/src/main/java/shit/zen/gui/newclickgui/BooleanSettingElement.java index ab6aa60..5094ecd 100644 --- a/src/main/java/shit/zen/gui/newclickgui/BooleanSettingElement.java +++ b/src/main/java/shit/zen/gui/newclickgui/BooleanSettingElement.java @@ -78,7 +78,10 @@ extends SettingElement { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.isHovered && CursorUtil.isInBounds((float)mouseX, (float)mouseY, this.x + 120.0f - 20.0f - 6.0f, this.y + (this.getHeight() - 10.0f) / 2.0f, 20.0f, 10.0f)) { + if (!this.setting.getVisibility().displayable()) { + return false; + } + if (this.isHovered && CursorUtil.isInBounds((float)mouseX, (float)mouseY, this.x, this.y, 120.0f, this.getHeight())) { this.setting.setValue(this.setting.getValue() == false); return true; } diff --git a/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java b/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java index f159c05..9e8d955 100644 --- a/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java +++ b/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java @@ -175,9 +175,8 @@ extends UIElement { @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (CursorUtil.isInBounds((float)mouseX, (float)mouseY, this.posX, this.posY + 20.0f, 120.0f, this.panelHeight - 20.0f)) { - for (ModuleElement moduleElement : this.moduleElements) { - if (!moduleElement.mouseReleased(mouseX, mouseY, button)) continue; + for (ModuleElement moduleElement : this.moduleElements) { + if (moduleElement.mouseReleased(mouseX, mouseY, button)) { return true; } } diff --git a/src/main/java/shit/zen/gui/newclickgui/ModeSettingElement.java b/src/main/java/shit/zen/gui/newclickgui/ModeSettingElement.java index be5144e..5235d13 100644 --- a/src/main/java/shit/zen/gui/newclickgui/ModeSettingElement.java +++ b/src/main/java/shit/zen/gui/newclickgui/ModeSettingElement.java @@ -92,6 +92,9 @@ extends SettingElement { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (!this.setting.getVisibility().displayable()) { + return false; + } if (this.isDropdownHovered) { this.isOpen = !this.isOpen; return true; diff --git a/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java b/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java index fb95763..5a1fa29 100644 --- a/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java +++ b/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java @@ -146,8 +146,10 @@ extends UIElement { return true; } if (CursorUtil.isInBounds((float) mouseX, (float) mouseY, this.posX, this.posY + 20.0f, 120.0f, this.totalHeight - 20.0f)) { - Iterator> iterator = this.settingElements.iterator(); - while (iterator.hasNext() && !iterator.next().mouseClicked(mouseX, mouseY, button)) { + for (SettingElement settingElement : this.settingElements) { + if (settingElement.getSetting().getVisibility().displayable() && settingElement.mouseClicked(mouseX, mouseY, button)) { + return true; + } } } return this.isHovered; @@ -155,12 +157,12 @@ extends UIElement { @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (this.isHovered && CursorUtil.isInBounds((float) mouseX, (float) mouseY, this.posX, this.posY + 20.0f, 120.0f, this.totalHeight - 20.0f)) { - Iterator> iterator = this.settingElements.iterator(); - while (iterator.hasNext() && !iterator.next().mouseReleased(mouseX, mouseY, button)) { + for (SettingElement settingElement : this.settingElements) { + if (settingElement.mouseReleased(mouseX, mouseY, button)) { + return true; } } - return this.isHovered; + return false; } @Override diff --git a/src/main/java/shit/zen/gui/newclickgui/MultiSelectSettingElement.java b/src/main/java/shit/zen/gui/newclickgui/MultiSelectSettingElement.java index e8814e1..9900472 100644 --- a/src/main/java/shit/zen/gui/newclickgui/MultiSelectSettingElement.java +++ b/src/main/java/shit/zen/gui/newclickgui/MultiSelectSettingElement.java @@ -124,6 +124,9 @@ extends SettingElement { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (!this.setting.getVisibility().displayable()) { + return false; + } if (this.isDropdownHovered) { this.isOpen = !this.isOpen; return true;