From 9dbcfad0357ef39e5ca597f6c01a04848f129d6b Mon Sep 17 00:00:00 2001 From: "Anthony (Codetoil)" Date: Thu, 2 Feb 2023 04:18:56 +0000 Subject: [PATCH] Resource + Metadata overhaul again. --- package.json | 19 -- .../models/block/distributor_front.json | 2 +- .../block/distributor_front_driven.json | 4 +- .../models/block/distributor_front_on.json | 24 +-- .../block/distributor_front_on_driven.json | 26 +-- .../models/block/distributor_left.json | 2 +- .../models/block/distributor_left_driven.json | 4 +- .../models/block/distributor_left_on.json | 24 +-- .../block/distributor_left_on_driven.json | 26 +-- .../models/block/distributor_right.json | 2 +- .../block/distributor_right_driven.json | 4 +- .../models/block/distributor_right_on.json | 24 +-- .../block/distributor_right_on_driven.json | 26 +-- .../models/block/distributor_rotating.json | 2 +- .../models/block/distributor_rotating_on.json | 17 +- .../models/block/selector_front.json | 2 +- .../models/block/selector_front_driven.json | 4 +- .../models/block/selector_front_on.json | 24 +-- .../block/selector_front_on_driven.json | 26 +-- .../models/block/selector_left.json | 2 +- .../models/block/selector_left_driven.json | 2 +- .../models/block/selector_left_on.json | 24 +-- .../models/block/selector_left_on_driven.json | 26 +-- .../models/block/selector_right.json | 2 +- .../models/block/selector_right_driven.json | 4 +- .../models/block/selector_right_on.json | 164 ++++++++++-------- .../block/selector_right_on_driven.json | 26 +-- .../models/block/selector_rotating.json | 4 +- .../models/block/selector_rotating_on.json | 16 +- ...{distributor_front.png => distributor.png} | Bin .../textures/block/distributor_left.png | Bin 277 -> 0 bytes .../textures/block/distributor_left_on.png | Bin 277 -> 0 bytes .../textures/block/distributor_right.png | Bin 277 -> 0 bytes .../textures/block/distributor_right_on.png | Bin 277 -> 0 bytes ...{distributor_front_on.png => selector.png} | Bin .../textures/block/selector_front.png | Bin 277 -> 0 bytes .../textures/block/selector_front_on.png | Bin 277 -> 0 bytes .../textures/block/selector_left.png | Bin 277 -> 0 bytes .../textures/block/selector_left_on.png | Bin 277 -> 0 bytes .../textures/block/selector_right.png | Bin 277 -> 0 bytes .../textures/block/selector_right_on.png | Bin 277 -> 0 bytes 41 files changed, 265 insertions(+), 267 deletions(-) delete mode 100644 package.json rename src/main/resources/assets/redstoneelectronics/textures/block/{distributor_front.png => distributor.png} (100%) delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/distributor_left.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/distributor_left_on.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/distributor_right.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/distributor_right_on.png rename src/main/resources/assets/redstoneelectronics/textures/block/{distributor_front_on.png => selector.png} (100%) delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/selector_front.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/selector_front_on.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/selector_left.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/selector_left_on.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/selector_right.png delete mode 100644 src/main/resources/assets/redstoneelectronics/textures/block/selector_right_on.png diff --git a/package.json b/package.json deleted file mode 100644 index a01b45c..0000000 --- a/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "redstoneelctronicstest", - "version": "0.1.0", - "description": "Test script for Redstone Electronics", - "scripts": { - "test": "node analyze.js", - "build": "echo This test script is static. The mod itself is built using gradle." - }, - "repository": { - "type": "git", - "url": "git+https://github.com/Codetoil/RedstoneElectronics.git" - }, - "keywords": [], - "author": "Codetoil", - "license": "GPL-3.0-or-later", - "devDependencies": {}, - "type": "module" - } - \ No newline at end of file diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front.json index 2686dfc..f982c52 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front.json @@ -4,7 +4,7 @@ "textures": { "particle": "minecraft:block/comparator", "unlit": "minecraft:block/redstone_torch_off", - "top": "redstoneelectronics:block/distributor_front", + "top": "redstoneelectronics:block/distributor", "slab": "minecraft:block/smooth_stone" }, "display": { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_driven.json index b1491fb..2f0171a 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_driven.json @@ -3,9 +3,9 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/distributor_front", + "top": "redstoneelectronics:block/distributor", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on.json index 5f7debb..6fc9af9 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "textures": { "particle": "minecraft:block/comparator", - "unlit": "minecraft:block/redstone_torch", - "top": "redstoneelectronics:block/distributor_front_on", + "lit": "minecraft:block/redstone_torch", + "top": "redstoneelectronics:block/distributor", "slab": "minecraft:block/smooth_stone" }, "display": { @@ -74,11 +74,11 @@ "from": [7, 2, 11], "to": [9, 7, 13], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } }, { @@ -86,11 +86,11 @@ "from": [7, 2, 2], "to": [9, 6, 4], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } } ] diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on_driven.json index 0a036b2..a167d3a 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on_driven.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/distributor_front_on", + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/distributor", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ @@ -43,11 +43,11 @@ "from": [7, 2, 11], "to": [9, 7, 13], "faces": { - "north": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { @@ -55,11 +55,11 @@ "from": [7, 2, 2], "to": [9, 6, 4], "faces": { - "north": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left.json index e5363a1..6403737 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left.json @@ -4,7 +4,7 @@ "textures": { "particle": "minecraft:block/comparator", "unlit": "minecraft:block/redstone_torch_off", - "top": "redstoneelectronics:block/distributor_left", + "top": "redstoneelectronics:block/distributor", "slab": "minecraft:block/smooth_stone" }, "display": { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_driven.json index 519736a..72c51c6 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_driven.json @@ -3,9 +3,9 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/distributor_left", + "top": "redstoneelectronics:block/distributor", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on.json index b3c3076..a643952 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "textures": { "particle": "minecraft:block/comparator", - "unlit": "minecraft:block/redstone_torch", - "top": "redstoneelectronics:block/distributor_left_on", + "lit": "minecraft:block/redstone_torch", + "top": "redstoneelectronics:block/distributor", "slab": "minecraft:block/smooth_stone" }, "display": { @@ -74,11 +74,11 @@ "from": [7, 2, 11], "to": [9, 7, 13], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } }, { @@ -86,11 +86,11 @@ "from": [2, 2, 5], "to": [4, 6, 7], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } } ] diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on_driven.json index 08842fe..94f3ebc 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on_driven.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/distributor_left_on", + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/distributor", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ @@ -43,11 +43,11 @@ "from": [7, 2, 11], "to": [9, 7, 13], "faces": { - "north": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { @@ -55,11 +55,11 @@ "from": [2, 2, 5], "to": [4, 6, 7], "faces": { - "north": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right.json index 6e68ebc..7f8550b 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right.json @@ -4,7 +4,7 @@ "textures": { "particle": "minecraft:block/comparator", "unlit": "minecraft:block/redstone_torch_off", - "top": "redstoneelectronics:block/distributor_right", + "top": "redstoneelectronics:block/distributor", "slab": "minecraft:block/smooth_stone" }, "display": { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_driven.json index 91b0b76..544d2dd 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_driven.json @@ -3,9 +3,9 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/distributor_right", + "top": "redstoneelectronics:block/distributor", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on.json index ba91e39..9e5db7f 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "textures": { "particle": "minecraft:block/comparator", - "unlit": "minecraft:block/redstone_torch", - "top": "redstoneelectronics:block/distributor_right_on", + "lit": "minecraft:block/redstone_torch", + "top": "redstoneelectronics:block/distributor", "slab": "minecraft:block/smooth_stone" }, "display": { @@ -74,11 +74,11 @@ "from": [7, 2, 11], "to": [9, 7, 13], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } }, { @@ -86,11 +86,11 @@ "from": [12, 2, 5], "to": [14, 6, 7], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } } ] diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on_driven.json index ad87022..209695d 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on_driven.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/distributor_right_on", + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/distributor", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ @@ -43,11 +43,11 @@ "from": [7, 2, 11], "to": [9, 7, 13], "faces": { - "north": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { @@ -55,11 +55,11 @@ "from": [12, 2, 5], "to": [14, 6, 7], "faces": { - "north": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating.json index 3286b97..6f803e0 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating.json @@ -3,7 +3,7 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/distributor_front", + "top": "redstoneelectronics:block/distributor", "slab": "block/smooth_stone", "particle": "block/comparator" }, diff --git a/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating_on.json b/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating_on.json index 0e5913c..eff54c4 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating_on.json @@ -2,9 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/distributor_left_on", - "slab": "block/smooth_stone" + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/distributor", + "slab": "block/smooth_stone", + "particle": "minecraft:block/comparator" }, "elements": [ { @@ -41,11 +42,11 @@ "from": [7, 2, 11], "to": [9, 7, 13], "faces": { - "north": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } } ], diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_front.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_front.json index f7da7c8..8b87fec 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_front.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_front.json @@ -4,7 +4,7 @@ "textures": { "particle": "minecraft:block/comparator", "unlit": "minecraft:block/redstone_torch_off", - "top": "redstoneelectronics:block/selector_front", + "top": "redstoneelectronics:block/selector", "slab": "minecraft:block/smooth_stone" }, "display": { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_front_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_front_driven.json index 7838539..29a36a0 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_front_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_front_driven.json @@ -3,9 +3,9 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/selector_front", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on.json index e6c095b..f0899d0 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "textures": { "particle": "minecraft:block/comparator", - "unlit": "minecraft:block/redstone_torch", - "top": "redstoneelectronics:block/selector_front_on", + "lit": "minecraft:block/redstone_torch", + "top": "redstoneelectronics:block/selector", "slab": "minecraft:block/smooth_stone" }, "display": { @@ -74,11 +74,11 @@ "from": [7, 2, 11], "to": [9, 6, 13], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } }, { @@ -86,11 +86,11 @@ "from": [7, 2, 2], "to": [9, 7, 4], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } } ] diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on_driven.json index b15722c..bffcde0 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_front_on_driven.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/selector_front_on", + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ @@ -43,11 +43,11 @@ "from": [7, 2, 11], "to": [9, 6, 13], "faces": { - "north": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { @@ -55,11 +55,11 @@ "from": [7, 2, 2], "to": [9, 7, 4], "faces": { - "north": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_left.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_left.json index e927efa..eb8530f 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_left.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_left.json @@ -4,7 +4,7 @@ "textures": { "particle": "minecraft:block/comparator", "unlit": "minecraft:block/redstone_torch_off", - "top": "redstoneelectronics:block/selector_left", + "top": "redstoneelectronics:block/selector", "slab": "minecraft:block/smooth_stone" }, "display": { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_left_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_left_driven.json index 6e04c0f..2d4edcc 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_left_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_left_driven.json @@ -3,7 +3,7 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/selector_right", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", "particle": "block/oak_planks", "oak_planks": "block/oak_planks" diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on.json index cfee553..36324c9 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "textures": { "particle": "minecraft:block/comparator", - "unlit": "minecraft:block/redstone_torch", - "top": "redstoneelectronics:block/selector_left_on", + "lit": "minecraft:block/redstone_torch", + "top": "redstoneelectronics:block/selector", "slab": "minecraft:block/smooth_stone" }, "display": { @@ -74,11 +74,11 @@ "from": [7, 2, 11], "to": [9, 6, 13], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 10] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } }, { @@ -86,11 +86,11 @@ "from": [12, 2, 5], "to": [14, 7, 7], "faces": { - "north": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "east": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "south": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "west": { "texture": "#unlit", "uv": [7, 6, 9, 11] }, - "up": { "texture": "#unlit", "uv": [7, 6, 9, 8] } + "north": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } } } ] diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on_driven.json index 6b31354..22f541d 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_left_on_driven.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/selector_left_on", + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ @@ -43,11 +43,11 @@ "from": [7, 2, 11], "to": [9, 6, 13], "faces": { - "north": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { @@ -55,11 +55,11 @@ "from": [12, 2, 5], "to": [14, 7, 7], "faces": { - "north": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_right.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_right.json index 8c7a5d4..f0a7d49 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_right.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_right.json @@ -4,7 +4,7 @@ "textures": { "particle": "minecraft:block/comparator", "unlit": "minecraft:block/redstone_torch_off", - "top": "redstoneelectronics:block/selector_right", + "top": "redstoneelectronics:block/selector", "slab": "minecraft:block/smooth_stone" }, "display": { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_right_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_right_driven.json index 9a64da4..849f63b 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_right_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_right_driven.json @@ -3,9 +3,9 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/selector_right", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on.json index 2db4bef..3e24eda 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on.json @@ -1,81 +1,97 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "particle": "minecraft:block/comparator", - "unlit": "minecraft:block/redstone_torch", - "top": "redstoneelectronics:block/selector_right_on", - "slab": "minecraft:block/smooth_stone" + "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", + "ambientocclusion": false, + "textures": { + "particle": "minecraft:block/comparator", + "lit": "minecraft:block/redstone_torch", + "top": "redstoneelectronics:block/selector", + "slab": "minecraft:block/smooth_stone" + }, + "display": { + "gui": { + "rotation": [30, 45, 0], + "translation": [0, 0, 0], + "scale": [0.625, 0.625, 0.625] }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] + "ground": { + "rotation": [0, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, 0], + "scale": [1, 1, 1] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 0, 0], + "scale": [1, 1, 1] + }, + "firstperson_righthand": { + "rotation": [0, 315, 0], + "translation": [0, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "thirdperson_righthand": { + "rotation": [75, 315, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + } + }, + "elements": [ + { + "name": "Element", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": { + "texture": "#slab", + "uv": [0, 14, 16, 16], + "cullface": "north" }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] + "east": { + "texture": "#slab", + "uv": [0, 14, 16, 16], + "cullface": "east" }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] + "south": { + "texture": "#slab", + "uv": [0, 14, 16, 16], + "cullface": "south" }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] + "west": { + "texture": "#slab", + "uv": [0, 14, 16, 16], + "cullface": "west" }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } + "up": { "uv": [0, 0, 16, 16], "texture": "#top" }, + "down": { "texture": "#slab", "uv": [0, 0, 16, 16], "cullface": "down" } + } }, - "elements": [ - { - "name": "Element", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#slab", "uv": [ 0, 14, 16, 16 ], "cullface": "north" }, - "east": { "texture": "#slab", "uv": [ 0, 14, 16, 16 ], "cullface": "east" }, - "south": { "texture": "#slab", "uv": [ 0, 14, 16, 16 ], "cullface": "south" }, - "west": { "texture": "#slab", "uv": [ 0, 14, 16, 16 ], "cullface": "west" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, - "down": { "texture": "#slab", "uv": [ 0, 0, 16, 16 ], "cullface": "down" } - } - }, - { - "name": "Element", - "from": [ 7, 2, 11 ], - "to": [ 9, 6, 13 ], - "faces": { - "north": { "texture": "#unlit", "uv": [ 7, 6, 9, 10 ] }, - "east": { "texture": "#unlit", "uv": [ 7, 6, 9, 10 ] }, - "south": { "texture": "#unlit", "uv": [ 7, 6, 9, 10 ] }, - "west": { "texture": "#unlit", "uv": [ 7, 6, 9, 10 ] }, - "up": { "texture": "#unlit", "uv": [ 7, 6, 9, 8 ] } - } - }, - { - "name": "Element", - "from": [ 2, 2, 5 ], - "to": [ 4, 7, 7 ], - "faces": { - "north": { "texture": "#unlit", "uv": [ 7, 6, 9, 11 ] }, - "east": { "texture": "#unlit", "uv": [ 7, 6, 9, 11 ] }, - "south": { "texture": "#unlit", "uv": [ 7, 6, 9, 11 ] }, - "west": { "texture": "#unlit", "uv": [ 7, 6, 9, 11 ] }, - "up": { "texture": "#unlit", "uv": [ 7, 6, 9, 8 ] } - } - } - ] -} \ No newline at end of file + { + "name": "Element", + "from": [7, 2, 11], + "to": [9, 6, 13], + "faces": { + "north": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 10] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } + } + }, + { + "name": "Element", + "from": [2, 2, 5], + "to": [4, 7, 7], + "faces": { + "north": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "east": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "south": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "west": { "texture": "#lit", "uv": [7, 6, 9, 11] }, + "up": { "texture": "#lit", "uv": [7, 6, 9, 8] } + } + } + ] +} diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on_driven.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on_driven.json index bb7f876..941c33a 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on_driven.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_right_on_driven.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc), but modified by Codetoil", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/selector_right_on", + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", - "particle": "block/oak_planks", + "particle": "minecraft:block/comparator", "oak_planks": "block/oak_planks" }, "elements": [ @@ -43,11 +43,11 @@ "from": [7, 2, 11], "to": [9, 6, 13], "faces": { - "north": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { @@ -55,11 +55,11 @@ "from": [2, 2, 5], "to": [4, 7, 7], "faces": { - "north": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 11], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 11], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } }, { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating.json index 8c9fd6c..e94a491 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating.json @@ -3,9 +3,9 @@ "ambientocclusion": false, "textures": { "unlit": "block/redstone_torch_off", - "top": "redstoneelectronics:block/selector_front", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", - "particle": "block/oak_planks" + "particle": "minecraft:block/comparator" }, "elements": [ { diff --git a/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating_on.json b/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating_on.json index f7c0f21..3ba0e05 100644 --- a/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating_on.json +++ b/src/main/resources/assets/redstoneelectronics/models/block/selector_rotating_on.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "ambientocclusion": false, "textures": { - "unlit": "block/redstone_torch", - "top": "redstoneelectronics:block/selector_left_on", + "lit": "block/redstone_torch", + "top": "redstoneelectronics:block/selector", "slab": "block/smooth_stone", - "particle": "block/oak_planks" + "particle": "minecraft:block/comparator" }, "elements": [ { @@ -42,11 +42,11 @@ "from": [7, 2, 11], "to": [9, 6, 13], "faces": { - "north": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "east": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "south": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "west": { "uv": [7, 6, 9, 10], "texture": "#unlit" }, - "up": { "uv": [7, 6, 9, 8], "texture": "#unlit" } + "north": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "east": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "south": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "west": { "uv": [7, 6, 9, 10], "texture": "#lit" }, + "up": { "uv": [7, 6, 9, 8], "texture": "#lit" } } } ], diff --git a/src/main/resources/assets/redstoneelectronics/textures/block/distributor_front.png b/src/main/resources/assets/redstoneelectronics/textures/block/distributor.png similarity index 100% rename from src/main/resources/assets/redstoneelectronics/textures/block/distributor_front.png rename to src/main/resources/assets/redstoneelectronics/textures/block/distributor.png diff --git a/src/main/resources/assets/redstoneelectronics/textures/block/distributor_left.png b/src/main/resources/assets/redstoneelectronics/textures/block/distributor_left.png deleted file mode 100644 index 680484cd774f962800647789bba025505ae68290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFSl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*Sl`sr)ZN>?X4RVAyLTTwb@b|ut3Y|IK(axc2PnZ=;1OBO zz`%DHgc*