Resource + Metadata overhaul again.

Codetoil · Feb 2, 2023 · 9dbcfad · 9dbcfad
1 parent 1f1898c
commit 9dbcfad
Show file tree

Hide file tree

Showing 41 changed files with 265 additions and 267 deletions.
diff --git a/package.json b/package.json
diff --git 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
@@ -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
@@ -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,23 +74,23 @@
       "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] }
       }
     },
     {
       "name": "Element",
       "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
@@ -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,23 +43,23 @@
       "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" }
       }
     },
     {
       "name": "Element",
       "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
@@ -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
@@ -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
@@ -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,23 +74,23 @@
       "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] }
       }
     },
     {
       "name": "Element",
       "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
@@ -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,23 +43,23 @@
       "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" }
       }
     },
     {
       "name": "Element",
       "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
@@ -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
@@ -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
@@ -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,23 +74,23 @@
       "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] }
       }
     },
     {
       "name": "Element",
       "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
@@ -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,23 +43,23 @@
       "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" }
       }
     },
     {
       "name": "Element",
       "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
@@ -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"
   },