Merge branch 'master' into master

GTNewHorizons · Jul 30, 2024 · 35eb376 · 35eb376
2 parents 360d7b3 + f634354
commit 35eb376
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 0 deletions.
diff --git 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 static void init() {}
             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
@@ -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
@@ -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
@@ -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
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
@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}