From 9c69b39f137614549749260fc6fa7f5d7340ce75 Mon Sep 17 00:00:00 2001 From: AbdoDayem Date: Fri, 24 Oct 2025 17:10:10 -0500 Subject: [PATCH] Added inverter card compatability to Fluid Cells (cherry picked from commit c3a1e85205e412374031d75f08b83d80f413cd50) --- .../storage/FluidCellInventoryHandler.java | 6 ++++- .../glodblock/github/proxy/CommonProxy.java | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java index a73af7c9..4299fb65 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java @@ -57,6 +57,7 @@ public class FluidCellInventoryHandler extends MEInventoryHandler final IInventory upgrades = ci.getUpgradesInventory(); boolean hasSticky = false; + boolean hasInverter = false; for (int x = 0; x < upgrades.getSizeInventory(); x++) { final ItemStack is = upgrades.getStackInSlot(x); @@ -64,11 +65,14 @@ public class FluidCellInventoryHandler extends MEInventoryHandler final Upgrades u = ((IUpgradeModule) is.getItem()).getType(is); if (u == Upgrades.STICKY) { hasSticky = true; - break; + } else if (u == Upgrades.INVERTER) { + hasInverter = true; } } } + this.setWhitelist(hasInverter ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST); + if (hasSticky) { setSticky(true); } diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java index 2e859460..c2854c8f 100644 --- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java +++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java @@ -136,6 +136,18 @@ public class CommonProxy { Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.QUANTUM_CELL), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.SINGULARITY_CELL), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_VOID_CELL), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL1K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL4K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL16K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL64K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL256K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL1024K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL4096K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL16384K), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.QUANTUM_CELL), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.SINGULARITY_CELL), 1); + Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL1K), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL4K), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL16K), 1); @@ -156,6 +168,16 @@ public class CommonProxy { Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.CELL16384KM), 1); Upgrades.STICKY.registerItem(new ItemStack(ItemAndBlockHolder.ARTIFICIAL_UNIVERSE_CELL), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL1KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL4KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL16KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL64KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL256KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL1024KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL4096KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.CELL16384KM), 1); + Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.ARTIFICIAL_UNIVERSE_CELL), 1); + Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL1KM), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL4KM), 1); Upgrades.VOID_OVERFLOW.registerItem(new ItemStack(ItemAndBlockHolder.CELL16KM), 1);