From 6734a0e112c29541bc6611cc26c18874ec7a4c18 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sat, 28 Nov 2020 12:06:25 +0000 Subject: [PATCH] Also generate computer models I'm getting quite addicted to this. Maybe less savings than monitors, but still worth doing due to the number of files created. Also fix our angle calculations for monitors. Thankfully we hadn't shipped this yet :). --- .../blockstates/computer_advanced.json | 49 +++++ .../blockstates/computer_command.json | 49 +++++ .../blockstates/computer_normal.json | 49 +++++ .../blockstates/monitor_advanced.json | 192 +++++++++--------- .../blockstates/monitor_normal.json | 192 +++++++++--------- .../block/computer_advanced_blinking.json | 8 + .../models/block/computer_advanced_off.json | 8 + .../models/block/computer_advanced_on.json | 8 + .../block/computer_command_blinking.json | 8 + .../models/block/computer_command_off.json | 8 + .../models/block/computer_command_on.json | 8 + .../block/computer_normal_blinking.json | 8 + .../models/block/computer_normal_off.json | 8 + .../models/block/computer_normal_on.json | 8 + .../data/BlockModelProvider.java | 70 ++++++- .../blockstates/computer_advanced.json | 18 -- .../blockstates/computer_command.json | 19 -- .../blockstates/computer_normal.json | 18 -- .../block/computer_advanced_blinking.json | 8 - .../models/block/computer_advanced_off.json | 8 - .../models/block/computer_advanced_on.json | 8 - .../block/computer_command_blinking.json | 8 - .../models/block/computer_command_off.json | 8 - .../models/block/computer_command_on.json | 8 - .../block/computer_normal_blinking.json | 8 - .../models/block/computer_normal_off.json | 8 - .../models/block/computer_normal_on.json | 8 - 27 files changed, 473 insertions(+), 327 deletions(-) create mode 100644 src/generated/resources/assets/computercraft/blockstates/computer_advanced.json create mode 100644 src/generated/resources/assets/computercraft/blockstates/computer_command.json create mode 100644 src/generated/resources/assets/computercraft/blockstates/computer_normal.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_command_off.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_command_on.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_normal_off.json create mode 100644 src/generated/resources/assets/computercraft/models/block/computer_normal_on.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/computer_advanced.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/computer_command.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/computer_normal.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_advanced_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_advanced_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_command_blinking.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_command_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_command_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_normal_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_normal_on.json diff --git a/src/generated/resources/assets/computercraft/blockstates/computer_advanced.json b/src/generated/resources/assets/computercraft/blockstates/computer_advanced.json new file mode 100644 index 000000000..ca62effa6 --- /dev/null +++ b/src/generated/resources/assets/computercraft/blockstates/computer_advanced.json @@ -0,0 +1,49 @@ +{ + "variants": { + "facing=north,state=off": { + "model": "computercraft:block/computer_advanced_off" + }, + "facing=south,state=off": { + "model": "computercraft:block/computer_advanced_off", + "y": 180 + }, + "facing=west,state=off": { + "model": "computercraft:block/computer_advanced_off", + "y": 270 + }, + "facing=east,state=off": { + "model": "computercraft:block/computer_advanced_off", + "y": 90 + }, + "facing=north,state=on": { + "model": "computercraft:block/computer_advanced_on" + }, + "facing=south,state=on": { + "model": "computercraft:block/computer_advanced_on", + "y": 180 + }, + "facing=west,state=on": { + "model": "computercraft:block/computer_advanced_on", + "y": 270 + }, + "facing=east,state=on": { + "model": "computercraft:block/computer_advanced_on", + "y": 90 + }, + "facing=north,state=blinking": { + "model": "computercraft:block/computer_advanced_blinking" + }, + "facing=south,state=blinking": { + "model": "computercraft:block/computer_advanced_blinking", + "y": 180 + }, + "facing=west,state=blinking": { + "model": "computercraft:block/computer_advanced_blinking", + "y": 270 + }, + "facing=east,state=blinking": { + "model": "computercraft:block/computer_advanced_blinking", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/blockstates/computer_command.json b/src/generated/resources/assets/computercraft/blockstates/computer_command.json new file mode 100644 index 000000000..d0580539a --- /dev/null +++ b/src/generated/resources/assets/computercraft/blockstates/computer_command.json @@ -0,0 +1,49 @@ +{ + "variants": { + "facing=north,state=off": { + "model": "computercraft:block/computer_command_off" + }, + "facing=south,state=off": { + "model": "computercraft:block/computer_command_off", + "y": 180 + }, + "facing=west,state=off": { + "model": "computercraft:block/computer_command_off", + "y": 270 + }, + "facing=east,state=off": { + "model": "computercraft:block/computer_command_off", + "y": 90 + }, + "facing=north,state=on": { + "model": "computercraft:block/computer_command_on" + }, + "facing=south,state=on": { + "model": "computercraft:block/computer_command_on", + "y": 180 + }, + "facing=west,state=on": { + "model": "computercraft:block/computer_command_on", + "y": 270 + }, + "facing=east,state=on": { + "model": "computercraft:block/computer_command_on", + "y": 90 + }, + "facing=north,state=blinking": { + "model": "computercraft:block/computer_command_blinking" + }, + "facing=south,state=blinking": { + "model": "computercraft:block/computer_command_blinking", + "y": 180 + }, + "facing=west,state=blinking": { + "model": "computercraft:block/computer_command_blinking", + "y": 270 + }, + "facing=east,state=blinking": { + "model": "computercraft:block/computer_command_blinking", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/blockstates/computer_normal.json b/src/generated/resources/assets/computercraft/blockstates/computer_normal.json new file mode 100644 index 000000000..4108d0aa9 --- /dev/null +++ b/src/generated/resources/assets/computercraft/blockstates/computer_normal.json @@ -0,0 +1,49 @@ +{ + "variants": { + "facing=north,state=off": { + "model": "computercraft:block/computer_normal_off" + }, + "facing=south,state=off": { + "model": "computercraft:block/computer_normal_off", + "y": 180 + }, + "facing=west,state=off": { + "model": "computercraft:block/computer_normal_off", + "y": 270 + }, + "facing=east,state=off": { + "model": "computercraft:block/computer_normal_off", + "y": 90 + }, + "facing=north,state=on": { + "model": "computercraft:block/computer_normal_on" + }, + "facing=south,state=on": { + "model": "computercraft:block/computer_normal_on", + "y": 180 + }, + "facing=west,state=on": { + "model": "computercraft:block/computer_normal_on", + "y": 270 + }, + "facing=east,state=on": { + "model": "computercraft:block/computer_normal_on", + "y": 90 + }, + "facing=north,state=blinking": { + "model": "computercraft:block/computer_normal_blinking" + }, + "facing=south,state=blinking": { + "model": "computercraft:block/computer_normal_blinking", + "y": 180 + }, + "facing=west,state=blinking": { + "model": "computercraft:block/computer_normal_blinking", + "y": 270 + }, + "facing=east,state=blinking": { + "model": "computercraft:block/computer_normal_blinking", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json b/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json index 978e3ed95..230c2c727 100644 --- a/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json +++ b/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json @@ -12,12 +12,12 @@ "facing=west,orientation=down,state=none": { "model": "computercraft:block/monitor_advanced", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=none": { "model": "computercraft:block/monitor_advanced", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=none": { "model": "computercraft:block/monitor_advanced", @@ -31,12 +31,12 @@ "facing=west,orientation=up,state=none": { "model": "computercraft:block/monitor_advanced", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=none": { "model": "computercraft:block/monitor_advanced", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=none": { "model": "computercraft:block/monitor_advanced" @@ -47,11 +47,11 @@ }, "facing=west,orientation=north,state=none": { "model": "computercraft:block/monitor_advanced", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=none": { "model": "computercraft:block/monitor_advanced", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=l": { "model": "computercraft:block/monitor_advanced_l", @@ -65,12 +65,12 @@ "facing=west,orientation=down,state=l": { "model": "computercraft:block/monitor_advanced_l", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=l": { "model": "computercraft:block/monitor_advanced_l", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=l": { "model": "computercraft:block/monitor_advanced_l", @@ -84,12 +84,12 @@ "facing=west,orientation=up,state=l": { "model": "computercraft:block/monitor_advanced_l", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=l": { "model": "computercraft:block/monitor_advanced_l", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=l": { "model": "computercraft:block/monitor_advanced_l" @@ -100,11 +100,11 @@ }, "facing=west,orientation=north,state=l": { "model": "computercraft:block/monitor_advanced_l", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=l": { "model": "computercraft:block/monitor_advanced_l", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=r": { "model": "computercraft:block/monitor_advanced_r", @@ -118,12 +118,12 @@ "facing=west,orientation=down,state=r": { "model": "computercraft:block/monitor_advanced_r", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=r": { "model": "computercraft:block/monitor_advanced_r", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=r": { "model": "computercraft:block/monitor_advanced_r", @@ -137,12 +137,12 @@ "facing=west,orientation=up,state=r": { "model": "computercraft:block/monitor_advanced_r", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=r": { "model": "computercraft:block/monitor_advanced_r", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=r": { "model": "computercraft:block/monitor_advanced_r" @@ -153,11 +153,11 @@ }, "facing=west,orientation=north,state=r": { "model": "computercraft:block/monitor_advanced_r", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=r": { "model": "computercraft:block/monitor_advanced_r", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lr": { "model": "computercraft:block/monitor_advanced_lr", @@ -171,12 +171,12 @@ "facing=west,orientation=down,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lr": { "model": "computercraft:block/monitor_advanced_lr", @@ -190,12 +190,12 @@ "facing=west,orientation=up,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lr": { "model": "computercraft:block/monitor_advanced_lr" @@ -206,11 +206,11 @@ }, "facing=west,orientation=north,state=lr": { "model": "computercraft:block/monitor_advanced_lr", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lr": { "model": "computercraft:block/monitor_advanced_lr", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=u": { "model": "computercraft:block/monitor_advanced_u", @@ -224,12 +224,12 @@ "facing=west,orientation=down,state=u": { "model": "computercraft:block/monitor_advanced_u", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=u": { "model": "computercraft:block/monitor_advanced_u", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=u": { "model": "computercraft:block/monitor_advanced_u", @@ -243,12 +243,12 @@ "facing=west,orientation=up,state=u": { "model": "computercraft:block/monitor_advanced_u", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=u": { "model": "computercraft:block/monitor_advanced_u", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=u": { "model": "computercraft:block/monitor_advanced_u" @@ -259,11 +259,11 @@ }, "facing=west,orientation=north,state=u": { "model": "computercraft:block/monitor_advanced_u", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=u": { "model": "computercraft:block/monitor_advanced_u", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=d": { "model": "computercraft:block/monitor_advanced_d", @@ -277,12 +277,12 @@ "facing=west,orientation=down,state=d": { "model": "computercraft:block/monitor_advanced_d", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=d": { "model": "computercraft:block/monitor_advanced_d", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=d": { "model": "computercraft:block/monitor_advanced_d", @@ -296,12 +296,12 @@ "facing=west,orientation=up,state=d": { "model": "computercraft:block/monitor_advanced_d", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=d": { "model": "computercraft:block/monitor_advanced_d", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=d": { "model": "computercraft:block/monitor_advanced_d" @@ -312,11 +312,11 @@ }, "facing=west,orientation=north,state=d": { "model": "computercraft:block/monitor_advanced_d", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=d": { "model": "computercraft:block/monitor_advanced_d", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=ud": { "model": "computercraft:block/monitor_advanced_ud", @@ -330,12 +330,12 @@ "facing=west,orientation=down,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=ud": { "model": "computercraft:block/monitor_advanced_ud", @@ -349,12 +349,12 @@ "facing=west,orientation=up,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=ud": { "model": "computercraft:block/monitor_advanced_ud" @@ -365,11 +365,11 @@ }, "facing=west,orientation=north,state=ud": { "model": "computercraft:block/monitor_advanced_ud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=ud": { "model": "computercraft:block/monitor_advanced_ud", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=rd": { "model": "computercraft:block/monitor_advanced_rd", @@ -383,12 +383,12 @@ "facing=west,orientation=down,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=rd": { "model": "computercraft:block/monitor_advanced_rd", @@ -402,12 +402,12 @@ "facing=west,orientation=up,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=rd": { "model": "computercraft:block/monitor_advanced_rd" @@ -418,11 +418,11 @@ }, "facing=west,orientation=north,state=rd": { "model": "computercraft:block/monitor_advanced_rd", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=rd": { "model": "computercraft:block/monitor_advanced_rd", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=ld": { "model": "computercraft:block/monitor_advanced_ld", @@ -436,12 +436,12 @@ "facing=west,orientation=down,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=ld": { "model": "computercraft:block/monitor_advanced_ld", @@ -455,12 +455,12 @@ "facing=west,orientation=up,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=ld": { "model": "computercraft:block/monitor_advanced_ld" @@ -471,11 +471,11 @@ }, "facing=west,orientation=north,state=ld": { "model": "computercraft:block/monitor_advanced_ld", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=ld": { "model": "computercraft:block/monitor_advanced_ld", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=ru": { "model": "computercraft:block/monitor_advanced_ru", @@ -489,12 +489,12 @@ "facing=west,orientation=down,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=ru": { "model": "computercraft:block/monitor_advanced_ru", @@ -508,12 +508,12 @@ "facing=west,orientation=up,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=ru": { "model": "computercraft:block/monitor_advanced_ru" @@ -524,11 +524,11 @@ }, "facing=west,orientation=north,state=ru": { "model": "computercraft:block/monitor_advanced_ru", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=ru": { "model": "computercraft:block/monitor_advanced_ru", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lu": { "model": "computercraft:block/monitor_advanced_lu", @@ -542,12 +542,12 @@ "facing=west,orientation=down,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lu": { "model": "computercraft:block/monitor_advanced_lu", @@ -561,12 +561,12 @@ "facing=west,orientation=up,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lu": { "model": "computercraft:block/monitor_advanced_lu" @@ -577,11 +577,11 @@ }, "facing=west,orientation=north,state=lu": { "model": "computercraft:block/monitor_advanced_lu", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lu": { "model": "computercraft:block/monitor_advanced_lu", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", @@ -595,12 +595,12 @@ "facing=west,orientation=down,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", @@ -614,12 +614,12 @@ "facing=west,orientation=up,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd" @@ -630,11 +630,11 @@ }, "facing=west,orientation=north,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=rud": { "model": "computercraft:block/monitor_advanced_rud", @@ -648,12 +648,12 @@ "facing=west,orientation=down,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=rud": { "model": "computercraft:block/monitor_advanced_rud", @@ -667,12 +667,12 @@ "facing=west,orientation=up,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=rud": { "model": "computercraft:block/monitor_advanced_rud" @@ -683,11 +683,11 @@ }, "facing=west,orientation=north,state=rud": { "model": "computercraft:block/monitor_advanced_rud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=rud": { "model": "computercraft:block/monitor_advanced_rud", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lud": { "model": "computercraft:block/monitor_advanced_lud", @@ -701,12 +701,12 @@ "facing=west,orientation=down,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lud": { "model": "computercraft:block/monitor_advanced_lud", @@ -720,12 +720,12 @@ "facing=west,orientation=up,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lud": { "model": "computercraft:block/monitor_advanced_lud" @@ -736,11 +736,11 @@ }, "facing=west,orientation=north,state=lud": { "model": "computercraft:block/monitor_advanced_lud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lud": { "model": "computercraft:block/monitor_advanced_lud", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lru": { "model": "computercraft:block/monitor_advanced_lru", @@ -754,12 +754,12 @@ "facing=west,orientation=down,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lru": { "model": "computercraft:block/monitor_advanced_lru", @@ -773,12 +773,12 @@ "facing=west,orientation=up,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lru": { "model": "computercraft:block/monitor_advanced_lru" @@ -789,11 +789,11 @@ }, "facing=west,orientation=north,state=lru": { "model": "computercraft:block/monitor_advanced_lru", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lru": { "model": "computercraft:block/monitor_advanced_lru", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", @@ -807,12 +807,12 @@ "facing=west,orientation=down,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", @@ -826,12 +826,12 @@ "facing=west,orientation=up,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud" @@ -842,11 +842,11 @@ }, "facing=west,orientation=north,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", - "y": -90 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json b/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json index 64d2d4ce9..f3f94002e 100644 --- a/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json +++ b/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json @@ -12,12 +12,12 @@ "facing=west,orientation=down,state=none": { "model": "computercraft:block/monitor_normal", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=none": { "model": "computercraft:block/monitor_normal", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=none": { "model": "computercraft:block/monitor_normal", @@ -31,12 +31,12 @@ "facing=west,orientation=up,state=none": { "model": "computercraft:block/monitor_normal", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=none": { "model": "computercraft:block/monitor_normal", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=none": { "model": "computercraft:block/monitor_normal" @@ -47,11 +47,11 @@ }, "facing=west,orientation=north,state=none": { "model": "computercraft:block/monitor_normal", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=none": { "model": "computercraft:block/monitor_normal", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=l": { "model": "computercraft:block/monitor_normal_l", @@ -65,12 +65,12 @@ "facing=west,orientation=down,state=l": { "model": "computercraft:block/monitor_normal_l", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=l": { "model": "computercraft:block/monitor_normal_l", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=l": { "model": "computercraft:block/monitor_normal_l", @@ -84,12 +84,12 @@ "facing=west,orientation=up,state=l": { "model": "computercraft:block/monitor_normal_l", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=l": { "model": "computercraft:block/monitor_normal_l", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=l": { "model": "computercraft:block/monitor_normal_l" @@ -100,11 +100,11 @@ }, "facing=west,orientation=north,state=l": { "model": "computercraft:block/monitor_normal_l", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=l": { "model": "computercraft:block/monitor_normal_l", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=r": { "model": "computercraft:block/monitor_normal_r", @@ -118,12 +118,12 @@ "facing=west,orientation=down,state=r": { "model": "computercraft:block/monitor_normal_r", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=r": { "model": "computercraft:block/monitor_normal_r", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=r": { "model": "computercraft:block/monitor_normal_r", @@ -137,12 +137,12 @@ "facing=west,orientation=up,state=r": { "model": "computercraft:block/monitor_normal_r", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=r": { "model": "computercraft:block/monitor_normal_r", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=r": { "model": "computercraft:block/monitor_normal_r" @@ -153,11 +153,11 @@ }, "facing=west,orientation=north,state=r": { "model": "computercraft:block/monitor_normal_r", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=r": { "model": "computercraft:block/monitor_normal_r", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lr": { "model": "computercraft:block/monitor_normal_lr", @@ -171,12 +171,12 @@ "facing=west,orientation=down,state=lr": { "model": "computercraft:block/monitor_normal_lr", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lr": { "model": "computercraft:block/monitor_normal_lr", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lr": { "model": "computercraft:block/monitor_normal_lr", @@ -190,12 +190,12 @@ "facing=west,orientation=up,state=lr": { "model": "computercraft:block/monitor_normal_lr", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lr": { "model": "computercraft:block/monitor_normal_lr", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lr": { "model": "computercraft:block/monitor_normal_lr" @@ -206,11 +206,11 @@ }, "facing=west,orientation=north,state=lr": { "model": "computercraft:block/monitor_normal_lr", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lr": { "model": "computercraft:block/monitor_normal_lr", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=u": { "model": "computercraft:block/monitor_normal_u", @@ -224,12 +224,12 @@ "facing=west,orientation=down,state=u": { "model": "computercraft:block/monitor_normal_u", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=u": { "model": "computercraft:block/monitor_normal_u", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=u": { "model": "computercraft:block/monitor_normal_u", @@ -243,12 +243,12 @@ "facing=west,orientation=up,state=u": { "model": "computercraft:block/monitor_normal_u", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=u": { "model": "computercraft:block/monitor_normal_u", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=u": { "model": "computercraft:block/monitor_normal_u" @@ -259,11 +259,11 @@ }, "facing=west,orientation=north,state=u": { "model": "computercraft:block/monitor_normal_u", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=u": { "model": "computercraft:block/monitor_normal_u", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=d": { "model": "computercraft:block/monitor_normal_d", @@ -277,12 +277,12 @@ "facing=west,orientation=down,state=d": { "model": "computercraft:block/monitor_normal_d", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=d": { "model": "computercraft:block/monitor_normal_d", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=d": { "model": "computercraft:block/monitor_normal_d", @@ -296,12 +296,12 @@ "facing=west,orientation=up,state=d": { "model": "computercraft:block/monitor_normal_d", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=d": { "model": "computercraft:block/monitor_normal_d", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=d": { "model": "computercraft:block/monitor_normal_d" @@ -312,11 +312,11 @@ }, "facing=west,orientation=north,state=d": { "model": "computercraft:block/monitor_normal_d", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=d": { "model": "computercraft:block/monitor_normal_d", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=ud": { "model": "computercraft:block/monitor_normal_ud", @@ -330,12 +330,12 @@ "facing=west,orientation=down,state=ud": { "model": "computercraft:block/monitor_normal_ud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=ud": { "model": "computercraft:block/monitor_normal_ud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=ud": { "model": "computercraft:block/monitor_normal_ud", @@ -349,12 +349,12 @@ "facing=west,orientation=up,state=ud": { "model": "computercraft:block/monitor_normal_ud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=ud": { "model": "computercraft:block/monitor_normal_ud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=ud": { "model": "computercraft:block/monitor_normal_ud" @@ -365,11 +365,11 @@ }, "facing=west,orientation=north,state=ud": { "model": "computercraft:block/monitor_normal_ud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=ud": { "model": "computercraft:block/monitor_normal_ud", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=rd": { "model": "computercraft:block/monitor_normal_rd", @@ -383,12 +383,12 @@ "facing=west,orientation=down,state=rd": { "model": "computercraft:block/monitor_normal_rd", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=rd": { "model": "computercraft:block/monitor_normal_rd", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=rd": { "model": "computercraft:block/monitor_normal_rd", @@ -402,12 +402,12 @@ "facing=west,orientation=up,state=rd": { "model": "computercraft:block/monitor_normal_rd", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=rd": { "model": "computercraft:block/monitor_normal_rd", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=rd": { "model": "computercraft:block/monitor_normal_rd" @@ -418,11 +418,11 @@ }, "facing=west,orientation=north,state=rd": { "model": "computercraft:block/monitor_normal_rd", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=rd": { "model": "computercraft:block/monitor_normal_rd", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=ld": { "model": "computercraft:block/monitor_normal_ld", @@ -436,12 +436,12 @@ "facing=west,orientation=down,state=ld": { "model": "computercraft:block/monitor_normal_ld", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=ld": { "model": "computercraft:block/monitor_normal_ld", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=ld": { "model": "computercraft:block/monitor_normal_ld", @@ -455,12 +455,12 @@ "facing=west,orientation=up,state=ld": { "model": "computercraft:block/monitor_normal_ld", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=ld": { "model": "computercraft:block/monitor_normal_ld", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=ld": { "model": "computercraft:block/monitor_normal_ld" @@ -471,11 +471,11 @@ }, "facing=west,orientation=north,state=ld": { "model": "computercraft:block/monitor_normal_ld", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=ld": { "model": "computercraft:block/monitor_normal_ld", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=ru": { "model": "computercraft:block/monitor_normal_ru", @@ -489,12 +489,12 @@ "facing=west,orientation=down,state=ru": { "model": "computercraft:block/monitor_normal_ru", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=ru": { "model": "computercraft:block/monitor_normal_ru", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=ru": { "model": "computercraft:block/monitor_normal_ru", @@ -508,12 +508,12 @@ "facing=west,orientation=up,state=ru": { "model": "computercraft:block/monitor_normal_ru", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=ru": { "model": "computercraft:block/monitor_normal_ru", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=ru": { "model": "computercraft:block/monitor_normal_ru" @@ -524,11 +524,11 @@ }, "facing=west,orientation=north,state=ru": { "model": "computercraft:block/monitor_normal_ru", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=ru": { "model": "computercraft:block/monitor_normal_ru", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lu": { "model": "computercraft:block/monitor_normal_lu", @@ -542,12 +542,12 @@ "facing=west,orientation=down,state=lu": { "model": "computercraft:block/monitor_normal_lu", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lu": { "model": "computercraft:block/monitor_normal_lu", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lu": { "model": "computercraft:block/monitor_normal_lu", @@ -561,12 +561,12 @@ "facing=west,orientation=up,state=lu": { "model": "computercraft:block/monitor_normal_lu", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lu": { "model": "computercraft:block/monitor_normal_lu", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lu": { "model": "computercraft:block/monitor_normal_lu" @@ -577,11 +577,11 @@ }, "facing=west,orientation=north,state=lu": { "model": "computercraft:block/monitor_normal_lu", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lu": { "model": "computercraft:block/monitor_normal_lu", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", @@ -595,12 +595,12 @@ "facing=west,orientation=down,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", @@ -614,12 +614,12 @@ "facing=west,orientation=up,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lrd": { "model": "computercraft:block/monitor_normal_lrd" @@ -630,11 +630,11 @@ }, "facing=west,orientation=north,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=rud": { "model": "computercraft:block/monitor_normal_rud", @@ -648,12 +648,12 @@ "facing=west,orientation=down,state=rud": { "model": "computercraft:block/monitor_normal_rud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=rud": { "model": "computercraft:block/monitor_normal_rud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=rud": { "model": "computercraft:block/monitor_normal_rud", @@ -667,12 +667,12 @@ "facing=west,orientation=up,state=rud": { "model": "computercraft:block/monitor_normal_rud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=rud": { "model": "computercraft:block/monitor_normal_rud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=rud": { "model": "computercraft:block/monitor_normal_rud" @@ -683,11 +683,11 @@ }, "facing=west,orientation=north,state=rud": { "model": "computercraft:block/monitor_normal_rud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=rud": { "model": "computercraft:block/monitor_normal_rud", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lud": { "model": "computercraft:block/monitor_normal_lud", @@ -701,12 +701,12 @@ "facing=west,orientation=down,state=lud": { "model": "computercraft:block/monitor_normal_lud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lud": { "model": "computercraft:block/monitor_normal_lud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lud": { "model": "computercraft:block/monitor_normal_lud", @@ -720,12 +720,12 @@ "facing=west,orientation=up,state=lud": { "model": "computercraft:block/monitor_normal_lud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lud": { "model": "computercraft:block/monitor_normal_lud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lud": { "model": "computercraft:block/monitor_normal_lud" @@ -736,11 +736,11 @@ }, "facing=west,orientation=north,state=lud": { "model": "computercraft:block/monitor_normal_lud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lud": { "model": "computercraft:block/monitor_normal_lud", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lru": { "model": "computercraft:block/monitor_normal_lru", @@ -754,12 +754,12 @@ "facing=west,orientation=down,state=lru": { "model": "computercraft:block/monitor_normal_lru", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lru": { "model": "computercraft:block/monitor_normal_lru", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lru": { "model": "computercraft:block/monitor_normal_lru", @@ -773,12 +773,12 @@ "facing=west,orientation=up,state=lru": { "model": "computercraft:block/monitor_normal_lru", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lru": { "model": "computercraft:block/monitor_normal_lru", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lru": { "model": "computercraft:block/monitor_normal_lru" @@ -789,11 +789,11 @@ }, "facing=west,orientation=north,state=lru": { "model": "computercraft:block/monitor_normal_lru", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lru": { "model": "computercraft:block/monitor_normal_lru", - "y": -90 + "y": 90 }, "facing=north,orientation=down,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", @@ -807,12 +807,12 @@ "facing=west,orientation=down,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "x": 90, - "y": 90 + "y": 270 }, "facing=east,orientation=down,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "x": 90, - "y": -90 + "y": 90 }, "facing=north,orientation=up,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", @@ -826,12 +826,12 @@ "facing=west,orientation=up,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "x": 270, - "y": 90 + "y": 270 }, "facing=east,orientation=up,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "x": 270, - "y": -90 + "y": 90 }, "facing=north,orientation=north,state=lrud": { "model": "computercraft:block/monitor_normal_lrud" @@ -842,11 +842,11 @@ }, "facing=west,orientation=north,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", - "y": 90 + "y": 270 }, "facing=east,orientation=north,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", - "y": -90 + "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json b/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json new file mode 100644 index 000000000..25965f980 --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_advanced_top", + "side": "computercraft:block/computer_advanced_side", + "front": "computercraft:block/computer_advanced_front_blink" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json b/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json new file mode 100644 index 000000000..264f6932e --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_advanced_top", + "side": "computercraft:block/computer_advanced_side", + "front": "computercraft:block/computer_advanced_front" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json b/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json new file mode 100644 index 000000000..1a088dadc --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_advanced_top", + "side": "computercraft:block/computer_advanced_side", + "front": "computercraft:block/computer_advanced_front_on" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json b/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json new file mode 100644 index 000000000..4ad39b620 --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_command_top", + "side": "computercraft:block/computer_command_side", + "front": "computercraft:block/computer_command_front_blink" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_command_off.json b/src/generated/resources/assets/computercraft/models/block/computer_command_off.json new file mode 100644 index 000000000..9223552ef --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_command_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_command_top", + "side": "computercraft:block/computer_command_side", + "front": "computercraft:block/computer_command_front" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_command_on.json b/src/generated/resources/assets/computercraft/models/block/computer_command_on.json new file mode 100644 index 000000000..635df67ee --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_command_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_command_top", + "side": "computercraft:block/computer_command_side", + "front": "computercraft:block/computer_command_front_on" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json b/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json new file mode 100644 index 000000000..fb01777c4 --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_normal_top", + "side": "computercraft:block/computer_normal_side", + "front": "computercraft:block/computer_normal_front_blink" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json b/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json new file mode 100644 index 000000000..08288705e --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_normal_top", + "side": "computercraft:block/computer_normal_side", + "front": "computercraft:block/computer_normal_front" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json b/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json new file mode 100644 index 000000000..f5ca31116 --- /dev/null +++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "computercraft:block/computer_normal_top", + "side": "computercraft:block/computer_normal_side", + "front": "computercraft:block/computer_normal_front_on" + } +} \ No newline at end of file diff --git a/src/main/java/dan200/computercraft/data/BlockModelProvider.java b/src/main/java/dan200/computercraft/data/BlockModelProvider.java index 0ab5c92b8..6aea58d25 100644 --- a/src/main/java/dan200/computercraft/data/BlockModelProvider.java +++ b/src/main/java/dan200/computercraft/data/BlockModelProvider.java @@ -8,6 +8,8 @@ import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.Registry; +import dan200.computercraft.shared.computer.blocks.BlockComputer; +import dan200.computercraft.shared.computer.core.ComputerState; import dan200.computercraft.shared.peripheral.monitor.BlockMonitor; import dan200.computercraft.shared.peripheral.monitor.MonitorEdgeState; import net.minecraft.block.Block; @@ -20,12 +22,14 @@ public class BlockModelProvider extends BlockStateProvider { - private final ModelFile root; + private final ModelFile monitorBase; + private final ModelFile orientable; public BlockModelProvider( DataGenerator generator, ExistingFileHelper existingFileHelper ) { super( generator, ComputerCraft.MOD_ID, existingFileHelper ); - root = models().getExistingFile( new ResourceLocation( ComputerCraft.MOD_ID, "block/monitor_base" ) ); + monitorBase = models().getExistingFile( new ResourceLocation( ComputerCraft.MOD_ID, "block/monitor_base" ) ); + orientable = models().getExistingFile( new ResourceLocation( "block/orientable" ) ); } @Nonnull @@ -40,9 +44,35 @@ protected void registerStatesAndModels() { registerMonitors( Registry.ModBlocks.MONITOR_NORMAL.get() ); registerMonitors( Registry.ModBlocks.MONITOR_ADVANCED.get() ); + + registerComputer( Registry.ModBlocks.COMPUTER_NORMAL.get() ); + registerComputer( Registry.ModBlocks.COMPUTER_ADVANCED.get() ); + registerComputer( Registry.ModBlocks.COMPUTER_COMMAND.get() ); } - private void registerMonitors( Block block ) + private void registerComputer( BlockComputer block ) + { + VariantBlockStateBuilder builder = getVariantBuilder( block ); + for( ComputerState state : BlockComputer.STATE.getAllowedValues() ) + { + BlockModelBuilder model = models() + .getBuilder( suffix( block, "_" + state ) ) + .parent( orientable ) + .texture( "top", suffix( block, "_top" ) ) + .texture( "side", suffix( block, "_side" ) ) + .texture( "front", suffix( block, "_front" + toSuffix( state ) ) ); + + for( Direction facing : BlockComputer.FACING.getAllowedValues() ) + { + builder.partialState() + .with( BlockComputer.STATE, state ) + .with( BlockComputer.FACING, facing ) + .addModels( new ConfiguredModel( model, 0, toYAngle( facing ), false ) ); + } + } + } + + private void registerMonitors( BlockMonitor block ) { String name = block.getRegistryName().getPath(); registerMonitorModel( name, "", 16, 4, 0, 32 ); @@ -66,8 +96,7 @@ private void registerMonitors( Block block ) for( MonitorEdgeState edge : BlockMonitor.STATE.getAllowedValues() ) { String suffix = edge == MonitorEdgeState.NONE ? "" : "_" + edge.getName(); - ResourceLocation modelName = new ResourceLocation( ComputerCraft.MOD_ID, "block/" + name + suffix ); - ModelFile model = models().getBuilder( modelName.toString() ); + ModelFile model = models().getBuilder( suffix( block, suffix ) ); for( Direction facing : BlockMonitor.FACING.getAllowedValues() ) { @@ -77,7 +106,7 @@ private void registerMonitors( Block block ) .with( BlockMonitor.STATE, edge ) .with( BlockMonitor.FACING, facing ) .with( BlockMonitor.ORIENTATION, orientation ) - .addModels( new ConfiguredModel( model, toXAngle( orientation ), 180 - (int) facing.getHorizontalAngle(), false ) ); + .addModels( new ConfiguredModel( model, toXAngle( orientation ), toYAngle( facing ), false ) ); } } } @@ -87,14 +116,14 @@ private void registerMonitorModel( String prefix, String corners, int front, int { String texturePrefix = ComputerCraft.MOD_ID + ":block/" + prefix + "_"; models().getBuilder( prefix + corners ) - .parent( root ) + .parent( monitorBase ) .texture( "front", texturePrefix + front ) .texture( "side", texturePrefix + side ) .texture( "top", texturePrefix + top ) .texture( "back", texturePrefix + back ); } - private int toXAngle( Direction direction ) + private static int toXAngle( Direction direction ) { switch( direction ) { @@ -106,4 +135,29 @@ private int toXAngle( Direction direction ) return 90; } } + + private static int toYAngle( Direction direction ) + { + return ((int) direction.getHorizontalAngle() + 180) % 360; + } + + private static String toSuffix( ComputerState state ) + { + switch( state ) + { + default: + case OFF: + return ""; + case ON: + return "_on"; + case BLINKING: + return "_blink"; + } + } + + private static String suffix( Block block, String suffix ) + { + ResourceLocation id = block.getRegistryName(); + return new ResourceLocation( id.getNamespace(), "block/" + id.getPath() + suffix ).toString(); + } } diff --git a/src/main/resources/assets/computercraft/blockstates/computer_advanced.json b/src/main/resources/assets/computercraft/blockstates/computer_advanced.json deleted file mode 100644 index f438720d8..000000000 --- a/src/main/resources/assets/computercraft/blockstates/computer_advanced.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "variants": { - "facing=north,state=off": { "model": "computercraft:block/computer_advanced_off" }, - "facing=south,state=off": { "model": "computercraft:block/computer_advanced_off", "y": 180 }, - "facing=west,state=off": { "model": "computercraft:block/computer_advanced_off", "y": 270 }, - "facing=east,state=off": { "model": "computercraft:block/computer_advanced_off", "y": 90 }, - - "facing=north,state=on": { "model": "computercraft:block/computer_advanced_on" }, - "facing=south,state=on": { "model": "computercraft:block/computer_advanced_on", "y": 180 }, - "facing=west,state=on": { "model": "computercraft:block/computer_advanced_on", "y": 270 }, - "facing=east,state=on": { "model": "computercraft:block/computer_advanced_on", "y": 90 }, - - "facing=north,state=blinking": { "model": "computercraft:block/computer_advanced_blinking" }, - "facing=south,state=blinking": { "model": "computercraft:block/computer_advanced_blinking", "y": 180 }, - "facing=west,state=blinking": { "model": "computercraft:block/computer_advanced_blinking", "y": 270 }, - "facing=east,state=blinking": { "model": "computercraft:block/computer_advanced_blinking", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/computer_command.json b/src/main/resources/assets/computercraft/blockstates/computer_command.json deleted file mode 100644 index cb45d46c2..000000000 --- a/src/main/resources/assets/computercraft/blockstates/computer_command.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - - "facing=north,state=off": { "model": "computercraft:block/computer_command_off" }, - "facing=south,state=off": { "model": "computercraft:block/computer_command_off", "y": 180 }, - "facing=west,state=off": { "model": "computercraft:block/computer_command_off", "y": 270 }, - "facing=east,state=off": { "model": "computercraft:block/computer_command_off", "y": 90 }, - - "facing=north,state=on": { "model": "computercraft:block/computer_command_on" }, - "facing=south,state=on": { "model": "computercraft:block/computer_command_on", "y": 180 }, - "facing=west,state=on": { "model": "computercraft:block/computer_command_on", "y": 270 }, - "facing=east,state=on": { "model": "computercraft:block/computer_command_on", "y": 90 }, - - "facing=north,state=blinking": { "model": "computercraft:block/computer_command_blinking" }, - "facing=south,state=blinking": { "model": "computercraft:block/computer_command_blinking", "y": 180 }, - "facing=west,state=blinking": { "model": "computercraft:block/computer_command_blinking", "y": 270 }, - "facing=east,state=blinking": { "model": "computercraft:block/computer_command_blinking", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/computer_normal.json b/src/main/resources/assets/computercraft/blockstates/computer_normal.json deleted file mode 100644 index 95e521a7d..000000000 --- a/src/main/resources/assets/computercraft/blockstates/computer_normal.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "variants": { - "facing=north,state=off": { "model": "computercraft:block/computer_normal_off" }, - "facing=south,state=off": { "model": "computercraft:block/computer_normal_off", "y": 180 }, - "facing=west,state=off": { "model": "computercraft:block/computer_normal_off", "y": 270 }, - "facing=east,state=off": { "model": "computercraft:block/computer_normal_off", "y": 90 }, - - "facing=north,state=on": { "model": "computercraft:block/computer_normal_on" }, - "facing=south,state=on": { "model": "computercraft:block/computer_normal_on", "y": 180 }, - "facing=west,state=on": { "model": "computercraft:block/computer_normal_on", "y": 270 }, - "facing=east,state=on": { "model": "computercraft:block/computer_normal_on", "y": 90 }, - - "facing=north,state=blinking": { "model": "computercraft:block/computer_normal_blinking" }, - "facing=south,state=blinking": { "model": "computercraft:block/computer_normal_blinking", "y": 180 }, - "facing=west,state=blinking": { "model": "computercraft:block/computer_normal_blinking", "y": 270 }, - "facing=east,state=blinking": { "model": "computercraft:block/computer_normal_blinking", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json deleted file mode 100644 index ed4c9bec3..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_advanced_front_blink", - "side": "computercraft:block/computer_advanced_side", - "top": "computercraft:block/computer_advanced_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_advanced_off.json b/src/main/resources/assets/computercraft/models/block/computer_advanced_off.json deleted file mode 100644 index 8631c88ed..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_advanced_off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_advanced_front", - "side": "computercraft:block/computer_advanced_side", - "top": "computercraft:block/computer_advanced_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_advanced_on.json b/src/main/resources/assets/computercraft/models/block/computer_advanced_on.json deleted file mode 100644 index 2692aab84..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_advanced_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_advanced_front_on", - "side": "computercraft:block/computer_advanced_side", - "top": "computercraft:block/computer_advanced_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_command_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_command_blinking.json deleted file mode 100644 index 09d7ac1b3..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_command_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_command_front_blink", - "side": "computercraft:block/computer_command_side", - "top": "computercraft:block/computer_command_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_command_off.json b/src/main/resources/assets/computercraft/models/block/computer_command_off.json deleted file mode 100644 index eaa4970b9..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_command_off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_command_front", - "side": "computercraft:block/computer_command_side", - "top": "computercraft:block/computer_command_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_command_on.json b/src/main/resources/assets/computercraft/models/block/computer_command_on.json deleted file mode 100644 index 7d4730140..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_command_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_command_front_on", - "side": "computercraft:block/computer_command_side", - "top": "computercraft:block/computer_command_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json deleted file mode 100644 index d6d70f696..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_normal_front_blink", - "side": "computercraft:block/computer_normal_side", - "top": "computercraft:block/computer_normal_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_normal_off.json b/src/main/resources/assets/computercraft/models/block/computer_normal_off.json deleted file mode 100644 index 5d200f816..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_normal_off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_normal_front", - "side": "computercraft:block/computer_normal_side", - "top": "computercraft:block/computer_normal_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_normal_on.json b/src/main/resources/assets/computercraft/models/block/computer_normal_on.json deleted file mode 100644 index f434d7fa8..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_normal_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:block/computer_normal_front_on", - "side": "computercraft:block/computer_normal_side", - "top": "computercraft:block/computer_normal_top" - } -}