feat: move all tags to datagen (#1086)

* feat: move minecraft tags to datagen * fix: Fix iesnium pickaxe * fix: add Saplings tag * fix: add Saplings tag * feat: move all tags to datagenned * fix: made some items back to tagd
klikli-dev · Mar 16, 2024 · 8c664dc · 8c664dc
1 parent 7f01ecc
commit 8c664dc
Show file tree

Hide file tree

Showing 67 changed files with 361 additions and 179 deletions.
diff --git a/...esources/data/curios/tags/items/belt.json → ...esources/data/curios/tags/items/belt.json b/...esources/data/curios/tags/items/belt.json → ...esources/data/curios/tags/items/belt.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:satchel"
   ]

diff --git a/...sources/data/curios/tags/items/hands.json → ...sources/data/curios/tags/items/hands.json b/...sources/data/curios/tags/items/hands.json → ...sources/data/curios/tags/items/hands.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:storage_remote"
   ]

diff --git a/...esources/data/curios/tags/items/head.json → ...esources/data/curios/tags/items/head.json b/...esources/data/curios/tags/items/head.json → ...esources/data/curios/tags/items/head.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:otherworld_goggles"
   ]

diff --git a/...esources/data/curios/tags/items/ring.json → ...esources/data/curios/tags/items/ring.json b/...esources/data/curios/tags/items/ring.json → ...esources/data/curios/tags/items/ring.json
@@ -1,6 +1,5 @@
 {
-  "replace": false,
   "values": [
     "occultism:familiar_ring"
   ]
-}
+}
diff --git a/...data/minecraft/tags/blocks/campfires.json → ...data/minecraft/tags/blocks/campfires.json b/...data/minecraft/tags/blocks/campfires.json → ...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
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#minecraft:candles"
+  ]
+}
diff --git a/...ces/data/minecraft/tags/blocks/crops.json → ...ces/data/minecraft/tags/blocks/crops.json b/...ces/data/minecraft/tags/blocks/crops.json → ...ces/data/minecraft/tags/blocks/crops.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:datura"
   ]

diff --git a/...es/data/minecraft/tags/blocks/leaves.json → ...es/data/minecraft/tags/blocks/leaves.json b/...es/data/minecraft/tags/blocks/leaves.json → ...es/data/minecraft/tags/blocks/leaves.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:otherworld_leaves",
     "occultism:otherworld_leaves_natural"

diff --git a/...rces/data/minecraft/tags/blocks/logs.json → ...rces/data/minecraft/tags/blocks/logs.json b/...rces/data/minecraft/tags/blocks/logs.json → ...rces/data/minecraft/tags/blocks/logs.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:otherworld_log",
     "occultism:otherworld_log_natural"

diff --git a/...a/minecraft/tags/blocks/mineable/axe.json → ...a/minecraft/tags/blocks/mineable/axe.json b/...a/minecraft/tags/blocks/mineable/axe.json → ...a/minecraft/tags/blocks/mineable/axe.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:otherworld_log",
     "occultism:otherworld_log_natural",

diff --git a/...a/minecraft/tags/blocks/mineable/hoe.json → ...a/minecraft/tags/blocks/mineable/hoe.json b/...a/minecraft/tags/blocks/mineable/hoe.json → ...a/minecraft/tags/blocks/mineable/hoe.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:otherworld_leaves",
     "occultism:otherworld_leaves_natural"

diff --git a/...necraft/tags/blocks/mineable/pickaxe.json → ...necraft/tags/blocks/mineable/pickaxe.json b/...necraft/tags/blocks/mineable/pickaxe.json → ...necraft/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/...necraft/tags/items/piglin_repellents.json → ...ecraft/tags/blocks/piglin_repellents.json b/...necraft/tags/items/piglin_repellents.json → ...ecraft/tags/blocks/piglin_repellents.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:spirit_campfire"
   ]

diff --git a/.../data/minecraft/tags/blocks/saplings.json → .../data/minecraft/tags/blocks/saplings.json b/.../data/minecraft/tags/blocks/saplings.json → .../data/minecraft/tags/blocks/saplings.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "#occultism:saplings/otherworld"
   ]

