From aa388322df63a3a0014d440ad2bcbfe610112145 Mon Sep 17 00:00:00 2001 From: Scribble Date: Mon, 5 May 2025 14:11:01 +0200 Subject: [PATCH] [Keybinds] Fix TASmod keybinds resetting when restarting the game --- .../mctcommon/KeybindManager.java | 5 ++--- .../mctcommon/events/EventClient.java | 13 ++++++++++++ .../mctcommon/mixin/MixinGameSettings.java | 20 +++++++++++++++++++ .../com/minecrafttas/tasmod/TASmodClient.java | 10 ++++++---- src/main/resources/mctcommon.mixin.json | 3 ++- 5 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/minecrafttas/mctcommon/mixin/MixinGameSettings.java diff --git a/src/main/java/com/minecrafttas/mctcommon/KeybindManager.java b/src/main/java/com/minecrafttas/mctcommon/KeybindManager.java index 6577275a..53ee5b54 100644 --- a/src/main/java/com/minecrafttas/mctcommon/KeybindManager.java +++ b/src/main/java/com/minecrafttas/mctcommon/KeybindManager.java @@ -92,13 +92,12 @@ public void onRunClientGameLoop(Minecraft mc) { * Register new keybind * * @param keybind Keybind to register + * @param options */ - public void registerKeybind(Keybind keybind) { + public void registerKeybind(Keybind keybind, GameSettings options) { this.keybindings.add(keybind); KeyBinding keyBinding = keybind.vanillaKeyBinding; - // add category - GameSettings options = Minecraft.getMinecraft().gameSettings; if (!AccessorKeyBinding.getCategoryOrder().containsKey(keybind.category)) AccessorKeyBinding.getCategoryOrder().put(keybind.category, AccessorKeyBinding.getCategoryOrder().size() + 1); diff --git a/src/main/java/com/minecrafttas/mctcommon/events/EventClient.java b/src/main/java/com/minecrafttas/mctcommon/events/EventClient.java index dd6c9cbe..5eb11628 100644 --- a/src/main/java/com/minecrafttas/mctcommon/events/EventClient.java +++ b/src/main/java/com/minecrafttas/mctcommon/events/EventClient.java @@ -8,6 +8,7 @@ import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.network.NetHandlerPlayClient; +import net.minecraft.client.settings.GameSettings; /** * Contains all events fired on the client side @@ -218,4 +219,16 @@ public static interface EventDisconnectClient extends EventBase { */ public void onDisconnectClient(Client client); } + + /** + * Fired just before the vanilla options are loaded from the file + */ + @FunctionalInterface + public static interface EventOptionsInit extends EventBase { + + /** + * Fired just before the vanilla options are loaded from the file + */ + public void onOptionsInit(GameSettings options); + } } diff --git a/src/main/java/com/minecrafttas/mctcommon/mixin/MixinGameSettings.java b/src/main/java/com/minecrafttas/mctcommon/mixin/MixinGameSettings.java new file mode 100644 index 00000000..1b52aad5 --- /dev/null +++ b/src/main/java/com/minecrafttas/mctcommon/mixin/MixinGameSettings.java @@ -0,0 +1,20 @@ +package com.minecrafttas.mctcommon.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.minecrafttas.mctcommon.events.EventClient; +import com.minecrafttas.mctcommon.events.EventListenerRegistry; + +import net.minecraft.client.settings.GameSettings; + +@Mixin(GameSettings.class) +public class MixinGameSettings { + + @Inject(method = "loadOptions", at = @At("HEAD")) + public void events_loadOptions(CallbackInfo ci) { + EventListenerRegistry.fireEvent(EventClient.EventOptionsInit.class, (GameSettings) (Object) this); + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/TASmodClient.java b/src/main/java/com/minecrafttas/tasmod/TASmodClient.java index 88eace89..5f8aaa4f 100644 --- a/src/main/java/com/minecrafttas/tasmod/TASmodClient.java +++ b/src/main/java/com/minecrafttas/tasmod/TASmodClient.java @@ -16,6 +16,7 @@ import com.minecrafttas.mctcommon.LanguageManager; import com.minecrafttas.mctcommon.events.EventClient.EventClientInit; import com.minecrafttas.mctcommon.events.EventClient.EventOpenGui; +import com.minecrafttas.mctcommon.events.EventClient.EventOptionsInit; import com.minecrafttas.mctcommon.events.EventClient.EventPlayerJoinedClientSide; import com.minecrafttas.mctcommon.events.EventListenerRegistry; import com.minecrafttas.mctcommon.file.AbstractDataFile; @@ -55,9 +56,10 @@ import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.multiplayer.ServerData; +import net.minecraft.client.settings.GameSettings; import net.minecraft.server.MinecraftServer; -public class TASmodClient implements ClientModInitializer, EventClientInit, EventPlayerJoinedClientSide, EventOpenGui { +public class TASmodClient implements ClientModInitializer, EventClientInit, EventPlayerJoinedClientSide, EventOpenGui, EventOptionsInit { public static VirtualInput virtual; @@ -200,7 +202,6 @@ private void registerEventListeners() { @Override public void onClientInit(Minecraft mc) { - registerKeybindings(mc); registerPlaybackMetadata(mc); registerSerialiserFlavors(mc); registerFileCommands(); @@ -308,8 +309,9 @@ private void initializeCustomPacketHandler() { } } - private void registerKeybindings(Minecraft mc) { - Arrays.stream(TASmodKeybinds.valuesKeybind()).forEach(keybindManager::registerKeybind); + @Override + public void onOptionsInit(GameSettings options) { + Arrays.stream(TASmodKeybinds.valuesKeybind()).forEach((keybind) -> keybindManager.registerKeybind(keybind, options)); Arrays.stream(TASmodKeybinds.valuesVanillaKeybind()).forEach(VirtualKeybindings::registerBlockedKeyBinding); } diff --git a/src/main/resources/mctcommon.mixin.json b/src/main/resources/mctcommon.mixin.json index ef08c74d..5aabe249 100644 --- a/src/main/resources/mctcommon.mixin.json +++ b/src/main/resources/mctcommon.mixin.json @@ -12,6 +12,7 @@ "MixinMinecraft", "MixinNetHandlerPlayClient", "MixinWorldClient", - "MixinLocale" + "MixinLocale", + "MixinGameSettings" ] } \ No newline at end of file