From 5ff5b59ff53c6d01253849ee6b66b5f2e0017f91 Mon Sep 17 00:00:00 2001
From: levtus <i@alexander.systems>
Date: Mon, 25 Sep 2023 13:47:14 -0500
Subject: [PATCH] Fix model issues

---
 .../blockstates/corrugated_metro_panel.json      | 12 ++++++++----
 .../bellsandwhistles/blockstates/headlight.json  | 16 ++++++++--------
 .../blockstates/metro_panel.json                 | 13 ++++++++-----
 .../models/block/headlight/headlight_floor.json  |  2 ++
 .../models/block/headlight/headlight_wall.json   |  2 ++
 .../models/block/metro/door/fold_left.json       |  2 ++
 .../models/block/metro/door/fold_right.json      |  2 ++
 .../metro/door/folding_metro_door_bottom.json    |  2 ++
 .../block/metro/door/folding_metro_door_top.json |  2 ++
 .../metro/door/sliding_metro_door_bottom.json    |  2 ++
 .../block/metro/door/sliding_metro_door_top.json |  2 ++
 .../block/metro/trapdoor/block_bottom.json       |  2 +-
 .../models/block/metro/trapdoor/block_open.json  |  2 +-
 .../models/block/metro/trapdoor/block_top.json   |  2 +-
 .../models/block/metro/window/block_bottom.json  |  7 +++++--
 .../models/block/metro/window/block_open.json    |  4 +++-
 .../models/block/metro/window/block_top.json     |  4 +++-
 17 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/corrugated_metro_panel.json b/src/main/resources/assets/bellsandwhistles/blockstates/corrugated_metro_panel.json
index b58fde6..39169fe 100644
--- a/src/main/resources/assets/bellsandwhistles/blockstates/corrugated_metro_panel.json
+++ b/src/main/resources/assets/bellsandwhistles/blockstates/corrugated_metro_panel.json
@@ -6,21 +6,25 @@
     },
     "facing=east": {
       "model": "bellsandwhistles:block/metro/corrugated_panel/block_side",
-      "y": 270
+      "y": 90,
+      "x": 180
     },
     "facing=north": {
       "model": "bellsandwhistles:block/metro/corrugated_panel/block_side",
-      "y": 180
+      "x": 180
     },
     "facing=south": {
-      "model": "bellsandwhistles:block/metro/corrugated_panel/block_side"
+      "model": "bellsandwhistles:block/metro/corrugated_panel/block_side",
+      "x": 180,
+      "y": 180
     },
     "facing=up": {
       "model": "bellsandwhistles:block/metro/corrugated_panel/block_bottom"
     },
     "facing=west": {
       "model": "bellsandwhistles:block/metro/corrugated_panel/block_side",
-      "y": 90
+      "x": 180,
+      "y": 270
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/headlight.json b/src/main/resources/assets/bellsandwhistles/blockstates/headlight.json
index 892925b..f36e83c 100644
--- a/src/main/resources/assets/bellsandwhistles/blockstates/headlight.json
+++ b/src/main/resources/assets/bellsandwhistles/blockstates/headlight.json
@@ -4,23 +4,23 @@
       "model": "bellsandwhistles:block/headlight/headlight_floor",
       "x": 180
     },
