feat: move Forge Tags to datagen (#1085) - thanks @GaeaKat

note: Will need to recheck after rest moved
klikli-dev · Mar 14, 2024 · ffa06d5 · ffa06d5
1 parent eda1515
commit ffa06d5
Show file tree

Hide file tree

Showing 95 changed files with 387 additions and 184 deletions.
diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/generated/resources/data/forge/tags/blocks/ores.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#forge:ores/iesnium",
+    "#forge:ores/silver"
+  ]
+}
diff --git a/...s/data/forge/tags/items/ores/iesnium.json → .../data/forge/tags/blocks/ores/iesnium.json b/...s/data/forge/tags/items/ores/iesnium.json → .../data/forge/tags/blocks/ores/iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:iesnium_ore"
   ]

diff --git a/...es/data/forge/tags/items/ores/silver.json → ...s/data/forge/tags/blocks/ores/silver.json b/...es/data/forge/tags/items/ores/silver.json → ...s/data/forge/tags/blocks/ores/silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_ore",
     "occultism:silver_ore_deepslate"

diff --git a/...tags/blocks/ores_in_ground/deepslate.json → ...tags/blocks/ores_in_ground/deepslate.json b/...tags/blocks/ores_in_ground/deepslate.json → ...tags/blocks/ores_in_ground/deepslate.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_ore_deepslate"
   ]

diff --git a/...ags/blocks/ores_in_ground/netherrack.json → ...ags/blocks/ores_in_ground/netherrack.json b/...ags/blocks/ores_in_ground/netherrack.json → ...ags/blocks/ores_in_ground/netherrack.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:iesnium_ore"
   ]

diff --git a/...rge/tags/blocks/ores_in_ground/stone.json → ...rge/tags/blocks/ores_in_ground/stone.json b/...rge/tags/blocks/ores_in_ground/stone.json → ...rge/tags/blocks/ores_in_ground/stone.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_ore"
   ]

diff --git a/...data/forge/tags/items/storage_blocks.json → ...ata/forge/tags/blocks/storage_blocks.json b/...data/forge/tags/items/storage_blocks.json → ...ata/forge/tags/blocks/storage_blocks.json
@@ -1,9 +1,8 @@
 {
-  "replace": false,
   "values": [
     "#forge:storage_blocks/iesnium",
-    "#forge:storage_blocks/raw_iesnium",
     "#forge:storage_blocks/silver",
+    "#forge:storage_blocks/raw_iesnium",
     "#forge:storage_blocks/raw_silver"
   ]
 }
diff --git a/...ge/tags/items/storage_blocks/iesnium.json → ...e/tags/blocks/storage_blocks/iesnium.json b/...ge/tags/items/storage_blocks/iesnium.json → ...e/tags/blocks/storage_blocks/iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:iesnium_block"
   ]

diff --git a/...gs/blocks/storage_blocks/raw_iesnium.json → ...gs/blocks/storage_blocks/raw_iesnium.json b/...gs/blocks/storage_blocks/raw_iesnium.json → ...gs/blocks/storage_blocks/raw_iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:raw_iesnium_block"
   ]

diff --git a/...ags/blocks/storage_blocks/raw_silver.json → ...ags/blocks/storage_blocks/raw_silver.json b/...ags/blocks/storage_blocks/raw_silver.json → ...ags/blocks/storage_blocks/raw_silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:raw_silver_block"
   ]

diff --git a/...ge/tags/blocks/storage_blocks/silver.json → ...ge/tags/blocks/storage_blocks/silver.json b/...ge/tags/blocks/storage_blocks/silver.json → ...ge/tags/blocks/storage_blocks/silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_block"
   ]

diff --git a/...ata/forge/tags/entity_types/axolotls.json → ...ata/forge/tags/entity_types/axolotls.json b/...ata/forge/tags/entity_types/axolotls.json → ...ata/forge/tags/entity_types/axolotls.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:axolotl"
   ]

diff --git a/...es/data/forge/tags/entity_types/bats.json → ...es/data/forge/tags/entity_types/bats.json b/...es/data/forge/tags/entity_types/bats.json → ...es/data/forge/tags/entity_types/bats.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:bat"
   ]

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

diff --git a/src/generated/resources/data/forge/tags/entity_types/cows.json b/src/generated/resources/data/forge/tags/entity_types/cows.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:cow"
+  ]
+}
diff --git a/...data/forge/tags/entity_types/donkeys.json → ...data/forge/tags/entity_types/donkeys.json b/...data/forge/tags/entity_types/donkeys.json → ...data/forge/tags/entity_types/donkeys.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:donkey"
   ]

diff --git a/src/generated/resources/data/forge/tags/entity_types/fish.json b/src/generated/resources/data/forge/tags/entity_types/fish.json
@@ -0,0 +1,8 @@
+{
+  "values": [
+    "minecraft:cod",
+    "minecraft:salmon",
+    "minecraft:tropical_fish",
+    "minecraft:pufferfish"
+  ]
+}
diff --git a/...s/data/forge/tags/entity_types/goats.json → ...s/data/forge/tags/entity_types/goats.json b/...s/data/forge/tags/entity_types/goats.json → ...s/data/forge/tags/entity_types/goats.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:goat"
   ]

