From 79648a17b55cb751708b3b9059adb159cfa18787 Mon Sep 17 00:00:00 2001 From: Sam <78055941+samhaines-wustl@users.noreply.github.com> Date: Mon, 3 Aug 2026 23:05:17 -0500 Subject: [PATCH] Update ME Chest display for fluid cells (#456) --- .../java/com/glodblock/github/FluidCraft.java | 4 +- .../client/textures/FCPartsTexture.java | 5 +- .../github/util/FluidCellHandler.java | 85 ++++++++++++++++++ .../textures/blocks/fluid_terminal_dark.png | Bin 0 -> 95 bytes .../textures/blocks/fluid_terminal_light.png | Bin 0 -> 119 bytes .../textures/blocks/fluid_terminal_medium.png | Bin 0 -> 115 bytes 6 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glodblock/github/util/FluidCellHandler.java create mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_dark.png create mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_light.png create mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_medium.png diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 1728a0c7..6140edae 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -10,8 +10,10 @@ import com.glodblock.github.loader.ChannelLoader; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.loader.RecipeLoader; import com.glodblock.github.proxy.CommonProxy; +import com.glodblock.github.util.FluidCellHandler; import com.glodblock.github.util.ModAndClassUtil; +import appeng.api.AEApi; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -60,7 +62,7 @@ public class FluidCraft { @Mod.EventHandler public static void postInit(FMLPostInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(FluidCraft.INSTANCE, new InventoryHandler()); - + AEApi.instance().registries().cell().addCellHandler(new FluidCellHandler()); ItemAndBlockHolder.loadSetting(); if (!Config.removeRecipe) { diff --git a/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java b/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java index 2c1af821..51343785 100644 --- a/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java +++ b/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java @@ -27,7 +27,10 @@ public enum FCPartsTexture { PartFluidFormationPlane("fluid_formation_plane"), PartFluidAnnihilationPlane("fluid_annihilation_plane"), PartFluidFormationPlaneOn("fluid_formation_plane_on"), - PartFluidAnnihilationPlaneOn("fluid_annihilation_plane_on"); + PartFluidAnnihilationPlaneOn("fluid_annihilation_plane_on"), + BlockMEChestFluid_Bright("fluid_terminal_light"), + BlockMEChestFluid_Dark("fluid_terminal_dark"), + BlockMEChestFluid_Medium("fluid_terminal_medium"); private final String name; public net.minecraft.util.IIcon IIcon; diff --git a/src/main/java/com/glodblock/github/util/FluidCellHandler.java b/src/main/java/com/glodblock/github/util/FluidCellHandler.java new file mode 100644 index 00000000..ec48ea83 --- /dev/null +++ b/src/main/java/com/glodblock/github/util/FluidCellHandler.java @@ -0,0 +1,85 @@ +package com.glodblock.github.util; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; + +import com.glodblock.github.client.textures.FCPartsTexture; +import com.glodblock.github.common.item.FCBaseItemCell; + +import appeng.api.implementations.items.IStorageCell; +import appeng.api.implementations.tiles.IChestOrDrive; +import appeng.api.storage.ICellHandler; +import appeng.api.storage.ICellInventoryHandler; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.ISaveProvider; +import appeng.api.storage.StorageChannel; +import appeng.api.storage.data.IAEStackType; +import appeng.core.sync.GuiBridge; +import appeng.me.storage.CellInventory; +import appeng.me.storage.FluidCellInventoryHandler; +import appeng.util.Platform; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class FluidCellHandler implements ICellHandler { + + @Override + public boolean isCell(final ItemStack is) { + /* + * FCBaseItemCell covers Basic, Multi, and Extreme fluid storage + */ + return is != null && is.getItem() instanceof FCBaseItemCell; + } + + /** + * ME Chest icon + */ + @Override + @SideOnly(Side.CLIENT) + public IIcon getTopTexture_Dark() { + return FCPartsTexture.BlockMEChestFluid_Dark.getIcon(); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getTopTexture_Light() { + return FCPartsTexture.BlockMEChestFluid_Bright.getIcon(); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getTopTexture_Medium() { + return FCPartsTexture.BlockMEChestFluid_Medium.getIcon(); + } + + @Override + public void openChestGui(final EntityPlayer player, final IChestOrDrive chest, final ICellHandler cellHandler, + @SuppressWarnings("rawtypes") final IMEInventoryHandler inv, final ItemStack itemStack, + final StorageChannel channel) { + Platform.openGUI(player, (TileEntity) chest, chest.getUp(), GuiBridge.GUI_ME); + } + + @Override + public int getStatusForCell(ItemStack is, IMEInventory handler) { + if (handler instanceof FluidCellInventoryHandler ci) { + return ci.getStatusForCell(); + } + return 0; + } + + @Override + public double cellIdleDrain(final ItemStack is, @SuppressWarnings("rawtypes") final IMEInventory handler) { + return ((ICellInventoryHandler) handler).getCellInv().getIdleDrain(); + } + + @Override + public IMEInventoryHandler getCellInventory(ItemStack fluidCell, ISaveProvider saveProvider, IAEStackType type) { + if (fluidCell != null && fluidCell.getItem() instanceof IStorageCell cell && cell.getStackType() == type) { + return CellInventory.getCell(fluidCell, saveProvider, type); + } + return null; + } +} diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_dark.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..8cc51c790c440a7a035a322997b280854e8e256a GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6I14-?iy0XBmVq#1`<<2fKtVxI p7srr_Tgeia9{m3w$a;m9;mT+JkMo}V?FULSc)I$ztaD0e0stAO8}R@D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_light.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_light.png new file mode 100644 index 0000000000000000000000000000000000000000..29334b5b28a14c34d7228119fecea6083e89f210 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6I14-?iy0XBmVq#1`<<2fKtWAU z7srr_TgeNgfAljJXf=E&)N1%xpwY1LWN5>NnK`Tu4vor&%w2U140k=NTc1w*Ck52R N;OXk;vd$@?2>=CMBhUZ< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_medium.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_medium.png new file mode 100644 index 0000000000000000000000000000000000000000..6d24fcb8cd8fbd26f03dc1edf0db0d4a06c5f655 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6I14-?iy0XBmVq#1`<<2fKtWYc z7srr_Tgeg*AO73xaT+jO{IR65VS!2IuSBmCVGOJ-vX(Cx7%tAVKKfG3;vY~0gQu&X J%Q~loCIDjwA_@Qi literal 0 HcmV?d00001