From 4e396d2897a30ad37b96e72cf4d9e4c7ce405854 Mon Sep 17 00:00:00 2001
From: CoolMineman <62723322+CoolMineman@users.noreply.github.com>
Date: Sat, 1 Aug 2020 20:59:19 -0500
Subject: [PATCH] update to new fabric keybinding api and rebrand

---
 .../quakemovement/KeyBindInitializer.java     | 26 +++++--------------
 resources/assets/squake/lang/en_us.json       |  5 +++-
 resources/fabric.mod.json                     |  3 ++-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/java/squeek/quakemovement/KeyBindInitializer.java b/java/squeek/quakemovement/KeyBindInitializer.java
index c701854..f5974ff 100644
--- a/java/squeek/quakemovement/KeyBindInitializer.java
+++ b/java/squeek/quakemovement/KeyBindInitializer.java
@@ -3,30 +3,18 @@ package squeek.quakemovement;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
-import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.minecraft.client.options.KeyBinding;
 import net.minecraft.client.util.InputUtil;
-import net.minecraft.util.Identifier;
 import org.lwjgl.glfw.GLFW;
 
 @Environment(EnvType.CLIENT)
-public class KeyBindInitializer implements ClientModInitializer
-{
-	public static FabricKeyBinding ENABLE;
-	public static String CATEGORY = "fabric.mods." + ModInfo.MODID;
+public class KeyBindInitializer implements ClientModInitializer {
+	public static final String CATEGORY = "fabric.mods." + ModInfo.MODID;
+	public static final KeyBinding ENABLE = new KeyBinding(CATEGORY + "." + "enable", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_UNKNOWN, CATEGORY);
 
 	@Override
-	public void onInitializeClient()
-	{
-		KeyBindingRegistry.INSTANCE.addCategory(CATEGORY);
-		ENABLE = registerKey("enable", GLFW.GLFW_KEY_UNKNOWN, CATEGORY);
-	}
-
-	public static FabricKeyBinding registerKey(String name, Integer code, String category)
-	{
-		FabricKeyBinding key = FabricKeyBinding.Builder.create(new Identifier(ModInfo.MODID, name), InputUtil.Type.KEYSYM, code, category).build();
-		KeyBindingRegistry.INSTANCE.register(key);
-
-		return key;
+	public void onInitializeClient() {
+		KeyBindingHelper.registerKeyBinding(ENABLE);
 	}
 }
diff --git a/resources/assets/squake/lang/en_us.json b/resources/assets/squake/lang/en_us.json
index 0b50053..455aa42 100644
--- a/resources/assets/squake/lang/en_us.json
+++ b/resources/assets/squake/lang/en_us.json
@@ -13,5 +13,8 @@
 	"text.autoconfig.squake.option.trimpEnabled": "Trimp Enabled",
 	"text.autoconfig.squake.option.fallDistanceThresholdIncrease": "Fall Distance Threshold Increase",
 	"text.autoconfig.squake.option.maxAirAccelerationPerTick": "Max Air Acceleration Per Tick",
-	"text.autoconfig.squake.option.enabled": "Enabled"
+    "text.autoconfig.squake.option.enabled": "Enabled",
+    
+    "fabric.mods.squake": "Squake Reloaded",
+    "fabric.mods.squake.enable": "Toggle Squake Movement"
 }
\ No newline at end of file
diff --git a/resources/fabric.mod.json b/resources/fabric.mod.json
index 7d88841..facc2f9 100644
--- a/resources/fabric.mod.json
+++ b/resources/fabric.mod.json
@@ -3,9 +3,10 @@
   "id": "squake",
   "version": "${version}",
 
-  "name": "Squake",
+  "name": "Squake Reloaded",
   "description": "Quake-style movement (bunnyhopping, etc) in Minecraft",
   "authors": [
+    "ThatTrollzer/CoolMineman",
     "squeek502"
   ],
   "contact": {