diff --git a/.../forge/tags/entity_types/golems/snow.json → .../forge/tags/entity_types/golems/snow.json b/.../forge/tags/entity_types/golems/snow.json → .../forge/tags/entity_types/golems/snow.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:snow_golem"
   ]

diff --git a/...data/forge/tags/entity_types/hoglins.json → ...data/forge/tags/entity_types/hoglins.json b/...data/forge/tags/entity_types/hoglins.json → ...data/forge/tags/entity_types/hoglins.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:hoglin"
   ]

diff --git a/.../data/forge/tags/entity_types/horses.json → .../data/forge/tags/entity_types/horses.json b/.../data/forge/tags/entity_types/horses.json → .../data/forge/tags/entity_types/horses.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:horse"
   ]

diff --git a/.../data/forge/tags/entity_types/llamas.json → .../data/forge/tags/entity_types/llamas.json b/.../data/forge/tags/entity_types/llamas.json → .../data/forge/tags/entity_types/llamas.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:llama",
     "minecraft:trader_llama"

diff --git a/...s/data/forge/tags/entity_types/mules.json → ...s/data/forge/tags/entity_types/mules.json b/...s/data/forge/tags/entity_types/mules.json → ...s/data/forge/tags/entity_types/mules.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:mule"
   ]

diff --git a/.../data/forge/tags/entity_types/pandas.json → .../data/forge/tags/entity_types/pandas.json b/.../data/forge/tags/entity_types/pandas.json → .../data/forge/tags/entity_types/pandas.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:panda"
   ]

diff --git a/...data/forge/tags/entity_types/parrots.json → ...data/forge/tags/entity_types/parrots.json b/...data/forge/tags/entity_types/parrots.json → ...data/forge/tags/entity_types/parrots.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:parrot"
   ]

diff --git a/...es/data/forge/tags/entity_types/pigs.json → ...es/data/forge/tags/entity_types/pigs.json b/...es/data/forge/tags/entity_types/pigs.json → ...es/data/forge/tags/entity_types/pigs.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:pig"
   ]

diff --git a/...s/data/forge/tags/entity_types/sheep.json → ...s/data/forge/tags/entity_types/sheep.json b/...s/data/forge/tags/entity_types/sheep.json → ...s/data/forge/tags/entity_types/sheep.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:sheep"
   ]

diff --git a/src/generated/resources/data/forge/tags/entity_types/spiders.json b/src/generated/resources/data/forge/tags/entity_types/spiders.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "minecraft:spider",
+    "minecraft:cave_spider"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/entity_types/squid.json b/src/generated/resources/data/forge/tags/entity_types/squid.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "minecraft:squid",
+    "minecraft:glow_squid"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/entity_types/villagers.json b/src/generated/resources/data/forge/tags/entity_types/villagers.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "minecraft:villager",
+    "minecraft:wandering_trader"
+  ]
+}
diff --git a/...data/forge/tags/entity_types/zombies.json → ...data/forge/tags/entity_types/zombies.json b/...data/forge/tags/entity_types/zombies.json → ...data/forge/tags/entity_types/zombies.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:zombie",
     "minecraft:zombie_villager",

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

diff --git a/...esources/data/forge/tags/items/crops.json → ...esources/data/forge/tags/items/crops.json b/...esources/data/forge/tags/items/crops.json → ...esources/data/forge/tags/items/crops.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "#forge:crops/datura"
   ]

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

diff --git a/...esources/data/forge/tags/items/dusts.json → ...esources/data/forge/tags/items/dusts.json b/...esources/data/forge/tags/items/dusts.json → ...esources/data/forge/tags/items/dusts.json
@@ -1,14 +1,13 @@
 {
-  "replace": false,
   "values": [
-    "occultism:burnt_otherstone",
-    "occultism:otherworld_ashes",
-    "#forge:dusts/obsidian",
     "#forge:dusts/copper",
-    "#forge:dusts/silver",
-    "#forge:dusts/iesnium",
-    "#forge:dusts/iron",
+    "#forge:dusts/end_stone",
     "#forge:dusts/gold",
-    "#forge:dusts/end_stone"
+    "#forge:dusts/iron",
+    "#forge:dusts/iesnium",
+    "#forge:dusts/silver",
+    "#forge:dusts/obsidian",
+    "occultism:burnt_otherstone",
+    "occultism:otherworld_ashes"
   ]
 }
diff --git a/...s/data/forge/tags/items/dusts/copper.json → ...s/data/forge/tags/items/dusts/copper.json b/...s/data/forge/tags/items/dusts/copper.json → ...s/data/forge/tags/items/dusts/copper.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:copper_dust"
   ]

