From 6f9ee792f4bbedd9cfcf58df7256a45a6b186bf7 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 15 Dec 2020 23:22:12 +0100 Subject: [PATCH] Port recent changes --- .../create/blockstates/radial_chassis.json | 24 +++++++++---------- .../data/create/advancements/aesthetics.json | 9 ++++--- .../create/advancements/arm_blaze_burner.json | 3 ++- .../create/advancements/arm_many_targets.json | 3 ++- .../data/create/advancements/belt_funnel.json | 3 ++- .../create/advancements/belt_funnel_kiss.json | 3 ++- .../advancements/chained_item_drain.json | 3 ++- .../create/advancements/chocolate_wheel.json | 3 ++- .../advancements/clockwork_bearing.json | 3 ++- .../data/create/advancements/cuckoo.json | 3 ++- .../data/create/advancements/fan.json | 3 ++- .../data/create/advancements/fan_lava.json | 3 ++- .../data/create/advancements/fan_smoke.json | 3 ++- .../data/create/advancements/fan_water.json | 3 ++- .../data/create/advancements/flywheel.json | 3 ++- .../data/create/advancements/glass_pipe.json | 3 ++- .../data/create/advancements/hose_pulley.json | 3 ++- .../advancements/infinite_chocolate.json | 3 ++- .../create/advancements/infinite_lava.json | 3 ++- .../create/advancements/infinite_water.json | 3 ++- .../data/create/advancements/item_drain.json | 3 ++- .../create/advancements/maxed_windmill.json | 3 ++- .../advancements/overstress_flywheel.json | 3 ++- .../create/advancements/pipe_collision.json | 3 ++- .../data/create/advancements/pipe_spill.json | 3 ++- .../data/create/advancements/reinforced.json | 9 ++++--- .../create/advancements/splitter_tunnel.json | 3 ++- .../data/create/advancements/spout.json | 3 ++- .../create/advancements/spout_potion.json | 3 ++- .../data/create/advancements/tunnel.json | 3 ++- .../create/advancements/upward_chute.json | 3 ++- .../data/create/advancements/windmill.json | 3 ++- 32 files changed, 82 insertions(+), 47 deletions(-) diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 8bd829ffc..410cb13c7 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -89,8 +89,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "true" + "sticky_west": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -99,8 +99,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "true" + "sticky_west": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -109,8 +109,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "true" + "sticky_west": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky", @@ -119,8 +119,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "false" + "sticky_west": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -129,8 +129,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "false" + "sticky_west": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -139,8 +139,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "false" + "sticky_west": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z", diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index 722bd2ec7..192623a15 100644 --- a/src/generated/resources/data/create/advancements/aesthetics.json +++ b/src/generated/resources/data/create/advancements/aesthetics.json @@ -17,13 +17,16 @@ }, "criteria": { "0": { - "trigger": "create:bracket_shaft" + "trigger": "create:bracket_shaft", + "conditions": {} }, "1": { - "trigger": "create:bracket_cog" + "trigger": "create:bracket_cog", + "conditions": {} }, "2": { - "trigger": "create:bracket_pipe" + "trigger": "create:bracket_pipe", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/arm_blaze_burner.json b/src/generated/resources/data/create/advancements/arm_blaze_burner.json index ac2645b24..25057b193 100644 --- a/src/generated/resources/data/create/advancements/arm_blaze_burner.json +++ b/src/generated/resources/data/create/advancements/arm_blaze_burner.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:arm_blaze_burner" + "trigger": "create:arm_blaze_burner", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/arm_many_targets.json b/src/generated/resources/data/create/advancements/arm_many_targets.json index 445ce041a..4d6dddf00 100644 --- a/src/generated/resources/data/create/advancements/arm_many_targets.json +++ b/src/generated/resources/data/create/advancements/arm_many_targets.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:arm_many_targets" + "trigger": "create:arm_many_targets", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/belt_funnel.json b/src/generated/resources/data/create/advancements/belt_funnel.json index dde4c25d4..2173f6436 100644 --- a/src/generated/resources/data/create/advancements/belt_funnel.json +++ b/src/generated/resources/data/create/advancements/belt_funnel.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:belt_funnel" + "trigger": "create:belt_funnel", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/belt_funnel_kiss.json b/src/generated/resources/data/create/advancements/belt_funnel_kiss.json index 032676c52..10a2ed88a 100644 --- a/src/generated/resources/data/create/advancements/belt_funnel_kiss.json +++ b/src/generated/resources/data/create/advancements/belt_funnel_kiss.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:belt_funnel_kiss" + "trigger": "create:belt_funnel_kiss", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/chained_item_drain.json b/src/generated/resources/data/create/advancements/chained_item_drain.json index 7efe0209e..4f3f8736e 100644 --- a/src/generated/resources/data/create/advancements/chained_item_drain.json +++ b/src/generated/resources/data/create/advancements/chained_item_drain.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:chained_item_drain" + "trigger": "create:chained_item_drain", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/chocolate_wheel.json b/src/generated/resources/data/create/advancements/chocolate_wheel.json index f414feda2..c0f40f264 100644 --- a/src/generated/resources/data/create/advancements/chocolate_wheel.json +++ b/src/generated/resources/data/create/advancements/chocolate_wheel.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:chocolate_wheel" + "trigger": "create:chocolate_wheel", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/clockwork_bearing.json b/src/generated/resources/data/create/advancements/clockwork_bearing.json index b276c8ef7..fdbd0bc3b 100644 --- a/src/generated/resources/data/create/advancements/clockwork_bearing.json +++ b/src/generated/resources/data/create/advancements/clockwork_bearing.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:clockwork_bearing" + "trigger": "create:clockwork_bearing", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/cuckoo.json b/src/generated/resources/data/create/advancements/cuckoo.json index f7e1ef33b..9462e1f03 100644 --- a/src/generated/resources/data/create/advancements/cuckoo.json +++ b/src/generated/resources/data/create/advancements/cuckoo.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:cuckoo" + "trigger": "create:cuckoo", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/fan.json b/src/generated/resources/data/create/advancements/fan.json index fd00498a5..0cd2fcb42 100644 --- a/src/generated/resources/data/create/advancements/fan.json +++ b/src/generated/resources/data/create/advancements/fan.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:fan" + "trigger": "create:fan", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/fan_lava.json b/src/generated/resources/data/create/advancements/fan_lava.json index 1b15d56b6..3a5acbf01 100644 --- a/src/generated/resources/data/create/advancements/fan_lava.json +++ b/src/generated/resources/data/create/advancements/fan_lava.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:fan_lava" + "trigger": "create:fan_lava", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/fan_smoke.json b/src/generated/resources/data/create/advancements/fan_smoke.json index 51cd3cdc1..7a3244ed1 100644 --- a/src/generated/resources/data/create/advancements/fan_smoke.json +++ b/src/generated/resources/data/create/advancements/fan_smoke.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:fan_smoke" + "trigger": "create:fan_smoke", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/fan_water.json b/src/generated/resources/data/create/advancements/fan_water.json index a70ae1092..08ad3fddb 100644 --- a/src/generated/resources/data/create/advancements/fan_water.json +++ b/src/generated/resources/data/create/advancements/fan_water.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:fan_water" + "trigger": "create:fan_water", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/flywheel.json b/src/generated/resources/data/create/advancements/flywheel.json index 74d4cad67..407a25c20 100644 --- a/src/generated/resources/data/create/advancements/flywheel.json +++ b/src/generated/resources/data/create/advancements/flywheel.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:flywheel" + "trigger": "create:flywheel", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/glass_pipe.json b/src/generated/resources/data/create/advancements/glass_pipe.json index 0f5e25164..53082a5c3 100644 --- a/src/generated/resources/data/create/advancements/glass_pipe.json +++ b/src/generated/resources/data/create/advancements/glass_pipe.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:glass_pipe" + "trigger": "create:glass_pipe", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/hose_pulley.json b/src/generated/resources/data/create/advancements/hose_pulley.json index eaaedd31f..b15625017 100644 --- a/src/generated/resources/data/create/advancements/hose_pulley.json +++ b/src/generated/resources/data/create/advancements/hose_pulley.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:hose_pulley" + "trigger": "create:hose_pulley", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/infinite_chocolate.json b/src/generated/resources/data/create/advancements/infinite_chocolate.json index de6e78ad2..e01ea683c 100644 --- a/src/generated/resources/data/create/advancements/infinite_chocolate.json +++ b/src/generated/resources/data/create/advancements/infinite_chocolate.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:infinite_chocolate" + "trigger": "create:infinite_chocolate", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/infinite_lava.json b/src/generated/resources/data/create/advancements/infinite_lava.json index 732fbfd39..99bd03f84 100644 --- a/src/generated/resources/data/create/advancements/infinite_lava.json +++ b/src/generated/resources/data/create/advancements/infinite_lava.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:infinite_lava" + "trigger": "create:infinite_lava", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/infinite_water.json b/src/generated/resources/data/create/advancements/infinite_water.json index 1fc7be3c0..28d411155 100644 --- a/src/generated/resources/data/create/advancements/infinite_water.json +++ b/src/generated/resources/data/create/advancements/infinite_water.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:infinite_water" + "trigger": "create:infinite_water", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/item_drain.json b/src/generated/resources/data/create/advancements/item_drain.json index 56f352b7f..05d89b4a3 100644 --- a/src/generated/resources/data/create/advancements/item_drain.json +++ b/src/generated/resources/data/create/advancements/item_drain.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:item_drain" + "trigger": "create:item_drain", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/maxed_windmill.json b/src/generated/resources/data/create/advancements/maxed_windmill.json index 1a092b97b..63ad29a4d 100644 --- a/src/generated/resources/data/create/advancements/maxed_windmill.json +++ b/src/generated/resources/data/create/advancements/maxed_windmill.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:maxed_windmill" + "trigger": "create:maxed_windmill", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/overstress_flywheel.json b/src/generated/resources/data/create/advancements/overstress_flywheel.json index 91e112993..167e4c3db 100644 --- a/src/generated/resources/data/create/advancements/overstress_flywheel.json +++ b/src/generated/resources/data/create/advancements/overstress_flywheel.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:overstress_flywheel" + "trigger": "create:overstress_flywheel", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/pipe_collision.json b/src/generated/resources/data/create/advancements/pipe_collision.json index b31895488..a2ebbaecb 100644 --- a/src/generated/resources/data/create/advancements/pipe_collision.json +++ b/src/generated/resources/data/create/advancements/pipe_collision.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:pipe_collision" + "trigger": "create:pipe_collision", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/pipe_spill.json b/src/generated/resources/data/create/advancements/pipe_spill.json index 19dca7380..352a83ee4 100644 --- a/src/generated/resources/data/create/advancements/pipe_spill.json +++ b/src/generated/resources/data/create/advancements/pipe_spill.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:pipe_spill" + "trigger": "create:pipe_spill", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/reinforced.json b/src/generated/resources/data/create/advancements/reinforced.json index c83349f5f..a77c4c924 100644 --- a/src/generated/resources/data/create/advancements/reinforced.json +++ b/src/generated/resources/data/create/advancements/reinforced.json @@ -17,13 +17,16 @@ }, "criteria": { "0": { - "trigger": "create:casing_shaft" + "trigger": "create:casing_shaft", + "conditions": {} }, "1": { - "trigger": "create:casing_belt" + "trigger": "create:casing_belt", + "conditions": {} }, "2": { - "trigger": "create:casing_pipe" + "trigger": "create:casing_pipe", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/splitter_tunnel.json b/src/generated/resources/data/create/advancements/splitter_tunnel.json index f46b7b786..8cce2755f 100644 --- a/src/generated/resources/data/create/advancements/splitter_tunnel.json +++ b/src/generated/resources/data/create/advancements/splitter_tunnel.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:connect_tunnel" + "trigger": "create:connect_tunnel", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/spout.json b/src/generated/resources/data/create/advancements/spout.json index 1e0169e97..42ac31852 100644 --- a/src/generated/resources/data/create/advancements/spout.json +++ b/src/generated/resources/data/create/advancements/spout.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:spout" + "trigger": "create:spout", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/spout_potion.json b/src/generated/resources/data/create/advancements/spout_potion.json index f8fb78436..89e971a41 100644 --- a/src/generated/resources/data/create/advancements/spout_potion.json +++ b/src/generated/resources/data/create/advancements/spout_potion.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:spout_potion" + "trigger": "create:spout_potion", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/tunnel.json b/src/generated/resources/data/create/advancements/tunnel.json index d725340d8..78f9f3c18 100644 --- a/src/generated/resources/data/create/advancements/tunnel.json +++ b/src/generated/resources/data/create/advancements/tunnel.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:place_tunnel" + "trigger": "create:place_tunnel", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/upward_chute.json b/src/generated/resources/data/create/advancements/upward_chute.json index b6baa6065..424e8c0f6 100644 --- a/src/generated/resources/data/create/advancements/upward_chute.json +++ b/src/generated/resources/data/create/advancements/upward_chute.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:upward_chute" + "trigger": "create:upward_chute", + "conditions": {} } }, "requirements": [ diff --git a/src/generated/resources/data/create/advancements/windmill.json b/src/generated/resources/data/create/advancements/windmill.json index 6a5dffded..03f6a428b 100644 --- a/src/generated/resources/data/create/advancements/windmill.json +++ b/src/generated/resources/data/create/advancements/windmill.json @@ -17,7 +17,8 @@ }, "criteria": { "0": { - "trigger": "create:windmill" + "trigger": "create:windmill", + "conditions": {} } }, "requirements": [