diff options
| author | 2024-01-10 17:41:07 +0100 | |
|---|---|---|
| committer | 2024-01-10 17:41:07 +0100 | |
| commit | 000b84e87eaedb94fb87ccb11e376c51f99a1d07 (patch) | |
| tree | dd9519e7dadf613a71e01b04cac7be9c121a9f18 /src/main/resources | |
| parent | Move out common chest logic to separate files also in client code (diff) | |
| download | mc-eris-alchemy-000b84e87eaedb94fb87ccb11e376c51f99a1d07.tar.gz mc-eris-alchemy-000b84e87eaedb94fb87ccb11e376c51f99a1d07.tar.xz mc-eris-alchemy-000b84e87eaedb94fb87ccb11e376c51f99a1d07.zip | |
Added Energy Condenser
Diffstat (limited to 'src/main/resources')
14 files changed, 82 insertions, 9 deletions
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 @@ | |||
| 1 | { | ||
| 2 | "variants": { | ||
| 3 | "": { | ||
| 4 | "model": "eris_alchemy:block/energy_condenser" | ||
| 5 | } | ||
| 6 | } | ||
| 7 | } \ 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 @@ | |||
| 1 | { | 1 | { |
| 2 | "block.eris_alchemy.alchemical_chest": "Alchemical Chest", | 2 | "block.eris_alchemy.alchemical_chest": "Alchemical Chest", |
| 3 | "block.eris_alchemy.energy_condenser": "Energy Condenser", | ||
| 3 | 4 | ||
| 4 | "book.eris_alchemy.title": "Eris Alchemy", | 5 | "book.eris_alchemy.title": "Eris Alchemy", |
| 5 | "book.eris_alchemy.subtitle": "the Official Guide", | 6 | "book.eris_alchemy.subtitle": "the Official Guide", |
| 6 | "book.eris_alchemy.landing_text": "Welcome to Alchemy!", | 7 | "book.eris_alchemy.landing_text": "Welcome to Alchemy!", |
| 7 | 8 | ||
| 8 | "container.eris_alchemy.alchemical_chest": "Alchemical Chest", | 9 | "container.eris_alchemy.alchemical_chest": "Alchemical Chest", |
| 10 | "container.eris_alchemy.energy_condenser": "Energy Condenser", | ||
| 9 | 11 | ||
| 10 | "item.eris_alchemy.low_covalence_dust": "Low Covalence Dust", | 12 | "item.eris_alchemy.low_covalence_dust": "Low Covalence Dust", |
| 11 | "item.eris_alchemy.medium_covalence_dust": "Medium Covalence Dust", | 13 | "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 @@ | |||
| 1 | { | ||
| 2 | "textures": { | ||
| 3 | "particle": "minecraft:block/stone" | ||
| 4 | } | ||
| 5 | } \ 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 @@ | |||
| 1 | { | ||
| 2 | "parent": "item/chest", | ||
| 3 | "textures": { | ||
| 4 | "particle": "block/stone" | ||
| 5 | } | ||
| 6 | } \ 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 @@ | |||
| 4 | "category": "eris_alchemy:root", | 4 | "category": "eris_alchemy:root", |
| 5 | "pages": [{ | 5 | "pages": [{ |
| 6 | "type": "patchouli:spotlight", | 6 | "type": "patchouli:spotlight", |
| 7 | "title": "Covalence Dusts", | ||
| 8 | "item": "eris_alchemy:low_covalence_dust,eris_alchemy:medium_covalence_dust,eris_alchemy:high_covalence_dust", | 7 | "item": "eris_alchemy:low_covalence_dust,eris_alchemy:medium_covalence_dust,eris_alchemy:high_covalence_dust", |
| 9 | "link_recipe": true, | 8 | "link_recipe": true, |
| 10 | "text": "$(thing)Covalence dusts$() are the most basic items you create in Eris Alchemy." | 9 | "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 @@ | |||
| 1 | { | ||
| 2 | "name": "Energy Condenser", | ||
| 3 | "icon": "eris_alchemy:energy_condenser", | ||
| 4 | "category": "eris_alchemy:root", | ||
| 5 | "pages": [{ | ||
| 6 | "type": "patchouli:spotlight", | ||
| 7 | "item": "eris_alchemy:energy_condenser", | ||
| 8 | "link_recipe": true, | ||
| 9 | "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)." | ||
| 10 | }, { | ||
| 11 | "type": "patchouli:crafting", | ||
| 12 | "recipe": "eris_alchemy:energy_condenser" | ||
| 13 | }] | ||
| 14 | } \ 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 @@ | |||
| 4 | "category": "eris_alchemy:root", | 4 | "category": "eris_alchemy:root", |
| 5 | "pages": [{ | 5 | "pages": [{ |
| 6 | "type": "patchouli:spotlight", | 6 | "type": "patchouli:spotlight", |
| 7 | "title": "Guide Book", | ||
| 8 | "item": "patchouli:guide_book{'patchouli:book':'eris_alchemy:guide_book'}", | 7 | "item": "patchouli:guide_book{'patchouli:book':'eris_alchemy:guide_book'}", |
| 9 | "link_recipe": true, | 8 | "link_recipe": true, |
| 10 | "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." | 9 | "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 --- /dev/null +++ b/src/main/resources/assets/eris_alchemy/textures/entity/chest/energy_condenser.png | |||
| Binary files 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 --- /dev/null +++ b/src/main/resources/assets/eris_alchemy/textures/gui/container/energy_condenser.png | |||
| Binary files 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 @@ | |||
| 1 | { | ||
| 2 | "type": "minecraft:block", | ||
| 3 | "pools": [{ | ||
| 4 | "rolls": 1, | ||
| 5 | "entries": [{ | ||
| 6 | "type": "minecraft:item", | ||
| 7 | "name": "eris_alchemy:energy_condenser", | ||
| 8 | "functions": [{ | ||
| 9 | "function": "minecraft:copy_nbt", | ||
| 10 | "source": "block_entity", | ||
| 11 | "ops": [{ | ||
| 12 | "op": "replace", | ||
| 13 | "source": "stored_emc", | ||
| 14 | "target": "BlockEntityTag.stored_emc" | ||
| 15 | }] | ||
| 16 | }] | ||
| 17 | }], | ||
| 18 | "conditions": [{ | ||
| 19 | "condition": "minecraft:survives_explosion" | ||
| 20 | }] | ||
| 21 | }] | ||
| 22 | } \ 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 @@ | |||
| 1 | { | ||
| 2 | "type": "crafting_shaped", | ||
| 3 | "pattern": [ | ||
| 4 | "ODO", | ||
| 5 | "DCD", | ||
| 6 | "ODO" | ||
| 7 | ], | ||
| 8 | "key": { | ||
| 9 | "O": { | ||
| 10 | "item": "obsidian" | ||
| 11 | }, | ||
| 12 | "D": { | ||
| 13 | "item": "diamond" | ||
| 14 | }, | ||
| 15 | "C": { | ||
| 16 | "item": "eris_alchemy:alchemical_chest" | ||
| 17 | } | ||
| 18 | }, | ||
| 19 | "result": { | ||
| 20 | "item": "eris_alchemy:energy_condenser" | ||
| 21 | } | ||
| 22 | } \ 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 @@ | |||
| 1 | { | 1 | { |
| 2 | "replace": false, | 2 | "replace": false, |
| 3 | "values": [ | 3 | "values": [ |
| 4 | "eris_alchemy:alchemical_chest" | 4 | "eris_alchemy:alchemical_chest", |
| 5 | "eris_alchemy:energy_condenser" | ||
| 5 | ] | 6 | ] |
| 6 | } \ No newline at end of file | 7 | } \ 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 @@ | |||
| 7 | "client.SheetsMixin" | 7 | "client.SheetsMixin" |
| 8 | ], | 8 | ], |
| 9 | "mixins": [ | 9 | "mixins": [ |
| 10 | "ContainerOpenersCounterMixin", | ||
| 10 | "CoralBlockMixin", | 11 | "CoralBlockMixin", |
| 11 | "CoralFanBlockMixin", | 12 | "CoralFanBlockMixin", |
| 12 | "CoralPlantBlockMixin", | 13 | "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 @@ | |||
| 6 | "version": "${version}", | 6 | "version": "${version}", |
| 7 | "metadata": { | 7 | "metadata": { |
| 8 | "name": "Eris Alchemy", | 8 | "name": "Eris Alchemy", |
| 9 | "description": "Adds the condensing chest from EE2.", | 9 | "description": "Adds the energy condenser (and a bit more) from EE2.", |
| 10 | "contributors": { | 10 | "contributors": { |
| 11 | "Eris": "Owner" | 11 | "Eris": "Owner" |
| 12 | }, | 12 | }, |
| 13 | "contact": { | ||
| 14 | "homepage": "https://TODO", | ||
| 15 | "issues": "https://TODO", | ||
| 16 | "sources": "https://TODO" | ||
| 17 | }, | ||
| 18 | "icon": "assets/eris_alchemy/icon.png" | 13 | "icon": "assets/eris_alchemy/icon.png" |
| 19 | }, | 14 | }, |
| 20 | "intermediate_mappings": "net.fabricmc:intermediary", | 15 | "intermediate_mappings": "net.fabricmc:intermediary", |