diff --git a/src/main/resources/data/curios/tags/items/belt.json b/src/generated/resources/data/curios/tags/items/belt.json similarity index 69% rename from src/main/resources/data/curios/tags/items/belt.json rename to src/generated/resources/data/curios/tags/items/belt.json index 258a3b3da..7d8cd22ea 100644 --- a/src/main/resources/data/curios/tags/items/belt.json +++ b/src/generated/resources/data/curios/tags/items/belt.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:satchel" ] diff --git a/src/main/resources/data/curios/tags/items/hands.json b/src/generated/resources/data/curios/tags/items/hands.json similarity index 72% rename from src/main/resources/data/curios/tags/items/hands.json rename to src/generated/resources/data/curios/tags/items/hands.json index 460e43b29..e7ebce3fd 100644 --- a/src/main/resources/data/curios/tags/items/hands.json +++ b/src/generated/resources/data/curios/tags/items/hands.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:storage_remote" ] diff --git a/src/main/resources/data/curios/tags/items/head.json b/src/generated/resources/data/curios/tags/items/head.json similarity index 73% rename from src/main/resources/data/curios/tags/items/head.json rename to src/generated/resources/data/curios/tags/items/head.json index 29e20e805..0c0f35951 100644 --- a/src/main/resources/data/curios/tags/items/head.json +++ b/src/generated/resources/data/curios/tags/items/head.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_goggles" ] diff --git a/src/main/resources/data/curios/tags/items/ring.json b/src/generated/resources/data/curios/tags/items/ring.json similarity index 69% rename from src/main/resources/data/curios/tags/items/ring.json rename to src/generated/resources/data/curios/tags/items/ring.json index 9dc3d3a71..bc9d0191f 100644 --- a/src/main/resources/data/curios/tags/items/ring.json +++ b/src/generated/resources/data/curios/tags/items/ring.json @@ -1,6 +1,5 @@ { - "replace": false, "values": [ "occultism:familiar_ring" ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/campfires.json b/src/generated/resources/data/minecraft/tags/blocks/campfires.json similarity index 72% rename from src/main/resources/data/minecraft/tags/blocks/campfires.json rename to src/generated/resources/data/minecraft/tags/blocks/campfires.json index ab062ad30..da399b644 100644 --- a/src/main/resources/data/minecraft/tags/blocks/campfires.json +++ b/src/generated/resources/data/minecraft/tags/blocks/campfires.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:spirit_campfire" ] diff --git a/src/generated/resources/data/minecraft/tags/blocks/candles.json b/src/generated/resources/data/minecraft/tags/blocks/candles.json new file mode 100644 index 000000000..8b83834a6 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/candles.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:candles" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/crops.json b/src/generated/resources/data/minecraft/tags/blocks/crops.json similarity index 68% rename from src/main/resources/data/minecraft/tags/blocks/crops.json rename to src/generated/resources/data/minecraft/tags/blocks/crops.json index 7c7a82c95..805b05f84 100644 --- a/src/main/resources/data/minecraft/tags/blocks/crops.json +++ b/src/generated/resources/data/minecraft/tags/blocks/crops.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:datura" ] diff --git a/src/main/resources/data/minecraft/tags/blocks/leaves.json b/src/generated/resources/data/minecraft/tags/blocks/leaves.json similarity index 83% rename from src/main/resources/data/minecraft/tags/blocks/leaves.json rename to src/generated/resources/data/minecraft/tags/blocks/leaves.json index 951136026..0048e3879 100644 --- a/src/main/resources/data/minecraft/tags/blocks/leaves.json +++ b/src/generated/resources/data/minecraft/tags/blocks/leaves.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_leaves", "occultism:otherworld_leaves_natural" diff --git a/src/main/resources/data/minecraft/tags/blocks/logs.json b/src/generated/resources/data/minecraft/tags/blocks/logs.json similarity index 82% rename from src/main/resources/data/minecraft/tags/blocks/logs.json rename to src/generated/resources/data/minecraft/tags/blocks/logs.json index 92adade6d..0e8e271dd 100644 --- a/src/main/resources/data/minecraft/tags/blocks/logs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_log", "occultism:otherworld_log_natural" diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json similarity index 86% rename from src/main/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index e626ae07e..7b4229170 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_log", "occultism:otherworld_log_natural", diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json similarity index 83% rename from src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json rename to src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json index 951136026..0048e3879 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_leaves", "occultism:otherworld_leaves_natural" diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json similarity index 97% rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index aa5bdb0cf..20e4c3d39 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherstone", "occultism:otherstone_natural", @@ -20,8 +19,8 @@ "occultism:iesnium_ore", "occultism:iesnium_ore_natural", "occultism:silver_block", - "occultism:iesnium_block", "occultism:raw_silver_block", + "occultism:iesnium_block", "occultism:raw_iesnium_block", "occultism:spirit_lantern" ] diff --git a/src/main/resources/data/minecraft/tags/items/piglin_repellents.json b/src/generated/resources/data/minecraft/tags/blocks/piglin_repellents.json similarity index 72% rename from src/main/resources/data/minecraft/tags/items/piglin_repellents.json rename to src/generated/resources/data/minecraft/tags/blocks/piglin_repellents.json index ab062ad30..da399b644 100644 --- a/src/main/resources/data/minecraft/tags/items/piglin_repellents.json +++ b/src/generated/resources/data/minecraft/tags/blocks/piglin_repellents.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:spirit_campfire" ] diff --git a/src/main/resources/data/minecraft/tags/blocks/saplings.json b/src/generated/resources/data/minecraft/tags/blocks/saplings.json similarity index 74% rename from src/main/resources/data/minecraft/tags/blocks/saplings.json rename to src/generated/resources/data/minecraft/tags/blocks/saplings.json index 8a508bc5e..ae2130428 100644 --- a/src/main/resources/data/minecraft/tags/blocks/saplings.json +++ b/src/generated/resources/data/minecraft/tags/blocks/saplings.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#occultism:saplings/otherworld" ] diff --git a/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json b/src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json similarity index 81% rename from src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json rename to src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json index 2665b2888..f2760a97a 100644 --- a/src/main/resources/data/minecraft/tags/items/cluster_max_harvestables.json +++ b/src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:infused_pickaxe", "occultism:iesnium_pickaxe" diff --git a/src/main/resources/data/minecraft/tags/items/leaves.json b/src/generated/resources/data/minecraft/tags/items/leaves.json similarity index 83% rename from src/main/resources/data/minecraft/tags/items/leaves.json rename to src/generated/resources/data/minecraft/tags/items/leaves.json index 951136026..0048e3879 100644 --- a/src/main/resources/data/minecraft/tags/items/leaves.json +++ b/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_leaves", "occultism:otherworld_leaves_natural" diff --git a/src/main/resources/data/minecraft/tags/items/logs.json b/src/generated/resources/data/minecraft/tags/items/logs.json similarity index 82% rename from src/main/resources/data/minecraft/tags/items/logs.json rename to src/generated/resources/data/minecraft/tags/items/logs.json index 92adade6d..0e8e271dd 100644 --- a/src/main/resources/data/minecraft/tags/items/logs.json +++ b/src/generated/resources/data/minecraft/tags/items/logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_log", "occultism:otherworld_log_natural" diff --git a/src/main/resources/data/minecraft/tags/items/pickaxes.json b/src/generated/resources/data/minecraft/tags/items/pickaxes.json similarity index 81% rename from src/main/resources/data/minecraft/tags/items/pickaxes.json rename to src/generated/resources/data/minecraft/tags/items/pickaxes.json index 2665b2888..f2760a97a 100644 --- a/src/main/resources/data/minecraft/tags/items/pickaxes.json +++ b/src/generated/resources/data/minecraft/tags/items/pickaxes.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:infused_pickaxe", "occultism:iesnium_pickaxe" diff --git a/src/main/resources/data/minecraft/tags/blocks/piglin_repellents.json b/src/generated/resources/data/minecraft/tags/items/piglin_repellents.json similarity index 72% rename from src/main/resources/data/minecraft/tags/blocks/piglin_repellents.json rename to src/generated/resources/data/minecraft/tags/items/piglin_repellents.json index ab062ad30..da399b644 100644 --- a/src/main/resources/data/minecraft/tags/blocks/piglin_repellents.json +++ b/src/generated/resources/data/minecraft/tags/items/piglin_repellents.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:spirit_campfire" ] diff --git a/src/main/resources/data/minecraft/tags/items/saplings.json b/src/generated/resources/data/minecraft/tags/items/saplings.json similarity index 74% rename from src/main/resources/data/minecraft/tags/items/saplings.json rename to src/generated/resources/data/minecraft/tags/items/saplings.json index 8a508bc5e..ae2130428 100644 --- a/src/main/resources/data/minecraft/tags/items/saplings.json +++ b/src/generated/resources/data/minecraft/tags/items/saplings.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#occultism:saplings/otherworld" ] diff --git a/src/main/resources/data/minecraft/tags/items/swords.json b/src/generated/resources/data/minecraft/tags/items/swords.json similarity index 71% rename from src/main/resources/data/minecraft/tags/items/swords.json rename to src/generated/resources/data/minecraft/tags/items/swords.json index 31faa5047..3f2cbeae6 100644 --- a/src/main/resources/data/minecraft/tags/items/swords.json +++ b/src/generated/resources/data/minecraft/tags/items/swords.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:butcher_knife" ] diff --git a/src/main/resources/data/occultism/tags/blocks/candles.json b/src/generated/resources/data/occultism/tags/blocks/candles.json similarity index 71% rename from src/main/resources/data/occultism/tags/blocks/candles.json rename to src/generated/resources/data/occultism/tags/blocks/candles.json index 8aeed08be..4024a20a7 100644 --- a/src/main/resources/data/occultism/tags/blocks/candles.json +++ b/src/generated/resources/data/occultism/tags/blocks/candles.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:candle_white" ] diff --git a/src/main/resources/data/occultism/tags/blocks/cave_wall_blocks.json b/src/generated/resources/data/occultism/tags/blocks/cave_wall_blocks.json similarity index 85% rename from src/main/resources/data/occultism/tags/blocks/cave_wall_blocks.json rename to src/generated/resources/data/occultism/tags/blocks/cave_wall_blocks.json index 955eb346c..0269200f3 100644 --- a/src/main/resources/data/occultism/tags/blocks/cave_wall_blocks.json +++ b/src/generated/resources/data/occultism/tags/blocks/cave_wall_blocks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:stone", "minecraft:granite", diff --git a/src/main/resources/data/occultism/tags/blocks/netherrack.json b/src/generated/resources/data/occultism/tags/blocks/netherrack.json similarity index 70% rename from src/main/resources/data/occultism/tags/blocks/netherrack.json rename to src/generated/resources/data/occultism/tags/blocks/netherrack.json index d54c65bbb..daa9c6670 100644 --- a/src/main/resources/data/occultism/tags/blocks/netherrack.json +++ b/src/generated/resources/data/occultism/tags/blocks/netherrack.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:netherrack" ] diff --git a/src/generated/resources/data/occultism/tags/blocks/saplings/otherworld.json b/src/generated/resources/data/occultism/tags/blocks/saplings/otherworld.json new file mode 100644 index 000000000..a7cbb6c9a --- /dev/null +++ b/src/generated/resources/data/occultism/tags/blocks/saplings/otherworld.json @@ -0,0 +1,6 @@ +{ + "values": [ + "occultism:otherworld_sapling", + "occultism:otherworld_sapling_natural" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/blocks/storage_stabilizer.json b/src/generated/resources/data/occultism/tags/blocks/storage_stabilizer.json similarity index 89% rename from src/main/resources/data/occultism/tags/blocks/storage_stabilizer.json rename to src/generated/resources/data/occultism/tags/blocks/storage_stabilizer.json index 1699ca748..66bba5ccd 100644 --- a/src/main/resources/data/occultism/tags/blocks/storage_stabilizer.json +++ b/src/generated/resources/data/occultism/tags/blocks/storage_stabilizer.json @@ -1,9 +1,8 @@ { - "replace": false, "values": [ "occultism:storage_stabilizer_tier1", "occultism:storage_stabilizer_tier2", "occultism:storage_stabilizer_tier3", "occultism:storage_stabilizer_tier4" ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/blocks/tree_soil.json b/src/generated/resources/data/occultism/tags/blocks/tree_soil.json similarity index 65% rename from src/main/resources/data/occultism/tags/blocks/tree_soil.json rename to src/generated/resources/data/occultism/tags/blocks/tree_soil.json index 4abe6e8c9..750a62985 100644 --- a/src/main/resources/data/occultism/tags/blocks/tree_soil.json +++ b/src/generated/resources/data/occultism/tags/blocks/tree_soil.json @@ -1,6 +1,5 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/blocks/worldgen_blacklist.json b/src/generated/resources/data/occultism/tags/blocks/worldgen_blacklist.json similarity index 80% rename from src/main/resources/data/occultism/tags/blocks/worldgen_blacklist.json rename to src/generated/resources/data/occultism/tags/blocks/worldgen_blacklist.json index ebecc42e8..cf098c017 100644 --- a/src/main/resources/data/occultism/tags/blocks/worldgen_blacklist.json +++ b/src/generated/resources/data/occultism/tags/blocks/worldgen_blacklist.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:end_portal", "minecraft:end_portal_frame" diff --git a/src/main/resources/data/occultism/tags/entity_types/afrit_allies.json b/src/generated/resources/data/occultism/tags/entity_types/afrit_allies.json similarity index 68% rename from src/main/resources/data/occultism/tags/entity_types/afrit_allies.json rename to src/generated/resources/data/occultism/tags/entity_types/afrit_allies.json index 8a1ecc0e3..fb0e32f89 100644 --- a/src/main/resources/data/occultism/tags/entity_types/afrit_allies.json +++ b/src/generated/resources/data/occultism/tags/entity_types/afrit_allies.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:blaze" ] diff --git a/src/main/resources/data/occultism/tags/entity_types/cubemob.json b/src/generated/resources/data/occultism/tags/entity_types/cubemob.json similarity index 78% rename from src/main/resources/data/occultism/tags/entity_types/cubemob.json rename to src/generated/resources/data/occultism/tags/entity_types/cubemob.json index 92a98133f..858f48c81 100644 --- a/src/main/resources/data/occultism/tags/entity_types/cubemob.json +++ b/src/generated/resources/data/occultism/tags/entity_types/cubemob.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:slime", "minecraft:magma_cube" diff --git a/src/main/resources/data/occultism/tags/entity_types/flying_passive.json b/src/generated/resources/data/occultism/tags/entity_types/flying_passive.json similarity index 84% rename from src/main/resources/data/occultism/tags/entity_types/flying_passive.json rename to src/generated/resources/data/occultism/tags/entity_types/flying_passive.json index 6ee1dc823..1a50ad02f 100644 --- a/src/main/resources/data/occultism/tags/entity_types/flying_passive.json +++ b/src/generated/resources/data/occultism/tags/entity_types/flying_passive.json @@ -1,9 +1,8 @@ { - "replace": false, "values": [ "minecraft:bat", - "minecraft:bee", "minecraft:parrot", + "minecraft:bee", "minecraft:allay" ] } \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/entity_types/healed_by_demons_dream_fruit.json b/src/generated/resources/data/occultism/tags/entity_types/healed_by_demons_dream_fruit.json similarity index 98% rename from src/main/resources/data/occultism/tags/entity_types/healed_by_demons_dream_fruit.json rename to src/generated/resources/data/occultism/tags/entity_types/healed_by_demons_dream_fruit.json index 27ffb18b4..09f26df7c 100644 --- a/src/main/resources/data/occultism/tags/entity_types/healed_by_demons_dream_fruit.json +++ b/src/generated/resources/data/occultism/tags/entity_types/healed_by_demons_dream_fruit.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:foliot", "occultism:djinni", @@ -24,12 +23,12 @@ "occultism:headless_familiar", "occultism:chimera_familiar", "occultism:goat_familiar", - "occultism:shub_niggurath_familiar", + "occultism:shub_niggurath_spawn", "occultism:beholder_familiar", "occultism:fairy_familiar", "occultism:mummy_familiar", "occultism:beaver_familiar", - "occultism:shub_niggurath_spawn", + "occultism:shub_niggurath_familiar", "occultism:demonic_wife", "occultism:demonic_husband" ] diff --git a/src/main/resources/data/occultism/tags/entity_types/humans.json b/src/generated/resources/data/occultism/tags/entity_types/humans.json similarity index 77% rename from src/main/resources/data/occultism/tags/entity_types/humans.json rename to src/generated/resources/data/occultism/tags/entity_types/humans.json index bd54a0ca9..f502e5f05 100644 --- a/src/main/resources/data/occultism/tags/entity_types/humans.json +++ b/src/generated/resources/data/occultism/tags/entity_types/humans.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#forge:villagers", "minecraft:player" diff --git a/src/main/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json b/src/generated/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json similarity index 78% rename from src/main/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json rename to src/generated/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json index 4619bbd8e..5618a04b1 100644 --- a/src/main/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json +++ b/src/generated/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:wither", "minecraft:ender_dragon" diff --git a/src/main/resources/data/occultism/tags/entity_types/wild_hunt.json b/src/generated/resources/data/occultism/tags/entity_types/wild_hunt.json similarity index 83% rename from src/main/resources/data/occultism/tags/entity_types/wild_hunt.json rename to src/generated/resources/data/occultism/tags/entity_types/wild_hunt.json index 9aeb996b5..adc642342 100644 --- a/src/main/resources/data/occultism/tags/entity_types/wild_hunt.json +++ b/src/generated/resources/data/occultism/tags/entity_types/wild_hunt.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:wild_hunt_skeleton", "occultism:wild_hunt_wither_skeleton" diff --git a/src/main/resources/data/occultism/tags/items/books/book_of_calling_djinni.json b/src/generated/resources/data/occultism/tags/items/books/book_of_calling_djinni.json similarity index 78% rename from src/main/resources/data/occultism/tags/items/books/book_of_calling_djinni.json rename to src/generated/resources/data/occultism/tags/items/books/book_of_calling_djinni.json index ac5c098b4..fa1ea4ea9 100644 --- a/src/main/resources/data/occultism/tags/items/books/book_of_calling_djinni.json +++ b/src/generated/resources/data/occultism/tags/items/books/book_of_calling_djinni.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:book_of_calling_djinni_manage_machine" ] diff --git a/src/generated/resources/data/occultism/tags/items/books/book_of_calling_foliot.json b/src/generated/resources/data/occultism/tags/items/books/book_of_calling_foliot.json new file mode 100644 index 000000000..3af2a6c82 --- /dev/null +++ b/src/generated/resources/data/occultism/tags/items/books/book_of_calling_foliot.json @@ -0,0 +1,7 @@ +{ + "values": [ + "occultism:book_of_calling_foliot_lumberjack", + "occultism:book_of_calling_foliot_cleaner", + "occultism:book_of_calling_foliot_transport_items" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/items/elytra.json b/src/generated/resources/data/occultism/tags/items/elytra.json similarity index 86% rename from src/main/resources/data/occultism/tags/items/elytra.json rename to src/generated/resources/data/occultism/tags/items/elytra.json index 24333938b..a818140f9 100644 --- a/src/main/resources/data/occultism/tags/items/elytra.json +++ b/src/generated/resources/data/occultism/tags/items/elytra.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:elytra", { diff --git a/src/main/resources/data/occultism/tags/items/miners/basic_resources.json b/src/generated/resources/data/occultism/tags/items/miners/basic_resources.json similarity index 84% rename from src/main/resources/data/occultism/tags/items/miners/basic_resources.json rename to src/generated/resources/data/occultism/tags/items/miners/basic_resources.json index 12dd23c0a..a6ebfdd1e 100644 --- a/src/main/resources/data/occultism/tags/items/miners/basic_resources.json +++ b/src/generated/resources/data/occultism/tags/items/miners/basic_resources.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:miner_foliot_unspecialized", "occultism:miner_debug_unspecialized" diff --git a/src/main/resources/data/occultism/tags/items/miners/deeps.json b/src/generated/resources/data/occultism/tags/items/miners/deeps.json similarity index 81% rename from src/main/resources/data/occultism/tags/items/miners/deeps.json rename to src/generated/resources/data/occultism/tags/items/miners/deeps.json index 2fb3972c2..bdef039af 100644 --- a/src/main/resources/data/occultism/tags/items/miners/deeps.json +++ b/src/generated/resources/data/occultism/tags/items/miners/deeps.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:miner_afrit_deeps", "occultism:miner_marid_master" diff --git a/src/main/resources/data/occultism/tags/items/miners/master.json b/src/generated/resources/data/occultism/tags/items/miners/master.json similarity index 73% rename from src/main/resources/data/occultism/tags/items/miners/master.json rename to src/generated/resources/data/occultism/tags/items/miners/master.json index 7becf6941..c06c34274 100644 --- a/src/main/resources/data/occultism/tags/items/miners/master.json +++ b/src/generated/resources/data/occultism/tags/items/miners/master.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:miner_marid_master" ] diff --git a/src/main/resources/data/occultism/tags/items/miners/ores.json b/src/generated/resources/data/occultism/tags/items/miners/ores.json similarity index 76% rename from src/main/resources/data/occultism/tags/items/miners/ores.json rename to src/generated/resources/data/occultism/tags/items/miners/ores.json index 319fdbb03..846266201 100644 --- a/src/main/resources/data/occultism/tags/items/miners/ores.json +++ b/src/generated/resources/data/occultism/tags/items/miners/ores.json @@ -1,9 +1,7 @@ { - "replace": false, "values": [ "occultism:miner_foliot_unspecialized", "occultism:miner_debug_unspecialized", - "occultism:miner_djinni_ores", "occultism:miner_afrit_deeps", "occultism:miner_marid_master" ] diff --git a/src/main/resources/data/occultism/tags/items/otherworld_goggles.json b/src/generated/resources/data/occultism/tags/items/otherworld_goggles.json similarity index 73% rename from src/main/resources/data/occultism/tags/items/otherworld_goggles.json rename to src/generated/resources/data/occultism/tags/items/otherworld_goggles.json index 29e20e805..0c0f35951 100644 --- a/src/main/resources/data/occultism/tags/items/otherworld_goggles.json +++ b/src/generated/resources/data/occultism/tags/items/otherworld_goggles.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:otherworld_goggles" ] diff --git a/src/generated/resources/data/occultism/tags/items/saplings/otherworld.json b/src/generated/resources/data/occultism/tags/items/saplings/otherworld.json new file mode 100644 index 000000000..a7cbb6c9a --- /dev/null +++ b/src/generated/resources/data/occultism/tags/items/saplings/otherworld.json @@ -0,0 +1,6 @@ +{ + "values": [ + "occultism:otherworld_sapling", + "occultism:otherworld_sapling_natural" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/items/tools/knives.json b/src/generated/resources/data/occultism/tags/items/tools/knives.json similarity index 71% rename from src/main/resources/data/occultism/tags/items/tools/knives.json rename to src/generated/resources/data/occultism/tags/items/tools/knives.json index 31faa5047..3f2cbeae6 100644 --- a/src/main/resources/data/occultism/tags/items/tools/knives.json +++ b/src/generated/resources/data/occultism/tags/items/tools/knives.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:butcher_knife" ] diff --git a/src/main/resources/data/occultism/tags/worldgen/biome/allows_shub_niggurath_transformation.json b/src/generated/resources/data/occultism/tags/worldgen/biome/allows_shub_niggurath_transformation.json similarity index 70% rename from src/main/resources/data/occultism/tags/worldgen/biome/allows_shub_niggurath_transformation.json rename to src/generated/resources/data/occultism/tags/worldgen/biome/allows_shub_niggurath_transformation.json index 0de3a8bb3..68e29235c 100644 --- a/src/main/resources/data/occultism/tags/worldgen/biome/allows_shub_niggurath_transformation.json +++ b/src/generated/resources/data/occultism/tags/worldgen/biome/allows_shub_niggurath_transformation.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:is_forest" ] diff --git a/src/main/resources/data/per_viam_invenire/tags/entity_types/replace_vanilla_navigator.json b/src/generated/resources/data/per_viam_invenire/tags/entity_types/replace_vanilla_navigator.json similarity index 96% rename from src/main/resources/data/per_viam_invenire/tags/entity_types/replace_vanilla_navigator.json rename to src/generated/resources/data/per_viam_invenire/tags/entity_types/replace_vanilla_navigator.json index 813145b96..e26f9c87d 100644 --- a/src/main/resources/data/per_viam_invenire/tags/entity_types/replace_vanilla_navigator.json +++ b/src/generated/resources/data/per_viam_invenire/tags/entity_types/replace_vanilla_navigator.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:foliot", "occultism:djinni", 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 c7173eae3..5165141bf 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java @@ -31,6 +31,7 @@ import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; + import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java b/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java index fc7dffa91..f8414fb93 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java @@ -27,8 +27,9 @@ import com.klikli_dev.occultism.datagen.loot.OccultismBlockLoot; import com.klikli_dev.occultism.datagen.loot.OccultismEntityLoot; import com.klikli_dev.occultism.datagen.loot.OccultismLootModifiers; -import com.klikli_dev.occultism.datagen.tags.OccultismEntityTypeTagProvider; +import com.klikli_dev.occultism.datagen.tags.OccultismBiomeTagProvider; import com.klikli_dev.occultism.datagen.tags.OccultismBlockTagProvider; +import com.klikli_dev.occultism.datagen.tags.OccultismEntityTypeTagProvider; import com.klikli_dev.occultism.datagen.tags.OccultismItemTagProvider; import com.klikli_dev.occultism.datagen.worldgen.OccultismRegistries; import net.minecraft.data.DataGenerator; @@ -40,6 +41,7 @@ import net.neoforged.neoforge.common.data.AdvancementProvider; import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider; import net.neoforged.neoforge.data.event.GatherDataEvent; + import java.util.List; import java.util.Set; @@ -63,10 +65,12 @@ public static void gatherData(GatherDataEvent event) { generator.addProvider(event.includeServer(), new CrushingRecipeProvider(generator.getPackOutput())); generator.addProvider(event.includeServer(), new MinerRecipeProvider(generator.getPackOutput())); - OccultismBlockTagProvider forgeBlockProvider=new OccultismBlockTagProvider(generator.getPackOutput(),event.getLookupProvider() ,event.getExistingFileHelper()); + // Forge Tags + OccultismBlockTagProvider forgeBlockProvider = new OccultismBlockTagProvider(generator.getPackOutput(), event.getLookupProvider(), event.getExistingFileHelper()); generator.addProvider(event.includeServer(), forgeBlockProvider); - generator.addProvider(event.includeServer(),new OccultismEntityTypeTagProvider(generator.getPackOutput(),event.getLookupProvider(),event.getExistingFileHelper())); - generator.addProvider(event.includeServer(), new OccultismItemTagProvider(generator.getPackOutput(), event.getLookupProvider(), forgeBlockProvider.contentsGetter(),event.getExistingFileHelper())); + generator.addProvider(event.includeServer(), new OccultismEntityTypeTagProvider(generator.getPackOutput(), event.getLookupProvider(), event.getExistingFileHelper())); + generator.addProvider(event.includeServer(), new OccultismItemTagProvider(generator.getPackOutput(), event.getLookupProvider(), forgeBlockProvider.contentsGetter(), event.getExistingFileHelper())); + generator.addProvider(event.includeServer(), new OccultismBiomeTagProvider(generator.getPackOutput(), event.getLookupProvider(), event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new ItemModelsGenerator(generator.getPackOutput(), event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new StandardBlockStateProvider(generator.getPackOutput(), event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new OccultismLootModifiers(generator.getPackOutput())); 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 164c112ec..9294347f0 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java @@ -31,6 +31,7 @@ import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; + import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java index 6bd8aad31..40bed84ca 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java @@ -355,8 +355,8 @@ private BookEntryModel makeDemonsDreamEntry(CategoryEntryMap entryMap, char icon .withText(this.context().pageText()); this.lang().add(this.context().pageText(), """ - Multiple Demon's Dream fruits or seeds can be compressed into an essence that is much more potent. It *guarantees* the [#](%2$s)Third Eye[#]() and provides it for a longer amount of time, but comes with a lot of (positive and negative) side effects. - """.formatted(DEMONS_DREAM, COLOR_PURPLE) + Multiple Demon's Dream fruits or seeds can be compressed into an essence that is much more potent. It *guarantees* the [#](%2$s)Third Eye[#]() and provides it for a longer amount of time, but comes with a lot of (positive and negative) side effects. + """.formatted(DEMONS_DREAM, COLOR_PURPLE) ); this.context().page("recipe_essence"); @@ -371,8 +371,8 @@ private BookEntryModel makeDemonsDreamEntry(CategoryEntryMap entryMap, char icon .withText(this.context().pageText()); this.lang().add(this.context().pageText(), """ - The essence can be purified in spirit fire (more on that later!) to obtain a version free from all negative side effects, while retaining the positive. - """.formatted(DEMONS_DREAM, COLOR_PURPLE) + The essence can be purified in spirit fire (more on that later!) to obtain a version free from all negative side effects, while retaining the positive. + """.formatted(DEMONS_DREAM, COLOR_PURPLE) ); this.context().page("recipe_essence_pure"); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java index 8bfbb0c1f..ff4781cd4 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java @@ -39,6 +39,7 @@ import net.minecraft.world.level.block.Blocks; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java b/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java index f0c1cc7ae..638db3178 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java @@ -16,6 +16,7 @@ public class FamiliarRitualsCategory extends CategoryProvider { public static final String CATEGORY_ID = "familiar_rituals"; + public FamiliarRitualsCategory(BookProvider parent) { super(parent, CATEGORY_ID); } @@ -37,47 +38,47 @@ public String[] generateEntryMap() { @Override protected void generateEntries() { - var overview = this.add(this.makeFamiliarsRitualsOverviewEntry(entryMap, 'o')); - var returnToRituals = this.add(this.makeReturnToRitualsEntry(entryMap, 'r')); + var overview = this.add(this.makeFamiliarsRitualsOverviewEntry(this.entryMap, 'o')); + var returnToRituals = this.add(this.makeReturnToRitualsEntry(this.entryMap, 'r')); returnToRituals.withParent(BookEntryParentModel.create(overview.getId())); returnToRituals.withCondition(BookTrueConditionModel.create()); var resurrection = new ResurrectionEntry(this).generate('a'); resurrection.withParent(BookEntryParentModel.create(overview.getId())); - var familiarBat = this.add(this.makeFamiliarBatEntry(entryMap, 'I')); + var familiarBat = this.add(this.makeFamiliarBatEntry(this.entryMap, 'I')); familiarBat.withParent(BookEntryParentModel.create(overview.getId())); - var familiarBeaver = this.add(this.makeFamiliarBeaverEntry(entryMap, 'J')); + var familiarBeaver = this.add(this.makeFamiliarBeaverEntry(this.entryMap, 'J')); familiarBeaver.withParent(BookEntryParentModel.create(overview.getId())); - var familiarBeholder = this.add(this.makeFamiliarBeholderEntry(entryMap, 'K')); + var familiarBeholder = this.add(this.makeFamiliarBeholderEntry(this.entryMap, 'K')); familiarBeholder.withParent(BookEntryParentModel.create(overview.getId())); - var familiarBlacksmith = this.add(this.makeFamiliarBlacksmithEntry(entryMap, 'L')); + var familiarBlacksmith = this.add(this.makeFamiliarBlacksmithEntry(this.entryMap, 'L')); familiarBlacksmith.withParent(BookEntryParentModel.create(overview.getId())); - var familiarChimera = this.add(this.makeFamiliarChimeraEntry(entryMap, 'M')); + var familiarChimera = this.add(this.makeFamiliarChimeraEntry(this.entryMap, 'M')); familiarChimera.withParent(BookEntryParentModel.create(overview.getId())); - var familiarCthulhu = this.add(this.makeFamiliarCthulhuEntry(entryMap, 'N')); + var familiarCthulhu = this.add(this.makeFamiliarCthulhuEntry(this.entryMap, 'N')); familiarCthulhu.withParent(BookEntryParentModel.create(overview.getId())); - var familiarDeer = this.add(this.makeFamiliarDeerEntry(entryMap, 'O')); + var familiarDeer = this.add(this.makeFamiliarDeerEntry(this.entryMap, 'O')); familiarDeer.withParent(BookEntryParentModel.create(overview.getId())); - var familiarDevil = this.add(this.makeFamiliarDevilEntry(entryMap, 'P')); + var familiarDevil = this.add(this.makeFamiliarDevilEntry(this.entryMap, 'P')); familiarDevil.withParent(BookEntryParentModel.create(overview.getId())); - var familiarDragon = this.add(this.makeFamiliarDragonEntry(entryMap, 'Q')); + var familiarDragon = this.add(this.makeFamiliarDragonEntry(this.entryMap, 'Q')); familiarDragon.withParent(BookEntryParentModel.create(overview.getId())); - var familiarFairy = this.add(this.makeFamiliarFairyEntry(entryMap, 'R')); + var familiarFairy = this.add(this.makeFamiliarFairyEntry(this.entryMap, 'R')); familiarFairy.withParent(BookEntryParentModel.create(overview.getId())); - var familiarGreedy = this.add(this.makeFamiliarGreedyEntry(entryMap, 'S')); + var familiarGreedy = this.add(this.makeFamiliarGreedyEntry(this.entryMap, 'S')); familiarGreedy.withParent(BookEntryParentModel.create(overview.getId())); - var familiarGuardian = this.add(this.makeFamiliarGuardianEntry(entryMap, 'T')); + var familiarGuardian = this.add(this.makeFamiliarGuardianEntry(this.entryMap, 'T')); familiarGuardian.withParent(BookEntryParentModel.create(overview.getId())); - var familiarHeadlessRatman = this.add(this.makeFamiliarHeadlessRatmanEntry(entryMap, 'U')); + var familiarHeadlessRatman = this.add(this.makeFamiliarHeadlessRatmanEntry(this.entryMap, 'U')); familiarHeadlessRatman.withParent(BookEntryParentModel.create(overview.getId())); - var familiarMummy = this.add(this.makeFamiliarMummyEntry(entryMap, 'V')); + var familiarMummy = this.add(this.makeFamiliarMummyEntry(this.entryMap, 'V')); familiarMummy.withParent(BookEntryParentModel.create(overview.getId())); - var familiarOtherworldBird = this.add(this.makeFamiliarOtherworldBirdEntry(entryMap, 'W')); + var familiarOtherworldBird = this.add(this.makeFamiliarOtherworldBirdEntry(this.entryMap, 'W')); familiarOtherworldBird.withParent(BookEntryParentModel.create(overview.getId())); - var familiarParrot = this.add(this.makeFamiliarParrotEntry(entryMap, 'X')); + var familiarParrot = this.add(this.makeFamiliarParrotEntry(this.entryMap, 'X')); familiarParrot.withParent(BookEntryParentModel.create(overview.getId())); - var familiarShubNiggurath = this.add(this.makeFamiliarShubNiggurathEntry(entryMap, 'Y')); + var familiarShubNiggurath = this.add(this.makeFamiliarShubNiggurathEntry(this.entryMap, 'Y')); familiarShubNiggurath.withParent(BookEntryParentModel.create(overview.getId())); //add true condition to all entries to enable them by default diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/ResurrectionEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/ResurrectionEntry.java index 30a72487b..d25a8c0b0 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/ResurrectionEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/ResurrectionEntry.java @@ -5,7 +5,6 @@ import com.klikli_dev.modonomicon.api.datagen.EntryProvider; import com.klikli_dev.modonomicon.api.datagen.book.BookIconModel; import com.klikli_dev.modonomicon.api.datagen.book.page.BookCraftingRecipePageModel; -import com.klikli_dev.modonomicon.api.datagen.book.page.BookEntityPageModel; import com.klikli_dev.modonomicon.api.datagen.book.page.BookSpotlightPageModel; import com.klikli_dev.modonomicon.api.datagen.book.page.BookTextPageModel; import com.klikli_dev.occultism.integration.modonomicon.pages.BookRitualRecipePageModel; @@ -44,15 +43,15 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Resurrection"); this.pageText(""" - The resurrection is a relatively simple process. The soul shard is strengthened with {0} until it is strong enough to allow the familiar to return to the mortal realm and create a new body for itself. - \\ - \\ - The essence is obtained by growing (lots of) Demon's Dream plants. - """, + The resurrection is a relatively simple process. The soul shard is strengthened with {0} until it is strong enough to allow the familiar to return to the mortal realm and create a new body for itself. + \\ + \\ + The essence is obtained by growing (lots of) Demon's Dream plants. + """, this.itemLink(OccultismItems.OTHERWORLD_ESSENCE.get()) - ); + ); - this.page("recipe_essence", () ->BookCraftingRecipePageModel.create() + this.page("recipe_essence", () -> BookCraftingRecipePageModel.create() .withRecipeId1(this.modLoc("crafting/demons_dream_essence_from_fruit")) .withRecipeId2(this.modLoc("crafting/demons_dream_essence_from_seeds"))); //no text 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 e4c02c301..54b02a7a2 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 @@ -770,7 +770,7 @@ private void addRitualMessages() { this.addRitualMessage(OccultismRituals.RESURRECT_FAMILIAR_RITUAL, "interrupted", "Resurrection interrupted."); } - public void addRitualMessage(DeferredHolder ritual, String key, String message) { + public void addRitualMessage(DeferredHolder ritual, String key, String message) { this.add("ritual.%s.%s".formatted(ritual.getId().getNamespace(), ritual.getId().getPath()) + "." + key, message); } diff --git a/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismEntityLoot.java b/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismEntityLoot.java index ee84f245e..a729c0eb9 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismEntityLoot.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismEntityLoot.java @@ -44,11 +44,11 @@ public void generate() { //Guaranteed ender pearl drop for enderman this.add(OccultismEntities.POSSESSED_ENDERMAN_TYPE.get(), LootTable.lootTable().withPool( - LootPool.lootPool().setRolls(ConstantValue.exactly(1)) - .add(LootItem.lootTableItem(Items.ENDER_PEARL) - .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0f, 3.0F))) - .apply(LootingEnchantFunction.lootingMultiplier( - UniformGenerator.between(0.0F, 1.0F))))) + LootPool.lootPool().setRolls(ConstantValue.exactly(1)) + .add(LootItem.lootTableItem(Items.ENDER_PEARL) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0f, 3.0F))) + .apply(LootingEnchantFunction.lootingMultiplier( + UniformGenerator.between(0.0F, 1.0F))))) .withPool(LootPool.lootPool().setRolls(ConstantValue.exactly(1)) .add(LootItem.lootTableItem(Items.EYE_ARMOR_TRIM_SMITHING_TEMPLATE) .apply(SetItemCountFunction.setCount(UniformGenerator.between(0.1f, 1.0F)))))); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismLootModifiers.java b/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismLootModifiers.java index f2d9940c1..0341b089c 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismLootModifiers.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismLootModifiers.java @@ -4,23 +4,16 @@ import com.klikli_dev.occultism.loot.AddItemModifier; import com.klikli_dev.occultism.registry.OccultismItems; import com.klikli_dev.occultism.registry.OccultismTags; -import net.minecraft.advancements.critereon.*; +import net.minecraft.advancements.critereon.EntityEquipmentPredicate; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.ItemPredicate; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.EntityTypeTags; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.predicates.*; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.GlobalLootModifierProvider; -import net.neoforged.neoforge.common.data.internal.NeoForgeItemTagsProvider; -import net.neoforged.neoforge.common.loot.IGlobalLootModifier; -import net.neoforged.neoforge.common.loot.LootTableIdCondition; - -import java.util.Optional; public class OccultismLootModifiers extends GlobalLootModifierProvider { @@ -29,21 +22,21 @@ public OccultismLootModifiers(PackOutput output) { } private EntityEquipmentPredicate mainHand(ItemPredicate.Builder itemPredicate) { - EntityEquipmentPredicate.Builder builder = EntityEquipmentPredicate.Builder.equipment(); + EntityEquipmentPredicate.Builder builder = EntityEquipmentPredicate.Builder.equipment(); builder.mainhand(itemPredicate); return builder.build(); } - private AddItemModifier tallow(String entityType, int count ) { - return new AddItemModifier( - new LootItemCondition[]{ - LootItemEntityPropertyCondition - .hasProperties(LootContext.EntityTarget.KILLER, - EntityPredicate.Builder.entity() - .equipment(mainHand(ItemPredicate.Builder.item().of(OccultismTags.makeItemTag(new ResourceLocation(Occultism.MODID,"tools/knives")))))).build(), - LootItemEntityPropertyCondition - .hasProperties(LootContext.EntityTarget.THIS,EntityPredicate.Builder.entity().of(OccultismTags.makeEntityTypeTag(new ResourceLocation("forge",entityType)))).build() - },OccultismItems.TALLOW.get(),count); + private AddItemModifier tallow(String entityType, int count) { + return new AddItemModifier( + new LootItemCondition[]{ + LootItemEntityPropertyCondition + .hasProperties(LootContext.EntityTarget.KILLER, + EntityPredicate.Builder.entity() + .equipment(this.mainHand(ItemPredicate.Builder.item().of(OccultismTags.makeItemTag(new ResourceLocation(Occultism.MODID, "tools/knives")))))).build(), + LootItemEntityPropertyCondition + .hasProperties(LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().of(OccultismTags.makeEntityTypeTag(new ResourceLocation("forge", entityType)))).build() + }, OccultismItems.TALLOW.get(), count); } @Override @@ -54,24 +47,24 @@ protected void start() { new InvertedLootItemCondition( MatchTool.toolMatches(ItemPredicate.Builder.item().of(Tags.Items.SHEARS)).build() ) - }, OccultismItems.DATURA_SEEDS.get(),1)); + }, OccultismItems.DATURA_SEEDS.get(), 1)); - this.add("datura_seed_from_tall_grass",new AddItemModifier(new LootItemCondition[]{ + this.add("datura_seed_from_tall_grass", new AddItemModifier(new LootItemCondition[]{ new LootItemRandomChanceCondition(0.02f), LootItemBlockStatePropertyCondition.hasBlockStateProperties(Blocks.TALL_GRASS).build(), new InvertedLootItemCondition( MatchTool.toolMatches(ItemPredicate.Builder.item().of(Tags.Items.SHEARS)).build() ) - }, OccultismItems.DATURA_SEEDS.get(),1)); - this.add("tallow_from_cows",tallow("cows",4)); - this.add("tallow_from_donkeys",tallow("donkeys",3)); - this.add("tallow_from_goats",tallow("goats",2)); - this.add("tallow_from_hoglins",tallow("hoglins",4)); - this.add("tallow_from_horses",tallow("horses",3)); - this.add("tallow_from_llamas",tallow("llamas",3)); - this.add("tallow_from_mules",tallow("mules",3)); - this.add("tallow_from_pandas",tallow("pandas",3)); - this.add("tallow_from_pigs",tallow("pigs",2)); - this.add("tallow_from_sheep",tallow("sheep",2)); + }, OccultismItems.DATURA_SEEDS.get(), 1)); + this.add("tallow_from_cows", this.tallow("cows", 4)); + this.add("tallow_from_donkeys", this.tallow("donkeys", 3)); + this.add("tallow_from_goats", this.tallow("goats", 2)); + this.add("tallow_from_hoglins", this.tallow("hoglins", 4)); + this.add("tallow_from_horses", this.tallow("horses", 3)); + this.add("tallow_from_llamas", this.tallow("llamas", 3)); + this.add("tallow_from_mules", this.tallow("mules", 3)); + this.add("tallow_from_pandas", this.tallow("pandas", 3)); + this.add("tallow_from_pigs", this.tallow("pigs", 2)); + this.add("tallow_from_sheep", this.tallow("sheep", 2)); } } diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBiomeTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBiomeTagProvider.java new file mode 100644 index 000000000..5522114fc --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBiomeTagProvider.java @@ -0,0 +1,23 @@ +package com.klikli_dev.occultism.datagen.tags; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.BiomeTagsProvider; +import net.minecraft.tags.BiomeTags; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class OccultismBiomeTagProvider extends BiomeTagsProvider { + public OccultismBiomeTagProvider(PackOutput p_255800_, CompletableFuture p_256205_, @Nullable ExistingFileHelper existingFileHelper) { + super(p_255800_, p_256205_, Occultism.MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + this.tag(OccultismTags.ALLOWS_SHUB_NIGGURRATH_TRANSFORMATION).addTags(BiomeTags.IS_FOREST).replace(false); + } +} diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java index 47561959d..7cdcd8bb0 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java @@ -5,8 +5,10 @@ import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.BlockTagsProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; @@ -19,9 +21,67 @@ public OccultismBlockTagProvider(PackOutput output, CompletableFuture tag, Block block) { this.tag(tag) .add(block).replace(false); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismEntityTypeTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismEntityTypeTagProvider.java index 9153257ac..cb04dd657 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismEntityTypeTagProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismEntityTypeTagProvider.java @@ -1,10 +1,12 @@ package com.klikli_dev.occultism.datagen.tags; import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismEntities; import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.EntityTypeTagsProvider; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; @@ -18,6 +20,82 @@ public OccultismEntityTypeTagProvider(PackOutput p_256095_, CompletableFuture TREE_SOIL = makeBlockTag(new ResourceLocation(Occultism.MODID, "tree_soil")); public static final TagKey CAVE_WALL_BLOCKS = makeBlockTag(new ResourceLocation(Occultism.MODID, "cave_wall_blocks")); public static final TagKey WORLDGEN_BLACKLIST = makeBlockTag(new ResourceLocation(Occultism.MODID, "worldgen_blacklist")); + public static final TagKey NETHERRACK = makeBlockTag(new ResourceLocation(Occultism.MODID, "netherrack")); public static final TagKey CANDLES = makeBlockTag(new ResourceLocation("minecraft", "candles")); public static final TagKey IESNIUM_ORE = makeBlockTag(new ResourceLocation("forge", "ores/iesnium")); @@ -48,8 +49,12 @@ public static class Blocks { public static final TagKey STORAGE_BLOCKS_RAW_IESNIUM = makeBlockTag(new ResourceLocation("forge", "storage_blocks/raw_iesnium")); public static final TagKey STORAGE_BLOCKS_RAW_SILVER = makeBlockTag(new ResourceLocation("forge", "storage_blocks/raw_silver")); + public static final TagKey OTHERWORLD_SAPLINGS = makeBlockTag(new ResourceLocation(Occultism.MODID, "saplings/otherworld")); + public static final TagKey OCCULTISM_CANDLES = makeBlockTag(new ResourceLocation(Occultism.MODID, "candles")); + public static final TagKey STORAGE_STABILIZER = makeBlockTag(new ResourceLocation(Occultism.MODID, "storage_stabilizer")); } + public static class Items { @@ -86,11 +91,14 @@ public static class Items { public static final TagKey DATURA_SEEDS = makeItemTag(new ResourceLocation("forge", "seeds/datura")); //Item Tags + public static final TagKey TOOL_KNIVES = makeItemTag(new ResourceLocation(Occultism.MODID, "tools/knives")); public static final TagKey OTHERWORLD_GOGGLES = makeItemTag(new ResourceLocation(Occultism.MODID, "otherworld_goggles")); public static final TagKey ELYTRA = makeItemTag(new ResourceLocation(Occultism.MODID, "elytra")); public static final TagKey BOOKS = makeItemTag(new ResourceLocation("forge", "books")); public static final TagKey FRUITS = makeItemTag(new ResourceLocation("forge", "fruits")); public static final TagKey TALLOW = makeItemTag(new ResourceLocation("forge", "tallow")); + public static final TagKey BOOK_OF_CALLING_FOLIOT = makeItemTag(new ResourceLocation(Occultism.MODID, "books/book_of_calling_foliot")); + public static final TagKey BOOK_OF_CALLING_DJINNI = makeItemTag(new ResourceLocation(Occultism.MODID, "books/book_of_calling_djinni")); public static final TagKey MAGMA = makeItemTag(new ResourceLocation("forge", "magma")); @@ -98,6 +106,14 @@ public static class Items { public static final TagKey MANUALS = makeItemTag(new ResourceLocation("forge", "manuals")); public static final TagKey METAL_AXES = makeItemTag(new ResourceLocation("forge", "tools/metal/axes")); + public static final TagKey OTHERWORLD_SAPLINGS = makeItemTag(new ResourceLocation(Occultism.MODID, "saplings/otherworld")); + + public static class Miners { + public static final TagKey BASIC_RESOURCES = makeItemTag(new ResourceLocation(Occultism.MODID, "miners/basic_resources")); + public static final TagKey DEEPS = makeItemTag(new ResourceLocation(Occultism.MODID, "miners/deeps")); + public static final TagKey MASTER = makeItemTag(new ResourceLocation(Occultism.MODID, "miners/master")); + public static final TagKey ORES = makeItemTag(new ResourceLocation(Occultism.MODID,"miners/ores")); + } } public static class Entities { @@ -126,6 +142,9 @@ public static class Entities { public static final TagKey> AFRIT_ALLIES = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "afrit_allies")); public static final TagKey> WILD_HUNT = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "wild_hunt")); public static final TagKey> HEALED_BY_DEMONS_DREAM_FRUIT = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "healed_by_demons_dream_fruit")); + public static final TagKey> CUBEMOB = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "cubemob")); + public static final TagKey> FLYING_PASSIVE = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "flying_passive")); + public static final TagKey> HUMANS = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "humans")); } diff --git a/src/main/resources/data/minecraft/tags/blocks/candles.json b/src/main/resources/data/minecraft/tags/blocks/candles.json deleted file mode 100644 index 5c84d8953..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/candles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#occultism:candles" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/blocks/saplings/otherworld.json b/src/main/resources/data/occultism/tags/blocks/saplings/otherworld.json deleted file mode 100644 index f3120cf61..000000000 --- a/src/main/resources/data/occultism/tags/blocks/saplings/otherworld.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "occultism:otherworld_sapling_natural", - "occultism:otherworld_sapling" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/items/books/book_of_calling_foliot.json b/src/main/resources/data/occultism/tags/items/books/book_of_calling_foliot.json deleted file mode 100644 index f8d900ca2..000000000 --- a/src/main/resources/data/occultism/tags/items/books/book_of_calling_foliot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "occultism:book_of_calling_foliot_lumberjack" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/occultism/tags/items/saplings/otherworld.json b/src/main/resources/data/occultism/tags/items/saplings/otherworld.json deleted file mode 100644 index f3120cf61..000000000 --- a/src/main/resources/data/occultism/tags/items/saplings/otherworld.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "occultism:otherworld_sapling_natural", - "occultism:otherworld_sapling" - ] -} \ No newline at end of file