From 2be2edeed480d3d4edddb3cab997eeb37d4eee3b Mon Sep 17 00:00:00 2001
From: PaulGoersCode <102575758+PaulGoersCode@users.noreply.github.com>
Date: Tue, 11 Apr 2023 17:10:24 -0500
Subject: [PATCH] Tiki Torch Change

Updated Tiki Torch (tiki_torch) to support multiple heights when placed on Tiki Sticks (tiki_stick)
Added tiki_stick model
---
 .../models/block/tiki_stick.json              | 21 ++++++++++
 .../models/block/tiki_torch.json              | 38 +++++++------------
 2 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/tiki_stick.json

diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/tiki_stick.json b/Common/src/main/resources/assets/hyperlighting/models/block/tiki_stick.json
new file mode 100644
index 0000000..275eb50
--- /dev/null
+++ b/Common/src/main/resources/assets/hyperlighting/models/block/tiki_stick.json
@@ -0,0 +1,21 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "block/bamboo_block",
+		"particle": "block/bamboo_block"
+	},
+	"elements": [
+		{
+			"from": [7, 0, 7],
+			"to": [9, 16, 9],
+			"faces": {
+				"north": {"uv": [0, 0, 2, 16], "texture": "#0"},
+				"east": {"uv": [2, 0, 4, 16], "texture": "#0"},
+				"south": {"uv": [4, 0, 6, 16], "texture": "#0"},
+				"west": {"uv": [6, 0, 8, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 2, 2], "texture": "#0"},
+				"down": {"uv": [0, 0, 2, 2], "texture": "#0"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/tiki_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/tiki_torch.json
index 8c7b0d0..3499f3d 100644
--- a/Common/src/main/resources/assets/hyperlighting/models/block/tiki_torch.json
+++ b/Common/src/main/resources/assets/hyperlighting/models/block/tiki_torch.json
@@ -10,19 +10,7 @@
 	"elements": [
 		{
 			"from": [7, 0, 7],
-			"to": [9, 16, 9],
-			"faces": {
-				"north": {"uv": [0, 0, 2, 16], "texture": "#0"},
-				"east": {"uv": [2, 0, 4, 16], "texture": "#0"},
-				"south": {"uv": [4, 0, 6, 16], "texture": "#0"},
-				"west": {"uv": [6, 0, 8, 16], "texture": "#0"},
-				"up": {"uv": [0, 0, 2, 2], "texture": "#0"},
-				"down": {"uv": [0, 0, 2, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 16, 7],
-			"to": [9, 21, 9],
+			"to": [9, 5, 9],
 			"faces": {
 				"north": {"uv": [0, 9, 2, 16], "texture": "#0"},
 				"east": {"uv": [2, 9, 4, 16], "texture": "#0"},
@@ -33,8 +21,8 @@
 			}
 		},
 		{
-			"from": [6, 23, 6],
-			"to": [10, 26, 10],
+			"from": [6, 7, 6],
+			"to": [10, 10, 10],
 			"faces": {
 				"north": {"uv": [0, 0, 4, 3], "texture": "#2"},
 				"east": {"uv": [0, 0, 4, 3], "texture": "#2"},
@@ -45,8 +33,8 @@
 			}
 		},
 		{
-			"from": [6, 27, 6],
-			"to": [10, 28, 10],
+			"from": [6, 11, 6],
+			"to": [10, 12, 10],
 			"faces": {
 				"north": {"uv": [0, 0, 4, 1], "texture": "#2"},
 				"east": {"uv": [0, 0, 4, 1], "texture": "#2"},
@@ -57,8 +45,8 @@
 			}
 		},
 		{
-			"from": [6, 22, 6],
-			"to": [10, 23, 10],
+			"from": [6, 6, 6],
+			"to": [10, 7, 10],
 			"faces": {
 				"north": {"uv": [2, 1, 6, 2], "texture": "#3"},
 				"east": {"uv": [6, 1, 10, 2], "texture": "#3"},
@@ -69,8 +57,8 @@
 			}
 		},
 		{
-			"from": [6, 26, 6],
-			"to": [10, 27, 10],
+			"from": [6, 10, 6],
+			"to": [10, 11, 10],
 			"faces": {
 				"north": {"uv": [2, 1, 6, 2], "texture": "#3"},
 				"east": {"uv": [6, 1, 10, 2], "texture": "#3"},
@@ -81,8 +69,8 @@
 			}
 		},
 		{
-			"from": [7, 28, 7],
-			"to": [9, 29, 9],
+			"from": [7, 12, 7],
+			"to": [9, 13, 9],
 			"faces": {
 				"north": {"uv": [0, 0, 2, 1], "texture": "#1"},
 				"east": {"uv": [0, 0, 2, 1], "texture": "#1"},
@@ -93,8 +81,8 @@
 			}
 		},
 		{
-			"from": [7, 21, 7],
-			"to": [9, 22, 9],
+			"from": [7, 5, 7],
+			"to": [9, 6, 9],
 			"faces": {
 				"north": {"uv": [8, 1, 10, 2], "texture": "#3"},
 				"east": {"uv": [6, 1, 8, 2], "texture": "#3"},