From 385708068425e90bc2e26f99daca0c6fad7ed480 Mon Sep 17 00:00:00 2001 From: Oondanomala <87101222+Oondanomala@users.noreply.github.com> Date: Fri, 28 Feb 2025 19:55:08 +0100 Subject: [PATCH 1/3] Hide broadcast settings button --- .../sk1er/patcher/config/PatcherConfig.java | 7 +++++++ .../patcher/screen/PatcherMenuEditor.java | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/club/sk1er/patcher/config/PatcherConfig.java b/src/main/java/club/sk1er/patcher/config/PatcherConfig.java index 3e52f4e58..a9c009a0c 100644 --- a/src/main/java/club/sk1er/patcher/config/PatcherConfig.java +++ b/src/main/java/club/sk1er/patcher/config/PatcherConfig.java @@ -1098,6 +1098,13 @@ public static int getInventoryScale() { ) public static boolean cleanMainMenu = true; + @Property( + type = PropertyType.SWITCH, name = "Clean Options Menu", + description = "Remove the twitch broadcast button on the options menu.", + category = "Screens", subcategory = "General" + ) + public static boolean cleanOptionsMenu = true; + @Property( type = PropertyType.SELECTOR, name = "Open to LAN Replacement", description = "Modify the Open to LAN button to either redirect to the server list or be removed.", diff --git a/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java b/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java index b15abb42f..c041bc1ff 100644 --- a/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java +++ b/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java @@ -18,6 +18,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiIngameMenu; import net.minecraft.client.gui.GuiMainMenu; +import net.minecraft.client.gui.GuiOptions; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreenOptionsSounds; import net.minecraft.client.gui.GuiScreenResourcePacks; @@ -85,7 +86,22 @@ public void openMenu(GuiScreenEvent.InitGuiEvent.Post event) { } } } - } else if (gui instanceof GuiScreenResourcePacks) { + } + //#if MC==10809 + else if (gui instanceof GuiOptions && PatcherConfig.cleanOptionsMenu) { + for (GuiButton button : mcButtonList) { + if (button.displayString.equals(I18n.format("options.stream"))) { + button.visible = false; + button.enabled = false; + } else if (button.displayString.equals(I18n.format("options.sounds"))) { + button.xPosition = gui.width / 2 + 5; + } else if (button.displayString.equals(I18n.format("options.skinCustomisation"))) { + button.yPosition = gui.height / 6 + 72 - 6; + } + } + } + //#endif + else if (gui instanceof GuiScreenResourcePacks) { if (!Loader.isModLoaded("ResourcePackOrganizer")) { for (GuiButton button : mcButtonList) { button.width = 200; From 3e250fda98681082b80a889c0f0ae48d73e3b680 Mon Sep 17 00:00:00 2001 From: Oondanomala <87101222+Oondanomala@users.noreply.github.com> Date: Sat, 1 Mar 2025 14:44:47 +0100 Subject: [PATCH 2/3] Disable option in 1.12 --- src/main/java/club/sk1er/patcher/config/PatcherConfig.java | 4 ++-- .../java/club/sk1er/patcher/screen/PatcherMenuEditor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/club/sk1er/patcher/config/PatcherConfig.java b/src/main/java/club/sk1er/patcher/config/PatcherConfig.java index a9c009a0c..0dde291c3 100644 --- a/src/main/java/club/sk1er/patcher/config/PatcherConfig.java +++ b/src/main/java/club/sk1er/patcher/config/PatcherConfig.java @@ -1359,8 +1359,8 @@ public PatcherConfig() { Function0 minecraft112 = () -> ForgeVersion.mcVersion.equals("1.12.2"); Arrays.asList( "resourceExploitFix", "newKeybindHandling", "separateResourceLoading", "futureHitBoxes", - "leftHandInFirstPerson", "extendedChatLength", "chatPosition", - "parallaxFix", "crosshairPerspective", "extendChatBackground", "vanillaGlassPanes" + "leftHandInFirstPerson", "extendedChatLength", "chatPosition", "parallaxFix", + "crosshairPerspective", "extendChatBackground", "cleanOptionsMenu", "vanillaGlassPanes" ).forEach(property -> hidePropertyIf(property, minecraft112)); hidePropertyIf("keyboardLayout", () -> !SystemUtils.IS_OS_LINUX); diff --git a/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java b/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java index c041bc1ff..19b1b879b 100644 --- a/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java +++ b/src/main/java/club/sk1er/patcher/screen/PatcherMenuEditor.java @@ -94,9 +94,9 @@ else if (gui instanceof GuiOptions && PatcherConfig.cleanOptionsMenu) { button.visible = false; button.enabled = false; } else if (button.displayString.equals(I18n.format("options.sounds"))) { - button.xPosition = gui.width / 2 + 5; + button.xPosition = width / 2 + 5; } else if (button.displayString.equals(I18n.format("options.skinCustomisation"))) { - button.yPosition = gui.height / 6 + 72 - 6; + button.yPosition = height / 6 + 72 - 6; } } } From 0fde710849f18dbf4e1a4a554a4fc5cddf850905 Mon Sep 17 00:00:00 2001 From: Oondanomala <87101222+Oondanomala@users.noreply.github.com> Date: Sat, 8 Mar 2025 00:01:19 +0100 Subject: [PATCH 3/3] Add to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1dd40da09..f9bb2f9f7 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,7 @@ - **GUI Crosshair** - Stop rendering the crosshair when in a GUI. - **Startup Notification** - Notify how long the game took to start. *default - **Clean Main Menu** - Remove the Realms button on the main menu as it's useless on 1.8.9. *default +- **Clean Options Menu** - Remove the twitch broadcast button on the options menu. *default - **Open to LAN Replacement** - Modify the Open to LAN button to either redirect to the server list or be removed. - **Smart Disconnect -** Choose between disconnecting or relogging when clicking the disconnect button. (Only works on multiplayer servers) - **Image Preview** - Preview image links when hovering over a supported URL. Press shift to use fullscreen and Control to render in native image resolution. (Currently supported: Imgur, Discord, Badlion screenshots)