From 6fa032fe2dea13acbc118512f67564a8e3fbe70f Mon Sep 17 00:00:00 2001
From: TheTemporatlist <TheTemportalist@users.noreply.github.com>
Date: Tue, 11 Nov 2014 17:01:15 -0500
Subject: [PATCH] Patching compatibility

---
 .../modwarriors/notenoughkeys/api/Api.java    |  2 +-
 src/main/java/tconstruct/TConstruct.java      | 36 ++++++++-----------
 .../java/tconstruct/client/ArmorControls.java |  3 +-
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/api/java/modwarriors/notenoughkeys/api/Api.java b/src/api/java/modwarriors/notenoughkeys/api/Api.java
index 7b5c1943..390d28a3 100644
--- a/src/api/java/modwarriors/notenoughkeys/api/Api.java
+++ b/src/api/java/modwarriors/notenoughkeys/api/Api.java
@@ -29,7 +29,7 @@ public class Api {
 	 */
 	public static void registerMod(String modname, String[] keyDecriptions) {
 		try {
-			Class.forName("modwarriors.notenoughkeys.keys.KeyBindTracker").getMethod(
+			Class.forName("modwarriors.notenoughkeys.keys.KeyHelper").getMethod(
 					"registerMod", String.class, String[].class
 			).invoke(null, modname, keyDecriptions);
 		} catch (Exception e) {
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
index 9e3e6dce..7f47f8e8 100644
--- a/src/main/java/tconstruct/TConstruct.java
+++ b/src/main/java/tconstruct/TConstruct.java
@@ -1,17 +1,23 @@
 package tconstruct;
 
-import java.util.Map;
-import java.util.Random;
-
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.network.NetworkCheckHandler;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+import cpw.mods.fml.relauncher.Side;
 import mantle.pulsar.config.ForgeCFG;
 import mantle.pulsar.control.PulseManager;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraftforge.common.MinecraftForge;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
 import tconstruct.achievements.AchievementEvents;
 import tconstruct.achievements.TAchievements;
 import tconstruct.api.TConstructAPI;
@@ -43,22 +49,10 @@ import tconstruct.util.config.PHConstruct;
 import tconstruct.util.network.PacketPipeline;
 import tconstruct.world.TinkerWorld;
 import tconstruct.world.gen.SlimeIslandGen;
-import tconstruct.world.village.ComponentSmeltery;
-import tconstruct.world.village.ComponentToolWorkshop;
-import tconstruct.world.village.TVillageTrades;
-import tconstruct.world.village.VillageSmelteryHandler;
-import tconstruct.world.village.VillageToolStationHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.network.NetworkCheckHandler;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.VillagerRegistry;
-import cpw.mods.fml.relauncher.Side;
+import tconstruct.world.village.*;
+
+import java.util.Map;
+import java.util.Random;
 
 /**
  * TConstruct, the tool mod. Craft your tools with style, then modify until the
diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java
index 93538126..1b5f9d0c 100644
--- a/src/main/java/tconstruct/client/ArmorControls.java
+++ b/src/main/java/tconstruct/client/ArmorControls.java
@@ -1,6 +1,7 @@
 package tconstruct.client;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent;
 import mantle.common.network.AbstractPacket;
@@ -68,7 +69,7 @@ public class ArmorControls {
 			if (key != null)
 				ClientRegistry.registerKeyBinding(key);
 		}
-		if (Api.isLoaded())
+		if (Loader.isModLoaded("notenoughkeys"))
 			Api.registerMod(TConstruct.modID, ArmorControls.keyDescs);
 		// Add mc keys
 		this.keys[4] = ArmorControls.jumpKey;