Remove ModKeybindHandler, get everything onto ZKeyMapping. Also remov…

…e modifiers support sadly since it's a Forge extension 😔
VazkiiMods · Oct 28, 2023 · d2cc095 · d2cc095
1 parent 3fbe9dc
commit d2cc095
Show file tree

Hide file tree

Showing 22 changed files with 133 additions and 177 deletions.
diff --git a/src/main/java/vazkii/quark/base/QuarkClient.java b/src/main/java/vazkii/quark/base/QuarkClient.java
@@ -5,8 +5,6 @@
 import vazkii.zeta.util.ZetaSide;
 import vazkii.zetaimplforge.client.ForgeZetaClient;
 
-//ngl this is mainly a place to hold ZetaClient... which has side effect in constructor
-//this is kludgy, i dont like it
 public class QuarkClient {
 
 	static {
@@ -19,6 +17,10 @@ public class QuarkClient {
 	public static final ZetaClient ZETA_CLIENT = new ForgeZetaClient(Quark.ZETA);
 	public static final ClientTicker ticker = ZETA_CLIENT.ticker;
 
+	public static final String MISC_GROUP = "quark.gui.keygroup.misc";
+	public static final String INV_GROUP = "quark.gui.keygroup.inv";
+	public static final String EMOTE_GROUP = "quark.gui.keygroup.emote";
+
 	public static void start() {
 		instance = new QuarkClient();
 

diff --git a/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java b/src/main/java/vazkii/quark/base/client/handler/InventoryButtonHandler.java
@@ -32,6 +32,7 @@
 import vazkii.quark.addons.oddities.client.screen.BackpackInventoryScreen;
 import vazkii.quark.api.IQuarkButtonAllowed;
 import vazkii.quark.base.Quark;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.handler.GeneralConfig;
 import vazkii.quark.base.handler.InventoryTransferHandler;
 import vazkii.zeta.module.ZetaModule;
@@ -162,7 +163,7 @@ public static void addButtonProvider(ZetaModule module, ButtonTargetType type, i
 	}
 
 	public static void addButtonProvider(ZKeyMapping event, ZetaModule module, ButtonTargetType type, int priority, String keybindName, Consumer<AbstractContainerScreen<?>> onKeybind, ButtonProvider provider, Supplier<Boolean> enableCond) {
-		KeyMapping keybind = ModKeybindHandler.init(event, keybindName, null, ModKeybindHandler.INV_GROUP);
+		KeyMapping keybind = event.init(keybindName, null, QuarkClient.INV_GROUP);
 		keybind.setKeyConflictContext(KeyConflictContext.GUI);
 		addButtonProvider(module, type, priority, keybind, onKeybind, provider, enableCond);
 	}

diff --git a/src/main/java/vazkii/quark/base/client/handler/ModKeybindHandler.java b/src/main/java/vazkii/quark/base/client/handler/ModKeybindHandler.java
diff --git a/src/main/java/vazkii/quark/base/client/util/PredicatedKeyBinding.java b/src/main/java/vazkii/quark/base/client/util/PredicatedKeyBinding.java
diff --git a/src/main/java/vazkii/quark/base/client/util/SortedPredicatedKeyBinding.java b/src/main/java/vazkii/quark/base/client/util/SortedPredicatedKeyBinding.java
diff --git a/src/main/java/vazkii/quark/content/client/module/AutoWalkKeybindModule.java b/src/main/java/vazkii/quark/content/client/module/AutoWalkKeybindModule.java
@@ -17,7 +17,6 @@
 import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import vazkii.quark.base.QuarkClient;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.base.module.config.Config;
@@ -40,7 +39,7 @@ public class AutoWalkKeybindModule extends ZetaModule {
 	@LoadEvent
 	@OnlyIn(Dist.CLIENT)
 	public void registerKeybinds(ZKeyMapping event) {
-		keybind = ModKeybindHandler.init(event, "autorun", null, ModKeybindHandler.MISC_GROUP);
+		keybind = event.init("quark.keybind.autorun", null, QuarkClient.MISC_GROUP);
 	}
 
 	@SubscribeEvent

diff --git a/src/main/java/vazkii/quark/content/client/module/BackButtonKeybindModule.java b/src/main/java/vazkii/quark/content/client/module/BackButtonKeybindModule.java
@@ -18,7 +18,7 @@
 import net.minecraftforge.client.event.ScreenEvent.KeyPressed;
 import net.minecraftforge.client.event.ScreenEvent.MouseButtonPressed;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.zeta.event.bus.LoadEvent;
@@ -36,7 +36,8 @@ public class BackButtonKeybindModule extends ZetaModule {
 	@LoadEvent
 	@OnlyIn(Dist.CLIENT)
 	public void registerKeybinds(ZKeyMapping event) {
-		backKey = ModKeybindHandler.initMouse(event, "back", 4, ModKeybindHandler.MISC_GROUP, (modifier, key) -> key.getType() != Type.MOUSE || key.getValue() != 0);
+		//TODO ZETA: dunno if this predicate works lol
+		backKey = event.initMouse("quark.keybind.back", 4, QuarkClient.MISC_GROUP, (key) -> key.getType() != Type.MOUSE || key.getValue() != 0);
 	}
 
 	@SubscribeEvent

diff --git a/src/main/java/vazkii/quark/content/client/module/CameraModule.java b/src/main/java/vazkii/quark/content/client/module/CameraModule.java
@@ -24,7 +24,7 @@
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.lwjgl.glfw.GLFW;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.handler.QuarkSounds;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.ModuleLoader;
@@ -116,7 +116,7 @@ public boolean test(Object o) {
 
 	@LoadEvent
 	public void registerKeybinds(ZKeyMapping event) {
-		cameraModeKey = ModKeybindHandler.init(event, "camera_mode", "f12", ModKeybindHandler.MISC_GROUP);
+		cameraModeKey = event.init("quark.keybind.camera_mode", "f12", QuarkClient.MISC_GROUP);
 	}
 
 	@SubscribeEvent

diff --git a/src/main/java/vazkii/quark/content/experimental/module/NarratorReadoutModule.java b/src/main/java/vazkii/quark/content/experimental/module/NarratorReadoutModule.java
@@ -28,7 +28,6 @@
 import net.minecraftforge.client.settings.KeyModifier;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import vazkii.quark.base.QuarkClient;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.zeta.event.bus.LoadEvent;
@@ -49,8 +48,8 @@ public class NarratorReadoutModule extends ZetaModule {
 	@OnlyIn(Dist.CLIENT)
 	public void registerKeybinds(ZKeyMapping event) {
 		if(enabled) {
-			keybind = ModKeybindHandler.init(event, "narrator_readout", null, ModKeybindHandler.MISC_GROUP);
-			keybindFull = ModKeybindHandler.init(event, "narrator_full_readout", null, ModKeybindHandler.MISC_GROUP);
+			keybind = event.init("quark.keybind.narrator_readout", null, QuarkClient.MISC_GROUP);
+			keybindFull = event.init("quark.keybind.narrator_full_readout", null, QuarkClient.MISC_GROUP);
 		}
 	}
 

diff --git a/src/main/java/vazkii/quark/content/experimental/module/VariantSelectorModule.java b/src/main/java/vazkii/quark/content/experimental/module/VariantSelectorModule.java
@@ -46,7 +46,7 @@
 import net.minecraftforge.event.entity.EntityJoinLevelEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.handler.MiscUtil;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
@@ -104,7 +104,7 @@ public final void register(ZRegister event) {
 
 	@LoadEvent
 	public void registerKeybinds(ZKeyMapping event) {
-		variantSelectorKey = ModKeybindHandler.init(event, "variant_selector", "r", ModKeybindHandler.MISC_GROUP);
+		variantSelectorKey = event.init("quark.keybind.variant_selector", "r", QuarkClient.MISC_GROUP);
 	}
 
 	@LoadEvent

diff --git a/src/main/java/vazkii/quark/content/management/module/EasyTransferingModule.java b/src/main/java/vazkii/quark/content/management/module/EasyTransferingModule.java
@@ -29,7 +29,7 @@ public void registerKeybinds(ZKeyMapping event) {
 		addButton(event, 2, "extract", true);
 
 			InventoryButtonHandler.addButtonProvider(event, this, ButtonTargetType.CONTAINER_PLAYER_INVENTORY, 3,
-					"shift_lock",
+					"quark.keybind.shift_lock",
 					(screen) -> shiftLocked = !shiftLocked,
 					(parent, x, y) -> new MiniInventoryButton(parent, 4, x, y, "quark.gui.button.shift_lock",
 							(b) -> shiftLocked = !shiftLocked)
@@ -40,7 +40,7 @@ public void registerKeybinds(ZKeyMapping event) {
 	@OnlyIn(Dist.CLIENT)
 	private void addButton(ZKeyMapping event, int priority, String name, boolean restock) {
 		InventoryButtonHandler.addButtonProvider(event, this, ButtonTargetType.CONTAINER_PLAYER_INVENTORY, priority,
-				"transfer_" + name,
+				"quark.keybind.transfer_" + name,
 				(screen) -> QuarkNetwork.sendToServer(new InventoryTransferMessage(Screen.hasShiftDown(), restock)),
 				(parent, x, y) -> new MiniInventoryButton(parent, priority, x, y, 
 						(t) -> t.add(I18n.get("quark.gui.button." + name + (Screen.hasShiftDown() ? "_filtered" : ""))),

diff --git a/src/main/java/vazkii/quark/content/management/module/HotbarChangerModule.java b/src/main/java/vazkii/quark/content/management/module/HotbarChangerModule.java
@@ -24,7 +24,7 @@
 import net.minecraftforge.event.TickEvent.ClientTickEvent;
 import net.minecraftforge.event.TickEvent.Phase;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.base.network.QuarkNetwork;
@@ -52,7 +52,7 @@ public class HotbarChangerModule extends ZetaModule {
 
 	@LoadEvent
 	public void registerKeybinds(ZKeyMapping event) {
-		changeHotbarKey = ModKeybindHandler.init(event, "change_hotbar", "z", ModKeybindHandler.MISC_GROUP);
+		changeHotbarKey = event.init("quark.keybind.change_hotbar", "z", QuarkClient.MISC_GROUP);
 	}
 
 	@SubscribeEvent

diff --git a/src/main/java/vazkii/quark/content/management/module/InventorySortingModule.java b/src/main/java/vazkii/quark/content/management/module/InventorySortingModule.java
@@ -8,10 +8,10 @@
 import net.minecraft.sounds.SoundEvents;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.client.handler.InventoryButtonHandler;
 import vazkii.quark.base.client.handler.InventoryButtonHandler.ButtonProvider;
 import vazkii.quark.base.client.handler.InventoryButtonHandler.ButtonTargetType;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.base.module.config.Config;
@@ -36,7 +36,7 @@ public class InventorySortingModule extends ZetaModule {
 	@LoadEvent
 	@OnlyIn(Dist.CLIENT)
 	public void registerKeybinds(ZKeyMapping event) {
-		KeyMapping sortPlayer = ModKeybindHandler.init(event, "sort_player", null, ModKeybindHandler.INV_GROUP);
+		KeyMapping sortPlayer = event.init("quark.keybind.sort_player", null, QuarkClient.INV_GROUP);
 
 		InventoryButtonHandler.addButtonProvider(this, ButtonTargetType.PLAYER_INVENTORY, 0,
 				sortPlayer,
@@ -63,7 +63,7 @@ public void registerKeybinds(ZKeyMapping event) {
 				() -> enablePlayerInventoryInChests);
 
 		InventoryButtonHandler.addButtonProvider(event, this, ButtonTargetType.CONTAINER_INVENTORY, 0,
-				"sort_container",
+				"quark.keybind.sort_container",
 				(screen) -> {
 					if (enableChests) {
 						if (satisfyingClick)

diff --git a/src/main/java/vazkii/quark/content/tweaks/module/EmotesModule.java b/src/main/java/vazkii/quark/content/tweaks/module/EmotesModule.java
@@ -41,7 +41,7 @@
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import vazkii.aurelienribon.tweenengine.Tween;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.handler.ContributorRewardHandler;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaModule;
@@ -145,9 +145,9 @@ public void registerKeybinds(ZKeyMapping event) {
 
 		emoteKeybinds = new HashMap<>();
 		for (String s : DEFAULT_EMOTE_NAMES)
-			emoteKeybinds.put(ModKeybindHandler.init(event, "quark.emote." + s, null, "", ModKeybindHandler.EMOTE_GROUP, sortOrder++, false), s);
+			emoteKeybinds.put(event.init("quark.emote." + s, null, QuarkClient.EMOTE_GROUP, sortOrder++), s);
 		for (String s : PATREON_EMOTES)
-			emoteKeybinds.put(ModKeybindHandler.init(event, "patreon_emote." + s, null, ModKeybindHandler.EMOTE_GROUP, sortOrder++), s);
+			emoteKeybinds.put(event.init("quark.keybind.patreon_emote." + s, null, QuarkClient.EMOTE_GROUP, sortOrder++), s);
 	}
 
 	@LoadEvent

diff --git a/src/main/java/vazkii/quark/content/tweaks/module/LockRotationModule.java b/src/main/java/vazkii/quark/content/tweaks/module/LockRotationModule.java
@@ -41,7 +41,7 @@
 import org.lwjgl.opengl.GL11;
 
 import vazkii.quark.api.IRotationLockable;
-import vazkii.quark.base.client.handler.ModKeybindHandler;
+import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.handler.MiscUtil;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.ModuleLoader;
@@ -87,7 +87,7 @@ public final void setup(ZCommonSetup event) {
 	@LoadEvent
 	@OnlyIn(Dist.CLIENT)
 	public void registerKeybinds(ZKeyMapping event) {
-		keybind = ModKeybindHandler.init(event, "lock_rotation", "k", ModKeybindHandler.MISC_GROUP);
+		keybind = event.init("quark.keybind.lock_rotation", "k", QuarkClient.MISC_GROUP);
 	}
 
 	public static BlockState fixBlockRotation(BlockState state, BlockPlaceContext ctx) {