diff options
| author | Alkalus <draknyte1@hotmail.com> | 2020-03-31 02:40:07 +0000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2020-03-31 02:40:07 +0000 |
| commit | 6d6adf8039fb97f2025610eb313a4caa48df838b (patch) | |
| tree | 80e377c85c8a89edeac671cc6b2f2655a150f41e /src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | |
| parent | 47816dec7729bde0bf247ff7db8ebf6b25b92048 (diff) | |
| parent | 8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6 (diff) | |
| download | GT5-Unofficial-6d6adf8039fb97f2025610eb313a4caa48df838b.tar.gz GT5-Unofficial-6d6adf8039fb97f2025610eb313a4caa48df838b.tar.bz2 GT5-Unofficial-6d6adf8039fb97f2025610eb313a4caa48df838b.zip | |
Merged in AlkWork (pull request #4)
AlkWork
Diffstat (limited to 'src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java')
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java index 810076743f..29c3cecb6f 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; @@ -62,7 +60,7 @@ extends TemplateRecipeHandler { } public List<Recipe_GT> getSortedRecipes() { - List<Recipe_GT> result = new ArrayList<>(this.mRecipeMap.mRecipeList); + List<Recipe_GT> result = new ArrayList(this.mRecipeMap.mRecipeList); Collections.sort(result); return result; } @@ -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; |