From 000b84e87eaedb94fb87ccb11e376c51f99a1d07 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Wed, 10 Jan 2024 17:41:07 +0100 Subject: Added Energy Condenser --- .../eris_alchemy/blockstates/energy_condenser.json | 7 +++++++ .../resources/assets/eris_alchemy/lang/en_us.json | 2 ++ .../models/block/energy_condenser.json | 5 +++++ .../eris_alchemy/models/item/energy_condenser.json | 6 ++++++ .../en_us/entries/root/covalence_dusts.json | 1 - .../en_us/entries/root/energy_condenser.json | 14 +++++++++++++ .../guide_book/en_us/entries/root/guide_book.json | 1 - .../textures/entity/chest/energy_condenser.png | Bin 0 -> 2649 bytes .../textures/gui/container/energy_condenser.png | Bin 0 -> 1331 bytes .../loot_tables/blocks/energy_condenser.json | 22 +++++++++++++++++++++ .../eris_alchemy/recipes/energy_condenser.json | 22 +++++++++++++++++++++ .../minecraft/tags/blocks/mineable/pickaxe.json | 3 ++- src/main/resources/eris_alchemy.mixins.json | 1 + src/main/resources/quilt.mod.json | 7 +------ 14 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/eris_alchemy/blockstates/energy_condenser.json create mode 100644 src/main/resources/assets/eris_alchemy/models/block/energy_condenser.json create mode 100644 src/main/resources/assets/eris_alchemy/models/item/energy_condenser.json create mode 100644 src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/energy_condenser.json create mode 100644 src/main/resources/assets/eris_alchemy/textures/entity/chest/energy_condenser.png create mode 100644 src/main/resources/assets/eris_alchemy/textures/gui/container/energy_condenser.png create mode 100644 src/main/resources/data/eris_alchemy/loot_tables/blocks/energy_condenser.json create mode 100644 src/main/resources/data/eris_alchemy/recipes/energy_condenser.json (limited to 'src/main/resources') diff --git a/src/main/resources/assets/eris_alchemy/blockstates/energy_condenser.json b/src/main/resources/assets/eris_alchemy/blockstates/energy_condenser.json new file mode 100644 index 0000000..a6fc12f --- /dev/null +++ b/src/main/resources/assets/eris_alchemy/blockstates/energy_condenser.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "eris_alchemy:block/energy_condenser" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/eris_alchemy/lang/en_us.json b/src/main/resources/assets/eris_alchemy/lang/en_us.json index ed007dd..c399a68 100644 --- a/src/main/resources/assets/eris_alchemy/lang/en_us.json +++ b/src/main/resources/assets/eris_alchemy/lang/en_us.json @@ -1,11 +1,13 @@ { "block.eris_alchemy.alchemical_chest": "Alchemical Chest", + "block.eris_alchemy.energy_condenser": "Energy Condenser", "book.eris_alchemy.title": "Eris Alchemy", "book.eris_alchemy.subtitle": "the Official Guide", "book.eris_alchemy.landing_text": "Welcome to Alchemy!", "container.eris_alchemy.alchemical_chest": "Alchemical Chest", + "container.eris_alchemy.energy_condenser": "Energy Condenser", "item.eris_alchemy.low_covalence_dust": "Low Covalence Dust", "item.eris_alchemy.medium_covalence_dust": "Medium Covalence Dust", diff --git a/src/main/resources/assets/eris_alchemy/models/block/energy_condenser.json b/src/main/resources/assets/eris_alchemy/models/block/energy_condenser.json new file mode 100644 index 0000000..84acbec --- /dev/null +++ b/src/main/resources/assets/eris_alchemy/models/block/energy_condenser.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/eris_alchemy/models/item/energy_condenser.json b/src/main/resources/assets/eris_alchemy/models/item/energy_condenser.json new file mode 100644 index 0000000..62b3156 --- /dev/null +++ b/src/main/resources/assets/eris_alchemy/models/item/energy_condenser.json @@ -0,0 +1,6 @@ +{ + "parent": "item/chest", + "textures": { + "particle": "block/stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/covalence_dusts.json b/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/covalence_dusts.json index a55ae50..6000bdc 100644 --- a/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/covalence_dusts.json +++ b/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/covalence_dusts.json @@ -4,7 +4,6 @@ "category": "eris_alchemy:root", "pages": [{ "type": "patchouli:spotlight", - "title": "Covalence Dusts", "item": "eris_alchemy:low_covalence_dust,eris_alchemy:medium_covalence_dust,eris_alchemy:high_covalence_dust", "link_recipe": true, "text": "$(thing)Covalence dusts$() are the most basic items you create in Eris Alchemy." diff --git a/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/energy_condenser.json b/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/energy_condenser.json new file mode 100644 index 0000000..cea3e75 --- /dev/null +++ b/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/energy_condenser.json @@ -0,0 +1,14 @@ +{ + "name": "Energy Condenser", + "icon": "eris_alchemy:energy_condenser", + "category": "eris_alchemy:root", + "pages": [{ + "type": "patchouli:spotlight", + "item": "eris_alchemy:energy_condenser", + "link_recipe": true, + "text": "$(item)Energy Condenser$() has a slightly smaller chest space than $(item)Alchemical Chest$() but it transforms items placed into it into the template item (placed in the upper left slot)." + }, { + "type": "patchouli:crafting", + "recipe": "eris_alchemy:energy_condenser" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/guide_book.json b/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/guide_book.json index b501b0b..ba0812b 100644 --- a/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/guide_book.json +++ b/src/main/resources/assets/eris_alchemy/patchouli_books/guide_book/en_us/entries/root/guide_book.json @@ -4,7 +4,6 @@ "category": "eris_alchemy:root", "pages": [{ "type": "patchouli:spotlight", - "title": "Guide Book", "item": "patchouli:guide_book{'patchouli:book':'eris_alchemy:guide_book'}", "link_recipe": true, "text": "The Eris Alchemy $(item)Guide Book$() should be already in your inventory for obvious reasons, but if you ever lose it you can recreate it with this crafting recipe." diff --git a/src/main/resources/assets/eris_alchemy/textures/entity/chest/energy_condenser.png b/src/main/resources/assets/eris_alchemy/textures/entity/chest/energy_condenser.png new file mode 100644 index 0000000..4501c59 Binary files /dev/null and b/src/main/resources/assets/eris_alchemy/textures/entity/chest/energy_condenser.png differ diff --git a/src/main/resources/assets/eris_alchemy/textures/gui/container/energy_condenser.png b/src/main/resources/assets/eris_alchemy/textures/gui/container/energy_condenser.png new file mode 100644 index 0000000..d075bed Binary files /dev/null and b/src/main/resources/assets/eris_alchemy/textures/gui/container/energy_condenser.png differ diff --git a/src/main/resources/data/eris_alchemy/loot_tables/blocks/energy_condenser.json b/src/main/resources/data/eris_alchemy/loot_tables/blocks/energy_condenser.json new file mode 100644 index 0000000..07e2f55 --- /dev/null +++ b/src/main/resources/data/eris_alchemy/loot_tables/blocks/energy_condenser.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:block", + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": "eris_alchemy:energy_condenser", + "functions": [{ + "function": "minecraft:copy_nbt", + "source": "block_entity", + "ops": [{ + "op": "replace", + "source": "stored_emc", + "target": "BlockEntityTag.stored_emc" + }] + }] + }], + "conditions": [{ + "condition": "minecraft:survives_explosion" + }] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/recipes/energy_condenser.json b/src/main/resources/data/eris_alchemy/recipes/energy_condenser.json new file mode 100644 index 0000000..55c04bf --- /dev/null +++ b/src/main/resources/data/eris_alchemy/recipes/energy_condenser.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "ODO", + "DCD", + "ODO" + ], + "key": { + "O": { + "item": "obsidian" + }, + "D": { + "item": "diamond" + }, + "C": { + "item": "eris_alchemy:alchemical_chest" + } + }, + "result": { + "item": "eris_alchemy:energy_condenser" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 27c0b6d..958cc31 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "eris_alchemy:alchemical_chest" + "eris_alchemy:alchemical_chest", + "eris_alchemy:energy_condenser" ] } \ No newline at end of file diff --git a/src/main/resources/eris_alchemy.mixins.json b/src/main/resources/eris_alchemy.mixins.json index 36cb47f..fb52b89 100644 --- a/src/main/resources/eris_alchemy.mixins.json +++ b/src/main/resources/eris_alchemy.mixins.json @@ -7,6 +7,7 @@ "client.SheetsMixin" ], "mixins": [ + "ContainerOpenersCounterMixin", "CoralBlockMixin", "CoralFanBlockMixin", "CoralPlantBlockMixin", diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index 5b6373a..4e5a88d 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -6,15 +6,10 @@ "version": "${version}", "metadata": { "name": "Eris Alchemy", - "description": "Adds the condensing chest from EE2.", + "description": "Adds the energy condenser (and a bit more) from EE2.", "contributors": { "Eris": "Owner" }, - "contact": { - "homepage": "https://TODO", - "issues": "https://TODO", - "sources": "https://TODO" - }, "icon": "assets/eris_alchemy/icon.png" }, "intermediate_mappings": "net.fabricmc:intermediary", -- cgit v1.2.3