diff --git a/src/main/java/appeng/client/guidebook/hotkey/OpenGuideHotkey.java b/src/main/java/appeng/client/guidebook/hotkey/OpenGuideHotkey.java index e21ee4b21d3..f991043c7a5 100644 --- a/src/main/java/appeng/client/guidebook/hotkey/OpenGuideHotkey.java +++ b/src/main/java/appeng/client/guidebook/hotkey/OpenGuideHotkey.java @@ -28,7 +28,6 @@ import appeng.client.guidebook.PageAnchor; import appeng.client.guidebook.indices.ItemIndex; import appeng.client.guidebook.screen.GuideScreen; -import appeng.core.AEConfig; import appeng.core.AppEngClient; /** @@ -58,13 +57,9 @@ private OpenGuideHotkey() { } public static void init() { - if (AEConfig.instance().isGuideHotkeyEnabled()) { - NeoForge.EVENT_BUS.addListener( - (ItemTooltipEvent evt) -> handleTooltip(evt.getItemStack(), evt.getFlags(), evt.getToolTip())); - NeoForge.EVENT_BUS.addListener((ClientTickEvent.Post evt) -> newTick = true); - } else { - LOG.info("AE2 guide hotkey is disabled via config."); - } + NeoForge.EVENT_BUS.addListener( + (ItemTooltipEvent evt) -> handleTooltip(evt.getItemStack(), evt.getFlags(), evt.getToolTip())); + NeoForge.EVENT_BUS.addListener((ClientTickEvent.Post evt) -> newTick = true); } private static void handleTooltip(ItemStack itemStack, TooltipFlag tooltipFlag, List lines) { diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 6f6b466770b..254c9bfce10 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -43,7 +43,6 @@ public final class AEConfig { - private final StartupConfig startup = new StartupConfig(); private final ClientConfig client = new ClientConfig(); private final CommonConfig common = new CommonConfig(); @@ -53,7 +52,6 @@ public final class AEConfig { private static AEConfig instance; private AEConfig(ModContainer container) { - container.registerConfig(ModConfig.Type.STARTUP, startup.spec); container.registerConfig(ModConfig.Type.CLIENT, client.spec); container.registerConfig(ModConfig.Type.COMMON, common.spec); container.getEventBus().addListener((ModConfigEvent.Loading evt) -> { @@ -160,10 +158,6 @@ public void setTerminalStyle(TerminalStyle setting) { client.spec.save(); } - public boolean isGuideHotkeyEnabled() { - return startup.enableGuideHotkey.get(); - } - public double getGridEnergyStoragePerNode() { return common.gridEnergyStoragePerNode.get(); } @@ -408,19 +402,6 @@ public void save() { client.spec.save(); } - private static class StartupConfig { - private final ModConfigSpec spec; - - public final BooleanValue enableGuideHotkey; - - public StartupConfig() { - var builder = new ModConfigSpec.Builder(); - this.enableGuideHotkey = define(builder, "enableGuideHotkey", true, - "Enables the 'hold key to show guide' functionality in tooltips"); - this.spec = builder.build(); - } - } - private static class ClientConfig { private final ModConfigSpec spec; diff --git a/src/main/java/appeng/core/AppEngClient.java b/src/main/java/appeng/core/AppEngClient.java index c6ece8a42ef..0942c645984 100644 --- a/src/main/java/appeng/core/AppEngClient.java +++ b/src/main/java/appeng/core/AppEngClient.java @@ -58,6 +58,8 @@ import net.neoforged.neoforge.client.event.RegisterDimensionSpecialEffectsEvent; import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent; +import net.neoforged.neoforge.client.gui.ConfigurationScreen; +import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import net.neoforged.neoforge.client.settings.KeyConflictContext; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.server.ServerStartingEvent; @@ -189,6 +191,9 @@ public AppEngClient(IEventBus modEventBus, ModContainer container) { tickPinnedKeys(Minecraft.getInstance()); Hotkeys.checkHotkeys(); }); + + container.registerExtensionPoint(IConfigScreenFactory.class, + (mc, parent) -> new ConfigurationScreen(container, parent)); } private void enqueueImcMessages(InterModEnqueueEvent event) { @@ -247,9 +252,7 @@ public void registerHotkey(String id) { } private void registerHotkeys(RegisterKeyMappingsEvent e) { - if (AEConfig.instance().isGuideHotkeyEnabled()) { - e.register(OpenGuideHotkey.getHotkey()); - } + e.register(OpenGuideHotkey.getHotkey()); e.register(MOUSE_WHEEL_ITEM_MODIFIER); Hotkeys.finalizeRegistration(e::register); }