Workaround for issue where GT++ registers Chemical Plant handler twice

src/main/java/codechicken/nei/ItemPanel.java

@@ -12,6 +12,7 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
@@ -472,9 +473,9 @@ public class ItemPanel extends Widget
             final FluidStack fluidStack = StackInfo.getFluid(draggedStack);
 
             if (fluidStack != null) {
-                searchField.setText(SPECIAL_REGEX_CHARS.matcher(fluidStack.getLocalizedName()).replaceAll("\\\\$0"));
+                searchField.setText(SPECIAL_REGEX_CHARS.matcher(EnumChatFormatting.getTextWithoutFormattingCodes(fluidStack.getLocalizedName())).replaceAll("\\\\$0"));
             } else {
-                searchField.setText(SPECIAL_REGEX_CHARS.matcher(draggedStack.getDisplayName()).replaceAll("\\\\$0"));
+                searchField.setText(SPECIAL_REGEX_CHARS.matcher(EnumChatFormatting.getTextWithoutFormattingCodes(draggedStack.getDisplayName())).replaceAll("\\\\$0"));
             }
 
             return true;

src/main/java/codechicken/nei/ItemsGrid.java

@@ -91,18 +91,14 @@ public class ItemsGrid
     public void setGridSize(int mleft, int mtop, int w, int h)
     {
 
-        //I don't like this big condition
-        if (marginLeft != mleft || marginTop != mtop || width != w || height != h) {
+        marginLeft = mleft;
+        marginTop = mtop;
 
-            marginLeft = mleft;
-            marginTop = mtop;
+        width = Math.max(0, w);
+        height = Math.max(0, h);
 
-            width = Math.max(0, w);
-            height = Math.max(0, h);
-
-            columns = width / SLOT_SIZE;
-            rows = height / SLOT_SIZE;
-        }
+        columns = width / SLOT_SIZE;
+        rows = height / SLOT_SIZE;
 
     }
 

src/main/java/codechicken/nei/LayoutManager.java

@@ -316,6 +316,12 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         if (gui.height - gui.ySize <= 40)
             visiblity.showSearchSection = false;
 
+        if (visiblity.showBookmarkPanel || gui.guiTop <= 20)
+            visiblity.showSubsetDropdown = false;
+
+        if (!visiblity.showBookmarkPanel || gui.guiTop <= 20)
+            visiblity.showPresetsDropdown = false;
+
         if (gui.guiLeft - 4 < 76)
             visiblity.showWidgets = false;
         try {
@@ -690,7 +696,9 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         if (visiblity.showBookmarkPanel) {
             addWidget(bookmarkPanel);
             bookmarkPanel.setVisible();
+        }
 
+        if (visiblity.showPresetsDropdown) {
             addWidget(presetsPanel);
         }
 
@@ -717,7 +725,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
                 addWidget(delete);
         }
 
-        if (!visiblity.showBookmarkPanel) {
+        if (visiblity.showSubsetDropdown) {
             // Bookmarks or Subset/dropdown
             addWidget(dropDown);
         }

src/main/java/codechicken/nei/NEIModContainer.java

@@ -115,7 +115,6 @@ public class NEIModContainer extends DummyModContainer
     public void postInit(FMLPostInitializationEvent event) {
         if (CommonUtils.isClient()) {
             GuiRecipeTab.loadHandlerInfo();
-            RecipeCatalysts.loadCatalystInfo();
             ClientHandler.postInit();
         }
     }

src/main/java/codechicken/nei/VisiblityData.java

@@ -11,6 +11,14 @@ public class VisiblityData
      * Bookmark panel and associated buttons
      */
     public boolean showBookmarkPanel = true;
+    /**
+     * Subset dropdown
+     */
+    public boolean showSubsetDropdown = true;
+    /**
+     * Presets dropdown
+     */
+    public boolean showPresetsDropdown = true;
     /**
      * Item and search section
      */
@@ -40,6 +48,6 @@ public class VisiblityData
         if(!showWidgets)
             showItemSection = showUtilityButtons = false;
         if(!showItemSection)
-            showBookmarkPanel = showSearchSection = showItemPanel = false;
+            showBookmarkPanel = showSubsetDropdown = showPresetsDropdown = showSearchSection = showItemPanel = false;
     }
 }

src/main/resources/assets/nei/csv/catalysts.csv

@@ -79,8 +79,8 @@ net.bdew.gendustry.nei.ReplicatorHandler,gendustry:Replicator,,gendustry,TRUE,,,
 net.bdew.gendustry.nei.SamplerHandler,gendustry:Sampler,,gendustry,TRUE,,,,,,
 net.bdew.gendustry.nei.TransposerHandler,gendustry:Transposer,,gendustry,TRUE,,,,,,
 smelting,IC2:blockMachine:1,,IC2,TRUE,,,,,,
-smelting,IC2:blockMachine:2,,IC2,TRUE,,,,,,
-smelting,IC2:blockMachine:13,,IC2,TRUE,,,,,,
+smelting,IC2:blockMachine:2,,IC2,TRUE,dreamcraft,,,,,
+smelting,IC2:blockMachine:13,,IC2,TRUE,dreamcraft,,,,,
 ic2.neiIntegration.core.recipehandler.BlastFurnaceRecipeHandler,IC2:blockMachine3:1,,IC2,TRUE,,,,,,
 ic2.neiIntegration.core.recipehandler.BlockCutterRecipeHandler,IC2:blockMachine3:2,,IC2,TRUE,,,,,,
 ic2.neiIntegration.core.recipehandler.CentrifugeRecipeHandler,IC2:blockMachine2:3,,IC2,TRUE,,,,,,
