diff --git a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java index 08ffd95..52b7650 100644 --- a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java +++ b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java @@ -37,13 +37,14 @@ public final class ModCreativeTabs { output.accept(ModItems.OBLIVION_SINGULARITY.get()); output.accept(ModItems.STORAGE_CORE.get()); - if (ModItems.ENERGY_CORE != null) { - output.accept(ModItems.ENERGY_CORE.get()); + if (ModItems.ENERGY_STORAGE_CORE != null) { + output.accept(ModItems.ENERGY_STORAGE_CORE.get()); } if (ModItems.QUANTUM_STORAGE_CORE != null) { output.accept(ModItems.QUANTUM_STORAGE_CORE.get()); } output.accept(ModItems.SPATIAL_CORE.get()); + output.accept(ModItems.INFINITY_CORE.get()); output.accept(ModItems.INFINITY_BIGINTEGER_CELL_ITEM.get()); }) diff --git a/src/main/java/com/extendedae_plus/init/ModItems.java b/src/main/java/com/extendedae_plus/init/ModItems.java index 2fab060..83c9a85 100644 --- a/src/main/java/com/extendedae_plus/init/ModItems.java +++ b/src/main/java/com/extendedae_plus/init/ModItems.java @@ -91,21 +91,25 @@ public final class ModItems { "spatial_core", () -> new Item(new Item.Properties()) ); + public static final RegistryObject INFINITY_CORE = ITEMS.register( + "infinity_core", + () -> new Item(new Item.Properties()) + ); public static final RegistryObject OBLIVION_SINGULARITY = ITEMS.register( "oblivion_singularity", () -> new Item(new Item.Properties()) ); - public static final RegistryObject ENERGY_CORE; + public static final RegistryObject ENERGY_STORAGE_CORE; public static final RegistryObject QUANTUM_STORAGE_CORE; static { if (ModCheckUtils.isAppfluxLoading()) { - ENERGY_CORE = ITEMS.register( - "energy_core", + ENERGY_STORAGE_CORE = ITEMS.register( + "energy_storage_core", () -> new Item(new Item.Properties()) ); } else { - ENERGY_CORE = null; + ENERGY_STORAGE_CORE = null; } if (ModCheckUtils.isAAELoading()) { diff --git a/src/main/resources/assets/extendedae_plus/lang/en_us.json b/src/main/resources/assets/extendedae_plus/lang/en_us.json index b8190c3..86e9255 100644 --- a/src/main/resources/assets/extendedae_plus/lang/en_us.json +++ b/src/main/resources/assets/extendedae_plus/lang/en_us.json @@ -25,6 +25,9 @@ "item.extendedae_plus.entity_speed_card.x8": "Entity Acceleration Card (x8)", "item.extendedae_plus.entity_speed_card.x16": "Entity Acceleration Card (x16)", "item.extendedae_plus.storage_core": "Storage Core", + "item.extendedae_plus.energy_storage_core": "Energy Storage Core", + "item.extendedae_plus.quantum_storage_core": "Quantum Storage Core", + "item.extendedae_plus.infinity_core": "Devouring Storage Core", "item.extendedae_plus.spatial_core": "Spatial Core", "item.extendedae_plus.oblivion_singularity": "Oblivion Singularity", "item.extendedae_plus.infinity_biginteger_cell": "§4De§cvou§6rer §eof §aCo§bsmic §dSilence", diff --git a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json index d529f86..b65e188 100644 --- a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json +++ b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json @@ -25,8 +25,11 @@ "item.extendedae_plus.entity_speed_card.x8": "实体加速卡 (x8)", "item.extendedae_plus.entity_speed_card.x16": "实体加速卡 (x16)", "item.extendedae_plus.storage_core": "存储核心", + "item.extendedae_plus.energy_storage_core": "能源存储核心", + "item.extendedae_plus.quantum_storage_core": "量子核心", "item.extendedae_plus.spatial_core": "空间核心", "item.extendedae_plus.oblivion_singularity": "湮灭奇点", + "item.extendedae_plus.infinity_core": "吞噬核心", "item.extendedae_plus.infinity_biginteger_cell": "§4吞§c噬§6万§e籁§a的§b寂§d静", "tooltip.extendedae_plus.infinity_biginteger_cell.summon1": "§6九重献祭, 终得虚空回响§r——觐见§8虚空之主Iava§r, 赐汝此物", "tooltip.extendedae_plus.infinity_biginteger_cell.summon2": "§b——§4方§d寸§c之§e间§a, §6自§b有§5千§9寰", diff --git a/src/main/resources/assets/extendedae_plus/models/item/energy_core.json b/src/main/resources/assets/extendedae_plus/models/item/energy_core.json deleted file mode 100644 index 18b542f..0000000 --- a/src/main/resources/assets/extendedae_plus/models/item/energy_core.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "item/generated", - "textures": { "layer0": "extendedae_plus:item/energy_core" } -} \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/models/item/energy_storage_core.json b/src/main/resources/assets/extendedae_plus/models/item/energy_storage_core.json new file mode 100644 index 0000000..ca84dae --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/item/energy_storage_core.json @@ -0,0 +1,4 @@ +{ + "parent": "item/generated", + "textures": { "layer0": "extendedae_plus:item/energy_storage_core" } +} \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/models/item/infinity_core.json b/src/main/resources/assets/extendedae_plus/models/item/infinity_core.json new file mode 100644 index 0000000..8e6313e --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/item/infinity_core.json @@ -0,0 +1,4 @@ +{ + "parent": "item/generated", + "textures": { "layer0": "extendedae_plus:item/infinity_core" } +} \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/textures/item/energy_core.png b/src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png similarity index 52% rename from src/main/resources/assets/extendedae_plus/textures/item/energy_core.png rename to src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png index 9326bb9..a32e5d1 100644 Binary files a/src/main/resources/assets/extendedae_plus/textures/item/energy_core.png and b/src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png differ diff --git a/src/main/resources/assets/extendedae_plus/textures/item/energy_core.png.mcmeta b/src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png.mcmeta similarity index 52% rename from src/main/resources/assets/extendedae_plus/textures/item/energy_core.png.mcmeta rename to src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png.mcmeta index 2d3e00a..f1fb7d0 100644 --- a/src/main/resources/assets/extendedae_plus/textures/item/energy_core.png.mcmeta +++ b/src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png.mcmeta @@ -2,8 +2,8 @@ "animation": { "interpolate": true, "frames": [ - {"index": 0, "time": 35}, - {"index": 1, "time": 5} + {"index": 0, "time": 30}, + {"index": 1, "time": 3} ] } } \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/textures/item/infinity_core.png b/src/main/resources/assets/extendedae_plus/textures/item/infinity_core.png new file mode 100644 index 0000000..0ca4214 Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/item/infinity_core.png differ diff --git a/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png b/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png index 598a05e..6b63b83 100644 Binary files a/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png and b/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png differ diff --git a/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png.mcmeta b/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png.mcmeta index 2d3e00a..f1fb7d0 100644 --- a/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png.mcmeta +++ b/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png.mcmeta @@ -2,8 +2,8 @@ "animation": { "interpolate": true, "frames": [ - {"index": 0, "time": 35}, - {"index": 1, "time": 5} + {"index": 0, "time": 30}, + {"index": 1, "time": 3} ] } } \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/textures/item/spatial_core.png b/src/main/resources/assets/extendedae_plus/textures/item/spatial_core.png index 332a64d..b531cfc 100644 Binary files a/src/main/resources/assets/extendedae_plus/textures/item/spatial_core.png and b/src/main/resources/assets/extendedae_plus/textures/item/spatial_core.png differ diff --git a/src/main/resources/assets/extendedae_plus/textures/item/storage_core.png.mcmeta b/src/main/resources/assets/extendedae_plus/textures/item/storage_core.png.mcmeta index 2bf994f..f1fb7d0 100644 --- a/src/main/resources/assets/extendedae_plus/textures/item/storage_core.png.mcmeta +++ b/src/main/resources/assets/extendedae_plus/textures/item/storage_core.png.mcmeta @@ -1,9 +1,9 @@ - { +{ "animation": { "interpolate": true, "frames": [ - {"index": 0, "time": 35}, - {"index": 1, "time": 5} + {"index": 0, "time": 30}, + {"index": 1, "time": 3} ] } } \ No newline at end of file diff --git a/src/main/resources/data/extendedae_plus/recipes/infinity_biginteger_cell.json b/src/main/resources/data/extendedae_plus/recipes/infinity_biginteger_cell.json index a05271b..107dc02 100644 --- a/src/main/resources/data/extendedae_plus/recipes/infinity_biginteger_cell.json +++ b/src/main/resources/data/extendedae_plus/recipes/infinity_biginteger_cell.json @@ -1,16 +1,27 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { "item": "minecraft:turtle_helmet" }, - { "item": "minecraft:dragon_head" }, - { "item": "minecraft:totem_of_undying" }, - { "item": "minecraft:echo_shard" }, - { "item": "ae2:cell_component_256k" }, - { "item": "minecraft:heart_of_the_sea" }, - { "item": "minecraft:nether_star" }, - { "item": "minecraft:netherite_block" }, - { "item": "minecraft:enchanted_golden_apple" } + "type": "minecraft:crafting_shaped", + "pattern": [ + "GOG", + "NIN", + "BBB" ], + "key": { + "G": { + "item": "ae2:quartz_vibrant_glass" + }, + "O": { + "item": "extendedae_plus:oblivion_singularity" + }, + "N": { + "item": "minecraft:nether_star" + }, + "I": { + "item": "extendedae_plus:infinity_core" + }, + "B": { + "item": "minecraft:netherite_block" + } + }, "result": { "item": "extendedae_plus:infinity_biginteger_cell", "count": 1