-    "facing=east": {
+    "face=wall, facing=east": {
       "model": "bellsandwhistles:block/headlight/headlight_wall",
-      "y": 270
+      "y": 90
+    },
+    "face=wall, facing=north": {
+      "model": "bellsandwhistles:block/headlight/headlight_wall"
     },
-    "facing=north": {
+    "face=wall, facing=south": {
       "model": "bellsandwhistles:block/headlight/headlight_wall",
       "y": 180
     },
-    "facing=south": {
-      "model": "bellsandwhistles:block/headlight/headlight_wall"
-    },
     "face=floor": {
       "model": "bellsandwhistles:block/headlight/headlight_floor"
     },
-    "facing=west": {
+    "face=wall, facing=west": {
       "model": "bellsandwhistles:block/headlight/headlight_wall",
-      "y": 90
+      "y": 270
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/metro_panel.json b/src/main/resources/assets/bellsandwhistles/blockstates/metro_panel.json
index 24ecc92..42ad061 100644
--- a/src/main/resources/assets/bellsandwhistles/blockstates/metro_panel.json
+++ b/src/main/resources/assets/bellsandwhistles/blockstates/metro_panel.json
@@ -6,21 +6,24 @@
     },
     "facing=east": {
       "model": "bellsandwhistles:block/metro/panel/block_side",
-      "y": 270
+      "y": 90,
+      "x": 180
     },
     "facing=north": {
-      "model": "bellsandwhistles:block/metro/panel/block_side",
-      "y": 180
+      "model": "bellsandwhistles:block/metro/panel/block_side"
     },
     "facing=south": {
-      "model": "bellsandwhistles:block/metro/panel/block_side"
+      "model": "bellsandwhistles:block/metro/panel/block_side",
+      "y": 180,
+      "x": 180
     },
     "facing=up": {
       "model": "bellsandwhistles:block/metro/panel/block_bottom"
     },
     "facing=west": {
       "model": "bellsandwhistles:block/metro/panel/block_side",
-      "y": 90
+      "y": 270,
+      "x": 180
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_floor.json b/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_floor.json
index d4dc293..d9bc3be 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_floor.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_floor.json
@@ -1,5 +1,7 @@
 {
 	"credit": "Made with Blockbench",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"1": "bellsandwhistles:block/headlight",
 		"particle": "bellsandwhistles:block/headlight"
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_wall.json b/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_wall.json
index 30d5aec..600a413 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_wall.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/headlight/headlight_wall.json
@@ -1,5 +1,7 @@
 {
 	"credit": "Made with Blockbench",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"1": "bellsandwhistles:block/headlight",
 		"particle": "bellsandwhistles:block/headlight"
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_left.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_left.json
index 9f8156f..2455870 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_left.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_left.json
@@ -1,6 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"0": "bellsandwhistles:block/metro/metro_door_side",
 		"2": "bellsandwhistles:block/metro/folding_metro_door_top",
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_right.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_right.json
index 0d9f7e1..6cc19cb 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_right.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/fold_right.json
@@ -1,6 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"0": "bellsandwhistles:block/metro/metro_door_side",
 		"2": "bellsandwhistles:block/metro/folding_metro_door_top",
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_bottom.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_bottom.json
index 8c44d6c..3c78317 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_bottom.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_bottom.json
@@ -1,6 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"0": "bellsandwhistles:block/metro/metro_door_side",
 		"2": "bellsandwhistles:block/metro/folding_metro_door_bottom",
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_top.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_top.json
index 4b0a199..617c8b2 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_top.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/folding_metro_door_top.json
@@ -1,6 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"0": "bellsandwhistles:block/metro/metro_door_side",
 		"2": "bellsandwhistles:block/metro/folding_metro_door_top",
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_bottom.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_bottom.json
index 22c8c8e..12a9bd7 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_bottom.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_bottom.json
@@ -1,6 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"0": "bellsandwhistles:block/metro/metro_door_side",
 		"2": "bellsandwhistles:block/metro/sliding_metro_door_bottom",
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_top.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_top.json
index ea95538..75bb3f9 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_top.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/door/sliding_metro_door_top.json
@@ -1,6 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
 		"0": "bellsandwhistles:block/metro/metro_door_side",
 		"2": "bellsandwhistles:block/metro/sliding_metro_door_top",
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_bottom.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_bottom.json
index 06a7dc4..8bb48ea 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_bottom.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_bottom.json
@@ -2,7 +2,7 @@
 	"parent": "block/block",
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "bellsandwhistles:block/metro/metro_door_side",
+		"0": "bellsandwhistles:block/metro/door/metro_door_side",
 		"1": "bellsandwhistles:block/metro/metro_trapdoor",
 		"particle": "bellsandwhistles:block/metro/metro_trapdoor"
 	},
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_open.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_open.json
index e3fd056..3e0a83f 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_open.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_open.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "bellsandwhistles:block/metro/metro_door_side",
+		"0": "bellsandwhistles:block/metro/door/metro_door_side",
 		"1": "bellsandwhistles:block/metro/metro_trapdoor",
 		"particle": "bellsandwhistles:block/metro/metro_trapdoor"
 	},
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_top.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_top.json
index 2512bfa..916758c 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_top.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/trapdoor/block_top.json
@@ -2,7 +2,7 @@
 	"parent": "block/block",
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "bellsandwhistles:block/metro/metro_door_side",
+		"0": "bellsandwhistles:block/metro/door/metro_door_side",
 		"1": "bellsandwhistles:block/metro/metro_trapdoor",
 		"particle": "bellsandwhistles:block/metro/metro_trapdoor"
 	},
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_bottom.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_bottom.json
index e461494..d1fcdeb 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_bottom.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_bottom.json
@@ -1,10 +1,13 @@
 {
 	"parent": "block/block",
 	"credit": "Made with Blockbench",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
-		"0": "bellsandwhistles:block/metro/metro_door_side",
+		"0": "bellsandwhistles:block/metro/door/metro_door_side",
 		"1": "bellsandwhistles:block/metro/metro_window",
-		"particle": "bellsandwhistles:block/metro/metro_window"
+		"particle": "bellsandwhistles:block/metro/metro_window",
+
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_open.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_open.json
index 990cfde..94c2101 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_open.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_open.json
@@ -1,8 +1,10 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
-		"0": "bellsandwhistles:block/metro/metro_door_side",
+		"0": "bellsandwhistles:block/metro/door/metro_door_side",
 		"1": "bellsandwhistles:block/metro/metro_window",
 		"particle": "bellsandwhistles:block/metro/metro_window"
 	},
diff --git a/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_top.json b/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_top.json
index a6784ee..509acc0 100644
--- a/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_top.json
+++ b/src/main/resources/assets/bellsandwhistles/models/block/metro/window/block_top.json
@@ -1,8 +1,10 @@
 {
 	"parent": "block/block",
 	"credit": "Made with Blockbench",
+	"ambientocclusion": false,
+	"render_type" : "cutout",
 	"textures": {
-		"0": "bellsandwhistles:block/metro/metro_door_side",
+		"0": "bellsandwhistles:block/metro/door/metro_door_side",
 		"1": "bellsandwhistles:block/metro/metro_window",
 		"particle": "bellsandwhistles:block/metro/metro_window"
 	},