From a0db8e38e6a2d4ab656f34cd635fc2ea9fb17809 Mon Sep 17 00:00:00 2001 From: MCTBL <30978504+MCTBL@users.noreply.github.com> Date: Sun, 28 Jul 2024 20:32:26 +0800 Subject: [PATCH] Add Fluid Artificial Universe Cell (#218) * Add Fluid Artificial Universe Cell * reduce type from 63 to 5 * change the internal name of cell --- .../github/loader/ItemAndBlockHolder.java | 6 ++++++ .../com/glodblock/github/util/NameConst.java | 1 + src/main/resources/assets/ae2fc/lang/en_US.lang | 1 + src/main/resources/assets/ae2fc/lang/zh_CN.lang | 1 + .../textures/items/fluid_storage.Universe.png | Bin 0 -> 5206 bytes .../items/fluid_storage.Universe.png.mcmeta | 1 + 6 files changed, 10 insertions(+) create mode 100644 src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png create mode 100644 src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png.mcmeta diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 0006e5e9..15f5cbd5 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -134,6 +134,12 @@ public class ItemAndBlockHolder { 8, 1, 5).register(); + public static ItemFluidExtremeStorageCell ARTIFICIAL_UNIVERSE_CELL = new ItemFluidExtremeStorageCell( + NameConst.ITEM_ARTIFICIAL_UNIVERSE_STORAGE, + Long.MAX_VALUE / 2048, + 16384, + 5, + 600000D).register(); public static ItemCreativeFluidStorageCell CREATIVE_CELL = new ItemCreativeFluidStorageCell().register(); public static ItemInfinityWaterStorageCell INFINITY_WATER_CELL = new ItemInfinityWaterStorageCell().register(); public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register(); diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index b148329d..93852815 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -40,6 +40,7 @@ public class NameConst { public static final String ITEM_MULTI_FLUID_STORAGE = "multi_fluid_storage"; public static final String ITEM_QUANTUM_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".quantum"; public static final String ITEM_SINGULARITY_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".singularity"; + public static final String ITEM_ARTIFICIAL_UNIVERSE_STORAGE = ITEM_FLUID_STORAGE + ".Universe"; public static final String ITEM_INFINITY_FLUID_STORAGE = ITEM_FLUID_STORAGE + ".infinity"; public static final String ITEM_INFINITY_WATER_FLUID_STORAGE = ITEM_INFINITY_FLUID_STORAGE + ".water"; public static final String ITEM_CREATIVE_FLUID_STORAGE = "creative_" + ITEM_FLUID_STORAGE; diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index f6464f19..63433d1c 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -46,6 +46,7 @@ item.multi_fluid_storage.4096.name=%s4096k%s ME Multi-Fluid Storage Cell item.multi_fluid_storage.16384.name=%s16384k%s ME Multi-Fluid Storage Cell item.fluid_storage.quantum.name=ME Fluid Quantum Storage Cell item.fluid_storage.singularity.name=ME Fluid Digital Singularity Storage Cell +item.fluid_storage.Universe.name=ME Fluid Artificial Universe Storage Cell item.fluid_storage.infinity.water.name=ME Fluid Infinity Water Storage Cell item.fluid_part.0.name=%s1k%s ME Fluid Storage Component item.fluid_part.1.name=%s4k%s ME Fluid Storage Component diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index 3b8c3676..9cff88b3 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -41,6 +41,7 @@ item.multi_fluid_storage.4096.name=%s4096k%s-ME多重流体存储元件 item.multi_fluid_storage.16384.name=%s16384k%s-ME多重流体存储元件 item.fluid_storage.quantum.name=ME流体量子存储元件 item.fluid_storage.singularity.name=ME流体数字奇点元件 +item.fluid_storage.Universe.name=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流体存储组件 diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png new file mode 100644 index 0000000000000000000000000000000000000000..41df8cb8413202d6f4ec8ba8162ad3e50c253c13 GIT binary patch literal 5206 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 U$-0f`)h~bMrdB3*jffHd0aJE5ng9R* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png.mcmeta b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png.mcmeta new file mode 100644 index 00000000..cc8a1f3c --- /dev/null +++ b/src/main/resources/assets/ae2fc/textures/items/fluid_storage.Universe.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file