From 97aba40cb486904f2edc20a66056ecccfdbf486d Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Fri, 8 May 2020 11:42:54 +0800 Subject: [PATCH] Fix all blockstates --- .../create/blockstates/cart_assembler.json | 22 ++------- .../assets/create/blockstates/clutch.json | 22 ++++----- .../assets/create/blockstates/contact.json | 31 ++++++------ .../assets/create/blockstates/deployer.json | 5 +- .../create/blockstates/diorite_layers.json | 4 +- .../assets/create/blockstates/extractor.json | 25 +++++----- .../assets/create/blockstates/flexpeater.json | 9 ++-- .../create/blockstates/flexpulsepeater.json | 9 ++-- .../assets/create/blockstates/gearshift.json | 20 ++++---- .../blockstates/indented_gabbro_slab.json | 16 ++----- .../assets/create/blockstates/limesand.json | 13 +++-- .../create/blockstates/linked_transposer.json | 25 +++++----- .../create/blockstates/redstone_latch.json | 21 ++++----- .../create/blockstates/stockswitch.json | 47 +++++++++++-------- .../blockstates/translation_chassis.json | 5 +- .../translation_chassis_secondary.json | 5 +- .../assets/create/blockstates/transposer.json | 25 +++++----- .../blockstates/vertical_extractor.json | 24 ++++------ src/main/resources/pack.mcmeta | 2 +- 19 files changed, 147 insertions(+), 183 deletions(-) diff --git a/src/main/resources/assets/create/blockstates/cart_assembler.json b/src/main/resources/assets/create/blockstates/cart_assembler.json index 373c4a9d3..30acbf36d 100644 --- a/src/main/resources/assets/create/blockstates/cart_assembler.json +++ b/src/main/resources/assets/create/blockstates/cart_assembler.json @@ -1,20 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/cart_assembler" - }, "variants": { - "shape": { - "north_south": { }, - "east_west": { "y": 90 } - }, - "powered": { - "false": { }, - "true": { - "textures": { - "clutch_off": "create:block/clutch_on" - } - } - } + "shape=north_south,powered=false": { "model": "create:block/cart_assembler" }, + "shape=east_west,powered=false": { "model": "create:block/cart_assembler", "y": 90 }, + "shape=north_south,powered=true": { "model": "create:block/cart_assembler_powered" }, + "shape=east_west,powered=true": { "model": "create:block/cart_assembler_powered", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/clutch.json b/src/main/resources/assets/create/blockstates/clutch.json index e18f6dd35..68465673e 100644 --- a/src/main/resources/assets/create/blockstates/clutch.json +++ b/src/main/resources/assets/create/blockstates/clutch.json @@ -1,14 +1,10 @@ { - "forge_marker": 1, - "variants": { - "powered" : { - "true": { "model": "create:block/clutch_on" }, - "false": { "model": "create:block/clutch_off" } - }, - "axis": { - "y": { "x": 90 }, - "x": { "y": 90 }, - "z": {} - } - } -} \ No newline at end of file + "variants": { + "powered=true,axis=x": { "model": "create:block/clutch_on", "y": 90 }, + "powered=true,axis=y": { "model": "create:block/clutch_on", "x": 90 }, + "powered=true,axis=z": { "model": "create:block/clutch_on" }, + "powered=false,axis=x": { "model": "create:block/clutch_off", "y": 90 }, + "powered=false,axis=y": { "model": "create:block/clutch_off", "x": 90 }, + "powered=false,axis=z": { "model": "create:block/clutch_off" } + } +} diff --git a/src/main/resources/assets/create/blockstates/contact.json b/src/main/resources/assets/create/blockstates/contact.json index 02e597cf8..d44b78d45 100644 --- a/src/main/resources/assets/create/blockstates/contact.json +++ b/src/main/resources/assets/create/blockstates/contact.json @@ -1,17 +1,16 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/contact_powered" }, - "false": { "model": "create:block/contact" } - }, - "facing": { - "north": { "x": 90 }, - "south": { "x": 90, "y": 180 }, - "west": { "x": 90, "y": 270 }, - "up": { }, - "down": { "x": 180 }, - "east": { "x": 90, "y": 90 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/contact_powered", "x": 90 }, + "powered=true,facing=east": { "model": "create:block/contact_powered", "x": 90, "y": 90 }, + "powered=true,facing=south": { "model": "create:block/contact_powered", "x": 90, "y": 180 }, + "powered=true,facing=west": { "model": "create:block/contact_powered", "x": 90, "y": 270 }, + "powered=true,facing=up": { "model": "create:block/contact_powered" }, + "powered=true,facing=down": { "model": "create:block/contact_powered", "x": 180 }, + "powered=false,facing=north": { "model": "create:block/contact", "x": 90 }, + "powered=false,facing=east": { "model": "create:block/contact", "x": 90, "y": 90 }, + "powered=false,facing=south": { "model": "create:block/contact", "x": 90, "y": 180 }, + "powered=false,facing=west": { "model": "create:block/contact", "x": 90, "y": 270 }, + "powered=false,facing=up": { "model": "create:block/contact" }, + "powered=false,facing=down": { "model": "create:block/contact", "x": 180 } + } +} diff --git a/src/main/resources/assets/create/blockstates/deployer.json b/src/main/resources/assets/create/blockstates/deployer.json index fe3dd53ec..105b12a12 100644 --- a/src/main/resources/assets/create/blockstates/deployer.json +++ b/src/main/resources/assets/create/blockstates/deployer.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "facing=east,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 0, "y": 270 }, "facing=west,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 0, "y": 90 }, @@ -7,7 +6,7 @@ "facing=down,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 270, "y": 90 }, "facing=south,axis_along_first=false": { "model": "create:block/deployer/vertical", "x": 0, "y": 0 }, "facing=north,axis_along_first=false": { "model": "create:block/deployer/vertical", "x": 0, "y": 180 }, - + "facing=east,axis_along_first=true": { "model": "create:block/deployer/vertical", "x": 0, "y": 270 }, "facing=west,axis_along_first=true": { "model": "create:block/deployer/vertical", "x": 0, "y": 90 }, "facing=up,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 90, "y": 0 }, @@ -15,4 +14,4 @@ "facing=south,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 0, "y": 0 }, "facing=north,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 0, "y": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/diorite_layers.json b/src/main/resources/assets/create/blockstates/diorite_layers.json index dd73eefb3..08e2649c4 100644 --- a/src/main/resources/assets/create/blockstates/diorite_layers.json +++ b/src/main/resources/assets/create/blockstates/diorite_layers.json @@ -1,5 +1,5 @@ { - "variants": { + "variants": { "": { "model": "create:block/palettes/diorite_layers" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/extractor.json b/src/main/resources/assets/create/blockstates/extractor.json index be1a12d74..380fa0777 100644 --- a/src/main/resources/assets/create/blockstates/extractor.json +++ b/src/main/resources/assets/create/blockstates/extractor.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/extractor/horizontal_powered" }, - "false": { "model": "create:block/extractor/horizontal" } - }, - "facing": { - "south": { "y": 180 }, - "east": { "y": 90 }, - "north": { "y": 0 }, - "west": { "y": 270 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/extractor/horizontal_powered", "y": 180 }, + "powered=true,facing=east": { "model": "create:block/extractor/horizontal_powered", "y": 90 }, + "powered=true,facing=south": { "model": "create:block/extractor/horizontal_powered", "y": 0 }, + "powered=true,facing=west": { "model": "create:block/extractor/horizontal_powered", "y": 270 }, + "powered=false,facing=north": { "model": "create:block/extractor/horizontal", "y": 180 }, + "powered=false,facing=east": { "model": "create:block/extractor/horizontal", "y": 90 }, + "powered=false,facing=south": { "model": "create:block/extractor/horizontal", "y": 0 }, + "powered=false,facing=west": { "model": "create:block/extractor/horizontal", "y": 270 } + } +} diff --git a/src/main/resources/assets/create/blockstates/flexpeater.json b/src/main/resources/assets/create/blockstates/flexpeater.json index c81feb60b..6ac61f5f0 100644 --- a/src/main/resources/assets/create/blockstates/flexpeater.json +++ b/src/main/resources/assets/create/blockstates/flexpeater.json @@ -1,24 +1,23 @@ { - "forge_marker": 1, "variants": { "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/flexpeater", "y": 180 }, "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/flexpeater", "y": 270 }, "powered=false,powering=false,facing=south": { "model": "create:block/repeaters/flexpeater", "y": 0 }, "powered=false,powering=false,facing=west": { "model": "create:block/repeaters/flexpeater", "y": 90 }, - + "powered=true,powering=false,facing=north": { "model": "create:block/repeaters/flexpeater_powered", "y": 180 }, "powered=true,powering=false,facing=east": { "model": "create:block/repeaters/flexpeater_powered", "y": 270 }, "powered=true,powering=false,facing=south": { "model": "create:block/repeaters/flexpeater_powered", "y": 0 }, "powered=true,powering=false,facing=west": { "model": "create:block/repeaters/flexpeater_powered", "y": 90 }, - + "powered=false,powering=true,facing=north": { "model": "create:block/repeaters/flexpeater_powering", "y": 180 }, "powered=false,powering=true,facing=east": { "model": "create:block/repeaters/flexpeater_powering", "y": 270 }, "powered=false,powering=true,facing=south": { "model": "create:block/repeaters/flexpeater_powering", "y": 0 }, "powered=false,powering=true,facing=west": { "model": "create:block/repeaters/flexpeater_powering", "y": 90 }, - + "powered=true,powering=true,facing=north": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 180 }, "powered=true,powering=true,facing=east": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 270 }, "powered=true,powering=true,facing=south": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 0 }, "powered=true,powering=true,facing=west": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/flexpulsepeater.json b/src/main/resources/assets/create/blockstates/flexpulsepeater.json index 7344fa21b..fb2a1196b 100644 --- a/src/main/resources/assets/create/blockstates/flexpulsepeater.json +++ b/src/main/resources/assets/create/blockstates/flexpulsepeater.json @@ -1,24 +1,23 @@ { - "forge_marker": 1, "variants": { "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/flexpulsepeater", "y": 180 }, "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/flexpulsepeater", "y": 270 }, "powered=false,powering=false,facing=south": { "model": "create:block/repeaters/flexpulsepeater", "y": 0 }, "powered=false,powering=false,facing=west": { "model": "create:block/repeaters/flexpulsepeater", "y": 90 }, - + "powered=true,powering=false,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 180 }, "powered=true,powering=false,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 270 }, "powered=true,powering=false,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 0 }, "powered=true,powering=false,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 90 }, - + "powered=false,powering=true,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 180 }, "powered=false,powering=true,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 270 }, "powered=false,powering=true,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 0 }, "powered=false,powering=true,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 90 }, - + "powered=true,powering=true,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 180 }, "powered=true,powering=true,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 270 }, "powered=true,powering=true,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 0 }, "powered=true,powering=true,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/gearshift.json b/src/main/resources/assets/create/blockstates/gearshift.json index 3bbde498e..08d484215 100644 --- a/src/main/resources/assets/create/blockstates/gearshift.json +++ b/src/main/resources/assets/create/blockstates/gearshift.json @@ -1,14 +1,10 @@ { - "forge_marker": 1, - "variants": { - "powered" : { - "true": { "model": "create:block/gearshift_on" }, - "false": { "model": "create:block/gearshift_off" } - }, - "axis": { - "x": { "y": 90 }, - "y": { "x": 90 }, - "z": {} - } + "variants": { + "powered=true,axis=x": { "model": "create:block/gearshift_on", "y": 90 }, + "powered=true,axis=y": { "model": "create:block/gearshift_on", "x": 90 }, + "powered=true,axis=z": { "model": "create:block/gearshift_on" }, + "powered=false,axis=x": { "model": "create:block/gearshift_off", "y": 90 }, + "powered=false,axis=y": { "model": "create:block/gearshift_off", "x": 90 }, + "powered=false,axis=z": { "model": "create:block/gearshift_off" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json b/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json index 4e5db95dc..d2e573d99 100644 --- a/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json +++ b/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/indented_gabbro_slab_top" }, - "bottom": { "model":"create:block/palettes/indented_gabbro_slab" }, - "double": { "model":"create:block/palettes/indented_gabbro" } - } + "variants": { + "type=top": { "model":"create:block/palettes/indented_gabbro_slab_top" }, + "type=bottom": { "model":"create:block/palettes/indented_gabbro_slab" }, + "type=double": { "model":"create:block/palettes/indented_gabbro" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/limesand.json b/src/main/resources/assets/create/blockstates/limesand.json index bba383dc3..04e82892b 100644 --- a/src/main/resources/assets/create/blockstates/limesand.json +++ b/src/main/resources/assets/create/blockstates/limesand.json @@ -1,7 +1,10 @@ { - "forge_marker": 1, - "defaults": { "model": "create:block/palettes/limesand" }, - "variants": { - "": [{ "y": 0 }, { "y": 90 }, { "y": 180 }, { "y": 270 }] - } + "variants": { + "": [ + { "model": "create:block/palettes/limesand", "y": 0 }, + { "model": "create:block/palettes/limesand", "y": 90 }, + { "model": "create:block/palettes/limesand", "y": 180 }, + { "model": "create:block/palettes/limesand", "y": 270 } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/linked_transposer.json b/src/main/resources/assets/create/blockstates/linked_transposer.json index 55e413b81..7a8cd68f3 100644 --- a/src/main/resources/assets/create/blockstates/linked_transposer.json +++ b/src/main/resources/assets/create/blockstates/linked_transposer.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/transposer/linked_powered" }, - "false": { "model": "create:block/transposer/linked" } - }, - "facing": { - "north": { "y": 0 }, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/transposer/linked_powered", "y": 0 }, + "powered=true,facing=south": { "model": "create:block/transposer/linked_powered", "y": 180 }, + "powered=true,facing=west": { "model": "create:block/transposer/linked_powered", "y": 270 }, + "powered=true,facing=east": { "model": "create:block/transposer/linked_powered", "y": 90 }, + "powered=false,facing=north": { "model": "create:block/transposer/linked", "y": 0 }, + "powered=false,facing=south": { "model": "create:block/transposer/linked", "y": 180 }, + "powered=false,facing=west": { "model": "create:block/transposer/linked", "y": 270 }, + "powered=false,facing=east": { "model": "create:block/transposer/linked", "y": 90 } + } +} diff --git a/src/main/resources/assets/create/blockstates/redstone_latch.json b/src/main/resources/assets/create/blockstates/redstone_latch.json index 2ca364252..d261d4611 100644 --- a/src/main/resources/assets/create/blockstates/redstone_latch.json +++ b/src/main/resources/assets/create/blockstates/redstone_latch.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, "variants": { - "powering": { - "true": { "model": "create:block/repeaters/redstone_latch_powered" }, - "false": { "model": "create:block/repeaters/redstone_latch" } - }, - "facing": { - "north": { "y": 180 }, - "east": { "y": 270 }, - "south": { "y": 0 }, - "west": { "y": 90 } - } + "powering=true,facing=north": { "model": "create:block/repeaters/redstone_latch_powered", "y": 180 }, + "powering=true,facing=east": { "model": "create:block/repeaters/redstone_latch_powered", "y": 270 }, + "powering=true,facing=south": { "model": "create:block/repeaters/redstone_latch_powered", "y": 0 }, + "powering=true,facing=west": { "model": "create:block/repeaters/redstone_latch_powered", "y": 90 }, + "powering=false,facing=north": { "model": "create:block/repeaters/redstone_latch", "y": 180 }, + "powering=false,facing=east": { "model": "create:block/repeaters/redstone_latch", "y": 270 }, + "powering=false,facing=south": { "model": "create:block/repeaters/redstone_latch", "y": 0 }, + "powering=false,facing=west": { "model": "create:block/repeaters/redstone_latch", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/stockswitch.json b/src/main/resources/assets/create/blockstates/stockswitch.json index 15107fc1e..4d5967e5a 100644 --- a/src/main/resources/assets/create/blockstates/stockswitch.json +++ b/src/main/resources/assets/create/blockstates/stockswitch.json @@ -1,23 +1,32 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/stockpile_switch" - }, "variants": { - "indicator": { - "0": { "model": "create:block/stockpile_switch" }, - "1": { "model": "create:block/stockpile_switch_1" }, - "2": { "model": "create:block/stockpile_switch_2" }, - "3": { "model": "create:block/stockpile_switch_3" }, - "4": { "model": "create:block/stockpile_switch_4" }, - "5": { "model": "create:block/stockpile_switch_5" }, - "6": { "model": "create:block/stockpile_switch_6" } - }, - "facing": { - "south": { "y": 270 }, - "east": { "y": 180 }, - "north": { "y": 90 }, - "west": { "y": 0 } - } + "indicator=0,facing=south": { "model": "create:block/stockpile_switch", "y": 270 }, + "indicator=1,facing=south": { "model": "create:block/stockpile_switch_1", "y": 270 }, + "indicator=2,facing=south": { "model": "create:block/stockpile_switch_2", "y": 270 }, + "indicator=3,facing=south": { "model": "create:block/stockpile_switch_3", "y": 270 }, + "indicator=4,facing=south": { "model": "create:block/stockpile_switch_4", "y": 270 }, + "indicator=5,facing=south": { "model": "create:block/stockpile_switch_5", "y": 270 }, + "indicator=6,facing=south": { "model": "create:block/stockpile_switch_6", "y": 270 }, + "indicator=0,facing=east": { "model": "create:block/stockpile_switch", "y": 180 }, + "indicator=1,facing=east": { "model": "create:block/stockpile_switch_1", "y": 180 }, + "indicator=2,facing=east": { "model": "create:block/stockpile_switch_2", "y": 180 }, + "indicator=3,facing=east": { "model": "create:block/stockpile_switch_3", "y": 180 }, + "indicator=4,facing=east": { "model": "create:block/stockpile_switch_4", "y": 180 }, + "indicator=5,facing=east": { "model": "create:block/stockpile_switch_5", "y": 180 }, + "indicator=6,facing=east": { "model": "create:block/stockpile_switch_6", "y": 180 }, + "indicator=0,facing=north": { "model": "create:block/stockpile_switch", "y": 90 }, + "indicator=1,facing=north": { "model": "create:block/stockpile_switch_1", "y": 90 }, + "indicator=2,facing=north": { "model": "create:block/stockpile_switch_2", "y": 90 }, + "indicator=3,facing=north": { "model": "create:block/stockpile_switch_3", "y": 90 }, + "indicator=4,facing=north": { "model": "create:block/stockpile_switch_4", "y": 90 }, + "indicator=5,facing=north": { "model": "create:block/stockpile_switch_5", "y": 90 }, + "indicator=6,facing=north": { "model": "create:block/stockpile_switch_6", "y": 90 }, + "indicator=0,facing=west": { "model": "create:block/stockpile_switch", "y": 0 }, + "indicator=1,facing=west": { "model": "create:block/stockpile_switch_1", "y": 0 }, + "indicator=2,facing=west": { "model": "create:block/stockpile_switch_2", "y": 0 }, + "indicator=3,facing=west": { "model": "create:block/stockpile_switch_3", "y": 0 }, + "indicator=4,facing=west": { "model": "create:block/stockpile_switch_4", "y": 0 }, + "indicator=5,facing=west": { "model": "create:block/stockpile_switch_5", "y": 0 }, + "indicator=6,facing=west": { "model": "create:block/stockpile_switch_6", "y": 0 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/translation_chassis.json b/src/main/resources/assets/create/blockstates/translation_chassis.json index a558e2ed2..9bc46f235 100644 --- a/src/main/resources/assets/create/blockstates/translation_chassis.json +++ b/src/main/resources/assets/create/blockstates/translation_chassis.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/regular", "x": 90, "y": 90 }, @@ -17,6 +16,6 @@ "sticky_top=true,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/regular_both_sticky", "x": 90, "y": 90 }, "sticky_top=true,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/regular_both_sticky" }, "sticky_top=true,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/regular_both_sticky", "x": 90, "y": 180 } - + } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json b/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json index 6790e4009..efc93504e 100644 --- a/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json +++ b/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/alt", "x": 90, "y": 90 }, @@ -17,6 +16,6 @@ "sticky_top=true,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/alt_both_sticky", "x": 90, "y": 90 }, "sticky_top=true,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/alt_both_sticky" }, "sticky_top=true,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/alt_both_sticky", "x": 90, "y": 180 } - + } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/transposer.json b/src/main/resources/assets/create/blockstates/transposer.json index b4260b79a..12877a743 100644 --- a/src/main/resources/assets/create/blockstates/transposer.json +++ b/src/main/resources/assets/create/blockstates/transposer.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/transposer/default_powered" }, - "false": { "model": "create:block/transposer/default" } - }, - "facing": { - "north": { "y": 0 }, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/transposer/default_powered", "y": 0 }, + "powered=true,facing=east": { "model": "create:block/transposer/default_powered", "y": 90 }, + "powered=true,facing=south": { "model": "create:block/transposer/default_powered", "y": 180 }, + "powered=true,facing=west": { "model": "create:block/transposer/default_powered", "y": 270 }, + "powered=false,facing=north": { "model": "create:block/transposer/default", "y": 0 }, + "powered=false,facing=east": { "model": "create:block/transposer/default", "y": 90 }, + "powered=false,facing=south": { "model": "create:block/transposer/default", "y": 180 }, + "powered=false,facing=west": { "model": "create:block/transposer/default", "y": 270 } + } +} diff --git a/src/main/resources/assets/create/blockstates/vertical_extractor.json b/src/main/resources/assets/create/blockstates/vertical_extractor.json index c3cc50c14..69dd523fa 100644 --- a/src/main/resources/assets/create/blockstates/vertical_extractor.json +++ b/src/main/resources/assets/create/blockstates/vertical_extractor.json @@ -1,8 +1,4 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/extractor/vertical" - }, "variants": { "powered=true,upward=false,facing=south": { "model": "create:block/extractor/vertical_powered", "y": 180 }, @@ -13,15 +9,15 @@ "powered=true,upward=true,facing=east": { "model": "create:block/extractor/vertical_powered", "y": 270, "x": 180 }, "powered=true,upward=true,facing=north": { "model": "create:block/extractor/vertical_powered", "y": 180, "x": 180 }, "powered=true,upward=true,facing=west": { "model": "create:block/extractor/vertical_powered", "y": 90, "x": 180 }, - - "powered=false,upward=false,facing=south": { "y": 180 }, - "powered=false,upward=false,facing=east": { "y": 90 }, - "powered=false,upward=false,facing=north": { "y": 0 }, - "powered=false,upward=false,facing=west": { "y": 270 }, - "powered=false,upward=true,facing=south": { "y": 0, "x": 180 }, - "powered=false,upward=true,facing=east": { "y": 270, "x": 180 }, - "powered=false,upward=true,facing=north": { "y": 180, "x": 180 }, - "powered=false,upward=true,facing=west": { "y": 90, "x": 180 } + + "powered=false,upward=false,facing=south": { "model": "create:block/extractor/vertical", "y": 180 }, + "powered=false,upward=false,facing=east": { "model": "create:block/extractor/vertical", "y": 90 }, + "powered=false,upward=false,facing=north": { "model": "create:block/extractor/vertical", "y": 0 }, + "powered=false,upward=false,facing=west": { "model": "create:block/extractor/vertical", "y": 270 }, + "powered=false,upward=true,facing=south": { "model": "create:block/extractor/vertical", "y": 0, "x": 180 }, + "powered=false,upward=true,facing=east": { "model": "create:block/extractor/vertical", "y": 270, "x": 180 }, + "powered=false,upward=true,facing=north": { "model": "create:block/extractor/vertical", "y": 180, "x": 180 }, + "powered=false,upward=true,facing=west": { "model": "create:block/extractor/vertical", "y": 90, "x": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 867ef98d9..76a2c3d19 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "create resources", - "pack_format": 4 + "pack_format": 5 } }