From de212d0b6df8bc0f6aa6dde80e1ffa0d3583d24f Mon Sep 17 00:00:00 2001 From: lucaslah <47047328+Lucaslah@users.noreply.github.com> Date: Fri, 7 Oct 2022 13:36:18 -0400 Subject: [PATCH] fix: report button could still be interacted with - fixes #3 --- .devcontainer/devcontainer.json | 3 ++- gradle.properties | 2 +- .../java/me/lucaslah/ncrb/mixin/GameMenuScreenMixin.java | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bbfd11d..5b41e56 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -26,7 +26,8 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ - "vscjava.vscode-java-pack" + "vscjava.vscode-java-pack", + "vscjava.vscode-gradle" ] } }, diff --git a/gradle.properties b/gradle.properties index 5b974f8..3fdb3c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.19.2+build.1 loader_version=0.14.8 # Mod Properties -mod_version = 1.2.0 +mod_version = 1.2.1 maven_group = me.lucaslah archives_base_name = no-report-button diff --git a/src/main/java/me/lucaslah/ncrb/mixin/GameMenuScreenMixin.java b/src/main/java/me/lucaslah/ncrb/mixin/GameMenuScreenMixin.java index d82c9fc..e89a0a3 100644 --- a/src/main/java/me/lucaslah/ncrb/mixin/GameMenuScreenMixin.java +++ b/src/main/java/me/lucaslah/ncrb/mixin/GameMenuScreenMixin.java @@ -33,16 +33,13 @@ public abstract class GameMenuScreenMixin extends Screen { for (ClickableWidget button : buttons) { if (button.getMessage().getString().equals(I18n.translate("menu.playerReporting"))) { button.setWidth(-9999); + button.active = false; reportButton = button; reportButtonFound = true; } } if (reportButtonFound) { - //reportButton.setWidth(-9999); - //reportButton.setMessage(Text.of("")); - //reportButton.active = false; - ButtonWidget openToLanButton = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height / 4 + 96 + -16, 98, 20, Text.translatable("menu.shareToLan"), (button) -> { assert this.client != null; this.client.setScreen(new OpenToLanScreen(this));