From 0fd60ac639521d74f0026505c8f2c8db13750ae5 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sun, 29 Mar 2020 04:35:20 +0100 Subject: + Added code to remove GT recipes for rocket_fuel and 1,1dimethylhydrazine. % Made Formaldehyde Catalyst handled correctly in Chemical Plant. --- src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java') diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java index 810076743f..df437c4d23 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java @@ -25,13 +25,11 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gregtech.api.util.Recipe_GT; import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.nei.GT_NEI_MultiBlockHandler.CachedDefaultRecipe; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.init.Blocks; @@ -206,7 +204,7 @@ extends TemplateRecipeHandler { } } for (final PositionedStack tStack : tRecipe.mInputs) { - if (aStack == tStack.item) { + if (GT_Utility.areStacksEqual(aStack, tStack.item)) { if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || (tStack.item.stackSize != 0)) { break; -- cgit From 75ea33600537047847091b55a46f5b88c3c75dbb Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 31 Mar 2020 01:25:58 +0100 Subject: + Added Custom NEI Handler for IsaMIll. + Added Death by IsaMIll. % Moved debug mode switch to AsmConfig. $ Fixed handling of custom OrePrefixes. $ Fixed OreDict registration of MetaFoodItems. $ Improved handling of Core Classes being static initialised too early. $ Fixed client-side bug in Distillus which would cause an infinite loop. $ Fixed bug in ForgeEnumHelper. $ Fixed bug in setField methods from ReflectionUtils. --- src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java') diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java index df437c4d23..29c3cecb6f 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java @@ -60,7 +60,7 @@ extends TemplateRecipeHandler { } public List getSortedRecipes() { - List result = new ArrayList<>(this.mRecipeMap.mRecipeList); + List result = new ArrayList(this.mRecipeMap.mRecipeList); Collections.sort(result); return result; } -- cgit