From 52d12c0c02a89bfee266035d1057d0ec9346c3cb Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Sun, 18 Feb 2018 23:31:42 +0000 Subject: [PATCH] Fix curseforge issue #28, where keybinds would be reset on game launch --- src/main/java/electroblob/wizardry/Wizardry.java | 4 ++-- src/main/java/electroblob/wizardry/client/ClientProxy.java | 4 ++-- src/main/resources/assets/wizardry/lang/en_GB.lang | 4 ++-- src/main/resources/assets/wizardry/lang/en_US.lang | 4 ++-- src/main/resources/assets/wizardry/lang/es_ES.lang | 4 ++-- src/main/resources/assets/wizardry/lang/es_MX.lang | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java index 53c5f9fc..69f955fe 100644 --- a/src/main/java/electroblob/wizardry/Wizardry.java +++ b/src/main/java/electroblob/wizardry/Wizardry.java @@ -137,6 +137,8 @@ public class Wizardry { // Moved to preInit, because apparently it has to be here now. proxy.registerRenderers(); + // It seems this also has to be here + proxy.registerKeyBindings(); } @@ -145,8 +147,6 @@ public class Wizardry { settings.initConfigExtras(); - proxy.registerKeyBindings(); - // Event Handlers GameRegistry.registerWorldGenerator(generator, 0); MinecraftForge.EVENT_BUS.register(new WizardryKeyHandler()); diff --git a/src/main/java/electroblob/wizardry/client/ClientProxy.java b/src/main/java/electroblob/wizardry/client/ClientProxy.java index fa6bb170..5863acec 100644 --- a/src/main/java/electroblob/wizardry/client/ClientProxy.java +++ b/src/main/java/electroblob/wizardry/client/ClientProxy.java @@ -154,8 +154,8 @@ public class ClientProxy extends CommonProxy { public static MixedFontRenderer mixedFontRenderer; // Key Bindings - public static final KeyBinding NEXT_SPELL = new KeyBinding("key.wizardry:next_spell", Keyboard.KEY_N, "key.categories.wizardry"); - public static final KeyBinding PREVIOUS_SPELL = new KeyBinding("key.wizardry:previous_spell", Keyboard.KEY_B, "key.categories.wizardry"); + public static final KeyBinding NEXT_SPELL = new KeyBinding("key.wizardry.next_spell", Keyboard.KEY_N, "key.categories.wizardry"); + public static final KeyBinding PREVIOUS_SPELL = new KeyBinding("key.wizardry.previous_spell", Keyboard.KEY_B, "key.categories.wizardry"); // Armour Model public static final ModelBiped WIZARD_ARMOUR_MODEL = new ModelWizardArmour(0.75f); diff --git a/src/main/resources/assets/wizardry/lang/en_GB.lang b/src/main/resources/assets/wizardry/lang/en_GB.lang index fc660274..8ae8a4d4 100644 --- a/src/main/resources/assets/wizardry/lang/en_GB.lang +++ b/src/main/resources/assets/wizardry/lang/en_GB.lang @@ -616,8 +616,8 @@ enchantment.wizardry:freezing_weapon=Frost Imbuement key.categories.wizardry=Wizardry -key.wizardry:next_spell=Next Spell -key.wizardry:previous_spell=Previous Spell +key.wizardry.next_spell=Next Spell +key.wizardry.previous_spell=Previous Spell death.attack.wizardry_magic=%1$s was killed by %2$s using magic death.attack.indirect_wizardry_magic=%1$s was killed by %2$s using magic diff --git a/src/main/resources/assets/wizardry/lang/en_US.lang b/src/main/resources/assets/wizardry/lang/en_US.lang index 3f87afb7..286ae49a 100644 --- a/src/main/resources/assets/wizardry/lang/en_US.lang +++ b/src/main/resources/assets/wizardry/lang/en_US.lang @@ -616,8 +616,8 @@ enchantment.wizardry:freezing_weapon=Frost Imbuement key.categories.wizardry=Wizardry -key.wizardry:next_spell=Next Spell -key.wizardry:previous_spell=Previous Spell +key.wizardry.next_spell=Next Spell +key.wizardry.previous_spell=Previous Spell death.attack.wizardry_magic=%1$s was killed by %2$s using magic death.attack.indirect_wizardry_magic=%1$s was killed by %2$s using magic diff --git a/src/main/resources/assets/wizardry/lang/es_ES.lang b/src/main/resources/assets/wizardry/lang/es_ES.lang index 7608a50f..38ffd4fc 100644 --- a/src/main/resources/assets/wizardry/lang/es_ES.lang +++ b/src/main/resources/assets/wizardry/lang/es_ES.lang @@ -615,8 +615,8 @@ enchantment.wizardry:freezing_weapon=Impregnacion de Fuego key.categories.wizardry=Wizardry -key.wizardry:next_spell=Hechizo siguiente -key.wizardry:previous_spell=Hechizo anterior +key.wizardry.next_spell=Hechizo siguiente +key.wizardry.previous_spell=Hechizo anterior death.attack.wizardry_magic=%1$s fue matado por %2$s usando magia death.attack.indirect_wizardry_magic=%1$s fue matado por %2$s usando magia diff --git a/src/main/resources/assets/wizardry/lang/es_MX.lang b/src/main/resources/assets/wizardry/lang/es_MX.lang index 7608a50f..38ffd4fc 100644 --- a/src/main/resources/assets/wizardry/lang/es_MX.lang +++ b/src/main/resources/assets/wizardry/lang/es_MX.lang @@ -615,8 +615,8 @@ enchantment.wizardry:freezing_weapon=Impregnacion de Fuego key.categories.wizardry=Wizardry -key.wizardry:next_spell=Hechizo siguiente -key.wizardry:previous_spell=Hechizo anterior +key.wizardry.next_spell=Hechizo siguiente +key.wizardry.previous_spell=Hechizo anterior death.attack.wizardry_magic=%1$s fue matado por %2$s usando magia death.attack.indirect_wizardry_magic=%1$s fue matado por %2$s usando magia