From e14f0768834216b6bfd4822533b1460f143f3c1a Mon Sep 17 00:00:00 2001 From: Eqis-Edu <117950663+Eqis-Edu@users.noreply.github.com> Date: Mon, 27 Nov 2023 07:44:56 -0300 Subject: [PATCH] feat: The Raw Update (#1001) Crushing raw ores blocks Tiered miners recipe Increase spirits life Minor fix Closes #988 Closes #991 Big thanks to @Eqis-Edu! --- .../assets/occultism/lang/en_us.json | 2 ++ .../loot_tables/blocks/raw_iesnium_block.json | 21 +++++++++++++ .../loot_tables/blocks/raw_silver_block.json | 21 +++++++++++++ .../allthemodium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../aluminum_dust_from_raw_block.json | 28 ++++++++++++++++++ .../recipes/crushing/amber_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/apatite_dust_from_gem.json | 28 ++++++++++++++++++ .../recipes/crushing/arcane_crystal_dust.json | 28 ++++++++++++++++++ .../arcane_crystal_dust_from_gem.json | 28 ++++++++++++++++++ .../azure_silver_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/brass_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/bronze_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/certus_quartz_dust_from_gem.json | 28 ++++++++++++++++++ .../charged_certus_quartz_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/cinnabar_dust_from_gem.json | 28 ++++++++++++++++++ .../recipes/crushing/coal_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/cobalt_dust_from_raw_block.json | 28 ++++++++++++++++++ .../constantan_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/copper_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crimson_iron_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/diamond_dust_from_gem.json | 28 ++++++++++++++++++ .../electrum_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/emerald_dust_from_gem.json | 28 ++++++++++++++++++ .../enderium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/fluorite_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/gold_dust_from_raw_block.json | 28 ++++++++++++++++++ .../graphite_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/iesnium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/invar_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/iridium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/iron_dust_from_raw_block.json | 28 ++++++++++++++++++ .../recipes/crushing/lapis_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/lead_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/lumium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/mithril_dust_from_raw_block.json | 28 ++++++++++++++++++ .../netherite_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/nickel_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/osmium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/peridot_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/pewter_dust_from_raw_block.json | 28 ++++++++++++++++++ .../platinum_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/quartz_dust_from_gem.json | 28 ++++++++++++++++++ .../quicksilver_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/redstone_dust_from_gem.json | 28 ++++++++++++++++++ .../recipes/crushing/ruby_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/sapphire_dust_from_gem.json | 28 ++++++++++++++++++ .../signalum_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/silver_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/steel_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/sulfur_dust_from_gem.json | 28 ++++++++++++++++++ .../crushing/tin_dust_from_raw_block.json | 28 ++++++++++++++++++ .../recipes/crushing/topaz_dust_from_gem.json | 28 ++++++++++++++++++ .../tungsten_dust_from_raw_block.json | 28 ++++++++++++++++++ .../unobtainium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/uranium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../vibranium_dust_from_raw_block.json | 28 ++++++++++++++++++ .../crushing/zinc_dust_from_raw_block.json | 28 ++++++++++++++++++ .../runic_stone.json} | 6 ++-- .../common/entity/spirit/AfritEntity.java | 2 +- .../common/entity/spirit/DjinniEntity.java | 2 +- .../common/entity/spirit/FoliotEntity.java | 2 +- .../datagen/CrushingRecipeProvider.java | 9 ++++++ .../datagen/MinerRecipeProvider.java | 6 ++-- .../occultism/datagen/lang/ENUSProvider.java | 2 ++ .../occultism/registry/OccultismBlocks.java | 2 ++ .../registry/OccultismCreativeModeTabs.java | 19 ++++++------ .../klikli_dev/occultism/util/TextUtil.java | 4 +-- .../blockstates/raw_iesnium_block.json | 7 +++++ .../blockstates/raw_silver_block.json | 7 +++++ .../models/block/raw_iesnium_block.json | 6 ++++ .../models/block/raw_silver_block.json | 6 ++++ .../models/item/raw_iesnium_block.json | 3 ++ .../models/item/raw_silver_block.json | 3 ++ .../textures/block/raw_iesnium_block.png | Bin 0 -> 4788 bytes .../textures/block/raw_silver_block.png | Bin 0 -> 895 bytes .../forge/tags/blocks/storage_blocks.json | 9 ++++++ .../blocks/storage_blocks/raw_iesnium.json | 6 ++++ .../blocks/storage_blocks/raw_silver.json | 6 ++++ .../data/forge/tags/items/storage_blocks.json | 9 ++++++ .../items/storage_blocks/raw_iesnium.json | 6 ++++ .../tags/items/storage_blocks/raw_silver.json | 6 ++++ .../tags/blocks/mineable/pickaxe.json | 2 ++ .../tags/items/cluster_max_harvestables.json | 7 +++++ .../recipes/crafting/raw_iesnium_block.json | 16 ++++++++++ .../raw_iesnium_ingot_from_block.json | 12 ++++++++ .../recipes/crafting/raw_silver_block.json | 16 ++++++++++ .../crafting/raw_silver_ingot_from_block.json | 12 ++++++++ .../ritual/craft_miner_afrit_deeps.json | 2 +- .../ritual/craft_miner_djinni_ores.json | 4 +-- .../ritual/craft_miner_marid_master.json | 4 +-- 90 files changed, 1734 insertions(+), 25 deletions(-) create mode 100644 src/generated/resources/data/occultism/loot_tables/blocks/raw_iesnium_block.json create mode 100644 src/generated/resources/data/occultism/loot_tables/blocks/raw_silver_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/allthemodium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/aluminum_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/amber_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/apatite_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/azure_silver_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/brass_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/bronze_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/certus_quartz_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/charged_certus_quartz_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/cinnabar_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/coal_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/cobalt_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/constantan_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/copper_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/crimson_iron_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/diamond_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/electrum_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/emerald_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/enderium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/fluorite_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/gold_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/graphite_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/invar_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/iridium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/iron_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/lapis_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/lead_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/lumium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/mithril_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/netherite_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/nickel_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/osmium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/peridot_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/pewter_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/platinum_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/quartz_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/quicksilver_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/redstone_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/ruby_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/sapphire_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/signalum_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/silver_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/steel_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/sulfur_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/tin_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/topaz_dust_from_gem.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/tungsten_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/unobtainium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/uranium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/vibranium_dust_from_raw_block.json create mode 100644 src/generated/resources/data/occultism/recipes/crushing/zinc_dust_from_raw_block.json rename src/generated/resources/data/occultism/recipes/miner/{deeps/deepslate_arcane_crystal.json => ores/runic_stone.json} (62%) create mode 100644 src/main/resources/assets/occultism/blockstates/raw_iesnium_block.json create mode 100644 src/main/resources/assets/occultism/blockstates/raw_silver_block.json create mode 100644 src/main/resources/assets/occultism/models/block/raw_iesnium_block.json create mode 100644 src/main/resources/assets/occultism/models/block/raw_silver_block.json create mode 100644 src/main/resources/assets/occultism/models/item/raw_iesnium_block.json create mode 100644 src/main/resources/assets/occultism/models/item/raw_silver_block.json create mode 100644 src/main/resources/assets/occultism/textures/block/raw_iesnium_block.png create mode 100644 src/main/resources/assets/occultism/textures/block/raw_silver_block.png create mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks.json create mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json create mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json create mode 100644 src/main/resources/data/forge/tags/items/storage_blocks.json create mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json create mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/raw_silver.json create mode 100644 src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json create mode 100644 src/main/resources/data/occultism/recipes/crafting/raw_iesnium_block.json create mode 100644 src/main/resources/data/occultism/recipes/crafting/raw_iesnium_ingot_from_block.json create mode 100644 src/main/resources/data/occultism/recipes/crafting/raw_silver_block.json create mode 100644 src/main/resources/data/occultism/recipes/crafting/raw_silver_ingot_from_block.json diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index 89ba2972f..e02d76dc5 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -74,6 +74,8 @@ "block.occultism.otherworld_leaves": "Otherworld Leaves", "block.occultism.otherworld_log": "Otherworld Wood", "block.occultism.otherworld_sapling": "Otherworld Sapling", + "block.occultism.raw_iesnium_block": "Block of Raw Iesnium", + "block.occultism.raw_silver_block": "Block of Raw Silver", "block.occultism.sacrificial_bowl": "Sacrificial Bowl", "block.occultism.silver_block": "Block of Silver", "block.occultism.silver_ore": "Silver Ore", diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/raw_iesnium_block.json b/src/generated/resources/data/occultism/loot_tables/blocks/raw_iesnium_block.json new file mode 100644 index 000000000..e069fd0f1 --- /dev/null +++ b/src/generated/resources/data/occultism/loot_tables/blocks/raw_iesnium_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "occultism:raw_iesnium_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "occultism:blocks/raw_iesnium_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/raw_silver_block.json b/src/generated/resources/data/occultism/loot_tables/blocks/raw_silver_block.json new file mode 100644 index 000000000..243072c75 --- /dev/null +++ b/src/generated/resources/data/occultism/loot_tables/blocks/raw_silver_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "occultism:raw_silver_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "occultism:blocks/raw_silver_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/allthemodium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/allthemodium_dust_from_raw_block.json new file mode 100644 index 000000000..a3e53dc84 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/allthemodium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_allthemodium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/allthemodium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_allthemodium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/allthemodium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/aluminum_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/aluminum_dust_from_raw_block.json new file mode 100644 index 000000000..d06460e91 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/aluminum_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_aluminum" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/aluminum" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_aluminum" + }, + "result": { + "count": 18, + "tag": "forge:dusts/aluminum" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/amber_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/amber_dust_from_gem.json new file mode 100644 index 000000000..dd9637a81 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/amber_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/amber" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/amber" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/amber" + }, + "result": { + "count": 1, + "tag": "forge:dusts/amber" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/apatite_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/apatite_dust_from_gem.json new file mode 100644 index 000000000..1c6308e86 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/apatite_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/apatite" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/apatite" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/apatite" + }, + "result": { + "count": 1, + "tag": "forge:dusts/apatite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust.json b/src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust.json new file mode 100644 index 000000000..ca9a48b7e --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/arcane_crystal" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/arcane_crystal" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:ores/arcane_crystal" + }, + "result": { + "count": 4, + "tag": "forge:dusts/arcane_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust_from_gem.json new file mode 100644 index 000000000..88d35816d --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/arcane_crystal_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/arcane_crystal" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/arcane_crystal" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/arcane_crystal" + }, + "result": { + "count": 1, + "tag": "forge:dusts/arcane_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/azure_silver_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/azure_silver_dust_from_raw_block.json new file mode 100644 index 000000000..b27c95a25 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/azure_silver_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_azure_silver" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/azure_silver" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_azure_silver" + }, + "result": { + "count": 18, + "tag": "forge:dusts/azure_silver" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/brass_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/brass_dust_from_raw_block.json new file mode 100644 index 000000000..6617fef0a --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/brass_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_brass" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/brass" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_brass" + }, + "result": { + "count": 18, + "tag": "forge:dusts/brass" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/bronze_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/bronze_dust_from_raw_block.json new file mode 100644 index 000000000..4088a13fb --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/bronze_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_bronze" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/bronze" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_bronze" + }, + "result": { + "count": 18, + "tag": "forge:dusts/bronze" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/certus_quartz_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/certus_quartz_dust_from_gem.json new file mode 100644 index 000000000..23c7dab96 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/certus_quartz_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/certus_quartz" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/certus_quartz" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/certus_quartz" + }, + "result": { + "count": 1, + "tag": "forge:dusts/certus_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/charged_certus_quartz_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/charged_certus_quartz_dust_from_gem.json new file mode 100644 index 000000000..724df8d47 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/charged_certus_quartz_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/charged_certus_quartz" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/charged_certus_quartz" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/charged_certus_quartz" + }, + "result": { + "count": 1, + "tag": "forge:dusts/charged_certus_quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/cinnabar_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/cinnabar_dust_from_gem.json new file mode 100644 index 000000000..5f1dd253b --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/cinnabar_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/cinnabar" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/cinnabar" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/cinnabar" + }, + "result": { + "count": 1, + "tag": "forge:dusts/cinnabar" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/coal_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/coal_dust_from_gem.json new file mode 100644 index 000000000..752c86579 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/coal_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/coal" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/coal" + }, + "result": { + "count": 1, + "tag": "forge:dusts/coal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/cobalt_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/cobalt_dust_from_raw_block.json new file mode 100644 index 000000000..88f788d63 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/cobalt_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_cobalt" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/cobalt" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_cobalt" + }, + "result": { + "count": 18, + "tag": "forge:dusts/cobalt" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/constantan_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/constantan_dust_from_raw_block.json new file mode 100644 index 000000000..77103ed48 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/constantan_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_constantan" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/constantan" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_constantan" + }, + "result": { + "count": 18, + "tag": "forge:dusts/constantan" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/copper_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/copper_dust_from_raw_block.json new file mode 100644 index 000000000..cbbc04d61 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/copper_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_copper" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/copper" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_copper" + }, + "result": { + "count": 18, + "tag": "forge:dusts/copper" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/crimson_iron_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/crimson_iron_dust_from_raw_block.json new file mode 100644 index 000000000..b72fdee6e --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/crimson_iron_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_crimson_iron" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/crimson_iron" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_crimson_iron" + }, + "result": { + "count": 18, + "tag": "forge:dusts/crimson_iron" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/diamond_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/diamond_dust_from_gem.json new file mode 100644 index 000000000..b4fff20c4 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/diamond_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/diamond" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/diamond" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/diamond" + }, + "result": { + "count": 1, + "tag": "forge:dusts/diamond" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/electrum_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/electrum_dust_from_raw_block.json new file mode 100644 index 000000000..7883ad4da --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/electrum_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_electrum" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/electrum" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_electrum" + }, + "result": { + "count": 18, + "tag": "forge:dusts/electrum" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/emerald_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/emerald_dust_from_gem.json new file mode 100644 index 000000000..694e823e4 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/emerald_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/emerald" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/emerald" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/emerald" + }, + "result": { + "count": 1, + "tag": "forge:dusts/emerald" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/enderium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/enderium_dust_from_raw_block.json new file mode 100644 index 000000000..02e02772f --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/enderium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_enderium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/enderium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_enderium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/enderium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/fluorite_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/fluorite_dust_from_gem.json new file mode 100644 index 000000000..0430a53b5 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/fluorite_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/fluorite" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/fluorite" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/fluorite" + }, + "result": { + "count": 1, + "tag": "forge:dusts/fluorite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/gold_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/gold_dust_from_raw_block.json new file mode 100644 index 000000000..905e3ddac --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/gold_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_gold" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/gold" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_gold" + }, + "result": { + "count": 18, + "tag": "forge:dusts/gold" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/graphite_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/graphite_dust_from_raw_block.json new file mode 100644 index 000000000..3a8f5e8db --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/graphite_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_graphite" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/graphite" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_graphite" + }, + "result": { + "count": 18, + "tag": "forge:dusts/graphite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw_block.json new file mode 100644 index 000000000..47c4243e5 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/iesnium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_iesnium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/iesnium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_iesnium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/iesnium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/invar_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/invar_dust_from_raw_block.json new file mode 100644 index 000000000..c97e906e2 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/invar_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_invar" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/invar" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_invar" + }, + "result": { + "count": 18, + "tag": "forge:dusts/invar" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/iridium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/iridium_dust_from_raw_block.json new file mode 100644 index 000000000..d8f1213cc --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/iridium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_iridium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/iridium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_iridium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/iridium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/iron_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/iron_dust_from_raw_block.json new file mode 100644 index 000000000..610c5be18 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/iron_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_iron" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/iron" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_iron" + }, + "result": { + "count": 18, + "tag": "forge:dusts/iron" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/lapis_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/lapis_dust_from_gem.json new file mode 100644 index 000000000..c068dba85 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/lapis_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/lapis" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/lapis" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/lapis" + }, + "result": { + "count": 1, + "tag": "forge:dusts/lapis" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/lead_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/lead_dust_from_raw_block.json new file mode 100644 index 000000000..f22f2ca63 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/lead_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_lead" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/lead" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_lead" + }, + "result": { + "count": 18, + "tag": "forge:dusts/lead" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/lumium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/lumium_dust_from_raw_block.json new file mode 100644 index 000000000..00e5ffb29 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/lumium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_lumium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/lumium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_lumium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/lumium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/mithril_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/mithril_dust_from_raw_block.json new file mode 100644 index 000000000..b68542af9 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/mithril_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_mithril" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/mithril" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_mithril" + }, + "result": { + "count": 18, + "tag": "forge:dusts/mithril" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/netherite_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/netherite_dust_from_raw_block.json new file mode 100644 index 000000000..401e23b26 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/netherite_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_netherite" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/netherite" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_netherite" + }, + "result": { + "count": 18, + "tag": "forge:dusts/netherite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/nickel_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/nickel_dust_from_raw_block.json new file mode 100644 index 000000000..d84c2dadd --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/nickel_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_nickel" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/nickel" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_nickel" + }, + "result": { + "count": 18, + "tag": "forge:dusts/nickel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/osmium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/osmium_dust_from_raw_block.json new file mode 100644 index 000000000..1d436cdf2 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/osmium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_osmium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/osmium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_osmium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/osmium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/peridot_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/peridot_dust_from_gem.json new file mode 100644 index 000000000..a985eb76a --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/peridot_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/peridot" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/peridot" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/peridot" + }, + "result": { + "count": 1, + "tag": "forge:dusts/peridot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/pewter_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/pewter_dust_from_raw_block.json new file mode 100644 index 000000000..1290aa828 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/pewter_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_pewter" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/pewter" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_pewter" + }, + "result": { + "count": 18, + "tag": "forge:dusts/pewter" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/platinum_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/platinum_dust_from_raw_block.json new file mode 100644 index 000000000..08226114c --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/platinum_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_platinum" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/platinum" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_platinum" + }, + "result": { + "count": 18, + "tag": "forge:dusts/platinum" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/quartz_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/quartz_dust_from_gem.json new file mode 100644 index 000000000..3509d1793 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/quartz_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/quartz" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/quartz" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/quartz" + }, + "result": { + "count": 1, + "tag": "forge:dusts/quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/quicksilver_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/quicksilver_dust_from_raw_block.json new file mode 100644 index 000000000..722558ea2 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/quicksilver_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_quicksilver" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/quicksilver" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_quicksilver" + }, + "result": { + "count": 18, + "tag": "forge:dusts/quicksilver" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/redstone_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/redstone_dust_from_gem.json new file mode 100644 index 000000000..b01635624 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/redstone_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/redstone" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/redstone" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/redstone" + }, + "result": { + "count": 1, + "tag": "forge:dusts/redstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/ruby_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/ruby_dust_from_gem.json new file mode 100644 index 000000000..2bc197a43 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/ruby_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/ruby" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/ruby" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/ruby" + }, + "result": { + "count": 1, + "tag": "forge:dusts/ruby" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/sapphire_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/sapphire_dust_from_gem.json new file mode 100644 index 000000000..5039cfd03 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/sapphire_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/sapphire" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/sapphire" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/sapphire" + }, + "result": { + "count": 1, + "tag": "forge:dusts/sapphire" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/signalum_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/signalum_dust_from_raw_block.json new file mode 100644 index 000000000..21468625a --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/signalum_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_signalum" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/signalum" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_signalum" + }, + "result": { + "count": 18, + "tag": "forge:dusts/signalum" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/silver_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/silver_dust_from_raw_block.json new file mode 100644 index 000000000..2cb130a84 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/silver_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_silver" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/silver" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_silver" + }, + "result": { + "count": 18, + "tag": "forge:dusts/silver" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/steel_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/steel_dust_from_raw_block.json new file mode 100644 index 000000000..8f00171cc --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/steel_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_steel" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/steel" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_steel" + }, + "result": { + "count": 18, + "tag": "forge:dusts/steel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/sulfur_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/sulfur_dust_from_gem.json new file mode 100644 index 000000000..5e3f93a8e --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/sulfur_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/sulfur" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/sulfur" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/sulfur" + }, + "result": { + "count": 1, + "tag": "forge:dusts/sulfur" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/tin_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/tin_dust_from_raw_block.json new file mode 100644 index 000000000..97d0ba78f --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/tin_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_tin" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/tin" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_tin" + }, + "result": { + "count": 18, + "tag": "forge:dusts/tin" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/topaz_dust_from_gem.json b/src/generated/resources/data/occultism/recipes/crushing/topaz_dust_from_gem.json new file mode 100644 index 000000000..20aa0a18b --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/topaz_dust_from_gem.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:gems/topaz" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/topaz" + } + } + ], + "crushing_time": 200, + "ignore_crushing_multiplier": true, + "ingredient": { + "tag": "forge:gems/topaz" + }, + "result": { + "count": 1, + "tag": "forge:dusts/topaz" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/tungsten_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/tungsten_dust_from_raw_block.json new file mode 100644 index 000000000..5b365dd0e --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/tungsten_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_tungsten" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/tungsten" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_tungsten" + }, + "result": { + "count": 18, + "tag": "forge:dusts/tungsten" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/unobtainium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/unobtainium_dust_from_raw_block.json new file mode 100644 index 000000000..2621e9552 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/unobtainium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_unobtainium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/unobtainium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_unobtainium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/unobtainium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/uranium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/uranium_dust_from_raw_block.json new file mode 100644 index 000000000..20f65ca3f --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/uranium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_uranium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/uranium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_uranium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/uranium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/vibranium_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/vibranium_dust_from_raw_block.json new file mode 100644 index 000000000..5ffa59f54 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/vibranium_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_vibranium" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/vibranium" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_vibranium" + }, + "result": { + "count": 18, + "tag": "forge:dusts/vibranium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/crushing/zinc_dust_from_raw_block.json b/src/generated/resources/data/occultism/recipes/crushing/zinc_dust_from_raw_block.json new file mode 100644 index 000000000..b521f12d6 --- /dev/null +++ b/src/generated/resources/data/occultism/recipes/crushing/zinc_dust_from_raw_block.json @@ -0,0 +1,28 @@ +{ + "type": "occultism:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:storage_blocks/raw_zinc" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/zinc" + } + } + ], + "crushing_time": 1600, + "ignore_crushing_multiplier": false, + "ingredient": { + "tag": "forge:storage_blocks/raw_zinc" + }, + "result": { + "count": 18, + "tag": "forge:dusts/zinc" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipes/miner/deeps/deepslate_arcane_crystal.json b/src/generated/resources/data/occultism/recipes/miner/ores/runic_stone.json similarity index 62% rename from src/generated/resources/data/occultism/recipes/miner/deeps/deepslate_arcane_crystal.json rename to src/generated/resources/data/occultism/recipes/miner/ores/runic_stone.json index 0f9d70114..734b012f1 100644 --- a/src/generated/resources/data/occultism/recipes/miner/deeps/deepslate_arcane_crystal.json +++ b/src/generated/resources/data/occultism/recipes/miner/ores/runic_stone.json @@ -5,15 +5,15 @@ "type": "forge:not", "value": { "type": "forge:tag_empty", - "tag": "forge:ores/arcane_crystal" + "tag": "forbidden_arcanus:runic_stones" } } ], "ingredient": { - "tag": "occultism:miners/deeps" + "tag": "occultism:miners/ores" }, "result": { - "tag": "forge:ores/arcane_crystal" + "tag": "forbidden_arcanus:runic_stones" }, "weight": 200 } \ No newline at end of file diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritEntity.java index 38e8ebe1b..4cffab9e9 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritEntity.java @@ -43,7 +43,7 @@ public static AttributeSupplier.Builder createAttributes() { return SpiritEntity.createAttributes() .add(Attributes.ATTACK_DAMAGE, 8.0) .add(Attributes.ATTACK_SPEED, 8.0) - .add(Attributes.MAX_HEALTH, 100.0) + .add(Attributes.MAX_HEALTH, 200.0) .add(Attributes.MOVEMENT_SPEED, 0.40000001192092896) .add(Attributes.ARMOR, 8.0) .add(Attributes.ARMOR_TOUGHNESS, 50.0); diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java index 657e810f0..b44d1bce1 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java @@ -37,7 +37,7 @@ public DjinniEntity(EntityType type, Level level) { public static AttributeSupplier.Builder createAttributes() { return SpiritEntity.createAttributes() .add(Attributes.ATTACK_DAMAGE, 3.0) - .add(Attributes.MAX_HEALTH, 20.0) + .add(Attributes.MAX_HEALTH, 100.0) .add(Attributes.MOVEMENT_SPEED, 0.30000001192092896) .add(Attributes.ARMOR, 4.0) .add(Attributes.ARMOR_TOUGHNESS, 5.0) diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java index 8eb339403..e825a050a 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java @@ -37,7 +37,7 @@ public FoliotEntity(EntityType type, Level level) { public static AttributeSupplier.Builder createAttributes() { return SpiritEntity.createAttributes() .add(Attributes.ATTACK_DAMAGE, 1.0) - .add(Attributes.MAX_HEALTH, 8.0) + .add(Attributes.MAX_HEALTH, 20.0) .add(Attributes.MOVEMENT_SPEED, 0.30000001192092896) .add(Attributes.ARMOR, 2.0) .add(Attributes.ARMOR_TOUGHNESS, 1.0) diff --git a/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java index 55a3de92e..65dc2eb9b 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java @@ -114,12 +114,17 @@ protected void buildRecipes(Consumer> recipeC this.buildCrushingRecipeForGem("ruby", recipeConsumer); this.buildCrushingRecipeForGem("sapphire", recipeConsumer); this.buildCrushingRecipeForGem("topaz", recipeConsumer); + this.buildCrushingRecipeForGem("arcane_crystal", recipeConsumer); } protected void buildCrushingRecipeForGem(String gem, Consumer> recipeConsumer) { var gemDustId = new ResourceLocation(Occultism.MODID, gem + "_dust"); var gemDustRecipe = this.buildCrushingRecipe("forge:ores/" + gem, "forge:dusts/" + gem, 4, 200, false); recipeConsumer.accept(new Pair<>(gemDustId, gemDustRecipe)); + + var gemDustFromGemId = new ResourceLocation(Occultism.MODID, gem + "_dust_from_gem"); + var gemDustFromGemRecipe = this.buildCrushingRecipe("forge:gems/" + gem, "forge:dusts/" + gem, 1, 200, true); + recipeConsumer.accept(new Pair<>(gemDustFromGemId, gemDustFromGemRecipe)); } protected void buildCrushingRecipesForMetal(String metal, Consumer> recipeConsumer) { @@ -131,6 +136,10 @@ protected void buildCrushingRecipesForMetal(String metal, Consumer(metalDustFromRawRecipeId, metalDustFromRawRecipe)); + var metalDustFromRawBlockRecipeId = new ResourceLocation(Occultism.MODID, metal + "_dust_from_raw_block"); + var metalDustFromRawBlockRecipe = this.buildCrushingRecipe("forge:storage_blocks/raw_" + metal, "forge:dusts/" + metal, 18, 1600, false); + recipeConsumer.accept(new Pair<>(metalDustFromRawBlockRecipeId, metalDustFromRawBlockRecipe)); + var metalDustFromIngotRecipeId = new ResourceLocation(Occultism.MODID, metal + "_dust_from_ingot"); var metalDustFromIngotRecipe = this.buildCrushingRecipe("forge:ingots/" + metal, "forge:dusts/" + metal, 1, 200, true); recipeConsumer.accept(new Pair<>(metalDustFromIngotRecipeId, metalDustFromIngotRecipe)); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java index 9af5b3155..9294347f0 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java @@ -72,9 +72,9 @@ protected void buildRecipes(Consumer> recipes protected void buildForbiddenArcanusRecipes(Consumer> recipes) { recipes.accept(this.buildMinerRecipe( - this.modLoc("deeps/deepslate_arcane_crystal"), - this.modLoc("miners/deeps"), - this.loc("forge", "ores/arcane_crystal"), + this.modLoc("ores/runic_stone"), + this.modLoc("miners/ores"), + this.loc("forbidden_arcanus", "runic_stones"), 200)); recipes.accept(this.buildMinerRecipe( diff --git a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java index 6791394dd..dd6492012 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java @@ -275,6 +275,8 @@ private void addBlocks() { this.addBlock(OccultismBlocks.IESNIUM_ORE, "Iesnium Ore"); this.addBlock(OccultismBlocks.SILVER_BLOCK, "Block of Silver"); this.addBlock(OccultismBlocks.IESNIUM_BLOCK, "Block of Iesnium"); + this.addBlock(OccultismBlocks.RAW_SILVER_BLOCK, "Block of Raw Silver"); + this.addBlock(OccultismBlocks.RAW_IESNIUM_BLOCK, "Block of Raw Iesnium"); this.addBlock(OccultismBlocks.DIMENSIONAL_MINESHAFT, "Dimensional Mineshaft"); this.addBlock(OccultismBlocks.SKELETON_SKULL_DUMMY, "Skeleton Skull"); this.addBlock(OccultismBlocks.WITHER_SKELETON_SKULL_DUMMY, "Wither Skeleton Skull"); diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismBlocks.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismBlocks.java index d9f4a9df1..d335b1f92 100644 --- a/src/main/java/com/klikli_dev/occultism/registry/OccultismBlocks.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismBlocks.java @@ -151,7 +151,9 @@ public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSou register("iesnium_ore_natural", () -> new IesniumOreNaturalBlock(Block.Properties.copy(Blocks.IRON_ORE)), true, LootTableType.OTHERWORLD_BLOCK); public static final RegistryObject SILVER_BLOCK = register("silver_block", () -> new Block(Block.Properties.copy(Blocks.IRON_BLOCK))); + public static final RegistryObject RAW_SILVER_BLOCK = register("raw_silver_block", () -> new Block(Block.Properties.copy(Blocks.RAW_IRON_BLOCK))); public static final RegistryObject IESNIUM_BLOCK = register("iesnium_block", () -> new Block(Block.Properties.copy(Blocks.IRON_BLOCK))); + public static final RegistryObject RAW_IESNIUM_BLOCK = register("raw_iesnium_block", () -> new Block(Block.Properties.copy(Blocks.RAW_IRON_BLOCK))); //Decorative and Ritual Blocks public static final RegistryObject CANDLE_WHITE = register("candle_white", () -> new CandleBlock( diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismCreativeModeTabs.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismCreativeModeTabs.java index f076d84ab..632fc46c8 100644 --- a/src/main/java/com/klikli_dev/occultism/registry/OccultismCreativeModeTabs.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismCreativeModeTabs.java @@ -9,22 +9,23 @@ import net.minecraftforge.registries.RegistryObject; public class OccultismCreativeModeTabs { - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Occultism.MODID); + public static final DeferredRegister CREATIVE_MODE_TABS = + DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Occultism.MODID); - public static final RegistryObject OCCULTISM = CREATIVE_MODE_TABS.register(Occultism.MODID, () -> CreativeModeTab.builder() - .withTabsBefore(CreativeModeTabs.COMBAT) - .icon(() -> OccultismItems.PENTACLE.get().getDefaultInstance()) - .title(Component.translatable("itemGroup.occultism")) - .displayItems((parameters, output) -> { - OccultismItems.ITEMS.getEntries().forEach(i -> { + public static final RegistryObject OCCULTISM = CREATIVE_MODE_TABS.register("occultism", + () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.occultism")) + .withTabsBefore(CreativeModeTabs.SPAWN_EGGS) + .icon(() -> OccultismItems.PENTACLE.get().getDefaultInstance()) + .displayItems((parameters, output) -> { + OccultismItems.ITEMS.getEntries().forEach(i -> { if (!OccultismItems.shouldSkipCreativeModTab(i.get())) { output.accept(i.get()); } }); - output.accept(OccultismItems.DICTIONARY_OF_SPIRITS.get().getCreativeModeTabDisplayStack()); }).build()); -} +} \ No newline at end of file diff --git a/src/main/java/com/klikli_dev/occultism/util/TextUtil.java b/src/main/java/com/klikli_dev/occultism/util/TextUtil.java index 24154bb94..142368243 100644 --- a/src/main/java/com/klikli_dev/occultism/util/TextUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/TextUtil.java @@ -55,8 +55,8 @@ public class TextUtil { //Legiaseth: Tried to overload the storage system with nbt. Genius contraption using create to auto-create as much nbt as possible. Love it. //Vallen: Did a Bit-By-Bit Video! https://www.youtube.com/watch?v=kAKzzJ_yiC8 //Vemerion: Sooo many new familiars! <3 - //Eqis: the long-awaited additional spirit miner tiers - private static final String[] EASTER_EGGS = {"KliKli", "Xalmas", "Toastbroat", "Najlitarvan", "TheBoo", "Ridanisaurus", "Legiaseth", "Vallen", "Vemerion", "Eqis"}; + //EqisEdu: the long-awaited additional spirit miner tiers + private static final String[] EASTER_EGGS = {"KliKli", "Xalmas", "Toastbroat", "Najlitarvan", "TheBoo", "Ridanisaurus", "Legiaseth", "Vallen", "Vemerion", "EqisEdu"}; private static final String[] SYLLABLE1 = {"Kr", "Ca", "Ra", "Mrok", "Cru", "Ray", "Bre", "Zed", "Drak", "Mor", "Jag", "Mer", "Jar", "Mjol", "Zork", "Mad", "Cry", "Zur", "Creo", "Azak", "Azur", "Rei", "Cro", "Mar", "Luk", "Bar", "Gor", "Rak", "Thr", "Nar", "Vor", "Fir", "Trin", "Drog", "Karn", "Gar", "Ulf", "Hroth", "Ald", "Yng", "Styr", "Eir", "Ein", "Sig", "Ket", "Erl", "Haf", "Bryn", "Nid", "Grim", "Hol", "Fen", "Sigr", "Geir", "Hyr", "Val", "Har", "Kol", "Eyr"}; private static final String[] SYLLABLE2 = {"air", "ir", "mi", "sor", "mee", "clo", "red", "cra", "ark", "arc", "miri", "lori", "cres", "mur", "zer", "marac", "zoir", "slamar", "salmar", "urak", "tim", "jor", "vyr", "dor", "thor", "kyl", "lyn", "wyn", "wynn", "lond", "rond", "vond", "dorn", "korn", "morn", "gorn", "thorn", "worn", "norn", "rinn", "dell", "bell", "vell", "fell", "kell", "zell", "nir", "fir", "mir", "tir", "sir", "vir", "zir", "lir", "jyr", "ryl", "rym", "lym", "lyn", "ryn", "myr", "myl", "myn", "ryn"}; private static final String[] SYLLABLE3 = {"d", "ed", "ark", "arc", "es", "er", "der", "tron", "med", "ure", "zur", "cred", "mur", "aeus", "th", "vyr", "dor", "morn", "born", "thorn", "fyr", "lyr", "ryth", "ryn", "drin", "dryn", "kyr", "kyn", "lynd", "lind", "lyne", "line", "ryne", "rine", "thyr", "thyre", "vyn", "vin", "vyne", "vine", "rynne", "rinne", "syr", "syrn", "zirn", "zirne", "kyl", "kylle", "dor", "dorne", "lor", "lorne", "morn", "morne", "thorn", "thorne", "vyrn", "vyrne", "wyrm"}; diff --git a/src/main/resources/assets/occultism/blockstates/raw_iesnium_block.json b/src/main/resources/assets/occultism/blockstates/raw_iesnium_block.json new file mode 100644 index 000000000..406425bea --- /dev/null +++ b/src/main/resources/assets/occultism/blockstates/raw_iesnium_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "occultism:block/raw_iesnium_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/occultism/blockstates/raw_silver_block.json b/src/main/resources/assets/occultism/blockstates/raw_silver_block.json new file mode 100644 index 000000000..5fb8b4331 --- /dev/null +++ b/src/main/resources/assets/occultism/blockstates/raw_silver_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "occultism:block/raw_silver_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/occultism/models/block/raw_iesnium_block.json b/src/main/resources/assets/occultism/models/block/raw_iesnium_block.json new file mode 100644 index 000000000..61aca4371 --- /dev/null +++ b/src/main/resources/assets/occultism/models/block/raw_iesnium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "occultism:block/raw_iesnium_block" + } +} diff --git a/src/main/resources/assets/occultism/models/block/raw_silver_block.json b/src/main/resources/assets/occultism/models/block/raw_silver_block.json new file mode 100644 index 000000000..523a5f862 --- /dev/null +++ b/src/main/resources/assets/occultism/models/block/raw_silver_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "occultism:block/raw_silver_block" + } +} diff --git a/src/main/resources/assets/occultism/models/item/raw_iesnium_block.json b/src/main/resources/assets/occultism/models/item/raw_iesnium_block.json new file mode 100644 index 000000000..9e92bccac --- /dev/null +++ b/src/main/resources/assets/occultism/models/item/raw_iesnium_block.json @@ -0,0 +1,3 @@ +{ + "parent": "occultism:block/raw_iesnium_block" +} diff --git a/src/main/resources/assets/occultism/models/item/raw_silver_block.json b/src/main/resources/assets/occultism/models/item/raw_silver_block.json new file mode 100644 index 000000000..328145676 --- /dev/null +++ b/src/main/resources/assets/occultism/models/item/raw_silver_block.json @@ -0,0 +1,3 @@ +{ + "parent": "occultism:block/raw_silver_block" +} diff --git a/src/main/resources/assets/occultism/textures/block/raw_iesnium_block.png b/src/main/resources/assets/occultism/textures/block/raw_iesnium_block.png new file mode 100644 index 0000000000000000000000000000000000000000..69b6dba70c8fc226cd2d42dfc51c9f9f4c503351 GIT binary patch literal 4788 zcmeHKc~BE+77y;OFrc84Q3Q630c1rw>0Bgf2^k?MsKLmMh}!Ayga&euG$cR)D}y?s zg9n}ro;VJL7aoX%iq7B#jIxfyxQLFjqKt~?s-TGOmw*VhQ?+H)&VMA;>F#&@zW09L zd#~~>SA@+NY42)JqtQl&hRDLfeU#<08xDRa{QDgWZf7zhW2tb|#LydbDl&y&P#JoH zL6}Jujb^^4QN%meGDdW_)29Y5I8hjMHSF5R^f%)}_HZwb(JDQJp6=T^r}!iJQ0$Lh zP3!C`lA>G-0-ZH*(a4ueFDWnA5_XH#_*u5gu(SyZh>n_l4YD z+01DNvlK5F>&Xh+Bd>gCRDzF{ThLjSDwePcF))grzBhK7Pe%^xyISM6wzol`D9R#A~Y!IeLf(IlI%5-klN4P z&n}D)zC6>G7c%#PVoS$PX5lvl!4-;Y_WO`c^I!i(?z)yfZpQbOw{D$RHhq6KF2*)y z+Nd|Q)U?!aYR#B;8|m}TnDy6JnL0l+J*MRzu8%zIJ-n=#*yWtc*|_l2?ggAL;XmiY zlQsS7^6F^YLfo-xbhK_%qjnzBo~>NG-fKx$iTS7P z4r8Q-g!ETm8S7AKBYkB`=GIuo*jWj_Ce9Q$pQj^IWpf4fo$d3ZMY`1JJ!!wxc;})O z+xOwe!i@A!d?zla%Py3a=K1)_$fgj^n%zCemPtFhBHGs0McH_qAC{z;D9(8z?Yglq zu4JpBC@*z;=h>subBk*dwl`Hge2ledx6l@=Z_Rwrl`LQMsOb6h87tgvc4%(>tGcu< z>+~H*_}Q*mOWQ(hir*?no28|?`ajiHojzUM5}!5UTc^)ARL`riadcd~d<=0Q>%{R> z$E$K1k92q2RQ+c7A-+Hy2tOgilHRb zq*lUweEbxXLE;i-j6e>{^+7};8IoxrA~M4wvCL#lj5DPH_WouB0B8sbWtcT7S|ehX zFs--mY?#aDav@*=88fsLYKF8%4+}&uhKw*`22xLvIxWM3i7Itz zl!VCyddB7muT@PaiEa8R9BuvZt2(H6O9I-y4DjqKIQz{`b zPX$AK80A4?5!VkQU=&k|csL5ff&oyWS|f#OF~R}`z*!`~5h+nzC{hU^j*2gW_&9+= zN+BVDFaeLx5#u5uU*IjLFK?K9^b05YzzX@0o0g`*TILn#7)!dxE0;UHYUNRANU2oQk~f_Vr$ zz+Q)ws*L|-ZD}8dfA6M;kVde6hE>$tQxQaJ?_2L{3TbU72E*DG2#WQlU_{di+!`mq z>Q!Nhs8&sY`O#Of@8#t06a$~HM$CqX3{DGgoefR@c0MJ8=d=$S!bPdt@>Zs#ZFgJafk<*XSp+B?g4`^j&?8JYHpJ|xaaqd7QR zE*n~Li3F>syIYff{_eZ5Nx>pF^+dj)D8g{J zYm>YYFWy&Lf#!z(@#3yD16Afg1xR~n5i>w*Wdq#Q*C5;09W%vaMV=#k;4^Pt*H%E zeVMYdt@?uB*NUA!4Xw}o50aCG9phS)&P#B*@AMrX(|o>j%T?mgf@S4oY>C0F zT!1_Mbz9EThN&+%H?P|`E?VvGmE*P~XyyE`5Mm8|#pToUx2Z0cS5_w`{Hji9e3RdK zYDCYo?nQ0;8*@6+_wO%?8(m(~EKzwkT;e8e)Zu6j7hYA~al_}$vDTYz0g|Obo>y*H z$muOxb0!pLAJWyfA3%{EVe?DWlPmAfeTkkWmAQ*D=^Jj_?3u^vx;^XV9X~wiZDZjk zeq2ITc!lrWC&Zi=;(&yA2Xm9OwC~jVTtf#PQEX>4Tx04R}tkv&MmKpe$iQ>CI6g?5nQkf92KT~x%eRIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCVt}afBE>hzEl0u7E503ls?%w0>9UwF+Of`F=fT~$W zDjpNFxmD5kiUEWWzyyXRX6lLbVg_Bu*F8LZy^HXy?&tm-gG%0HfJY>bGTpF_YLqWz zT~;`6aaJoe*19Kup+B#!q`6LW6mcvefh0u8sG*DsEJSG4NHLM3{a6=&$nhu1C6lWR zMvetkp+a)};D7MDTeC1dPFL?vwO- zTMHinL)*Z`bz777fXf|VdT0f87GkLaBM=dWJHFGJTWXFZ{br6{xWw~Jw+SL?~lR723?u;&cX zhvV+^bnzx6ojHIQ7INHjOC`Eq^=(aDQ&(iklWWN$o-d*4I9&md^EW>dH}6WJw^wr3 zuTH0tYPgZn*ob1(mKlj*x%$WrQi+`CqRi5h*lFsDS)zvfhr2GQQQP&XZBb_JR$hH% zc=#Sta^~sRkv4X{T77(7Ms2%Z5tQtwHlowvVpvwMzu!`@6FSw0<8C7g<_dr};U7M6 VAShQPu!jHu002ovPDHLkV1k@%ow)!2 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/main/resources/data/forge/tags/blocks/storage_blocks.json new file mode 100644 index 000000000..a97f28f97 --- /dev/null +++ b/src/main/resources/data/forge/tags/blocks/storage_blocks.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#forge:storage_blocks/iesnium", + "#forge:storage_blocks/raw_iesnium", + "#forge:storage_blocks/silver", + "#forge:storage_blocks/raw_silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json new file mode 100644 index 000000000..fa2036f61 --- /dev/null +++ b/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "occultism:raw_iesnium_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json new file mode 100644 index 000000000..ce4313e1c --- /dev/null +++ b/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "occultism:raw_silver_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/main/resources/data/forge/tags/items/storage_blocks.json new file mode 100644 index 000000000..a97f28f97 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/storage_blocks.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#forge:storage_blocks/iesnium", + "#forge:storage_blocks/raw_iesnium", + "#forge:storage_blocks/silver", + "#forge:storage_blocks/raw_silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json b/src/main/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json new file mode 100644 index 000000000..fa2036f61 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "occultism:raw_iesnium_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/raw_silver.json b/src/main/resources/data/forge/tags/items/storage_blocks/raw_silver.json new file mode 100644 index 000000000..ce4313e1c --- /dev/null +++ b/src/main/resources/data/forge/tags/items/storage_blocks/raw_silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "occultism:raw_silver_block" + ] +} \ 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 16b8f24d8..aa5bdb0cf 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -21,6 +21,8 @@ "occultism:iesnium_ore_natural", "occultism:silver_block", "occultism:iesnium_block", + "occultism:raw_silver_block", + "occultism:raw_iesnium_block", "occultism:spirit_lantern" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json b/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json new file mode 100644 index 000000000..2665b2888 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "occultism:infused_pickaxe", + "occultism:iesnium_pickaxe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/recipes/crafting/raw_iesnium_block.json b/src/main/resources/data/occultism/recipes/crafting/raw_iesnium_block.json new file mode 100644 index 000000000..d7765a276 --- /dev/null +++ b/src/main/resources/data/occultism/recipes/crafting/raw_iesnium_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ppp", + "ppp", + "ppp" + ], + "key": { + "p": { + "tag": "forge:raw_ores/iesnium" + } + }, + "result": { + "item": "occultism:raw_iesnium_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/recipes/crafting/raw_iesnium_ingot_from_block.json b/src/main/resources/data/occultism/recipes/crafting/raw_iesnium_ingot_from_block.json new file mode 100644 index 000000000..f5c3b8552 --- /dev/null +++ b/src/main/resources/data/occultism/recipes/crafting/raw_iesnium_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/raw_iesnium" + } + ], + "result": { + "item": "occultism:raw_iesnium", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/recipes/crafting/raw_silver_block.json b/src/main/resources/data/occultism/recipes/crafting/raw_silver_block.json new file mode 100644 index 000000000..7f690f3c6 --- /dev/null +++ b/src/main/resources/data/occultism/recipes/crafting/raw_silver_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ppp", + "ppp", + "ppp" + ], + "key": { + "p": { + "tag": "forge:raw_ores/silver" + } + }, + "result": { + "item": "occultism:raw_silver_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/recipes/crafting/raw_silver_ingot_from_block.json b/src/main/resources/data/occultism/recipes/crafting/raw_silver_ingot_from_block.json new file mode 100644 index 000000000..805ff7d34 --- /dev/null +++ b/src/main/resources/data/occultism/recipes/crafting/raw_silver_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/raw_silver" + } + ], + "result": { + "item": "occultism:raw_silver", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/recipes/ritual/craft_miner_afrit_deeps.json b/src/main/resources/data/occultism/recipes/ritual/craft_miner_afrit_deeps.json index 5b5446fb7..0beda4081 100644 --- a/src/main/resources/data/occultism/recipes/ritual/craft_miner_afrit_deeps.json +++ b/src/main/resources/data/occultism/recipes/ritual/craft_miner_afrit_deeps.json @@ -11,7 +11,7 @@ }, "ingredients": [ { - "item": "occultism:magic_lamp_empty" + "item": "occultism:miner_djinni_ores" }, { "item": "occultism:iesnium_pickaxe" diff --git a/src/main/resources/data/occultism/recipes/ritual/craft_miner_djinni_ores.json b/src/main/resources/data/occultism/recipes/ritual/craft_miner_djinni_ores.json index 6d78520b0..4f5000bb4 100644 --- a/src/main/resources/data/occultism/recipes/ritual/craft_miner_djinni_ores.json +++ b/src/main/resources/data/occultism/recipes/ritual/craft_miner_djinni_ores.json @@ -11,7 +11,7 @@ }, "ingredients": [ { - "item": "occultism:magic_lamp_empty" + "item": "occultism:miner_foliot_unspecialized" }, { "item": "occultism:iesnium_pickaxe" @@ -20,7 +20,7 @@ "tag": "forge:raw_materials/gold" }, { - "tag": "forge:storage_blocks/iesnium" + "tag": "forge:storage_blocks/lapis" }, { "item": "occultism:spirit_attuned_crystal" diff --git a/src/main/resources/data/occultism/recipes/ritual/craft_miner_marid_master.json b/src/main/resources/data/occultism/recipes/ritual/craft_miner_marid_master.json index b215d485d..2f0d8fc05 100644 --- a/src/main/resources/data/occultism/recipes/ritual/craft_miner_marid_master.json +++ b/src/main/resources/data/occultism/recipes/ritual/craft_miner_marid_master.json @@ -7,11 +7,11 @@ "pentacle_id": "occultism:craft_marid", "duration": 120, "ritual_dummy": { - "item": "occultism:ritual_dummy/custom_ritual" + "item": "occultism:ritual_dummy/craft_miner_marid_master" }, "ingredients": [ { - "item": "occultism:magic_lamp_empty" + "item": "occultism:miner_afrit_deeps" }, { "item": "occultism:iesnium_pickaxe"