diff --git a/...ata/forge/tags/items/dusts/end_stone.json → ...ata/forge/tags/items/dusts/end_stone.json b/...ata/forge/tags/items/dusts/end_stone.json → ...ata/forge/tags/items/dusts/end_stone.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:crushed_end_stone"
   ]

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

diff --git a/.../data/forge/tags/items/dusts/iesnium.json → .../data/forge/tags/items/dusts/iesnium.json b/.../data/forge/tags/items/dusts/iesnium.json → .../data/forge/tags/items/dusts/iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:iesnium_dust"
   ]

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

diff --git a/...data/forge/tags/items/dusts/obsidian.json → ...data/forge/tags/items/dusts/obsidian.json b/...data/forge/tags/items/dusts/obsidian.json → ...data/forge/tags/items/dusts/obsidian.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:obsidian_dust"
   ]

diff --git a/...s/data/forge/tags/items/dusts/silver.json → ...s/data/forge/tags/items/dusts/silver.json b/...s/data/forge/tags/items/dusts/silver.json → ...s/data/forge/tags/items/dusts/silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_dust"
   ]

diff --git a/...sources/data/forge/tags/items/fruits.json → ...sources/data/forge/tags/items/fruits.json b/...sources/data/forge/tags/items/fruits.json → ...sources/data/forge/tags/items/fruits.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:apple"
   ]

diff --git a/...resources/data/forge/tags/items/gems.json → ...resources/data/forge/tags/items/gems.json b/...resources/data/forge/tags/items/gems.json → ...resources/data/forge/tags/items/gems.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:spirit_attuned_gem"
   ]

diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#forge:ingots/iesnium",
+    "#forge:ingots/silver"
+  ]
+}
diff --git a/...data/forge/tags/items/ingots/iesnium.json → ...data/forge/tags/items/ingots/iesnium.json b/...data/forge/tags/items/ingots/iesnium.json → ...data/forge/tags/items/ingots/iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:iesnium_ingot"
   ]

diff --git a/.../data/forge/tags/items/ingots/silver.json → .../data/forge/tags/items/ingots/silver.json b/.../data/forge/tags/items/ingots/silver.json → .../data/forge/tags/items/ingots/silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_ingot"
   ]

diff --git a/...esources/data/forge/tags/items/magma.json → ...esources/data/forge/tags/items/magma.json b/...esources/data/forge/tags/items/magma.json → ...esources/data/forge/tags/items/magma.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "minecraft:magma_block"
   ]

diff --git a/...ources/data/forge/tags/items/manuals.json → ...ources/data/forge/tags/items/manuals.json b/...ources/data/forge/tags/items/manuals.json → ...ources/data/forge/tags/items/manuals.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:dictionary_of_spirits"
   ]

diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#forge:nuggets/iesnium",
+    "#forge:nuggets/silver"
+  ]
+}
diff --git a/...ata/forge/tags/items/nuggets/iesnium.json → ...ata/forge/tags/items/nuggets/iesnium.json b/...ata/forge/tags/items/nuggets/iesnium.json → ...ata/forge/tags/items/nuggets/iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:iesnium_nugget"
   ]

diff --git a/...data/forge/tags/items/nuggets/silver.json → ...data/forge/tags/items/nuggets/silver.json b/...data/forge/tags/items/nuggets/silver.json → ...data/forge/tags/items/nuggets/silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_nugget"
   ]

diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#forge:ores/iesnium",
+    "#forge:ores/silver"
+  ]
+}
diff --git a/.../data/forge/tags/blocks/ores/iesnium.json → ...s/data/forge/tags/items/ores/iesnium.json b/.../data/forge/tags/blocks/ores/iesnium.json → ...s/data/forge/tags/items/ores/iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:iesnium_ore"
   ]

diff --git a/...s/data/forge/tags/blocks/ores/silver.json → ...es/data/forge/tags/items/ores/silver.json b/...s/data/forge/tags/blocks/ores/silver.json → ...es/data/forge/tags/items/ores/silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:silver_ore",
     "occultism:silver_ore_deepslate"

diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/generated/resources/data/forge/tags/items/raw_materials.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#forge:raw_materials/iesnium",
+    "#forge:raw_materials/silver"
+  ]
+}
diff --git a/...rge/tags/items/raw_materials/iesnium.json → ...rge/tags/items/raw_materials/iesnium.json b/...rge/tags/items/raw_materials/iesnium.json → ...rge/tags/items/raw_materials/iesnium.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:raw_iesnium"
   ]

diff --git a/...orge/tags/items/raw_materials/silver.json → ...orge/tags/items/raw_materials/silver.json b/...orge/tags/items/raw_materials/silver.json → ...orge/tags/items/raw_materials/silver.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "occultism:raw_silver"
   ]

diff --git a/...esources/data/forge/tags/items/seeds.json → ...esources/data/forge/tags/items/seeds.json b/...esources/data/forge/tags/items/seeds.json → ...esources/data/forge/tags/items/seeds.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "#forge:seeds/datura"
   ]