new tag format for entity_fishing & resonance_drops

DaFuqs · Dec 21, 2024 · 76d942d · 76d942d
1 parent 2ab398d
commit 76d942d
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 117 deletions.
diff --git a/src/main/resources/data/spectrum/entity_fishing/dragonrot.json b/src/main/resources/data/spectrum/entity_fishing/dragonrot.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "spectrum:dragonrot"
-    }
+    "fluid": "#spectrum:dragonrot"
   },
   "chance": 0.5,
   "entities": [

diff --git a/src/main/resources/data/spectrum/entity_fishing/goo.json b/src/main/resources/data/spectrum/entity_fishing/goo.json
@@ -1,8 +1,6 @@
 {
 	"location": {
-		"fluid": {
-			"tag": "spectrum:goo"
-		}
+      "fluid": "#spectrum:goo"
 	},
 	"chance": 0.05,
 	"entities": [

diff --git a/src/main/resources/data/spectrum/entity_fishing/lava.json b/src/main/resources/data/spectrum/entity_fishing/lava.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "minecraft:lava"
-    }
+    "fluid": "#minecraft:lava"
   },
   "chance": 0.02,
   "entities": [

diff --git a/src/main/resources/data/spectrum/entity_fishing/lava_nether_additions.json b/src/main/resources/data/spectrum/entity_fishing/lava_nether_additions.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "minecraft:lava"
-    },
+    "fluid": "#minecraft:lava",
     "dimension": {
       "worlds": [
         "minecraft:nether"

diff --git a/src/main/resources/data/spectrum/entity_fishing/liquid_crystal.json b/src/main/resources/data/spectrum/entity_fishing/liquid_crystal.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "spectrum:liquid_crystal"
-    }
+    "fluid": "#spectrum:liquid_crystal"
   },
   "chance": 0.05,
   "entities": [

diff --git a/src/main/resources/data/spectrum/entity_fishing/midnight_solution.json b/src/main/resources/data/spectrum/entity_fishing/midnight_solution.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "spectrum:midnight_solution"
-    }
+    "fluid": "#spectrum:midnight_solution"
   },
   "chance": 0.25,
   "entities": [

diff --git a/src/main/resources/data/spectrum/entity_fishing/water_deeper_down.json b/src/main/resources/data/spectrum/entity_fishing/water_deeper_down.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "minecraft:water"
-    },
+    "fluid": "#minecraft:water",
     "dimension": {
       "worlds": [
         "spectrum:deeper_down"

diff --git a/src/main/resources/data/spectrum/entity_fishing/water_end.json b/src/main/resources/data/spectrum/entity_fishing/water_end.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "minecraft:water"
-    },
+    "fluid": "#minecraft:water",
     "dimension": {
       "worlds": [
         "minecraft:the_end"

diff --git a/src/main/resources/data/spectrum/entity_fishing/water_overworld.json b/src/main/resources/data/spectrum/entity_fishing/water_overworld.json
@@ -1,8 +1,6 @@
 {
   "location": {
-    "fluid": {
-      "tag": "minecraft:water"
-    },
+    "fluid": "#minecraft:water",
     "dimension": {
       "worlds": [
         "minecraft:overworld"

diff --git a/src/main/resources/data/spectrum/resonance_drops/brushable_blocks.json b/src/main/resources/data/spectrum/resonance_drops/brushable_blocks.json
@@ -1,8 +1,6 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "c:brushable_blocks"
-  },
+  "block": "#c:brushable_blocks",
   "nbt_to_copy": [
     "LootTable",
     "LootTableSeed",

diff --git a/src/main/resources/data/spectrum/resonance_drops/budding_blocks.json b/src/main/resources/data/spectrum/resonance_drops/budding_blocks.json
@@ -1,6 +1,4 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "c:budding_blocks"
-  }
+  "block": "#c:budding_blocks"
 }
diff --git a/src/main/resources/data/spectrum/resonance_drops/buds.json b/src/main/resources/data/spectrum/resonance_drops/buds.json
@@ -1,6 +1,4 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "c:buds"
-  }
+  "block": "#c:buds"
 }
diff --git a/src/main/resources/data/spectrum/resonance_drops/clusters.json b/src/main/resources/data/spectrum/resonance_drops/clusters.json
@@ -1,6 +1,4 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "c:clusters"
-  }
+  "block": "#c:clusters"
 }
diff --git a/src/main/resources/data/spectrum/resonance_drops/infested_blocks.json b/src/main/resources/data/spectrum/resonance_drops/infested_blocks.json
@@ -1,6 +1,4 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "c:infested_blocks"
-  }
+  "block": "#c:infested_blocks"
 }
diff --git a/...ain/resources/data/spectrum/resonance_drops/mod_integration/botania/floating_flowers.json b/...ain/resources/data/spectrum/resonance_drops/mod_integration/botania/floating_flowers.json
@@ -1,8 +1,6 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "botania:floating_flowers"
-  },
+  "block": "#botania:floating_flowers",
   "nbt_to_copy": [
     "floating"
   ],

