bump version

AE2-UEL · Jun 7, 2024 · f0ca403 · f0ca403
1 parent 8da04c3
commit f0ca403
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 
-version = "2.6.0-r"
+version = "2.6.1-r"
 group = "ae2fc"
 archivesBaseName = "Fluid Craft for AE2"
 

diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java
@@ -14,7 +14,7 @@
 public class FluidCraft {
 
     public static final String MODID = "ae2fc";
-    public static final String VERSION = "2.6.0-r";
+    public static final String VERSION = "2.6.1-r";
     public static final boolean beta = false;
 
     @Mod.Instance(MODID)

diff --git a/src/main/java/com/glodblock/github/coremod/CoreModHooks.java b/src/main/java/com/glodblock/github/coremod/CoreModHooks.java
@@ -125,11 +125,11 @@ public static void readExtraNBTInterface(DualityInterface dual, NBTTagCompound n
 
     public static ItemStack removeFluidPackets(InventoryCrafting inv, int index) {
         ItemStack stack = inv.getStackInSlot(index);
-        if (stack != ItemStack.EMPTY && stack.getItem() == FCItems.FLUID_PACKET) {
+        if (!stack.isEmpty() && stack.getItem() == FCItems.FLUID_PACKET) {
             FluidStack fluid = FakeItemRegister.getStack(stack);
             return FakeFluids.packFluid2Drops(fluid);
         }
-        if (ModAndClassUtil.GAS && stack != ItemStack.EMPTY && stack.getItem() == FCGasItems.GAS_PACKET) {
+        if (ModAndClassUtil.GAS && !stack.isEmpty() && stack.getItem() == FCGasItems.GAS_PACKET) {
             GasStack gas = FakeItemRegister.getStack(stack);
             return FakeGases.packGas2Drops(gas);
         }
@@ -141,8 +141,7 @@ public static ItemStack removeFluidPackets(InventoryCrafting inv, int index) {
     public static long getCraftingByteCost(IAEItemStack stack) {
         if (stack.getItem() == FCItems.FLUID_DROP) {
             return (long) Math.ceil(stack.getStackSize() / 1000D);
-        }
-        if (ModAndClassUtil.GAS && stack.getItem() == FCGasItems.GAS_DROP) {
+        } else if (ModAndClassUtil.GAS && stack.getItem() == FCGasItems.GAS_DROP) {
             return (long) Math.ceil(stack.getStackSize() / 4000D);
         }
         return stack.getStackSize();
@@ -151,8 +150,7 @@ public static long getCraftingByteCost(IAEItemStack stack) {
     public static long getCraftingByteCost(long originBytes, long missingBytes, IAEItemStack stack) {
         if (stack != null && stack.getItem() == FCItems.FLUID_DROP) {
             return (long) Math.ceil(missingBytes / 1000D) + originBytes;
-        }
-        if (ModAndClassUtil.GAS && stack != null && stack.getItem() == FCGasItems.GAS_DROP) {
+        } else if (ModAndClassUtil.GAS && stack != null && stack.getItem() == FCGasItems.GAS_DROP) {
             return (long) Math.ceil(missingBytes / 4000D) + originBytes;
         }
         return missingBytes + originBytes;
@@ -251,8 +249,7 @@ public static long getFluidSize(IAEItemStack aeStack) {
         if (aeStack.getDefinition() != null && !aeStack.getDefinition().isEmpty()) {
             if (aeStack.getDefinition().getItem() == FCItems.FLUID_DROP) {
                 return (long) Math.max(aeStack.getStackSize() / 1000D, 1);
-            }
-            if (ModAndClassUtil.GAS && aeStack.getDefinition().getItem() == FCGasItems.GAS_DROP) {
+            } else if (ModAndClassUtil.GAS && aeStack.getDefinition().getItem() == FCGasItems.GAS_DROP) {
                 return (long) Math.max(aeStack.getStackSize() / 4000D, 1);
             }
         }

diff --git a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java
@@ -32,7 +32,7 @@ public static void init() {
             OC = true;
         }
 
-        if (Loader.isModLoaded("mekanism") && Loader.isModLoaded("mekeng")) {
+        if (Loader.isModLoaded("mekeng")) {
             GAS = true;
         }
     }