From b525760dd3dd3ed761daa500063e8a989305c834 Mon Sep 17 00:00:00 2001 From: azod <40648473+AzodFR@users.noreply.github.com> Date: Thu, 13 Mar 2025 18:48:25 +0100 Subject: [PATCH] feature: Overlays Settings GUI (Keep overlays through dimensions) (#610) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: AzodFR Co-authored-by: Théo Jacquelin --- src/main/java/codechicken/nei/ClientHandler.java | 5 +++-- src/main/java/codechicken/nei/NEIClientConfig.java | 3 +++ src/main/resources/assets/nei/lang/en_US.lang | 5 +++++ src/main/resources/assets/nei/lang/fr_FR.lang | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index 7b154139..e235f5f5 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -338,8 +338,9 @@ public class ClientHandler { public void loadWorld(World world, boolean fromServer) { if (world != lastworld) { SMPmagneticItems.clear(); - WorldOverlayRenderer.reset(); - + if (!NEIClientConfig.getBooleanSetting("world.overlays.lock")) { + WorldOverlayRenderer.reset(); + } if (!fromServer) { NEIClientConfig.setHasSMPCounterPart(false); NEIClientConfig.setInternalEnabled(false); diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 74f8e67f..2d423b93 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -349,6 +349,9 @@ public class NEIClientConfig { API.addOption(new OptionOpenGui("world.presets", GuiPresetList.class)); + tag.getTag("world.overlays.lock").getBooleanValue(true); + API.addOption(new OptionToggleButton("world.overlays.lock", true)); + tag.getTag("inventory.disableMouseScrollTransfer").getBooleanValue(false); API.addOption(new OptionToggleButton("inventory.disableMouseScrollTransfer", true)); diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 5f116661..69833ff7 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -386,6 +386,11 @@ nei.options.world.highlight_tips.sample=Sample nei.options.world.panels=Panels Settings nei.options.world.presets=Presets List +nei.options.world.overlays=Overlays Settings +nei.options.world.overlays.lock=Lock overlays between dimensions +nei.options.world.overlays.lock.true=Enabled +nei.options.world.overlays.lock.false=Disabled + nei.options.tools=Tools nei.options.tools.handler_load_from_config=Load handlers from Config nei.options.tools.handler_load_from_config.true=Config diff --git a/src/main/resources/assets/nei/lang/fr_FR.lang b/src/main/resources/assets/nei/lang/fr_FR.lang index a7f77a72..5ead5531 100644 --- a/src/main/resources/assets/nei/lang/fr_FR.lang +++ b/src/main/resources/assets/nei/lang/fr_FR.lang @@ -134,6 +134,11 @@ nei.options.world.highlight_tips=Mettez en surbrillance les info-bulles nei.options.world.highlight_tips.hide=Caché nei.options.world.highlight_tips.show=Montré +nei.options.world.overlays=Paramètres des overlays +nei.options.world.overlays.lock.true=Activé +nei.options.world.overlays.lock.false=Désactivé +nei.options.world.overlays.lock=Conserver les overlays entre les dimensions + nei.options.tools=Outils nei.options.tools.dump=Data Dumps nei.options.tools.dump.dump=Jeter