From ef2f5b96a724618df964adecde44b4e2a890b58e Mon Sep 17 00:00:00 2001
From: mezz <tehgeek@gmail.com>
Date: Fri, 28 Oct 2016 14:35:22 -0700
Subject: [PATCH] Fix reloading for CraftTweaker & Crafting Harmonics #537 #547

---
 src/main/java/mezz/jei/JeiStarter.java        | 20 ++++++++-----------
 src/main/java/mezz/jei/ProxyCommonClient.java | 12 +++--------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/main/java/mezz/jei/JeiStarter.java b/src/main/java/mezz/jei/JeiStarter.java
index bd2edff93..3f97622e3 100644
--- a/src/main/java/mezz/jei/JeiStarter.java
+++ b/src/main/java/mezz/jei/JeiStarter.java
@@ -18,24 +18,23 @@
 import net.minecraftforge.fml.common.ProgressManager;
 
 public class JeiStarter {
-	private final ModRegistry modRegistry;
-	private final StackHelper stackHelper;
-	private final IngredientRegistry ingredientRegistry;
-
 	private boolean started;
 	@Nullable
 	private GuiEventHandler guiEventHandler;
 
-	public JeiStarter(List<IModPlugin> plugins) {
+	public void start(List<IModPlugin> plugins) {
+		long jeiStartTime = System.currentTimeMillis();
+
+		Log.info("Starting JEI...");
 		SubtypeRegistry subtypeRegistry = new SubtypeRegistry();
 
 		registerItemSubtypes(plugins, subtypeRegistry);
 
-		stackHelper = new StackHelper(subtypeRegistry);
+		StackHelper stackHelper = new StackHelper(subtypeRegistry);
 		stackHelper.enableUidCache();
 		Internal.setStackHelper(stackHelper);
 
-		ingredientRegistry = registerIngredients(plugins);
+		IngredientRegistry ingredientRegistry = registerIngredients(plugins);
 		Internal.setIngredientRegistry(ingredientRegistry);
 
 		JeiHelpers jeiHelpers = new JeiHelpers(ingredientRegistry, stackHelper, subtypeRegistry);
@@ -44,13 +43,9 @@ public JeiStarter(List<IModPlugin> plugins) {
 		ModIdUtil modIdUtil = Internal.getModIdUtil();
 		ItemRegistry itemRegistry = new ItemRegistry(ingredientRegistry, modIdUtil);
 
-		modRegistry = new ModRegistry(jeiHelpers, itemRegistry, ingredientRegistry);
+		ModRegistry modRegistry = new ModRegistry(jeiHelpers, itemRegistry, ingredientRegistry);
 
 		registerPlugins(plugins, modRegistry);
-	}
-
-	public void start(List<IModPlugin> plugins) {
-		stackHelper.enableUidCache();
 
 		Log.info("Building recipe registry...");
 		long start_time = System.currentTimeMillis();
@@ -80,6 +75,7 @@ public void start(List<IModPlugin> plugins) {
 		MinecraftForge.EVENT_BUS.register(guiEventHandler);
 
 		started = true;
+		Log.info("Finished Starting JEI in {} ms", System.currentTimeMillis() - jeiStartTime);
 	}
 
 	public boolean hasStarted() {
diff --git a/src/main/java/mezz/jei/ProxyCommonClient.java b/src/main/java/mezz/jei/ProxyCommonClient.java
index 2ed4beb58..b950b2914 100644
--- a/src/main/java/mezz/jei/ProxyCommonClient.java
+++ b/src/main/java/mezz/jei/ProxyCommonClient.java
@@ -37,8 +37,7 @@
 @SuppressWarnings("unused")
 public class ProxyCommonClient extends ProxyCommon {
 	private List<IModPlugin> plugins = new ArrayList<IModPlugin>();
-	@Nullable
-	private JeiStarter starter;
+	private final JeiStarter starter = new JeiStarter();
 
 	private static void initVersionChecker() {
 		final NBTTagCompound compound = new NBTTagCompound();
@@ -108,12 +107,7 @@ public void onResourceManagerReload(IResourceManager resourceManager) {
 			}
 		});
 
-		long jeiStartTime = System.currentTimeMillis();
-		Log.info("Starting JEI...");
-		this.starter = new JeiStarter(this.plugins);
-
-		this.starter.start(this.plugins);
-		Log.info("Finished Starting JEI in {} ms", System.currentTimeMillis() - jeiStartTime);
+		this.starter.start(plugins);
 	}
 
 	@SubscribeEvent
@@ -127,7 +121,7 @@ public void onEntityJoinedWorld(EntityJoinWorldEvent event) {
 	@Override
 	public void restartJEI() {
 		// check that JEI has been started before. if not, do nothing
-		if (this.starter != null && this.starter.hasStarted()) {
+		if (this.starter.hasStarted()) {
 			this.starter.start(this.plugins);
 		}
 	}