Followup for the great renaming & cleanup IMC for NEI (#3083)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

src/main/java/gregtech/common/GTClient.java

@@ -775,7 +775,7 @@ public void onPlayerTickEventClient(TickEvent.PlayerTickEvent aEvent) {
 
     @SubscribeEvent
     public void onConfigChange(ConfigChangedEvent.OnConfigChangedEvent e) {
-        if (GregTech.ID.equals(e.modID) && "kekztech/client".equals(e.configID)) {
+        if (GregTech.ID.equals(e.modID) && "client".equals(e.configID)) {
             // refresh client preference and send to server, since it's the only config we allow changing at runtime.
             mPreference = new GTClientPreference();
             GTPreLoad.loadClientConfig();

src/main/java/gtneioreplugin/GTNEIOrePlugin.java

@@ -4,6 +4,7 @@
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
+import net.minecraftforge.common.MinecraftForge;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -19,7 +20,7 @@
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import gregtech.GT_Version;
-import gtneioreplugin.plugin.IMCForNEI;
+import gtneioreplugin.plugin.NEIPluginConfig;
 import gtneioreplugin.plugin.block.ModBlocks;
 import gtneioreplugin.util.CSVMaker;
 import gtneioreplugin.util.GT5OreLayerHelper;
@@ -67,7 +68,7 @@ public void preinit(FMLPreInitializationEvent event) {
     @EventHandler
     public void init(FMLInitializationEvent event) {
         ModBlocks.init();
-        IMCForNEI.IMCSender();
+        MinecraftForge.EVENT_BUS.register(new NEIPluginConfig());
     }
 
     @EventHandler

src/main/java/gtneioreplugin/plugin/NEIPluginConfig.java

@@ -1,7 +1,21 @@
 package gtneioreplugin.plugin;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+
 import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
+import codechicken.nei.event.NEIRegisterHandlerInfosEvent;
+import codechicken.nei.recipe.HandlerInfo;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GTOreDictUnificator;
 import gtneioreplugin.GTNEIOrePlugin;
 import gtneioreplugin.plugin.gregtech5.PluginGT5SmallOreStat;
 import gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid;
@@ -31,5 +45,35 @@ public void loadConfig() {
         API.registerUsageHandler(pluginSmallOreStat);
         API.registerRecipeHandler(pluginGT5UndergroundFluid);
         API.registerUsageHandler(pluginGT5UndergroundFluid);
+
+        List<ItemList> catalysts = Arrays.asList(
+            ItemList.OilDrill1,
+            ItemList.OilDrill2,
+            ItemList.OilDrill3,
+            ItemList.OilDrill4,
+            ItemList.OilDrillInfinite);
+        for (ItemList catalyst : catalysts) {
+            API.addRecipeCatalyst(catalyst.get(1), pluginGT5UndergroundFluid);
+        }
+    }
+
+    @SubscribeEvent
+    public void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) {
+        // Though first two handlers are already registered in NEI jar, we need to re-register
+        // because new DimensionDisplayItems made tabs a bit taller.
+        Map<String, ItemStack> handlers = new HashMap<>();
+        handlers.put("PluginGT5VeinStat", GTOreDictUnificator.get(OrePrefixes.ore, Materials.Manyullyn, 1));
+        handlers.put("PluginGT5SmallOreStat", GTOreDictUnificator.get(OrePrefixes.ore, Materials.Platinum, 1));
+        handlers.put("PluginGT5UndergroundFluid", ItemList.Electric_Pump_UEV.get(1));
+        for (Map.Entry<String, ItemStack> handler : handlers.entrySet()) {
+            event.registerHandlerInfo(
+                new HandlerInfo.Builder(
+                    "gtneioreplugin.plugin.gregtech5." + handler.getKey(),
+                    GTNEIOrePlugin.NAME,
+                    GTNEIOrePlugin.MODID).setHeight(160)
+                        .setMaxRecipesPerPage(2)
+                        .setDisplayStack(handler.getValue())
+                        .build());
+        }
     }
 }

src/main/java/kubatech/ClientProxy.java

@@ -30,7 +30,6 @@
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import kubatech.api.utils.ModUtils;
-import kubatech.nei.IMCForNEI;
 
 @SuppressWarnings("unused")
 public class ClientProxy extends CommonProxy {
@@ -42,7 +41,6 @@ public void preInit(FMLPreInitializationEvent event) {
 
     public void init(FMLInitializationEvent event) {
         super.init(event);
-        IMCForNEI.IMCSender();
     }
 
     public void postInit(FMLPostInitializationEvent event) {

src/main/java/kubatech/nei/NEIConfig.java

@@ -20,6 +20,8 @@
 
 package kubatech.nei;
 
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.MobsInfo;
 import static kubatech.api.enums.ItemList.LegendaryBlackTea;
 import static kubatech.api.enums.ItemList.LegendaryButterflyTea;
 import static kubatech.api.enums.ItemList.LegendaryEarlGrayTea;
@@ -37,11 +39,15 @@
 import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
 import kubatech.Tags;
+import kubatech.api.enums.ItemList;
 
 public class NEIConfig implements IConfigureNEI {
 
     @Override
     public void loadConfig() {
+        if (MobsInfo.isModLoaded() && EnderIO.isModLoaded()) {
+            API.addRecipeCatalyst(ItemList.ExtremeEntityCrusher.get(1), "mobsinfo.mobhandler");
+        }
         API.hideItem(LegendaryBlackTea.get(1));
         API.hideItem(LegendaryButterflyTea.get(1));
         API.hideItem(LegendaryEarlGrayTea.get(1));