diff --git a/.../tags/items/cluster_max_harvestables.json → .../tags/items/cluster_max_harvestables.json b/.../tags/items/cluster_max_harvestables.json → .../tags/items/cluster_max_harvestables.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:infused_pickaxe",
     "occultism:iesnium_pickaxe"

diff --git a/...ces/data/minecraft/tags/items/leaves.json → ...ces/data/minecraft/tags/items/leaves.json b/...ces/data/minecraft/tags/items/leaves.json → ...ces/data/minecraft/tags/items/leaves.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:otherworld_leaves",
     "occultism:otherworld_leaves_natural"

diff --git a/...urces/data/minecraft/tags/items/logs.json → ...urces/data/minecraft/tags/items/logs.json b/...urces/data/minecraft/tags/items/logs.json → ...urces/data/minecraft/tags/items/logs.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:otherworld_log",
     "occultism:otherworld_log_natural"

diff --git a/...s/data/minecraft/tags/items/pickaxes.json → ...s/data/minecraft/tags/items/pickaxes.json b/...s/data/minecraft/tags/items/pickaxes.json → ...s/data/minecraft/tags/items/pickaxes.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:infused_pickaxe",
     "occultism:iesnium_pickaxe"

diff --git a/...ecraft/tags/blocks/piglin_repellents.json → ...necraft/tags/items/piglin_repellents.json b/...ecraft/tags/blocks/piglin_repellents.json → ...necraft/tags/items/piglin_repellents.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:spirit_campfire"
   ]

diff --git a/...s/data/minecraft/tags/items/saplings.json → ...s/data/minecraft/tags/items/saplings.json b/...s/data/minecraft/tags/items/saplings.json → ...s/data/minecraft/tags/items/saplings.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "#occultism:saplings/otherworld"
   ]

diff --git a/...ces/data/minecraft/tags/items/swords.json → ...ces/data/minecraft/tags/items/swords.json b/...ces/data/minecraft/tags/items/swords.json → ...ces/data/minecraft/tags/items/swords.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:butcher_knife"
   ]

diff --git a/...s/data/occultism/tags/blocks/candles.json → ...s/data/occultism/tags/blocks/candles.json b/...s/data/occultism/tags/blocks/candles.json → ...s/data/occultism/tags/blocks/candles.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:candle_white"
   ]

diff --git a/...cultism/tags/blocks/cave_wall_blocks.json → ...cultism/tags/blocks/cave_wall_blocks.json b/...cultism/tags/blocks/cave_wall_blocks.json → ...cultism/tags/blocks/cave_wall_blocks.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:stone",
     "minecraft:granite",

diff --git a/...ata/occultism/tags/blocks/netherrack.json → ...ata/occultism/tags/blocks/netherrack.json b/...ata/occultism/tags/blocks/netherrack.json → ...ata/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
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "occultism:otherworld_sapling",
+    "occultism:otherworld_sapling_natural"
+  ]
+}
diff --git a/...ltism/tags/blocks/storage_stabilizer.json → ...ltism/tags/blocks/storage_stabilizer.json b/...ltism/tags/blocks/storage_stabilizer.json → ...ltism/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"
   ]
-}
+}
diff --git a/...data/occultism/tags/blocks/tree_soil.json → ...data/occultism/tags/blocks/tree_soil.json b/...data/occultism/tags/blocks/tree_soil.json → ...data/occultism/tags/blocks/tree_soil.json
@@ -1,6 +1,5 @@
 {
-  "replace": false,
   "values": [
     "#minecraft:dirt"
   ]
-}
+}
diff --git a/...ltism/tags/blocks/worldgen_blacklist.json → ...ltism/tags/blocks/worldgen_blacklist.json b/...ltism/tags/blocks/worldgen_blacklist.json → ...ltism/tags/blocks/worldgen_blacklist.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:end_portal",
     "minecraft:end_portal_frame"

diff --git a/...ltism/tags/entity_types/afrit_allies.json → ...ltism/tags/entity_types/afrit_allies.json b/...ltism/tags/entity_types/afrit_allies.json → ...ltism/tags/entity_types/afrit_allies.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:blaze"
   ]

diff --git a/.../occultism/tags/entity_types/cubemob.json → .../occultism/tags/entity_types/cubemob.json b/.../occultism/tags/entity_types/cubemob.json → .../occultism/tags/entity_types/cubemob.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:slime",
     "minecraft:magma_cube"

