From 4440ea5a1c6c7e7a1ddf56908f0487bdbe6fc11d Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 23 Jan 2023 20:52:19 +0800 Subject: [PATCH] colorful tooltips and 16384k cell --- .../item/ItemBasicFluidStorageCell.java | 25 ++++++++---- .../item/ItemBasicFluidStoragePart.java | 7 +++- .../github/common/storage/CellType.java | 30 +++++++++++++- .../common/storage/FluidCellHandler.java | 1 + .../common/storage/FluidCellInventory.java | 37 ++++++++---------- .../github/loader/ItemAndBlockHolder.java | 3 ++ .../glodblock/github/loader/RecipeLoader.java | 32 ++++++++++----- .../resources/assets/ae2fc/lang/en_US.lang | 30 +++++++------- .../resources/assets/ae2fc/lang/ru_RU.lang | 28 ++++++------- .../resources/assets/ae2fc/lang/zh_CN.lang | 28 ++++++------- .../ae2fc/textures/items/fluid_part.7.png | Bin 0 -> 497 bytes .../textures/items/fluid_storage.16384.png | Bin 0 -> 486 bytes .../textures/items/fluid_storage.4096.png | Bin 371 -> 359 bytes 13 files changed, 139 insertions(+), 82 deletions(-) create mode 100644 src/main/resources/assets/ae2fc/textures/items/fluid_part.7.png create mode 100644 src/main/resources/assets/ae2fc/textures/items/fluid_storage.16384.png diff --git a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java index a20c1a53..9ef3b0d9 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java @@ -41,6 +41,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -94,6 +95,10 @@ public class ItemBasicFluidStorageCell extends AEBaseItem this.idleDrain = 3.5; this.perType = 8; break; + case Cell16384kPart: + this.idleDrain = 4.0; + this.perType = 8; + break; default: this.idleDrain = 0.0; this.perType = 8; @@ -106,7 +111,10 @@ public class ItemBasicFluidStorageCell extends AEBaseItem @Override public String getItemStackDisplayName(ItemStack stack) { - return StatCollector.translateToLocalFormatted("item.fluid_storage." + this.totalBytes / 1024 + ".name"); + return StatCollector.translateToLocalFormatted( + "item.fluid_storage." + this.totalBytes / 1024 + ".name", + CellType.getTypeColor(this.component), + EnumChatFormatting.RESET); } @Override @@ -136,11 +144,14 @@ public class ItemBasicFluidStorageCell extends AEBaseItem final IFluidCellInventory cellInventory = handler.getCellInv(); if (cellInventory != null) { - lines.add(cellInventory.getUsedBytes() + " " + GuiText.Of.getLocal() + ' ' - + cellInventory.getTotalBytes() + ' ' + GuiText.BytesUsed.getLocal()); - - lines.add(cellInventory.getStoredFluidTypes() + " " + GuiText.Of.getLocal() + ' ' - + cellInventory.getTotalFluidTypes() + ' ' + GuiText.Types.getLocal()); + lines.add(EnumChatFormatting.WHITE + String.valueOf(cellInventory.getUsedBytes()) + + EnumChatFormatting.GRAY + " " + GuiText.Of.getLocal() + " " + + EnumChatFormatting.DARK_GREEN + cellInventory.getTotalBytes() + " " + + EnumChatFormatting.GRAY + GuiText.BytesUsed.getLocal()); + lines.add(EnumChatFormatting.WHITE + String.valueOf(cellInventory.getStoredFluidTypes()) + + EnumChatFormatting.GRAY + " " + GuiText.Of.getLocal() + " " + + EnumChatFormatting.DARK_GREEN + cellInventory.getTotalFluidTypes() + " " + + EnumChatFormatting.GRAY + GuiText.Types.getLocal()); if (GuiScreen.isCtrlKeyDown()) { if (cellInventory.getStoredFluidTypes() > 0) { @@ -148,7 +159,7 @@ public class ItemBasicFluidStorageCell extends AEBaseItem for (IAEFluidStack fluid : cellInventory.getContents()) { if (fluid != null) { lines.add(String.format( - " %s x%smB", + " %s x%s mB", fluid.getFluidStack().getLocalizedName(), format.toWideReadableForm(fluid.getStackSize()))); } diff --git a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java index 6c331c84..6d601423 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java +++ b/src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java @@ -2,6 +2,7 @@ package com.glodblock.github.common.item; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.Config; +import com.glodblock.github.common.storage.CellType; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.util.NameConst; import cpw.mods.fml.common.registry.GameRegistry; @@ -13,12 +14,13 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; public class ItemBasicFluidStoragePart extends FCBaseItem { - public static final int types = 7; + public static final int types = 8; private static final HashMap icon = new HashMap<>(); public ItemBasicFluidStoragePart() { @@ -39,7 +41,8 @@ public class ItemBasicFluidStoragePart extends FCBaseItem { @Override public String getItemStackDisplayName(ItemStack stack) { int meta = stack.getItemDamage(); - return StatCollector.translateToLocalFormatted("item.fluid_part." + meta + ".name"); + return StatCollector.translateToLocalFormatted( + "item.fluid_part." + meta + ".name", CellType.getTypeColor(meta), EnumChatFormatting.RESET); } @Override diff --git a/src/main/java/com/glodblock/github/common/storage/CellType.java b/src/main/java/com/glodblock/github/common/storage/CellType.java index d52b4dfc..5c29f233 100644 --- a/src/main/java/com/glodblock/github/common/storage/CellType.java +++ b/src/main/java/com/glodblock/github/common/storage/CellType.java @@ -4,6 +4,7 @@ import appeng.core.features.AEFeature; import java.util.EnumSet; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public enum CellType { Cell1kPart(0, AEFeature.StorageCells), @@ -12,7 +13,8 @@ public enum CellType { Cell64kPart(3, AEFeature.StorageCells), Cell256kPart(4, AEFeature.StorageCells), Cell1024kPart(5, AEFeature.StorageCells), - Cell4096kPart(6, AEFeature.StorageCells); + Cell4096kPart(6, AEFeature.StorageCells), + Cell16384kPart(7, AEFeature.StorageCells); private final EnumSet features; private int damageValue; @@ -46,4 +48,30 @@ public enum CellType { public void setItemInstance(final Item itemInstance) { this.itemInstance = itemInstance; } + + public static EnumChatFormatting getTypeColor(int type) { + return getTypeColor(CellType.values()[type % CellType.values().length]); + } + + public static EnumChatFormatting getTypeColor(CellType type) { + switch (type) { + case Cell1kPart: + return EnumChatFormatting.GOLD; + case Cell4kPart: + return EnumChatFormatting.YELLOW; + case Cell16kPart: + return EnumChatFormatting.GREEN; + case Cell64kPart: + return EnumChatFormatting.AQUA; + case Cell256kPart: + return EnumChatFormatting.BLUE; + case Cell1024kPart: + return EnumChatFormatting.LIGHT_PURPLE; + case Cell4096kPart: + return EnumChatFormatting.RED; + case Cell16384kPart: + return EnumChatFormatting.DARK_PURPLE; + } + return EnumChatFormatting.WHITE; + } } diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java b/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java index 92f08d1a..0c64c131 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java @@ -20,6 +20,7 @@ public class FluidCellHandler implements ICellHandler { } @Override + @SuppressWarnings("rawtypes") public IMEInventoryHandler getCellInventory( final ItemStack is, final ISaveProvider container, final StorageChannel channel) { if (channel == StorageChannel.FLUIDS) { diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java index 47028642..efd7b2ee 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java @@ -39,6 +39,22 @@ public class FluidCellInventory implements IFluidCellInventory { public static final int singleByteAmount = 256 * 8; public FluidCellInventory(final ItemStack o, final ISaveProvider container) throws AppEngException { + if (o == null) { + throw new AppEngException("ItemStack was used as a cell, but was not a cell!"); + } + this.cellType = null; + this.cellItem = o; + final Item type = this.cellItem.getItem(); + if (type instanceof IStorageFluidCell) { + this.cellType = (IStorageFluidCell) this.cellItem.getItem(); + } + if (this.cellType == null) { + throw new AppEngException("ItemStack was used as a cell, but was not a cell!"); + } + if (!this.cellType.isStorageCell(this.cellItem)) { + throw new AppEngException("ItemStack was used as a cell, but was not a cell!"); + } + if (fluidSlots == null) { fluidSlots = new String[MAX_TYPE]; fluidSlotCount = new String[MAX_TYPE]; @@ -49,27 +65,6 @@ public class FluidCellInventory implements IFluidCellInventory { } } - if (o == null) { - throw new AppEngException("ItemStack was used as a cell, but was not a cell!"); - } - - this.cellType = null; - this.cellItem = o; - - final Item type = this.cellItem.getItem(); - - if (type instanceof IStorageFluidCell) { - this.cellType = (IStorageFluidCell) this.cellItem.getItem(); - } - - if (this.cellType == null) { - throw new AppEngException("ItemStack was used as a cell, but was not a cell!"); - } - - if (!this.cellType.isStorageCell(this.cellItem)) { - throw new AppEngException("ItemStack was used as a cell, but was not a cell!"); - } - this.container = container; this.tagCompound = Platform.openNbtData(o); this.storedFluids = this.tagCompound.getShort(FLUID_TYPE_TAG); diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 5d376b55..7999bc65 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -40,6 +40,8 @@ public class ItemAndBlockHolder { new ItemBasicFluidStorageCell(CellType.Cell1024kPart, 1024).register(); public static ItemBasicFluidStorageCell CELL4096K = new ItemBasicFluidStorageCell(CellType.Cell4096kPart, 4096).register(); + public static ItemBasicFluidStorageCell CELL16384K = + new ItemBasicFluidStorageCell(CellType.Cell16384kPart, 16384).register(); public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register(); public static void loadSetting() { @@ -51,5 +53,6 @@ public class ItemAndBlockHolder { CellType.Cell256kPart.setItemInstance(CELL_PART); CellType.Cell1024kPart.setItemInstance(CELL_PART); CellType.Cell4096kPart.setItemInstance(CELL_PART); + CellType.Cell16384kPart.setItemInstance(CELL_PART); } } diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index 673a9c7d..53b4b6f0 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -177,7 +177,7 @@ public class RecipeLoader implements Runnable { "CEC", "DCD", 'D', - "dyeBlue", + "dyeRed", 'C', "anyCertusCrystal", 'E', @@ -188,7 +188,7 @@ public class RecipeLoader implements Runnable { "CGC", "DCD", 'D', - "dyeBlue", + "dyeRed", 'C', CellType.Cell1kPart.stack(1), 'P', @@ -201,7 +201,7 @@ public class RecipeLoader implements Runnable { "CGC", "DCD", 'D', - "dyeBlue", + "dyeRed", 'C', CellType.Cell4kPart.stack(1), 'P', @@ -214,7 +214,7 @@ public class RecipeLoader implements Runnable { "CGC", "DCD", 'D', - "dyeBlue", + "dyeRed", 'C', CellType.Cell16kPart.stack(1), 'P', @@ -227,7 +227,7 @@ public class RecipeLoader implements Runnable { "CGC", "DCD", 'D', - "dyeBlue", + "dyeRed", 'C', CellType.Cell64kPart.stack(1), 'P', @@ -240,7 +240,7 @@ public class RecipeLoader implements Runnable { "CGC", "DCD", 'D', - "dyeBlue", + "dyeRed", 'C', CellType.Cell256kPart.stack(1), 'P', @@ -253,16 +253,30 @@ public class RecipeLoader implements Runnable { "CGC", "DCD", 'D', - "dyeBlue", + "dyeRed", 'C', CellType.Cell1024kPart.stack(1), 'P', + AE2_PROCESS_CAL, + 'G', + AE2_LAMP_GLASS)); + GameRegistry.addRecipe(new ShapedOreRecipe( + CellType.Cell16384kPart.stack(1), + "DPD", + "CGC", + "DCD", + 'D', + "dyeRed", + 'C', + CellType.Cell4096kPart.stack(1), + 'P', AE2_PROCESS_ENG, 'G', AE2_LAMP_GLASS)); - ItemBasicFluidStorageCell[] cells = - new ItemBasicFluidStorageCell[] {CELL1K, CELL4K, CELL16K, CELL64K, CELL256K, CELL1024K, CELL4096K}; + ItemBasicFluidStorageCell[] cells = new ItemBasicFluidStorageCell[] { + CELL1K, CELL4K, CELL16K, CELL64K, CELL256K, CELL1024K, CELL4096K, CELL16384K + }; for (ItemBasicFluidStorageCell cell : cells) { GameRegistry.addRecipe(new ShapedOreRecipe( diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index cd18c2c3..b233d81f 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -9,20 +9,22 @@ item.part_fluid_export.name=ME Fluid Export Bus item.part_fluid_storage_bus.name=ME Fluid Storage Bus item.part_fluid_level_emitter.name=ME Fluid Level Emitter item.fluid_packet.name=Fluid Packet -item.fluid_storage.1.name=1k ME Fluid Storage Cell -item.fluid_storage.4.name=4k ME Fluid Storage Cell -item.fluid_storage.16.name=16k ME Fluid Storage Cell -item.fluid_storage.64.name=64k ME Fluid Storage Cell -item.fluid_storage.256.name=256k ME Fluid Storage Cell -item.fluid_storage.1024.name=1024k ME Fluid Storage Cell -item.fluid_storage.4096.name=4096k ME Fluid Storage Cell -item.fluid_part.0.name=1k ME Fluid Storage Component -item.fluid_part.1.name=4k ME Fluid Storage Component -item.fluid_part.2.name=16k ME Fluid Storage Component -item.fluid_part.3.name=64k ME Fluid Storage Component -item.fluid_part.4.name=256k ME Fluid Storage Component -item.fluid_part.5.name=1024k ME Fluid Storage Component -item.fluid_part.6.name=4096k ME Fluid Storage Component +item.fluid_storage.1.name=%s1k%s ME Fluid Storage Cell +item.fluid_storage.4.name=%s4k%s ME Fluid Storage Cell +item.fluid_storage.16.name=%s16k%s ME Fluid Storage Cell +item.fluid_storage.64.name=%s64k%s ME Fluid Storage Cell +item.fluid_storage.256.name=%s256k%s ME Fluid Storage Cell +item.fluid_storage.1024.name=%s1024k%s ME Fluid Storage Cell +item.fluid_storage.4096.name=%s4096k%s ME Fluid Storage Cell +item.fluid_storage.16384.name=%s16384k%s ME Fluid Storage Cell +item.fluid_part.0.name=%s1k%s ME Fluid Storage Component +item.fluid_part.1.name=%s4k%s ME Fluid Storage Component +item.fluid_part.2.name=%s16k%s ME Fluid Storage Component +item.fluid_part.3.name=%s64k%s ME Fluid Storage Component +item.fluid_part.4.name=%s256k%s ME Fluid Storage Component +item.fluid_part.5.name=%s1024k%s ME Fluid Storage Component +item.fluid_part.6.name=%s4096k%s ME Fluid Storage Component +item.fluid_part.7.name=%s16384k%s ME Fluid Storage Component tile.fluid_discretizer.name=Fluid Discretizer tile.fluid_pattern_encoder.name=Fluid Pattern Encoder diff --git a/src/main/resources/assets/ae2fc/lang/ru_RU.lang b/src/main/resources/assets/ae2fc/lang/ru_RU.lang index 7e6d54d6..982ee0ff 100644 --- a/src/main/resources/assets/ae2fc/lang/ru_RU.lang +++ b/src/main/resources/assets/ae2fc/lang/ru_RU.lang @@ -6,20 +6,20 @@ item.part_fluid_interface.name=Жидкостный интерфейс item.part_fluid_import.name=МЭ жидкостная шина импорта item.part_fluid_export.name=МЭ жидкостная шина экспорта item.fluid_packet.name=Жидкостный пакет -item.fluid_storage.1.name=1К МЭ жидкостная ячейка хранения -item.fluid_storage.4.name=4К МЭ жидкостная ячейка хранения -item.fluid_storage.16.name=16К МЭ жидкостная ячейка хранения -item.fluid_storage.64.name=64К МЭ жидкостная ячейка хранения -item.fluid_storage.256.name=256К МЭ жидкостная ячейка хранения -item.fluid_storage.1024.name=1024К МЭ жидкостная ячейка хранения -item.fluid_storage.4096.name=4096К МЭ жидкостная ячейка хранения -item.fluid_part.0.name=1К МЭ жидкостный компонент хранения -item.fluid_part.1.name=4К МЭ жидкостный компонент хранения -item.fluid_part.2.name=16К МЭ жидкостный компонент хранения -item.fluid_part.3.name=64К МЭ жидкостный компонент хранения -item.fluid_part.4.name=256К МЭ жидкостный компонент хранения -item.fluid_part.5.name=1024К МЭ жидкостный компонент хранения -item.fluid_part.6.name=4096К МЭ жидкостный компонент хранения +item.fluid_storage.1.name=%s1К%s МЭ жидкостная ячейка хранения +item.fluid_storage.4.name=%s4К%s МЭ жидкостная ячейка хранения +item.fluid_storage.16.name=%s16К%s МЭ жидкостная ячейка хранения +item.fluid_storage.64.name=%s64К%s МЭ жидкостная ячейка хранения +item.fluid_storage.256.name=%s256К%s МЭ жидкостная ячейка хранения +item.fluid_storage.1024.name=%s1024К%s МЭ жидкостная ячейка хранения +item.fluid_storage.4096.name=%s4096К%s МЭ жидкостная ячейка хранения +item.fluid_part.0.name=%s1К%s МЭ жидкостный компонент хранения +item.fluid_part.1.name=%s4К%s МЭ жидкостный компонент хранения +item.fluid_part.2.name=%s16К%s МЭ жидкостный компонент хранения +item.fluid_part.3.name=%s64К%s МЭ жидкостный компонент хранения +item.fluid_part.4.name=%s256К%s МЭ жидкостный компонент хранения +item.fluid_part.5.name=%s1024К%s МЭ жидкостный компонент хранения +item.fluid_part.6.name=%s4096К%s МЭ жидкостный компонент хранения tile.fluid_discretizer.name=Дискретизатор жидкости tile.fluid_pattern_encoder.name=Кодировщик жидкостных шаблонов diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index bbbc0f3a..8089a2f6 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -8,20 +8,20 @@ item.part_fluid_import.name=ME流体输入总线 item.part_fluid_export.name=ME流体输出总线 item.part_fluid_level_emitter.name=ME流体发信器 item.fluid_packet.name=流体封包 -item.fluid_storage.1.name=1k-ME流体存储元件 -item.fluid_storage.4.name=4k-ME流体存储元件 -item.fluid_storage.16.name=16k-ME流体存储元件 -item.fluid_storage.64.name=64k-ME流体存储元件 -item.fluid_storage.256.name=256k-ME流体存储元件 -item.fluid_storage.1024.name=1024k-ME流体存储元件 -item.fluid_storage.4096.name=4096k-ME流体存储元件 -item.fluid_part.0.name=1k-ME流体存储组件 -item.fluid_part.1.name=4k-ME流体存储组件 -item.fluid_part.2.name=16k-ME流体存储组件 -item.fluid_part.3.name=64k-ME流体存储组件 -item.fluid_part.4.name=256k-ME流体存储组件 -item.fluid_part.5.name=1024k-ME流体存储组件 -item.fluid_part.6.name=4096k-ME流体存储组件 +item.fluid_storage.1.name=%s1k%s-ME流体存储元件 +item.fluid_storage.4.name=%s4k%s-ME流体存储元件 +item.fluid_storage.16.name=%s16k%s-ME流体存储元件 +item.fluid_storage.64.name=%s64k%s-ME流体存储元件 +item.fluid_storage.256.name=%s256k%s-ME流体存储元件 +item.fluid_storage.1024.name=%s1024k%s-ME流体存储元件 +item.fluid_storage.4096.name=%s4096k%s-ME流体存储元件 +item.fluid_part.0.name=%s1k%s-ME流体存储组件 +item.fluid_part.1.name=%s4k%s-ME流体存储组件 +item.fluid_part.2.name=%s16k%s-ME流体存储组件 +item.fluid_part.3.name=%s64k%s-ME流体存储组件 +item.fluid_part.4.name=%s256k%s-ME流体存储组件 +item.fluid_part.5.name=%s1024k%s-ME流体存储组件 +item.fluid_part.6.name=%s4096k%s-ME流体存储组件 tile.fluid_discretizer.name=ME流体离散器 tile.fluid_pattern_encoder.name=流体适配型样板编码台 diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_part.7.png b/src/main/resources/assets/ae2fc/textures/items/fluid_part.7.png new file mode 100644 index 0000000000000000000000000000000000000000..8fbf73324ace42c86a31f3a5c652d42682dfa272 GIT binary patch literal 497 zcmVE*M{Kg8B$Nmu#BkIp zu&E&j*P^VD42&P=*?aw;(Bg&1yZ^p>&b#;A_i0j-{^HkGmi6bC9`iT1Qfxmy%Cp^J zpT{O$-Lyphlo2dPLwZF`iEpdb$`&`AIqY+~91V>V09=eK^q$R9BOR8+1CU`1PL$kVq=5p!AH!&$mKYu0e%j}K01hK nc_Ao9WweNv7dL}wawDQ|e1QO*RfMgm00000NkvXXu0mjfBMR18 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_storage.16384.png b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.16384.png new file mode 100644 index 0000000000000000000000000000000000000000..0b987302ede43dc3f97d5a466209f7c61630d259 GIT binary patch literal 486 zcmV@P)ib%aYXZ}3mzOBe*SCQjv)*v%xt{`2E^intTM)|ZxmpEErM6w7 zQUPk}Oaw>IbKB_;(k;BFTP@`Bx&?vN1nNU9SHw{vm;Z!+aS8J5G_tWH4tZXI-|gm_ zz@YeRJOxoep#a(8Ks+{U6YU}#^LvPI2S)WVGL|NDn}DIeMwpr?*g)^6hNeR zBDzACrT%Bh${1zN#T?UPq`OC=#5K|V6Z_OV07*qoM6N<$f?Fos8~^|S literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_storage.4096.png b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.4096.png index 44dbdad8116e7b6bc232b828a43adafd2351dcb7..407ed60dc7df2429bc8b4b5915a7bdbae230745a 100644 GIT binary patch delta 244 zcmV9<2*{tX@Ilt>V4eg|{w&B|skSv{Oi6^K1!QP{g4lgI#~HRH zZf3aqUH~OuzztZhSOuoF6dB-#9LhZo77NHp0BZ(iDlN1)#hDvHDGru4K7DzEHAjMS uBZ?Q00Z4<@qgh~+kIAKB&CU!A3=9B1B1L(smrB?G0000N-M>sJOw zM$8BRsRij_U|@hq7KWt3O-6SGHrqioNDoRFY?!hD?8lVEV2A+B@3637U;xX3)PU5Y z0GO%ktLJ071kGk-HCO`?n<3cbP*N|5bFZ}(!w`@^Vc~@A7_0000~CrS