diff --git a/build.properties b/build.properties
index 928ef535..55791a44 100644
--- a/build.properties
+++ b/build.properties
@@ -2,4 +2,4 @@ mc_version=1.7.10
forge_version=10.13.4.1614-1.7.10
ccl_version=1.1.3.138
ccc_version=1.0.7.+
-mod_version=2.1.7-GTNH
+mod_version=2.1.8-GTNH
diff --git a/src/codechicken/nei/NEIClientConfig.java b/src/codechicken/nei/NEIClientConfig.java
index 5b38d070..e3a9a113 100644
--- a/src/codechicken/nei/NEIClientConfig.java
+++ b/src/codechicken/nei/NEIClientConfig.java
@@ -24,6 +24,7 @@ import codechicken.nei.config.OptionTextField;
import codechicken.nei.config.OptionToggleButton;
import codechicken.nei.config.OptionToggleButtonBoubs;
import codechicken.nei.config.OptionUtilities;
+import codechicken.nei.event.NEIConfigsLoadedEvent;
import codechicken.nei.recipe.GuiRecipeTab;
import codechicken.nei.recipe.RecipeInfo;
import codechicken.obfuscator.ObfuscationRun;
@@ -33,6 +34,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraft.world.storage.SaveFormatComparator;
+import net.minecraftforge.common.MinecraftForge;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.lwjgl.input.Keyboard;
@@ -297,6 +299,8 @@ public class NEIClientConfig {
logger.error("Failed to Load " + clazz.getName(), e);
}
}
+
+ MinecraftForge.EVENT_BUS.post(new NEIConfigsLoadedEvent());
}
}.start();
ItemSorter.loadConfig();
diff --git a/src/codechicken/nei/event/NEIConfigsLoadedEvent.java b/src/codechicken/nei/event/NEIConfigsLoadedEvent.java
new file mode 100644
index 00000000..487c5486
--- /dev/null
+++ b/src/codechicken/nei/event/NEIConfigsLoadedEvent.java
@@ -0,0 +1,15 @@
+package codechicken.nei.event;
+
+import codechicken.nei.api.IConfigureNEI;
+import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraftforge.common.MinecraftForge;
+
+/**
+ * Event is posted from NEI Plugin Loader Thread after all {@link IConfigureNEI} were loaded.
+ *
+ * This event does not have a result. {@link HasResult}
+ *
+ * This event is fired on the {@link MinecraftForge#EVENT_BUS}.
+ */
+public class NEIConfigsLoadedEvent extends Event {
+}
diff --git a/src/codechicken/nei/event/RegisterHandlerInfosEvent.java b/src/codechicken/nei/event/RegisterHandlerInfosEvent.java
new file mode 100644
index 00000000..a5e11fa8
--- /dev/null
+++ b/src/codechicken/nei/event/RegisterHandlerInfosEvent.java
@@ -0,0 +1,27 @@
+package codechicken.nei.event;
+
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.HandlerInfo;
+import codechicken.nei.recipe.IRecipeHandler;
+import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraftforge.common.MinecraftForge;
+
+/**
+ * Event is posted every time the handler infos got registered or reloaded.
+ * During it, you can safely register your custom handler info.
+ *
+ *
+ * This event does not have a result. {@link HasResult}
+ *
+ * This event is fired on the {@link MinecraftForge#EVENT_BUS}.
+ */
+public class RegisterHandlerInfosEvent extends Event {
+ public void registerHandlerInfo(Class extends IRecipeHandler> handlerClazz, HandlerInfo info) {
+ if (GuiRecipeTab.handlerMap.put(handlerClazz.getName(), info) != null) {
+ NEIClientConfig.logger.info("Replaced handler info for {}", handlerClazz.getName());
+ } else {
+ NEIClientConfig.logger.info("Added handler info for {}", handlerClazz.getName());
+ }
+ }
+}
diff --git a/src/codechicken/nei/recipe/GuiRecipe.java b/src/codechicken/nei/recipe/GuiRecipe.java
index 3b983836..95b8d9be 100644
--- a/src/codechicken/nei/recipe/GuiRecipe.java
+++ b/src/codechicken/nei/recipe/GuiRecipe.java
@@ -299,16 +299,14 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve
setRecipePage(--recipetype);
}
-
public HandlerInfo getHandlerInfo(IRecipeHandler handler) {
- final String handlerName = handler.toString().split("@")[0];
final String handlerID;
if(handler instanceof TemplateRecipeHandler) {
handlerID = (((TemplateRecipeHandler)handler).getOverlayIdentifier());
} else {
handlerID = null;
}
- HandlerInfo info = GuiRecipeTab.getHandlerInfo(handlerName, handlerID);
+ HandlerInfo info = GuiRecipeTab.getHandlerInfo(handler.getClass().getName(), handlerID);
if (info == null)
return GuiRecipeTab.DEFAULT_HANDLER_INFO;
diff --git a/src/codechicken/nei/recipe/GuiRecipeTab.java b/src/codechicken/nei/recipe/GuiRecipeTab.java
index 90557f13..6040ffa4 100644
--- a/src/codechicken/nei/recipe/GuiRecipeTab.java
+++ b/src/codechicken/nei/recipe/GuiRecipeTab.java
@@ -5,11 +5,13 @@ import codechicken.lib.gui.GuiDraw;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.Widget;
import codechicken.nei.drawable.DrawableResource;
+import codechicken.nei.event.RegisterHandlerInfosEvent;
import codechicken.nei.guihook.GuiContainerManager;
import cpw.mods.fml.common.Loader;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.common.MinecraftForge;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
@@ -19,7 +21,6 @@ import org.lwjgl.opengl.GL12;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -259,9 +260,10 @@ public abstract class GuiRecipeTab extends Widget {
} catch (Exception e) {
NEIClientConfig.logger.info("Error parsing CSV");
e.printStackTrace();
-
}
+ NEIClientConfig.logger.info("Sending {}", RegisterHandlerInfosEvent.class.getSimpleName());
+ MinecraftForge.EVENT_BUS.post(new RegisterHandlerInfosEvent());
}
private static HandlerInfo getDefaultHandlerInfo() {