From 582ead2b92a0e6b396602e672fea731a75ba826b Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Tue, 24 Jan 2023 17:26:39 +0100
Subject: [PATCH] Certified forge user

- Use builtin composite loader to fix blending issues with nixie tube and display link models
---
 .../models/block/display_link/block.json      | 211 ++++++++++--------
 .../create/models/block/nixie_tube/block.json | 138 ++++++------
 .../create/models/block/nixie_tube/item.json  |  84 +------
 3 files changed, 181 insertions(+), 252 deletions(-)

diff --git a/src/main/resources/assets/create/models/block/display_link/block.json b/src/main/resources/assets/create/models/block/display_link/block.json
index ad18cbb19..70d6993d8 100644
--- a/src/main/resources/assets/create/models/block/display_link/block.json
+++ b/src/main/resources/assets/create/models/block/display_link/block.json
@@ -1,110 +1,125 @@
 {
 	"credit": "Made with Blockbench",
+	"loader": "forge:composite",
 	"parent": "block/block",
 	"textures": {
 		"0": "create:block/display_link",
 		"3": "create:block/display_link_side",
 		"particle": "create:block/brass_casing"
 	},
-	"elements": [
-		{
-			"from": [9, 6, 3.5],
-			"to": [13, 9, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
-			"faces": {
-				"north": {"uv": [14.5, 0, 12.5, 1.5], "texture": "#0"},
-				"east": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"},
-				"south": {"uv": [12.5, 0, 14.5, 1.5], "texture": "#0"},
-				"west": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [14.5, 1.5, 12.5, 6], "rotation": 180, "texture": "#0"}
-			}
+	"children": {
+		"base": {
+			"render_type": "minecraft:solid",
+			"textures": {
+				"0": "create:block/display_link",
+				"3": "create:block/display_link_side"
+			},
+			"elements": [
+				{
+					"from": [9, 6, 3.5],
+					"to": [13, 9, 12.5],
+					"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
+					"faces": {
+						"north": {"uv": [14.5, 0, 12.5, 1.5], "texture": "#0"},
+						"east": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"},
+						"south": {"uv": [12.5, 0, 14.5, 1.5], "texture": "#0"},
+						"west": {"uv": [14.5, 6, 16, 1.5], "rotation": 90, "texture": "#0"},
+						"up": {"uv": [14.5, 1.5, 12.5, 6], "rotation": 180, "texture": "#0"}
+					}
+				},
+				{
+					"from": [1, 1, 1],
+					"to": [15, 6, 15],
+					"faces": {
+						"north": {"uv": [0, 0, 14, 5], "texture": "#3"},
+						"east": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"},
+						"south": {"uv": [0, 0, 14, 5], "texture": "#3"},
+						"west": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"},
+						"up": {"uv": [0, 9, 7, 16], "texture": "#0"},
+						"down": {"uv": [0, 1.5, 7, 8.5], "texture": "#0"}
+					}
+				},
+				{
+					"from": [2, -1, 2],
+					"to": [14, 1, 14],
+					"faces": {
+						"north": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
+						"east": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
+						"south": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
+						"west": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
+						"down": {"uv": [0.5, 2, 6.5, 8], "texture": "#0"}
+					}
+				},
+				{
+					"from": [3, 5, 3],
+					"to": [7, 7, 7],
+					"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
+					"faces": {
+						"north": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
+						"east": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
+						"south": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
+						"west": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
+						"up": {"uv": [13.5, 8, 11.5, 10], "texture": "#0"}
+					}
+				},
+				{
+					"from": [3, 6, 8],
+					"to": [7, 8, 12],
+					"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
+					"faces": {
+						"north": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
+						"east": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
+						"south": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
+						"west": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
+						"up": {"uv": [13.5, 6, 11.5, 8], "texture": "#0"}
+					}
+				}
+			]
 		},
-		{
-			"from": [1, 1, 1],
-			"to": [15, 6, 15],
-			"faces": {
-				"north": {"uv": [0, 0, 14, 5], "texture": "#3"},
-				"east": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"},
-				"south": {"uv": [0, 0, 14, 5], "texture": "#3"},
-				"west": {"uv": [7.5, 9, 10, 16], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [0, 9, 7, 16], "texture": "#0"},
-				"down": {"uv": [0, 1.5, 7, 8.5], "texture": "#0"}
-			}
+		"bulb_inner": {
+			"render_type": "minecraft:cutout",
+			"textures": {
+				"0": "create:block/display_link"
+			},
+			"elements": [
+				{
+					"from": [2.5, 8, 9],
+					"to": [7.5, 13, 10],
+					"rotation": {"angle": 0, "axis": "y", "origin": [6, 7.5, 19]},
+					"faces": {
+						"south": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"}
+					}
+				},
+				{
+					"from": [2.5, 8, 10],
+					"to": [7.5, 13, 11],
+					"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
+					"faces": {
+						"north": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"}
+					}
+				}
+			]
 		},
-		{
-			"from": [2, -1, 2],
-			"to": [14, 1, 14],
-			"faces": {
-				"north": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
-				"east": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
-				"south": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
-				"west": {"uv": [0.5, 0, 6.5, 1], "texture": "#0"},
-				"down": {"uv": [0.5, 2, 6.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3, 5, 3],
-			"to": [7, 7, 7],
-			"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
-			"faces": {
-				"north": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
-				"east": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
-				"south": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
-				"west": {"uv": [13.5, 10, 11.5, 11], "texture": "#0"},
-				"up": {"uv": [13.5, 8, 11.5, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3, 6, 8],
-			"to": [7, 8, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
-			"faces": {
-				"north": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
-				"east": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
-				"south": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
-				"west": {"uv": [13.5, 8, 11.5, 9], "texture": "#0"},
-				"up": {"uv": [13.5, 6, 11.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 8, 7.5],
-			"to": [7.5, 13, 12.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
-			"faces": {
-				"north": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
-				"east": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
-				"south": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
-				"west": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
-				"up": {"uv": [16, 6, 13.5, 8.5], "texture": "#0"},
-				"down": {"uv": [16, 11, 13.5, 13.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 8, 9],
-			"to": [7.5, 13, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [6, 7.5, 19]},
-			"faces": {
-				"south": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"}
-			}
-		},
-		{
-			"from": [2.5, 8, 10],
-			"to": [7.5, 13, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
-			"faces": {
-				"north": {"uv": [16, 13.5, 13.5, 16], "texture": "#0"}
-			}
+		"bulb": {
+			"render_type": "minecraft:translucent",
+			"textures": {
+				"0": "create:block/display_link"
+			},
+			"elements": [
+				{
+					"from": [2.5, 8, 7.5],
+					"to": [7.5, 13, 12.5],
+					"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
+					"faces": {
+						"north": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
+						"east": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
+						"south": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
+						"west": {"uv": [16, 8.5, 13.5, 11], "texture": "#0"},
+						"up": {"uv": [16, 6, 13.5, 8.5], "texture": "#0"},
+						"down": {"uv": [16, 11, 13.5, 13.5], "texture": "#0"}
+					}
+				}
+			]
 		}
-	],
-	"groups": [
-		0,
-		1,
-		2,
-		{
-			"name": "group",
-			"origin": [16, 0, 0],
-			"color": 0,
-			"children": [3, 4, 5, 6, 7]
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/nixie_tube/block.json b/src/main/resources/assets/create/models/block/nixie_tube/block.json
index baf3fa243..c38e37191 100644
--- a/src/main/resources/assets/create/models/block/nixie_tube/block.json
+++ b/src/main/resources/assets/create/models/block/nixie_tube/block.json
@@ -1,85 +1,81 @@
 {
 	"credit": "Made with Blockbench",
+	"loader": "forge:composite",
 	"parent": "block/block",
 	"textures": {
 		"0": "create:block/nixie_tube",
 		"particle": "create:block/nixie_tube"
 	},
-	"elements": [
-		{
-			"name": "connector4",
-			"from": [5, 0, 9],
-			"to": [11, 3, 15],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"east": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"south": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"west": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"up": {"uv": [6, 6, 12, 12], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 6, 12, 12], "rotation": 90, "texture": "#0"}
-			}
-		},
-		{
-			"name": "connector5",
-			"from": [5, 0, 1],
-			"to": [11, 3, 7],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"east": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"south": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"west": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"up": {"uv": [6, 6, 12, 12], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [6, 6, 12, 12], "rotation": 90, "texture": "#0"}
-			}
-		},
-		{
-			"name": "tube5",
-			"from": [5, 3, 9],
-			"to": [11, 12, 15],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"east": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"south": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"west": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"up": {"uv": [6, 0, 12, 6], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "tube6",
-			"from": [5, 3, 1],
-			"to": [11, 12, 7],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"east": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"south": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"west": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"up": {"uv": [6, 0, 12, 6], "rotation": 180, "texture": "#0"}
-			}
-		}
-	],
-	"groups": [
-		{
-			"name": "block",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [
+	"children": {
+		"connectors": {
+			"render_type": "minecraft:solid",
+			"textures": {
+				"0": "create:block/nixie_tube"
+			},
+			"elements": [
 				{
-					"name": "group",
-					"origin": [17, 14, 13],
-					"color": 0,
-					"children": []
+					"name": "connector1",
+					"from": [5, 0, 9],
+					"to": [11, 3, 15],
+					"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
+					"faces": {
+						"north": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"east": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"south": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"west": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"up": {"uv": [6, 6, 12, 12], "rotation": 270, "texture": "#0"},
+						"down": {"uv": [6, 6, 12, 12], "rotation": 90, "texture": "#0"}
+					}
 				},
 				{
-					"name": "group",
-					"origin": [17, 14, 13],
-					"color": 0,
-					"children": [0, 1, 2, 3]
+					"name": "connector2",
+					"from": [5, 0, 1],
+					"to": [11, 3, 7],
+					"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
+					"faces": {
+						"north": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"east": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"south": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"west": {"uv": [0, 10, 6, 13], "texture": "#0"},
+						"up": {"uv": [6, 6, 12, 12], "rotation": 270, "texture": "#0"},
+						"down": {"uv": [6, 6, 12, 12], "rotation": 90, "texture": "#0"}
+					}
+				}
+			]
+		},
+		"tubes": {
+			"render_type": "minecraft:translucent",
+			"textures": {
+				"0": "create:block/nixie_tube"
+			},
+			"elements": [
+				{
+					"name": "tube1",
+					"from": [5, 3, 9],
+					"to": [11, 12, 15],
+					"rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]},
+					"faces": {
+						"north": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"east": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"south": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"west": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"up": {"uv": [6, 0, 12, 6], "rotation": 180, "texture": "#0"}
+					}
+				},
+				{
+					"name": "tube2",
+					"from": [5, 3, 1],
+					"to": [11, 12, 7],
+					"rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]},
+					"faces": {
+						"north": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"east": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"south": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"west": {"uv": [0, 1, 6, 10], "texture": "#0"},
+						"up": {"uv": [6, 0, 12, 6], "rotation": 180, "texture": "#0"}
+					}
 				}
 			]
 		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/nixie_tube/item.json b/src/main/resources/assets/create/models/block/nixie_tube/item.json
index 8f7772e24..089b5d325 100644
--- a/src/main/resources/assets/create/models/block/nixie_tube/item.json
+++ b/src/main/resources/assets/create/models/block/nixie_tube/item.json
@@ -1,85 +1,3 @@
 {
-	"credit": "Made with Blockbench",
-	"parent": "block/block",
-	"textures": {
-		"0": "create:block/nixie_tube",
-		"particle": "create:block/nixie_tube"
-	},
-	"elements": [
-		{
-			"name": "connector4",
-			"from": [9, 0, 5],
-			"to": [15, 3, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"east": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"south": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"west": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"up": {"uv": [6, 6, 12, 12], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 6, 12, 12], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "connector5",
-			"from": [1, 0, 5],
-			"to": [7, 3, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"east": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"south": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"west": {"uv": [0, 10, 6, 13], "texture": "#0"},
-				"up": {"uv": [6, 6, 12, 12], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [6, 6, 12, 12], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "tube5",
-			"from": [9, 3, 5],
-			"to": [15, 12, 11],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"east": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"south": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"west": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"up": {"uv": [6, 0, 12, 6], "rotation": 90, "texture": "#0"}
-			}
-		},
-		{
-			"name": "tube6",
-			"from": [1, 3, 5],
-			"to": [7, 12, 11],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"east": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"south": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"west": {"uv": [0, 1, 6, 10], "texture": "#0"},
-				"up": {"uv": [6, 0, 12, 6], "rotation": 90, "texture": "#0"}
-			}
-		}
-	],
-	"groups": [
-		{
-			"name": "block",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [
-				{
-					"name": "group",
-					"origin": [17, 14, 13],
-					"color": 0,
-					"children": []
-				},
-				{
-					"name": "group",
-					"origin": [17, 14, 13],
-					"color": 0,
-					"children": [0, 1, 2, 3]
-				}
-			]
-		}
-	]
+	"parent": "create:block/nixie_tube/block"
 }
\ No newline at end of file