Change bulbs to new lamp_off tex. Fix upper quad bulb size

CSX8600 · Mar 15, 2024 · 8919e3a · 8919e3a
1 parent c89870a
commit 8919e3a
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps.json b/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps.json
@@ -4,8 +4,8 @@
         "model": "trafficcontrol:crossing_gate_lamps",
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_ne_lamp.json b/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_ne_lamp.json
@@ -3,8 +3,8 @@
     "defaults": {
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_nw_lamp.json b/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_nw_lamp.json
@@ -3,8 +3,8 @@
     "defaults": {
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_se_lamp.json b/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_se_lamp.json
@@ -3,8 +3,8 @@
     "defaults": {
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_sw_lamp.json b/src/main/resources/assets/trafficcontrol/blockstates/crossing_gate_lamps_sw_lamp.json
@@ -4,8 +4,8 @@
     	"model": "trafficcontrol:crossing_gate_lamps_sw_lamp",
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps.json b/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps.json
@@ -4,8 +4,8 @@
         "model": "trafficcontrol:overhead_lamps",
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps_ne_lamp.json b/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps_ne_lamp.json
@@ -3,8 +3,8 @@
     "defaults": {
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps_nw_lamp.json b/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps_nw_lamp.json
@@ -3,8 +3,8 @@
     "defaults": {
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps_se_lamp.json b/src/main/resources/assets/trafficcontrol/blockstates/overhead_lamps_se_lamp.json
@@ -3,8 +3,8 @@
     "defaults": {
         "textures":
         {
-            "leftlamp": "trafficcontrol:blocks/black",
-            "rightlamp": "trafficcontrol:blocks/black"
+            "leftlamp": "trafficcontrol:blocks/lamp_off",
+            "rightlamp": "trafficcontrol:blocks/lamp_off"
         }
     },
     "variants": {

diff --git a/src/main/resources/assets/trafficcontrol/models/block/vertical_wig_wag_arm.json b/src/main/resources/assets/trafficcontrol/models/block/vertical_wig_wag_arm.json
@@ -56,8 +56,8 @@
 			}
 		},
 		{
-			"from": [-1, 6.25, -0.8],
-			"to": [1, 8.25, 0.4],
+			"from": [-1.25, 6, -0.8],
+			"to": [1.25, 8.5, 0.4],
 			"faces": {
 				"north": {"uv": [0, 0, 2, 2], "texture": "#3"},
 				"east": {"uv": [0, 0, 1.2, 2], "texture": "#3"},

diff --git a/src/main/resources/assets/trafficcontrol/models/block/vertical_wig_wag_master.json b/src/main/resources/assets/trafficcontrol/models/block/vertical_wig_wag_master.json
@@ -74,8 +74,8 @@
 			}
 		},
 		{
-			"from": [7, 13, 3.4],
-			"to": [9, 15, 4.6],
+			"from": [6.75, 12.75, 3.4],
+			"to": [9.25, 15.25, 4.6],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 2, 2], "texture": "#3"},