fix: change minecraft:alternative to minecraft:any_of in predicates

moxvallix · moxvallix · commit 0cd079c87a69 · 2023-08-03T12:41:59.000+09:30
diff --git a/data/moxlib/predicates/block/has_state.json b/data/moxlib/predicates/block/has_state.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/age.json b/data/moxlib/predicates/block/states/age.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/attached.json b/data/moxlib/predicates/block/states/attached.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/attachment.json b/data/moxlib/predicates/block/states/attachment.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/axis.json b/data/moxlib/predicates/block/states/axis.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/berries.json b/data/moxlib/predicates/block/states/berries.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/bites.json b/data/moxlib/predicates/block/states/bites.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/bloom.json b/data/moxlib/predicates/block/states/bloom.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/bool.json b/data/moxlib/predicates/block/states/bool.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/bottom.json b/data/moxlib/predicates/block/states/bottom.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/can_summon.json b/data/moxlib/predicates/block/states/can_summon.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/charges.json b/data/moxlib/predicates/block/states/charges.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/conditional.json b/data/moxlib/predicates/block/states/conditional.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/delay.json b/data/moxlib/predicates/block/states/delay.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/directional.json b/data/moxlib/predicates/block/states/directional.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/disarmed.json b/data/moxlib/predicates/block/states/disarmed.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/display.json b/data/moxlib/predicates/block/states/display.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/distance.json b/data/moxlib/predicates/block/states/distance.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/down.json b/data/moxlib/predicates/block/states/down.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/drag.json b/data/moxlib/predicates/block/states/drag.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/east.json b/data/moxlib/predicates/block/states/east.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/eggs.json b/data/moxlib/predicates/block/states/eggs.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/enabled.json b/data/moxlib/predicates/block/states/enabled.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/extended.json b/data/moxlib/predicates/block/states/extended.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/eye.json b/data/moxlib/predicates/block/states/eye.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/face.json b/data/moxlib/predicates/block/states/face.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/facing.json b/data/moxlib/predicates/block/states/facing.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/figure.json b/data/moxlib/predicates/block/states/figure.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/half.json b/data/moxlib/predicates/block/states/half.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/hanging.json b/data/moxlib/predicates/block/states/hanging.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/has_book.json b/data/moxlib/predicates/block/states/has_book.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/has_bottle_0.json b/data/moxlib/predicates/block/states/has_bottle_0.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/has_bottle_1.json b/data/moxlib/predicates/block/states/has_bottle_1.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/has_bottle_2.json b/data/moxlib/predicates/block/states/has_bottle_2.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/has_record.json b/data/moxlib/predicates/block/states/has_record.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/hatch.json b/data/moxlib/predicates/block/states/hatch.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/hinge.json b/data/moxlib/predicates/block/states/hinge.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/honey_level.json b/data/moxlib/predicates/block/states/honey_level.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/in_wall.json b/data/moxlib/predicates/block/states/in_wall.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/instrument.json b/data/moxlib/predicates/block/states/instrument.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/layers.json b/data/moxlib/predicates/block/states/layers.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/leaves.json b/data/moxlib/predicates/block/states/leaves.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/level.json b/data/moxlib/predicates/block/states/level.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/lit.json b/data/moxlib/predicates/block/states/lit.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/locked.json b/data/moxlib/predicates/block/states/locked.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/misc.json b/data/moxlib/predicates/block/states/misc.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/mode.json b/data/moxlib/predicates/block/states/mode.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/moisture.json b/data/moxlib/predicates/block/states/moisture.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/north.json b/data/moxlib/predicates/block/states/north.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/note.json b/data/moxlib/predicates/block/states/note.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/occupied.json b/data/moxlib/predicates/block/states/occupied.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/open.json b/data/moxlib/predicates/block/states/open.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/orientation.json b/data/moxlib/predicates/block/states/orientation.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/part.json b/data/moxlib/predicates/block/states/part.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/persistent.json b/data/moxlib/predicates/block/states/persistent.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/pickles.json b/data/moxlib/predicates/block/states/pickles.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/plant.json b/data/moxlib/predicates/block/states/plant.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:reference",
diff --git a/data/moxlib/predicates/block/states/power.json b/data/moxlib/predicates/block/states/power.json
diff --git a/data/moxlib/predicates/block/states/powered.json b/data/moxlib/predicates/block/states/powered.json
diff --git a/data/moxlib/predicates/block/states/redstone.json b/data/moxlib/predicates/block/states/redstone.json
diff --git a/data/moxlib/predicates/block/states/rotation.json b/data/moxlib/predicates/block/states/rotation.json
diff --git a/data/moxlib/predicates/block/states/sculk_sensor_phase.json b/data/moxlib/predicates/block/states/sculk_sensor_phase.json
diff --git a/data/moxlib/predicates/block/states/shape.json b/data/moxlib/predicates/block/states/shape.json
diff --git a/data/moxlib/predicates/block/states/shrieking.json b/data/moxlib/predicates/block/states/shrieking.json
diff --git a/data/moxlib/predicates/block/states/signal_fire.json b/data/moxlib/predicates/block/states/signal_fire.json
diff --git a/data/moxlib/predicates/block/states/slot_0_occupied.json b/data/moxlib/predicates/block/states/slot_0_occupied.json
diff --git a/data/moxlib/predicates/block/states/slot_1_occupied.json b/data/moxlib/predicates/block/states/slot_1_occupied.json
diff --git a/data/moxlib/predicates/block/states/slot_2_occupied.json b/data/moxlib/predicates/block/states/slot_2_occupied.json
diff --git a/data/moxlib/predicates/block/states/slot_3_occupied.json b/data/moxlib/predicates/block/states/slot_3_occupied.json
diff --git a/data/moxlib/predicates/block/states/slot_4_occupied.json b/data/moxlib/predicates/block/states/slot_4_occupied.json
diff --git a/data/moxlib/predicates/block/states/slot_5_occupied.json b/data/moxlib/predicates/block/states/slot_5_occupied.json
diff --git a/data/moxlib/predicates/block/states/snowy.json b/data/moxlib/predicates/block/states/snowy.json
diff --git a/data/moxlib/predicates/block/states/south.json b/data/moxlib/predicates/block/states/south.json
diff --git a/data/moxlib/predicates/block/states/stage.json b/data/moxlib/predicates/block/states/stage.json
diff --git a/data/moxlib/predicates/block/states/thickness.json b/data/moxlib/predicates/block/states/thickness.json
diff --git a/data/moxlib/predicates/block/states/tilt.json b/data/moxlib/predicates/block/states/tilt.json
diff --git a/data/moxlib/predicates/block/states/triggered.json b/data/moxlib/predicates/block/states/triggered.json
diff --git a/data/moxlib/predicates/block/states/type.json b/data/moxlib/predicates/block/states/type.json
diff --git a/data/moxlib/predicates/block/states/unstable.json b/data/moxlib/predicates/block/states/unstable.json
diff --git a/data/moxlib/predicates/block/states/up.json b/data/moxlib/predicates/block/states/up.json
diff --git a/data/moxlib/predicates/block/states/vertical_direction.json b/data/moxlib/predicates/block/states/vertical_direction.json
diff --git a/data/moxlib/predicates/block/states/waterlogged.json b/data/moxlib/predicates/block/states/waterlogged.json
diff --git a/data/moxlib/predicates/block/states/west.json b/data/moxlib/predicates/block/states/west.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "condition": "minecraft:alternative",`
	`2`	`+ "condition": "minecraft:any_of",`
`3`	`3`	`"terms": [`
`4`	`4`	`{`
`5`	`5`	`"condition": "minecraft:reference",`