diff --git a/...in/resources/data/spectrum/resonance_drops/mod_integration/create/pure_zinc_from_ore.json b/...in/resources/data/spectrum/resonance_drops/mod_integration/create/pure_zinc_from_ore.json
@@ -1,13 +1,9 @@
 {
   "type": "spectrum:modify_drops",
-  "block": {
-    "tag": "c:ores"
-  },
+  "block": "#c:ores",
   "modify_drops": [
     {
-      "input": {
-        "item": "create:raw_zinc"
-      },
+      "input": "create:raw_zinc",
       "output": "spectrum:pure_zinc"
     }
   ],

diff --git a/...main/resources/data/spectrum/resonance_drops/mod_integration/dimdoors/altered_fabric.json b/...main/resources/data/spectrum/resonance_drops/mod_integration/dimdoors/altered_fabric.json
@@ -1,8 +1,6 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "dimdoors:fabric"
-  },
+  "block": "#dimdoors:fabric",
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",

diff --git a/...a/spectrum/resonance_drops/mod_integration/spelunkery/pure_resources_from_rough_gems.json b/...a/spectrum/resonance_drops/mod_integration/spelunkery/pure_resources_from_rough_gems.json
@@ -1,31 +1,21 @@
 {
   "type": "spectrum:modify_drops",
-  "block": {
-    "tag": "c:ores"
-  },
+  "block": "#c:ores",
   "modify_drops": [
     {
-      "input": {
-        "item": "spelunkery:rough_diamond"
-      },
+      "input": "spelunkery:rough_diamond",
       "output": "spectrum:pure_diamond"
     },
     {
-      "input": {
-        "item": "spelunkery:rough_emerald"
-      },
+      "input": "spelunkery:rough_emerald",
       "output": "spectrum:pure_emerald"
     },
     {
-      "input": {
-        "item": "spelunkery:rough_lazurite"
-      },
+      "input": "spelunkery:rough_lazurite",
       "output": "spectrum:pure_lapis"
     },
     {
-      "input": {
-        "item": "spelunkery:rough_cinnabar"
-      },
+      "input": "spelunkery:rough_cinnabar",
       "output": "spectrum:pure_redstone"
     }
   ],

diff --git a/src/main/resources/data/spectrum/resonance_drops/pure_resources_from_ore.json b/src/main/resources/data/spectrum/resonance_drops/pure_resources_from_ore.json
@@ -1,91 +1,61 @@
 {
   "type": "spectrum:modify_drops",
-  "block": {
-    "tag": "c:ores"
-  },
+  "block": "#c:ores",
   "modify_drops": [
     {
-      "input": {
-        "item": "minecraft:coal"
-      },
+      "input": "minecraft:coal",
       "output": "spectrum:pure_coal"
     },
     {
-      "input": {
-        "item": "minecraft:raw_copper"
-      },
+      "input": "minecraft:raw_copper",
       "output": "spectrum:pure_copper"
     },
     {
-      "input": {
-        "item": "minecraft:diamond"
-      },
+      "input": "minecraft:diamond",
       "output": "spectrum:pure_diamond"
     },
     {
-      "input": {
-        "item": "minecraft:echo_shard"
-      },
+      "input": "minecraft:echo_shard",
       "output": "spectrum:pure_echo"
     },
     {
-      "input": {
-        "item": "minecraft:emerald"
-      },
+      "input": "minecraft:emerald",
       "output": "spectrum:pure_emerald"
     },
     {
-      "input": {
-        "item": "minecraft:glowstone_dust"
-      },
+      "input": "minecraft:glowstone_dust",
       "output": "spectrum:pure_glowstone"
     },
     {
-      "input": {
-        "item": "minecraft:raw_gold"
-      },
+      "input": "minecraft:raw_gold",
       "output": "spectrum:pure_gold"
     },
     {
-      "input": {
-        "item": "minecraft:raw_iron"
-      },
+      "input": "minecraft:raw_iron",
       "output": "spectrum:pure_iron"
     },
     {
-      "input": {
-        "item": "minecraft:lapis_lazuli"
-      },
+      "input": "minecraft:lapis_lazuli",
       "output": "spectrum:pure_lapis"
     },
     {
-      "input": {
-        "item": "minecraft:prismarine_crystals"
-      },
+      "input": "minecraft:prismarine_crystals",
       "output": "spectrum:pure_prismarine"
     },
     {
-      "input": {
-        "item": "minecraft:quartz"
-      },
+      "input": "minecraft:quartz",
       "output": "spectrum:pure_quartz"
     },
     {
-      "input": {
-        "item": "minecraft:redstone"
-      },
+      "input": "minecraft:redstone",
       "output": "spectrum:pure_redstone"
     },
     {
-      "input": {
-        "item": "minecraft:ancient_debris"
-      },
+      "input": "minecraft:ancient_debris",
       "output": "spectrum:pure_netherite_scrap"
     },
     {
-      "input": {
-        "item": "minecraft:netherite_scrap"
-      },
+      "input": "minecraft:netherite_scrap",
       "output": "spectrum:pure_netherite_scrap"
     }
   ]

diff --git a/src/main/resources/data/spectrum/resonance_drops/signs.json b/src/main/resources/data/spectrum/resonance_drops/signs.json
@@ -1,8 +1,6 @@
 {
   "type": "spectrum:drop_self",
-  "block": {
-    "tag": "minecraft:all_signs"
-  },
+  "block": "#minecraft:all_signs",
   "nbt_to_copy": [
     "front_text",
     "back_text",