From 07071324d2d615c9910674e95965770d32aa5630 Mon Sep 17 00:00:00 2001 From: Abdulmujeeb Raji Date: Mon, 15 Apr 2024 16:24:29 +0100 Subject: [PATCH] =?UTF-8?q?v1.0a=20-=20That's=20a=20wrap,=20folks=20(fr=20?= =?UTF-8?q?this=20time)=20Somehow=20didn't=20catch=20a=20bug=20where=20you?= =?UTF-8?q?=20can't=20check=20the=20menu=20more=20than=20once=20?= =?UTF-8?q?=F0=9F=A4=A6.=20Thanks=20@Nateboy.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Features: - Remove GAME_COLLECTION_EMPTY Check. - Move the GUI elements closer together. - Remove double clicking sound on button press --- gradle.properties | 2 +- .../gamerulesmenu/GamerulesMenu.java | 1 - .../gamerulesmenu/gui/NewGamerulesMenu.java | 21 +++++++------------ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3727104..c09b3c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,6 @@ mod_menu_version=2.0.5 halplibe_version=3.5.2 # Mod -mod_version=1.0 +mod_version=1.0a mod_group=midnadimple mod_name=gamerulesmenu diff --git a/src/main/java/midnadimple/gamerulesmenu/GamerulesMenu.java b/src/main/java/midnadimple/gamerulesmenu/GamerulesMenu.java index ff7eb17..6f9958e 100644 --- a/src/main/java/midnadimple/gamerulesmenu/GamerulesMenu.java +++ b/src/main/java/midnadimple/gamerulesmenu/GamerulesMenu.java @@ -17,7 +17,6 @@ public class GamerulesMenu implements ModInitializer, GameStartEntrypoint, Recip public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static GameRuleCollection gameRuleCollection = new GameRuleCollection(); - public static boolean GAMERULE_COLLECTION_EMPTY = true; public static final List> gameRuleList = new ArrayList<>(); @Override diff --git a/src/main/java/midnadimple/gamerulesmenu/gui/NewGamerulesMenu.java b/src/main/java/midnadimple/gamerulesmenu/gui/NewGamerulesMenu.java index c817871..acb98aa 100644 --- a/src/main/java/midnadimple/gamerulesmenu/gui/NewGamerulesMenu.java +++ b/src/main/java/midnadimple/gamerulesmenu/gui/NewGamerulesMenu.java @@ -9,7 +9,6 @@ import net.minecraft.core.data.gamerule.GameRule; import net.minecraft.core.data.gamerule.GameRuleBoolean; import net.minecraft.core.data.registry.Registries; import net.minecraft.core.lang.I18n; -import net.minecraft.core.sound.SoundCategory; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -34,27 +33,24 @@ public class NewGamerulesMenu extends GuiScreen { @Override public void init() { - controlList.add(this.cheatsButton = new GuiButton(0, this.width / 2 - 100, BUTTON_BORDER_OFFSET, 200, 20, "")); - int i = 2; for (GameRule gameRule : Registries.GAME_RULES) { - GuiButton guiButton = new GuiButton(i, this.width - BUTTON_BORDER_OFFSET - 60 , (int) (2 * BUTTON_BORDER_OFFSET + (i - 2) * BUTTON_BORDER_OFFSET * 0.75 - scrollFloat), 50, 20, ""); + GuiButton guiButton = new GuiButton(i, this.width - BUTTON_BORDER_OFFSET - 100 , (int) (2 * BUTTON_BORDER_OFFSET + (i - 2) * BUTTON_BORDER_OFFSET * 0.75 - scrollFloat), 50, 20, ""); controlList.add(guiButton); - Boolean value; - if (GamerulesMenu.GAMERULE_COLLECTION_EMPTY) { + if (!GamerulesMenu.gameRuleList.contains(gameRule)) { GamerulesMenu.gameRuleList.add(gameRule); + } + + Boolean value = (Boolean) GamerulesMenu.gameRuleCollection.getValue(gameRule); + if (value == null) { value = (Boolean) gameRule.getDefaultValue(); - } else { - value = (Boolean) GamerulesMenu.gameRuleCollection.getValue(gameRule); } gameRuleButtons.put(guiButton, value); i++; } - if (GamerulesMenu.GAMERULE_COLLECTION_EMPTY) { - GamerulesMenu.GAMERULE_COLLECTION_EMPTY = false; - } + controlList.add(this.cheatsButton = new GuiButton(0, this.width / 2 - 100, BUTTON_BORDER_OFFSET, 200, 20, "")); controlList.add(new GuiButton(1, this.width / 2 - 100, this.height - BUTTON_BORDER_OFFSET, 200, 20, loc.translateKey("gamerulesmenu.goback"))); updateButtons(); @@ -102,7 +98,7 @@ public class NewGamerulesMenu extends GuiScreen { AtomicInteger i = new AtomicInteger(); for (GameRule gameRule : GamerulesMenu.gameRuleList) { - drawStringCentered(fontRenderer, gameRule.getKey(), BUTTON_BORDER_OFFSET + 60, (int) (2.15 * BUTTON_BORDER_OFFSET + i.get() * BUTTON_BORDER_OFFSET * 0.75 - scrollFloat), 0xFFFFFF); + drawString(fontRenderer, gameRule.getKey(), BUTTON_BORDER_OFFSET + 50, (int) (2.15 * BUTTON_BORDER_OFFSET + i.get() * BUTTON_BORDER_OFFSET * 0.75 - scrollFloat), 0xFFFFFF); i.getAndIncrement(); } @@ -132,6 +128,5 @@ public class NewGamerulesMenu extends GuiScreen { } } } - this.mc.sndManager.playSound("random.click", SoundCategory.GUI_SOUNDS, 1.0F, 1.0F); } }