From 92aa47a4f50467566ae4241a88ba0ad5fbd5780d Mon Sep 17 00:00:00 2001 From: Choonster TheMage Date: Tue, 29 Dec 2020 18:41:24 +1100 Subject: [PATCH] Fix block model rotation and add rotation for Mod Chest block - Fixes #10, 12 --- .../black_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/black_rotatable_block.json | 17 ++--- .../blue_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/blue_rotatable_block.json | 17 ++--- .../brown_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/brown_rotatable_block.json | 17 ++--- .../chain_survival_command_block.json | 34 ++++------ .../assets/testmod3/blockstates/chest.json | 14 +++- .../cyan_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/cyan_rotatable_block.json | 17 ++--- .../gray_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/gray_rotatable_block.json | 17 ++--- .../green_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/green_rotatable_block.json | 17 ++--- .../light_blue_multi_rotatable_block.json | 68 ++++++++----------- .../light_blue_rotatable_block.json | 17 ++--- .../light_gray_multi_rotatable_block.json | 68 ++++++++----------- .../light_gray_rotatable_block.json | 17 ++--- .../lime_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/lime_rotatable_block.json | 17 ++--- .../magenta_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/magenta_rotatable_block.json | 17 ++--- .../orange_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/orange_rotatable_block.json | 17 ++--- .../pink_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/pink_rotatable_block.json | 17 ++--- .../purple_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/purple_rotatable_block.json | 17 ++--- .../red_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/red_rotatable_block.json | 17 ++--- .../repeating_survival_command_block.json | 34 ++++------ .../testmod3/blockstates/rotatable_lamp.json | 34 ++++------ .../blockstates/survival_command_block.json | 34 ++++------ .../white_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/white_rotatable_block.json | 17 ++--- .../yellow_multi_rotatable_block.json | 68 ++++++++----------- .../blockstates/yellow_rotatable_block.json | 17 ++--- .../models/block/cube_rotated_left.json | 12 ++-- .../models/block/cube_rotated_right.json | 12 ++-- .../data/TestMod3BlockStateProvider.java | 15 ++-- 40 files changed, 651 insertions(+), 898 deletions(-) diff --git a/src/generated/resources/assets/testmod3/blockstates/black_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/black_multi_rotatable_block.json index 51227d34..a87e43ac 100644 --- a/src/generated/resources/assets/testmod3/blockstates/black_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/black_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/black_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/black_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/black_rotatable_block.json index a53a66a6..7352a6c3 100644 --- a/src/generated/resources/assets/testmod3/blockstates/black_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/black_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/black_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/black_rotatable_block" + "model": "testmod3:block/colored_rotatable/black_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/black_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/black_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/black_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/black_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/black_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/blue_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/blue_multi_rotatable_block.json index 2e14043f..67c403c7 100644 --- a/src/generated/resources/assets/testmod3/blockstates/blue_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/blue_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/blue_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/blue_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/blue_rotatable_block.json index 977e0093..02d942bb 100644 --- a/src/generated/resources/assets/testmod3/blockstates/blue_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/blue_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/blue_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/blue_rotatable_block" + "model": "testmod3:block/colored_rotatable/blue_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/blue_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/blue_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/blue_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/blue_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/blue_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/brown_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/brown_multi_rotatable_block.json index 7ee738dd..5ff50dbc 100644 --- a/src/generated/resources/assets/testmod3/blockstates/brown_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/brown_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/brown_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/brown_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/brown_rotatable_block.json index c540d13a..ca436da7 100644 --- a/src/generated/resources/assets/testmod3/blockstates/brown_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/brown_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/brown_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/brown_rotatable_block" + "model": "testmod3:block/colored_rotatable/brown_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/brown_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/brown_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/brown_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/brown_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/brown_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/chain_survival_command_block.json b/src/generated/resources/assets/testmod3/blockstates/chain_survival_command_block.json index 4a564c14..b900374d 100644 --- a/src/generated/resources/assets/testmod3/blockstates/chain_survival_command_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/chain_survival_command_block.json @@ -2,55 +2,49 @@ "variants": { "conditional=false,facing=down": { "model": "testmod3:block/chain_survival_command_block", - "x": 180 + "x": 90 }, "conditional=true,facing=down": { "model": "testmod3:block/chain_survival_command_block_conditional", - "x": 180 + "x": 90 }, "conditional=false,facing=up": { - "model": "testmod3:block/chain_survival_command_block" + "model": "testmod3:block/chain_survival_command_block", + "x": -90 }, "conditional=true,facing=up": { - "model": "testmod3:block/chain_survival_command_block_conditional" + "model": "testmod3:block/chain_survival_command_block_conditional", + "x": -90 }, "conditional=false,facing=north": { - "model": "testmod3:block/chain_survival_command_block", - "x": 90, - "y": 180 + "model": "testmod3:block/chain_survival_command_block" }, "conditional=true,facing=north": { - "model": "testmod3:block/chain_survival_command_block_conditional", - "x": 90, - "y": 180 + "model": "testmod3:block/chain_survival_command_block_conditional" }, "conditional=false,facing=south": { "model": "testmod3:block/chain_survival_command_block", - "x": 90 + "y": 180 }, "conditional=true,facing=south": { "model": "testmod3:block/chain_survival_command_block_conditional", - "x": 90 + "y": 180 }, "conditional=false,facing=west": { "model": "testmod3:block/chain_survival_command_block", - "x": 90, - "y": 90 + "y": 270 }, "conditional=true,facing=west": { "model": "testmod3:block/chain_survival_command_block_conditional", - "x": 90, - "y": 90 + "y": 270 }, "conditional=false,facing=east": { "model": "testmod3:block/chain_survival_command_block", - "x": 90, - "y": 270 + "y": 90 }, "conditional=true,facing=east": { "model": "testmod3:block/chain_survival_command_block_conditional", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/chest.json b/src/generated/resources/assets/testmod3/blockstates/chest.json index 7d5f4d80..a36c92f9 100644 --- a/src/generated/resources/assets/testmod3/blockstates/chest.json +++ b/src/generated/resources/assets/testmod3/blockstates/chest.json @@ -1,7 +1,19 @@ { "variants": { - "": { + "facing=north": { "model": "testmod3:block/chest" + }, + "facing=south": { + "model": "testmod3:block/chest", + "y": 180 + }, + "facing=west": { + "model": "testmod3:block/chest", + "y": 270 + }, + "facing=east": { + "model": "testmod3:block/chest", + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/cyan_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/cyan_multi_rotatable_block.json index ef20c7a0..de3d5fe5 100644 --- a/src/generated/resources/assets/testmod3/blockstates/cyan_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/cyan_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/cyan_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/cyan_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/cyan_rotatable_block.json index 2dff3e8a..7ce98a6e 100644 --- a/src/generated/resources/assets/testmod3/blockstates/cyan_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/cyan_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/cyan_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/cyan_rotatable_block" + "model": "testmod3:block/colored_rotatable/cyan_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/cyan_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/cyan_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/cyan_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/cyan_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/cyan_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/gray_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/gray_multi_rotatable_block.json index d2e0005d..dc892b50 100644 --- a/src/generated/resources/assets/testmod3/blockstates/gray_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/gray_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/gray_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/gray_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/gray_rotatable_block.json index 40f68877..e9b6f07d 100644 --- a/src/generated/resources/assets/testmod3/blockstates/gray_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/gray_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/gray_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/gray_rotatable_block" + "model": "testmod3:block/colored_rotatable/gray_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/gray_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/gray_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/gray_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/gray_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/gray_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/green_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/green_multi_rotatable_block.json index e7e28a2a..10b6a7c2 100644 --- a/src/generated/resources/assets/testmod3/blockstates/green_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/green_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/green_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/green_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/green_rotatable_block.json index e5bfd6c2..e76ce07a 100644 --- a/src/generated/resources/assets/testmod3/blockstates/green_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/green_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/green_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/green_rotatable_block" + "model": "testmod3:block/colored_rotatable/green_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/green_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/green_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/green_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/green_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/green_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/light_blue_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/light_blue_multi_rotatable_block.json index aae7b09f..a613df9d 100644 --- a/src/generated/resources/assets/testmod3/blockstates/light_blue_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/light_blue_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/light_blue_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/light_blue_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/light_blue_rotatable_block.json index 97179f80..568e0eb2 100644 --- a/src/generated/resources/assets/testmod3/blockstates/light_blue_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/light_blue_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block" + "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/light_blue_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/light_gray_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/light_gray_multi_rotatable_block.json index 92f59b43..8e3b4132 100644 --- a/src/generated/resources/assets/testmod3/blockstates/light_gray_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/light_gray_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/light_gray_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/light_gray_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/light_gray_rotatable_block.json index 2315eb8f..6ad42b04 100644 --- a/src/generated/resources/assets/testmod3/blockstates/light_gray_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/light_gray_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block" + "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/light_gray_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/lime_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/lime_multi_rotatable_block.json index 1a9a7c24..c71e320e 100644 --- a/src/generated/resources/assets/testmod3/blockstates/lime_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/lime_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/lime_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/lime_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/lime_rotatable_block.json index ed7b4b9b..e8dc4600 100644 --- a/src/generated/resources/assets/testmod3/blockstates/lime_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/lime_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/lime_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/lime_rotatable_block" + "model": "testmod3:block/colored_rotatable/lime_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/lime_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/lime_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/lime_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/lime_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/lime_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/magenta_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/magenta_multi_rotatable_block.json index 805ef4aa..d24f0071 100644 --- a/src/generated/resources/assets/testmod3/blockstates/magenta_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/magenta_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/magenta_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/magenta_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/magenta_rotatable_block.json index 3f932ecb..7409bf4f 100644 --- a/src/generated/resources/assets/testmod3/blockstates/magenta_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/magenta_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/magenta_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/magenta_rotatable_block" + "model": "testmod3:block/colored_rotatable/magenta_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/magenta_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/magenta_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/magenta_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/magenta_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/magenta_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/orange_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/orange_multi_rotatable_block.json index 8432f0c3..ee0fc333 100644 --- a/src/generated/resources/assets/testmod3/blockstates/orange_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/orange_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/orange_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/orange_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/orange_rotatable_block.json index f35f3a68..4d7861c1 100644 --- a/src/generated/resources/assets/testmod3/blockstates/orange_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/orange_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/orange_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/orange_rotatable_block" + "model": "testmod3:block/colored_rotatable/orange_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/orange_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/orange_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/orange_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/orange_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/orange_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/pink_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/pink_multi_rotatable_block.json index cac4aded..b4b75f5d 100644 --- a/src/generated/resources/assets/testmod3/blockstates/pink_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/pink_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/pink_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/pink_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/pink_rotatable_block.json index 6a2b2cf3..d082d67b 100644 --- a/src/generated/resources/assets/testmod3/blockstates/pink_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/pink_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/pink_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/pink_rotatable_block" + "model": "testmod3:block/colored_rotatable/pink_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/pink_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/pink_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/pink_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/pink_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/pink_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/purple_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/purple_multi_rotatable_block.json index dac836f4..187062cd 100644 --- a/src/generated/resources/assets/testmod3/blockstates/purple_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/purple_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/purple_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/purple_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/purple_rotatable_block.json index 4cd87e39..98724686 100644 --- a/src/generated/resources/assets/testmod3/blockstates/purple_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/purple_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/purple_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/purple_rotatable_block" + "model": "testmod3:block/colored_rotatable/purple_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/purple_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/purple_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/purple_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/purple_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/purple_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/red_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/red_multi_rotatable_block.json index 672e65de..a07c9c8d 100644 --- a/src/generated/resources/assets/testmod3/blockstates/red_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/red_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/red_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/red_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/red_rotatable_block.json index 7f908421..7b85eb48 100644 --- a/src/generated/resources/assets/testmod3/blockstates/red_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/red_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/red_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/red_rotatable_block" + "model": "testmod3:block/colored_rotatable/red_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/red_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/red_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/red_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/red_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/red_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/repeating_survival_command_block.json b/src/generated/resources/assets/testmod3/blockstates/repeating_survival_command_block.json index ed151bd8..42bde69b 100644 --- a/src/generated/resources/assets/testmod3/blockstates/repeating_survival_command_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/repeating_survival_command_block.json @@ -2,55 +2,49 @@ "variants": { "conditional=false,facing=down": { "model": "testmod3:block/repeating_survival_command_block", - "x": 180 + "x": 90 }, "conditional=true,facing=down": { "model": "testmod3:block/repeating_survival_command_block_conditional", - "x": 180 + "x": 90 }, "conditional=false,facing=up": { - "model": "testmod3:block/repeating_survival_command_block" + "model": "testmod3:block/repeating_survival_command_block", + "x": -90 }, "conditional=true,facing=up": { - "model": "testmod3:block/repeating_survival_command_block_conditional" + "model": "testmod3:block/repeating_survival_command_block_conditional", + "x": -90 }, "conditional=false,facing=north": { - "model": "testmod3:block/repeating_survival_command_block", - "x": 90, - "y": 180 + "model": "testmod3:block/repeating_survival_command_block" }, "conditional=true,facing=north": { - "model": "testmod3:block/repeating_survival_command_block_conditional", - "x": 90, - "y": 180 + "model": "testmod3:block/repeating_survival_command_block_conditional" }, "conditional=false,facing=south": { "model": "testmod3:block/repeating_survival_command_block", - "x": 90 + "y": 180 }, "conditional=true,facing=south": { "model": "testmod3:block/repeating_survival_command_block_conditional", - "x": 90 + "y": 180 }, "conditional=false,facing=west": { "model": "testmod3:block/repeating_survival_command_block", - "x": 90, - "y": 90 + "y": 270 }, "conditional=true,facing=west": { "model": "testmod3:block/repeating_survival_command_block_conditional", - "x": 90, - "y": 90 + "y": 270 }, "conditional=false,facing=east": { "model": "testmod3:block/repeating_survival_command_block", - "x": 90, - "y": 270 + "y": 90 }, "conditional=true,facing=east": { "model": "testmod3:block/repeating_survival_command_block_conditional", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/rotatable_lamp.json b/src/generated/resources/assets/testmod3/blockstates/rotatable_lamp.json index 3b80d7ba..3bb90dba 100644 --- a/src/generated/resources/assets/testmod3/blockstates/rotatable_lamp.json +++ b/src/generated/resources/assets/testmod3/blockstates/rotatable_lamp.json @@ -2,55 +2,49 @@ "variants": { "facing=down,lit=false": { "model": "testmod3:block/rotatable_lamp_off", - "x": 180 + "x": 90 }, "facing=up,lit=false": { - "model": "testmod3:block/rotatable_lamp_off" + "model": "testmod3:block/rotatable_lamp_off", + "x": -90 }, "facing=north,lit=false": { - "model": "testmod3:block/rotatable_lamp_off", - "x": 90, - "y": 180 + "model": "testmod3:block/rotatable_lamp_off" }, "facing=south,lit=false": { "model": "testmod3:block/rotatable_lamp_off", - "x": 90 + "y": 180 }, "facing=west,lit=false": { "model": "testmod3:block/rotatable_lamp_off", - "x": 90, - "y": 90 + "y": 270 }, "facing=east,lit=false": { "model": "testmod3:block/rotatable_lamp_off", - "x": 90, - "y": 270 + "y": 90 }, "facing=down,lit=true": { "model": "testmod3:block/rotatable_lamp_on", - "x": 180 + "x": 90 }, "facing=up,lit=true": { - "model": "testmod3:block/rotatable_lamp_on" + "model": "testmod3:block/rotatable_lamp_on", + "x": -90 }, "facing=north,lit=true": { - "model": "testmod3:block/rotatable_lamp_on", - "x": 90, - "y": 180 + "model": "testmod3:block/rotatable_lamp_on" }, "facing=south,lit=true": { "model": "testmod3:block/rotatable_lamp_on", - "x": 90 + "y": 180 }, "facing=west,lit=true": { "model": "testmod3:block/rotatable_lamp_on", - "x": 90, - "y": 90 + "y": 270 }, "facing=east,lit=true": { "model": "testmod3:block/rotatable_lamp_on", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/survival_command_block.json b/src/generated/resources/assets/testmod3/blockstates/survival_command_block.json index c3fbb896..c4f92579 100644 --- a/src/generated/resources/assets/testmod3/blockstates/survival_command_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/survival_command_block.json @@ -2,55 +2,49 @@ "variants": { "conditional=false,facing=down": { "model": "testmod3:block/survival_command_block", - "x": 180 + "x": 90 }, "conditional=true,facing=down": { "model": "testmod3:block/survival_command_block_conditional", - "x": 180 + "x": 90 }, "conditional=false,facing=up": { - "model": "testmod3:block/survival_command_block" + "model": "testmod3:block/survival_command_block", + "x": -90 }, "conditional=true,facing=up": { - "model": "testmod3:block/survival_command_block_conditional" + "model": "testmod3:block/survival_command_block_conditional", + "x": -90 }, "conditional=false,facing=north": { - "model": "testmod3:block/survival_command_block", - "x": 90, - "y": 180 + "model": "testmod3:block/survival_command_block" }, "conditional=true,facing=north": { - "model": "testmod3:block/survival_command_block_conditional", - "x": 90, - "y": 180 + "model": "testmod3:block/survival_command_block_conditional" }, "conditional=false,facing=south": { "model": "testmod3:block/survival_command_block", - "x": 90 + "y": 180 }, "conditional=true,facing=south": { "model": "testmod3:block/survival_command_block_conditional", - "x": 90 + "y": 180 }, "conditional=false,facing=west": { "model": "testmod3:block/survival_command_block", - "x": 90, - "y": 90 + "y": 270 }, "conditional=true,facing=west": { "model": "testmod3:block/survival_command_block_conditional", - "x": 90, - "y": 90 + "y": 270 }, "conditional=false,facing=east": { "model": "testmod3:block/survival_command_block", - "x": 90, - "y": 270 + "y": 90 }, "conditional=true,facing=east": { "model": "testmod3:block/survival_command_block_conditional", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/white_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/white_multi_rotatable_block.json index 1b77f6c4..9437f78b 100644 --- a/src/generated/resources/assets/testmod3/blockstates/white_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/white_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/white_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/white_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/white_rotatable_block.json index d472013c..cd24757f 100644 --- a/src/generated/resources/assets/testmod3/blockstates/white_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/white_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/white_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/white_rotatable_block" + "model": "testmod3:block/colored_rotatable/white_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/white_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/white_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/white_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/white_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/white_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/yellow_multi_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/yellow_multi_rotatable_block.json index cd33a543..bb4063fc 100644 --- a/src/generated/resources/assets/testmod3/blockstates/yellow_multi_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/yellow_multi_rotatable_block.json @@ -2,107 +2,95 @@ "variants": { "face_rotation=up,facing=down": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block", - "x": 180 + "x": 90 }, "face_rotation=right,facing=down": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right", - "x": 180 + "x": 90 }, "face_rotation=down,facing=down": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down", - "x": 180 + "x": 90 }, "face_rotation=left,facing=down": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left", - "x": 180 + "x": 90 }, "face_rotation=up,facing=up": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block" + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block", + "x": -90 }, "face_rotation=right,facing=up": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right" + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right", + "x": -90 }, "face_rotation=down,facing=up": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down" + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down", + "x": -90 }, "face_rotation=left,facing=up": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left" + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left", + "x": -90 }, "face_rotation=up,facing=north": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block" }, "face_rotation=right,facing=north": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right" }, "face_rotation=down,facing=north": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down" }, "face_rotation=left,facing=north": { - "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left" }, "face_rotation=up,facing=south": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block", - "x": 90 + "y": 180 }, "face_rotation=right,facing=south": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right", - "x": 90 + "y": 180 }, "face_rotation=down,facing=south": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down", - "x": 90 + "y": 180 }, "face_rotation=left,facing=south": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left", - "x": 90 + "y": 180 }, "face_rotation=up,facing=west": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=right,facing=west": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=down,facing=west": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=left,facing=west": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left", - "x": 90, - "y": 90 + "y": 270 }, "face_rotation=up,facing=east": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=right,facing=east": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_right", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=down,facing=east": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_down", - "x": 90, - "y": 270 + "y": 90 }, "face_rotation=left,facing=east": { "model": "testmod3:block/colored_rotatable/yellow_multi_rotatable_block_rotated_left", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/blockstates/yellow_rotatable_block.json b/src/generated/resources/assets/testmod3/blockstates/yellow_rotatable_block.json index fd416714..efe03b44 100644 --- a/src/generated/resources/assets/testmod3/blockstates/yellow_rotatable_block.json +++ b/src/generated/resources/assets/testmod3/blockstates/yellow_rotatable_block.json @@ -2,29 +2,26 @@ "variants": { "facing=down": { "model": "testmod3:block/colored_rotatable/yellow_rotatable_block", - "x": 180 + "x": 90 }, "facing=up": { - "model": "testmod3:block/colored_rotatable/yellow_rotatable_block" + "model": "testmod3:block/colored_rotatable/yellow_rotatable_block", + "x": -90 }, "facing=north": { - "model": "testmod3:block/colored_rotatable/yellow_rotatable_block", - "x": 90, - "y": 180 + "model": "testmod3:block/colored_rotatable/yellow_rotatable_block" }, "facing=south": { "model": "testmod3:block/colored_rotatable/yellow_rotatable_block", - "x": 90 + "y": 180 }, "facing=west": { "model": "testmod3:block/colored_rotatable/yellow_rotatable_block", - "x": 90, - "y": 90 + "y": 270 }, "facing=east": { "model": "testmod3:block/colored_rotatable/yellow_rotatable_block", - "x": 90, - "y": 270 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/testmod3/models/block/cube_rotated_left.json b/src/generated/resources/assets/testmod3/models/block/cube_rotated_left.json index bbcb9b2f..b1165618 100644 --- a/src/generated/resources/assets/testmod3/models/block/cube_rotated_left.json +++ b/src/generated/resources/assets/testmod3/models/block/cube_rotated_left.json @@ -16,32 +16,32 @@ "down": { "texture": "#down", "cullface": "down", - "rotation": 180 + "rotation": 270 }, "up": { "texture": "#up", "cullface": "up", - "rotation": 180 + "rotation": 270 }, "north": { "texture": "#north", "cullface": "north", - "rotation": 180 + "rotation": 270 }, "south": { "texture": "#south", "cullface": "south", - "rotation": 180 + "rotation": 270 }, "west": { "texture": "#west", "cullface": "west", - "rotation": 180 + "rotation": 270 }, "east": { "texture": "#east", "cullface": "east", - "rotation": 180 + "rotation": 270 } } } diff --git a/src/generated/resources/assets/testmod3/models/block/cube_rotated_right.json b/src/generated/resources/assets/testmod3/models/block/cube_rotated_right.json index bbcb9b2f..c5eb9e45 100644 --- a/src/generated/resources/assets/testmod3/models/block/cube_rotated_right.json +++ b/src/generated/resources/assets/testmod3/models/block/cube_rotated_right.json @@ -16,32 +16,32 @@ "down": { "texture": "#down", "cullface": "down", - "rotation": 180 + "rotation": 90 }, "up": { "texture": "#up", "cullface": "up", - "rotation": 180 + "rotation": 90 }, "north": { "texture": "#north", "cullface": "north", - "rotation": 180 + "rotation": 90 }, "south": { "texture": "#south", "cullface": "south", - "rotation": 180 + "rotation": 90 }, "west": { "texture": "#west", "cullface": "west", - "rotation": 180 + "rotation": 90 }, "east": { "texture": "#east", "cullface": "east", - "rotation": 180 + "rotation": 90 } } } diff --git a/src/main/java/choonster/testmod3/data/TestMod3BlockStateProvider.java b/src/main/java/choonster/testmod3/data/TestMod3BlockStateProvider.java index f0c7d595..aa4c126c 100644 --- a/src/main/java/choonster/testmod3/data/TestMod3BlockStateProvider.java +++ b/src/main/java/choonster/testmod3/data/TestMod3BlockStateProvider.java @@ -35,6 +35,8 @@ public class TestMod3BlockStateProvider extends BlockStateProvider { private static final Logger LOGGER = LogManager.getLogger(); + private static final int DEFAULT_ANGLE_OFFSET = 180; + private final List errors = new ArrayList<>(); /** @@ -98,10 +100,13 @@ public class TestMod3BlockStateProvider extends BlockStateProvider { switch (faceRotation) { case LEFT: faceBuilder.rotation(ModelBuilder.FaceRotation.COUNTERCLOCKWISE_90); + break; case RIGHT: faceBuilder.rotation(ModelBuilder.FaceRotation.CLOCKWISE_90); + break; case DOWN: faceBuilder.rotation(ModelBuilder.FaceRotation.UPSIDE_DOWN); + break; } }) .end(); @@ -397,7 +402,7 @@ protected void registerStatesAndModels() { .texture("chest", modLoc("block/chest/wood")) .texture("particle", blockTexture(Blocks.OAK_PLANKS)); - simpleBlock(ModBlocks.CHEST.get(), chest); + horizontalBlock(ModBlocks.CHEST.get(), chest); simpleBlockItem(ModBlocks.CHEST.get(), chest); @@ -665,8 +670,8 @@ private void pipeBlock(final BasePipeBlock block, final ResourceLocation centre, .part() .modelFile(sideModel) .uvLock(true) - .rotationX(direction == Direction.DOWN ? 90 : direction.getAxis().isHorizontal() ? 0 : -90) - .rotationY(getRotationY(direction.getOpposite())) + .rotationX(getRotationX(direction)) + .rotationY(getRotationY(direction)) .addModel() .condition(BasePipeBlock.getConnectedProperty(direction), true); } @@ -698,10 +703,10 @@ private void commandBlock(final CommandBlockBlock commandBlock, final Block mode } private int getRotationX(final Direction direction) { - return direction == Direction.DOWN ? 180 : direction.getAxis().isHorizontal() ? 90 : 0; + return direction == Direction.DOWN ? 90 : direction.getAxis().isHorizontal() ? 0 : -90; } private int getRotationY(final Direction direction) { - return direction.getAxis().isVertical() ? 0 : (int) direction.getHorizontalAngle(); + return direction.getAxis().isVertical() ? 0 : (((int) direction.getHorizontalAngle()) + DEFAULT_ANGLE_OFFSET) % 360; } }