diff options
author | miozune <miozune@gmail.com> | 2022-06-01 20:36:42 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-01 13:36:42 +0200 |
commit | 8bde03f5330693cfb1c04c256af87f57ac86ca18 (patch) | |
tree | ead2b18588fe71c15997b802b72942ff33916f2e /src/main/java/gregtech/api/util | |
parent | 6be27cf6dfaa474b36172a88568d375d7bb1c9fc (diff) | |
download | GT5-Unofficial-8bde03f5330693cfb1c04c256af87f57ac86ca18.tar.gz GT5-Unofficial-8bde03f5330693cfb1c04c256af87f57ac86ca18.tar.bz2 GT5-Unofficial-8bde03f5330693cfb1c04c256af87f57ac86ca18.zip |
Fixes (#198)
* Fix IsaMill controller GUI void items
* Add structure check for Milling Ball Housing
* Fix internal crash that was handled somewhere else
* Fix ore type can be locked to 0
* Add scan result for locked ore type
* Fix height in tooltip
* Delegate to native isRecipeInputEqual
* Don't consume energy to fill water
* Fix flowing water is not filled sometimes
* Add info about filling water
* Fix carelessness
* Fix flowing water in Algae Farm
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r-- | src/main/java/gregtech/api/util/GTPP_Recipe.java | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index e777a0bf36..93144aed83 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -234,81 +234,6 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { return this.mFluidOutputs[aIndex].copy(); } - @Override - public boolean isRecipeInputEqual(final boolean aDecreaseStacksizeBySuccess, final FluidStack[] aFluidInputs, final ItemStack... aInputs) { - return this.isRecipeInputEqual(aDecreaseStacksizeBySuccess, false, aFluidInputs, aInputs); - } - - @Override - public boolean isRecipeInputEqual(final boolean aDecreaseStacksizeBySuccess, final boolean aDontCheckStackSizes, final FluidStack[] aFluidInputs, final ItemStack... aInputs) { - if ((this.mFluidInputs.length > 0) && (aFluidInputs == null)) { - return false; - } - for (final FluidStack tFluid : this.mFluidInputs) { - if (tFluid != null) { - boolean temp = true; - for (final FluidStack aFluid : aFluidInputs) { - if ((aFluid != null) && aFluid.isFluidEqual(tFluid) && (aDontCheckStackSizes || (aFluid.amount >= tFluid.amount))) { - temp = false; - break; - } - } - if (temp) { - return false; - } - } - } - - if ((this.mInputs.length > 0) && (aInputs == null)) { - return false; - } - - for (final ItemStack tStack : this.mInputs) { - if (tStack != null) { - boolean temp = true; - for (final ItemStack aStack : aInputs) { - if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) && (aDontCheckStackSizes || (aStack.stackSize >= tStack.stackSize))) { - temp = false; - break; - } - } - if (temp) { - return false; - } - } - } - - if (aDecreaseStacksizeBySuccess) { - if (aFluidInputs != null) { - for (final FluidStack tFluid : this.mFluidInputs) { - if (tFluid != null) { - for (final FluidStack aFluid : aFluidInputs) { - if ((aFluid != null) && aFluid.isFluidEqual(tFluid) && (aDontCheckStackSizes || (aFluid.amount >= tFluid.amount))) { - aFluid.amount -= tFluid.amount; - break; - } - } - } - } - } - - if (aInputs != null) { - for (final ItemStack tStack : this.mInputs) { - if (tStack != null) { - for (final ItemStack aStack : aInputs) { - if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) && (aDontCheckStackSizes || (aStack.stackSize >= tStack.stackSize))) { - aStack.stackSize -= tStack.stackSize; - break; - } - } - } - } - } - } - - return true; - } - public static class GTPP_Recipe_Map_Internal extends GT_Recipe_Map { public static final Collection<GTPP_Recipe_Map_Internal> sMappingsEx = new ArrayList<>(); |