From 89ec81a78b23bda14ce9027798f3883eee8c5316 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 25 Aug 2016 23:43:17 -0700 Subject: [PATCH] Register and localize the keybinds Forgot that --- .../bloodmagic/util/handler/event/ClientHandler.java | 10 ++++++++-- src/main/resources/assets/bloodmagic/lang/en_US.lang | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index b7050f9e..2a08ff33 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -35,6 +35,7 @@ import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.client.settings.KeyModifier; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -105,8 +106,13 @@ public class ClientHandler // Contrary to what your IDE tells you, this *is* actually needed. // TODO - Rewrite this "BMKeyBinding" thing. Arc what the heck were you thinking... public static final BMKeyBinding keyOpenSigilHolding = new BMKeyBinding("openSigilHolding", Keyboard.KEY_H, BMKeyBinding.Key.OPEN_SIGIL_HOLDING); - public static final KeyBinding KEY_HOLDING_CYCLE_POS = new KeyBinding(Constants.Mod.MODID + "cycleHoldingPos", KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_EQUALS, Constants.Mod.NAME); - public static final KeyBinding KEY_HOLDING_CYCLE_NEG = new KeyBinding(Constants.Mod.MODID + "cycleHoldingNeg", KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_MINUS, Constants.Mod.NAME); + public static final KeyBinding KEY_HOLDING_CYCLE_POS = new KeyBinding(Constants.Mod.MODID + ".keybind.cycleHoldingPos", KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_EQUALS, Constants.Mod.NAME); + public static final KeyBinding KEY_HOLDING_CYCLE_NEG = new KeyBinding(Constants.Mod.MODID + ".keybind.cycleHoldingNeg", KeyConflictContext.IN_GAME, KeyModifier.SHIFT, Keyboard.KEY_MINUS, Constants.Mod.NAME); + + static { + ClientRegistry.registerKeyBinding(KEY_HOLDING_CYCLE_POS); + ClientRegistry.registerKeyBinding(KEY_HOLDING_CYCLE_NEG); + } @SubscribeEvent public void onTooltipEvent(ItemTooltipEvent event) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index d921ad20..a58288a1 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -659,6 +659,8 @@ commands.soulnetwork.create.success=Successfully created %s's Soul Network (Orb # Keybinds BloodMagic.keybind.openSigilHolding=Open Sigil of Holding +BloodMagic.keybind.cycleHoldingPos=Cycle Sigil (+) +BloodMagic.keybind.cycleHoldingNeg=Cycle Sigil (-) # JustEnoughItems jei.BloodMagic.recipe.altar=Blood Altar