Resource conditions, more tags

Electro593 · Electro593 · commit f1792ecc4535 · 2025-02-02T02:01:00.000-05:00
diff --git a/src/main/resources/data/adventurez/tags/block/unbreakable_blocks.json b/src/main/resources/data/adventurez/tags/block/unbreakable_blocks.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "#spectrum:unbreakable",
-    "#spectrum:structure_blocks"
+    "#spectrum:unbreakable"
   ]
 }
diff --git a/src/main/resources/data/ae2/tags/block/blacklisted/annihilation_plane.json b/src/main/resources/data/ae2/tags/block/blacklisted/annihilation_plane.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "#spectrum:unbreakable",
-    "#spectrum:structure_blocks"
+    "#spectrum:unbreakable"
   ]
 }
diff --git a/src/main/resources/data/ae2/tags/block/blacklisted/spatial.json b/src/main/resources/data/ae2/tags/block/blacklisted/spatial.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "#spectrum:unbreakable",
-    "#spectrum:structure_blocks"
+    "#spectrum:unbreakable"
   ]
 }
diff --git a/src/main/resources/data/c/tags/block/cobblestones.json b/src/main/resources/data/c/tags/block/cobblestones.json
diff --git a/src/main/resources/data/c/tags/block/glass_panes.json b/src/main/resources/data/c/tags/block/glass_panes.json
@@ -1,7 +1,6 @@
 {
   "values": [
     "#spectrum:gemstone_glass_panes",
-
     "spectrum:hummingstone_glass_pane",
     "spectrum:radiant_glass_pane"
   ]
diff --git a/src/main/resources/data/c/tags/block/movement_restricted.json b/src/main/resources/data/c/tags/block/movement_restricted.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "#spectrum:unbreakable",
-    "#spectrum:structure_blocks"
+    "#spectrum:unbreakable"
   ]
 }
diff --git a/src/main/resources/data/c/tags/item/foods.json b/src/main/resources/data/c/tags/item/foods.json
@@ -8,7 +8,7 @@
     "spectrum:bagnun",
     "spectrum:banyash",
     "spectrum:berliner",
-    "spectrum:bitter_oils"
+    "spectrum:bitter_oils",
     "spectrum:bloodboil_syrup",
     "spectrum:bodacious_berry_bar",
     "spectrum:bristle_mead",
diff --git a/src/main/resources/data/c/tags/item/glass_panes.json b/src/main/resources/data/c/tags/item/glass_panes.json
@@ -1,7 +1,6 @@
 {
   "values": [
     "#spectrum:gemstone_glass_panes",
-
     "spectrum:hummingstone_glass_pane",
     "spectrum:radiant_glass_pane"
   ]
diff --git a/src/main/resources/data/coxinhautilities/tags/block/unboxable.json b/src/main/resources/data/coxinhautilities/tags/block/unboxable.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "#spectrum:unbreakable",
-    "#spectrum:structure_blocks"
+    "#spectrum:unbreakable"
   ]
 }
diff --git a/src/main/resources/data/minecraft/tags/item/axolotl_food.json b/src/main/resources/data/minecraft/tags/item/axolotl_food.json
@@ -1,5 +1,5 @@
 {
   "values": [
-    "minecraft:bucket_of_eraser"
+    "spectrum:bucket_of_eraser"
   ]
 }
diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/sword.json b/src/main/resources/data/minecraft/tags/item/enchantable/sword.json
@@ -1,5 +1,5 @@
 {
-  "value": [
+  "values": [
     "spectrum:dragon_talon"
   ]
 }
diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/sake.json b/src/main/resources/data/spectrum/recipe/mod_integration/sake.json
@@ -117,7 +117,8 @@
   "required_advancement": "spectrum:triggers/confirmed_drinking_age",
   "fabric:load_conditions": [
     {
-      "condition": "fabric:item_tags_populated",
+      "condition": "fabric:tags_populated",
+      "registry": "minecraft:item",
       "values": [
         "c:rice"
       ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/bristle_mead.json b/src/main/resources/data/spectrum/recipe/titration_barrel/bristle_mead.json
@@ -116,7 +116,8 @@
     {
       "condition": "fabric:not",
       "value": {
-        "condition": "fabric:fluid_tags_populated",
+        "condition": "fabric:tags_populated",
+        "registry": "minecraft:fluid",
         "values": [
           "c:honey"
         ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/bristle_mead_fluid.json b/src/main/resources/data/spectrum/recipe/titration_barrel/bristle_mead_fluid.json
@@ -108,7 +108,8 @@
   "required_advancement": "spectrum:hidden/collect_cookbooks/brewers_handbook",
   "fabric:load_conditions": [
     {
-      "condition": "fabric:fluid_tags_populated",
+      "condition": "fabric:tags_populated",
+      "registry": "minecraft:fluid",
       "values": [
         "c:honey"
       ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream.json b/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream.json
@@ -19,7 +19,8 @@
     {
       "condition": "fabric:not",
       "value": {
-        "condition": "fabric:fluid_tags_populated",
+        "condition": "fabric:tags_populated",
+        "registry": "minecraft:fluid",
         "values": [
           "c:milk"
         ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream_fluid.json b/src/main/resources/data/spectrum/recipe/titration_barrel/clotted_cream_fluid.json
@@ -14,7 +14,8 @@
   },
   "fabric:load_conditions": [
     {
-      "condition": "fabric:fluid_tags_populated",
+      "condition": "fabric:tags_populated",
+      "registry": "minecraft:fluid",
       "values": [
         "c:milk"
       ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/lager.json b/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/lager.json
@@ -113,7 +113,8 @@
     {
       "condition": "fabric:not",
       "value": {
-        "condition": "fabric:fluid_tags_populated",
+        "condition": "fabric:tags_populated",
+        "registry": "minecraft:fluid",
         "values": [
           "c:honey"
         ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/lager_fluid.json b/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/lager_fluid.json
@@ -105,7 +105,8 @@
   "required_advancement": "spectrum:triggers/confirmed_drinking_age",
   "fabric:load_conditions": [
     {
-      "condition": "fabric:fluid_tags_populated",
+      "condition": "fabric:tags_populated",
+      "registry": "minecraft:fluid",
       "values": [
         "c:honey"
       ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/mead.json b/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/mead.json
@@ -111,7 +111,8 @@
     {
       "condition": "fabric:not",
       "value": {
-        "condition": "fabric:fluid_tags_populated",
+        "condition": "fabric:tags_populated",
+        "registry": "minecraft:fluid",
         "values": [
           "c:honey"
         ]
diff --git a/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/mead_fluid.json b/src/main/resources/data/spectrum/recipe/titration_barrel/infused_beverages/mead_fluid.json
@@ -107,7 +107,8 @@
   "required_advancement": "spectrum:triggers/confirmed_drinking_age",
   "fabric:load_conditions": [
     {
-      "condition": "fabric:fluid_tags_populated",
+      "condition": "fabric:tags_populated",
+      "registry": "minecraft:fluid",
       "values": [
         "c:honey"
       ]
diff --git a/src/main/resources/data/spectrum/tags/item/enchantable/clovers_favor.json b/src/main/resources/data/spectrum/tags/item/enchantable/clovers_favor.json
@@ -1,6 +1,6 @@
 {
   "values": [
     "#minecraft:enchantable/sword",
-    "#spectrum:enchantable/malum_scythe_toto_replace"
+    "#spectrum:enchantable/malum_scythe_todo_replace"
   ]
 }
diff --git a/src/main/resources/data/spectrum/tags/item/enchantable/exuberance.json b/src/main/resources/data/spectrum/tags/item/enchantable/exuberance.json
@@ -3,6 +3,6 @@
     "#minecraft:enchantable/weapon",
     "#minecraft:enchantable/mining_loot",
     "#spectrum:fishing_rods",
-    "#spectrum:enchantable/malum_scythe_toto_replace"
+    "#spectrum:enchantable/malum_scythe_todo_replace"
   ]
 }
diff --git a/src/main/resources/data/spectrum/tags/item/enchantable/first_strike.json b/src/main/resources/data/spectrum/tags/item/enchantable/first_strike.json
@@ -1,6 +1,6 @@
 {
   "values": [
     "#minecraft:enchantable/weapon",
-    "#spectrum:enchantable/malum_scythe_toto_replace"
+    "#spectrum:enchantable/malum_scythe_todo_replace"
   ]
 }
diff --git a/src/main/resources/data/spectrum/tags/item/enchantable/improved_critical.json b/src/main/resources/data/spectrum/tags/item/enchantable/improved_critical.json
@@ -1,6 +1,6 @@
 {
   "values": [
     "#minecraft:enchantable/weapon",
-    "#spectrum:enchantable/malum_scythe_toto_replace"
+    "#spectrum:enchantable/malum_scythe_todo_replace"
   ]
 }
diff --git a/src/main/resources/data/spectrum/tags/item/enchantable/inventory_insertion.json b/src/main/resources/data/spectrum/tags/item/enchantable/inventory_insertion.json
@@ -6,6 +6,6 @@
     "#minecraft:enchantable/bow",
     "#minecraft:enchantable/crossbow",
     "#spectrum:fishing_rods",
-    "#spectrum:enchantable/malum_scythe_toto_replace"
+    "#spectrum:enchantable/malum_scythe_todo_replace"
   ]
 }
diff --git a/src/main/resources/data/spectrum/tags/item/enchantable/tight_grip.json b/src/main/resources/data/spectrum/tags/item/enchantable/tight_grip.json
@@ -1,6 +1,6 @@
 {
   "values": [
     "#minecraft:enchantable/sword",
-    "#spectrum:enchantable/malum_scythe_toto_replace"
+    "#spectrum:enchantable/malum_scythe_todo_replace"
   ]
 }
diff --git a/src/main/resources/data/spectrum/tags/item/enchantable/treasure_hunter.json b/src/main/resources/data/spectrum/tags/item/enchantable/treasure_hunter.json
@@ -1,6 +1,6 @@
 {
   "values": [
     "#minecraft:enchantable/weapon",
-    "#spectrum:enchantable/malum_scythe_toto_replace"
+    "#spectrum:enchantable/malum_scythe_todo_replace"
   ]
 }
diff --git a/src/main/resources/data/spectrum/tags/item/gemstone_glass_panes.json b/src/main/resources/data/spectrum/tags/item/gemstone_glass_panes.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "spectrum:amethyst_glass_pane",
+    "spectrum:citrine_glass_pane",
+    "spectrum:topaz_glass_pane",
+    "spectrum:moonstone_glass_pane",
+    "spectrum:onyx_glass_pane"
+  ]
+}
diff --git a/src/main/resources/data/spelunkery/tags/block/blast_miner_immune.json b/src/main/resources/data/spelunkery/tags/block/blast_miner_immune.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "#spectrum:unbreakable",
-    "#spectrum:structure_blocks"
+    "#spectrum:unbreakable"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
`3`		`- "#spectrum:unbreakable",`
`4`		`- "#spectrum:structure_blocks"`
	`3`	`+ "#spectrum:unbreakable"`
`5`	`4`	`]`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
`3`	`3`	`"#spectrum:gemstone_glass_panes",`
`4`		`-`
`5`	`4`	`"spectrum:hummingstone_glass_pane",`
`6`	`5`	`"spectrum:radiant_glass_pane"`
`7`	`6`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
`3`		`- "minecraft:bucket_of_eraser"`
	`3`	`+ "spectrum:bucket_of_eraser"`
`4`	`4`	`]`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "value": [`
	`2`	`+ "values": [`
`3`	`3`	`"spectrum:dragon_talon"`
`4`	`4`	`]`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,8 @@`
`117`	`117`	`"required_advancement": "spectrum:triggers/confirmed_drinking_age",`
`118`	`118`	`"fabric:load_conditions": [`
`119`	`119`	`{`
`120`		`- "condition": "fabric:item_tags_populated",`
	`120`	`+ "condition": "fabric:tags_populated",`
	`121`	`+ "registry": "minecraft:item",`
`121`	`122`	`"values": [`
`122`	`123`	`"c:rice"`
`123`	`124`	`]`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@`
`116`	`116`	`{`
`117`	`117`	`"condition": "fabric:not",`
`118`	`118`	`"value": {`
`119`		`- "condition": "fabric:fluid_tags_populated",`
	`119`	`+ "condition": "fabric:tags_populated",`
	`120`	`+ "registry": "minecraft:fluid",`
`120`	`121`	`"values": [`
`121`	`122`	`"c:honey"`
`122`	`123`	`]`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@`
`108`	`108`	`"required_advancement": "spectrum:hidden/collect_cookbooks/brewers_handbook",`
`109`	`109`	`"fabric:load_conditions": [`
`110`	`110`	`{`
`111`		`- "condition": "fabric:fluid_tags_populated",`
	`111`	`+ "condition": "fabric:tags_populated",`
	`112`	`+ "registry": "minecraft:fluid",`
`112`	`113`	`"values": [`
`113`	`114`	`"c:honey"`
`114`	`115`	`]`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@`
`19`	`19`	`{`
`20`	`20`	`"condition": "fabric:not",`
`21`	`21`	`"value": {`
`22`		`- "condition": "fabric:fluid_tags_populated",`
	`22`	`+ "condition": "fabric:tags_populated",`
	`23`	`+ "registry": "minecraft:fluid",`
`23`	`24`	`"values": [`
`24`	`25`	`"c:milk"`
`25`	`26`	`]`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@`
`14`	`14`	`},`
`15`	`15`	`"fabric:load_conditions": [`
`16`	`16`	`{`
`17`		`- "condition": "fabric:fluid_tags_populated",`
	`17`	`+ "condition": "fabric:tags_populated",`
	`18`	`+ "registry": "minecraft:fluid",`
`18`	`19`	`"values": [`
`19`	`20`	`"c:milk"`
`20`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@`
`113`	`113`	`{`
`114`	`114`	`"condition": "fabric:not",`
`115`	`115`	`"value": {`
`116`		`- "condition": "fabric:fluid_tags_populated",`
	`116`	`+ "condition": "fabric:tags_populated",`
	`117`	`+ "registry": "minecraft:fluid",`
`117`	`118`	`"values": [`
`118`	`119`	`"c:honey"`
`119`	`120`	`]`