diff --git a/...ism/tags/entity_types/flying_passive.json → ...ism/tags/entity_types/flying_passive.json b/...ism/tags/entity_types/flying_passive.json → ...ism/tags/entity_types/flying_passive.json
@@ -1,9 +1,8 @@
 {
-  "replace": false,
   "values": [
     "minecraft:bat",
-    "minecraft:bee",
     "minecraft:parrot",
+    "minecraft:bee",
     "minecraft:allay"
   ]
 }
diff --git a/...y_types/healed_by_demons_dream_fruit.json → ...y_types/healed_by_demons_dream_fruit.json b/...y_types/healed_by_demons_dream_fruit.json → ...y_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/...a/occultism/tags/entity_types/humans.json → ...a/occultism/tags/entity_types/humans.json b/...a/occultism/tags/entity_types/humans.json → ...a/occultism/tags/entity_types/humans.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "#forge:villagers",
     "minecraft:player"

diff --git a/...tags/entity_types/soul_gem_deny_list.json → ...tags/entity_types/soul_gem_deny_list.json b/...tags/entity_types/soul_gem_deny_list.json → ...tags/entity_types/soul_gem_deny_list.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:wither",
     "minecraft:ender_dragon"

diff --git a/...ccultism/tags/entity_types/wild_hunt.json → ...ccultism/tags/entity_types/wild_hunt.json b/...ccultism/tags/entity_types/wild_hunt.json → ...ccultism/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/...s/items/books/book_of_calling_djinni.json → ...s/items/books/book_of_calling_djinni.json b/...s/items/books/book_of_calling_djinni.json → ...s/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
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "occultism:book_of_calling_foliot_lumberjack",
+    "occultism:book_of_calling_foliot_cleaner",
+    "occultism:book_of_calling_foliot_transport_items"
+  ]
+}
diff --git a/...ces/data/occultism/tags/items/elytra.json → ...ces/data/occultism/tags/items/elytra.json b/...ces/data/occultism/tags/items/elytra.json → ...ces/data/occultism/tags/items/elytra.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:elytra",
     {

diff --git a/...sm/tags/items/miners/basic_resources.json → ...sm/tags/items/miners/basic_resources.json b/...sm/tags/items/miners/basic_resources.json → ...sm/tags/items/miners/basic_resources.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:miner_foliot_unspecialized",
     "occultism:miner_debug_unspecialized"

diff --git a/...ta/occultism/tags/items/miners/deeps.json → ...ta/occultism/tags/items/miners/deeps.json b/...ta/occultism/tags/items/miners/deeps.json → ...ta/occultism/tags/items/miners/deeps.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:miner_afrit_deeps",
     "occultism:miner_marid_master"

diff --git a/...a/occultism/tags/items/miners/master.json → ...a/occultism/tags/items/miners/master.json b/...a/occultism/tags/items/miners/master.json → ...a/occultism/tags/items/miners/master.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:miner_marid_master"
   ]

diff --git a/...ata/occultism/tags/items/miners/ores.json → ...ata/occultism/tags/items/miners/ores.json b/...ata/occultism/tags/items/miners/ores.json → ...ata/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/...ultism/tags/items/otherworld_goggles.json → ...ultism/tags/items/otherworld_goggles.json b/...ultism/tags/items/otherworld_goggles.json → ...ultism/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
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "occultism:otherworld_sapling",
+    "occultism:otherworld_sapling_natural"
+  ]
+}
diff --git a/...ta/occultism/tags/items/tools/knives.json → ...ta/occultism/tags/items/tools/knives.json b/...ta/occultism/tags/items/tools/knives.json → ...ta/occultism/tags/items/tools/knives.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:butcher_knife"
   ]

diff --git a/...allows_shub_niggurath_transformation.json → ...allows_shub_niggurath_transformation.json b/...allows_shub_niggurath_transformation.json → ...allows_shub_niggurath_transformation.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "#minecraft:is_forest"
   ]

diff --git a/...tity_types/replace_vanilla_navigator.json → ...tity_types/replace_vanilla_navigator.json b/...tity_types/replace_vanilla_navigator.json → ...tity_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
@@ -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
@@ -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
@@ -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;