@@ -383,6 +383,11 @@ nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft:recyclerIdle,,NuclearCraft,TR
 nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,,,,
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,etfuturum:smoker,,etfuturum,TRUE,,,,,,not working well
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,etfuturum:blast_furnace,,etfuturum,TRUE,,,,,,not working well
+connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,campfirebackport:campfire,,campfirebackport,TRUE,,,,,,
+connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,campfirebackport:soul_campfire,,campfirebackport,TRUE,,,,,,
+connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,campfirebackport:campfire,,campfirebackport,TRUE,,,,,,
+connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,campfirebackport:soul_campfire,,campfirebackport,TRUE,,,,,,
+smelting,Natura:NetherFurnace,,Natura,TRUE,,,,,,
 crafting,gregtech:gt.metaitem.01:32744,,gregtech,TRUE,,,,,,"GT5 start: for readability, keep all GTNH-related catalysts below"
 gt.recipe.primitiveblastfurnace,gregtech:gt.blockmachines:140,,gregtech,TRUE,,,,,,
 gt.recipe.primitiveblastfurnace,gregtech:gt.blockmachines:108,,gregtech,TRUE,,,,,,
@@ -1033,14 +1038,6 @@ gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:814,,miscutils,TRUE,,,,
 gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:815,,miscutils,TRUE,,,,,,
 gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:816,,miscutils,TRUE,,,,,,
 gtpp.recipe.chemicaldehydrator,gregtech:gt.blockmachines:995,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:851,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:852,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:853,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:854,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:855,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:856,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:857,,miscutils,TRUE,,,,,,
-gt.recipe.mixer,gregtech:gt.blockmachines:858,,miscutils,TRUE,,,,,,
 gt.recipe.fusionreactor,gregtech:gt.blockmachines:965,,miscutils,TRUE,,,,,,
 gtpp.recipe.alloyblastsmelter,gregtech:gt.blockmachines:810,,miscutils,TRUE,,,,,,
 gtpp.recipe.rocketenginefuel,gregtech:gt.blockmachines:793,,miscutils,TRUE,,,,,,
@@ -1072,9 +1069,9 @@ gtpp.recipe.simplewasher,gregtech:gt.blockmachines:31018,,miscutils,TRUE,,,,,,
 gtpp.recipe.simplewasher,gregtech:gt.blockmachines:31019,,miscutils,TRUE,,,,,,
 gtpp.recipe.simplewasher,gregtech:gt.blockmachines:31020,,miscutils,TRUE,,,,,,
 gtpp.recipe.vacfurnace,gregtech:gt.blockmachines:995,,miscutils,TRUE,,,,,,
-gtPlusPlus.nei.GT_NEI_FlotationCell,gregtech:gt.blockmachines:31028,,miscutils,TRUE,,,,,,
-gtPlusPlus.nei.GT_NEI_FluidReactor,gregtech:gt.blockmachines:998,,miscutils,TRUE,,,,,,
-gtPlusPlus.nei.GT_NEI_MillingMachine,gregtech:gt.blockmachines:31027,,miscutils,TRUE,,,,,,
+gtpp.recipe.flotationcell,gregtech:gt.blockmachines:31028,,miscutils,TRUE,,,,,,
+gtpp.recipe.fluidchemicaleactor,gregtech:gt.blockmachines:998,,miscutils,TRUE,,,,,,
+gtpp.recipe.oremill,gregtech:gt.blockmachines:31027,,miscutils,TRUE,,,,,,
 team.chisel.compat.nei.RecipeHandlerChisel,gregtech:gt.blockmachines:31066,,miscutils,TRUE,,,,,,
 team.chisel.compat.nei.RecipeHandlerChisel,gregtech:gt.blockmachines:31067,,miscutils,TRUE,,,,,,
 team.chisel.compat.nei.RecipeHandlerChisel,gregtech:gt.blockmachines:31068,,miscutils,TRUE,,,,,,

src/main/resources/assets/nei/csv/handlers.csv

@@ -473,4 +473,6 @@ nc.crafting.nei.HeliumExtractorRecipeHandler,NuclearCraft,NuclearCraft:heliumExt
 nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft,NuclearCraft:recyclerIdle,,NuclearCraft,TRUE,,,65,166,5,,,,,,
 nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,130,,2,,,,,,
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,EtFuturum Requiem,etfuturum:lit_smoker,,etfuturum,TRUE,,,65,166,5,,,,,,
-ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,EtFuturum Requiem,etfuturum:lit_blast_furnace,,etfuturum,TRUE,,,65,166,5,,,,,,
+ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,EtFuturum Requiem,etfuturum:lit_blast_furnace,,etfuturum,TRUE,,,65,166,5,,,,,,
+connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,Campfire Backport,campfirebackport:campfire,,campfirebackport,TRUE,,,65,166,5,,,,,,
+connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,Campfire Backport,campfirebackport:campfire_base,,campfirebackport,TRUE,,,65,166,5,,,,,,