mirror of
https://github.com/GTNewHorizons/ModTweaker.git
synced 2026-11-18 03:35:03 +00:00
More Thermal Expansion rework
- Equals method - refreshRecipes for all machines
This commit is contained in:
1 parent
615e96d27f
commit
9f61304258
8 files changed
+437
-6
No files matched your search
@@ -7,6 +7,7 @@ import minetweaker.api.liquid.ILiquidStack;
|
||||
import modtweaker2.mods.botania.Botania;
|
||||
import modtweaker2.utils.TweakerPlugin;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public class StackHelper {
|
||||
/**
|
||||
@@ -22,6 +23,14 @@ public class StackHelper {
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean areEqual(FluidStack stack1, FluidStack stack2) {
|
||||
if(stack1 == null || stack2 == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return stack1.isFluidEqual(stack2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compares two ItemStack instances if they reference the same object or
|
||||
* are both null. If false, the method areEqual() is called to check if the
|
||||
@@ -36,6 +45,15 @@ public class StackHelper {
|
||||
return(areEqual(stack1, stack2));
|
||||
}
|
||||
|
||||
public static boolean areEqualOrNull(FluidStack stack1, FluidStack stack2) {
|
||||
// Check if they reference the same object or are are both null
|
||||
if(stack1 == stack2) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return(areEqual(stack1, stack2));
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds extra check to IIngredient matches() for Botania special flowers
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user