Merge branch 'main' of https://github.com/ProjectTSB/TSB-ResourcePack

ProjectTSB · Oct 19, 2024 · 44e5539 · 44e5539
2 parents a6f9300 + 2221b30
commit 44e5539
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 0 deletions.
diff --git a/assets/minecraft/models/item/artifact/carrot_on_a_stick/1112.json b/assets/minecraft/models/item/artifact/carrot_on_a_stick/1112.json
@@ -0,0 +1,40 @@
+{
+    "parent": "item/handheld_tsb",
+    "textures": {
+        "layer0": "item/artifact/carrot_on_a_stick/1112"
+    },
+    "display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 90, 35],
+			"translation": [0, 7.5, 0.5],
+			"scale": [1.8, 1.8, 0.9]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, -90, -35],
+			"translation": [0, 7.5, 0.5],
+			"scale": [1.8, 1.8, 0.9]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 90, 70],
+			"translation": [0, 4, 2],
+			"scale": [1.5, 1.5, 0.75]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, -70],
+			"translation": [0, 4, 2],
+			"scale": [1.5, 1.5, 0.75]
+		},
+		"ground": {
+			"scale": [1, 1, 0.5]
+		},
+		"gui": {
+			"scale": [1.3, 1.3, 1.3]
+		},
+		"head": {
+			"scale": [1.5, 1.5, 0.75]
+		},
+		"fixed": {
+			"scale": [1.5, 1.5, 0.75]
+		}
+	}
+}
diff --git a/assets/minecraft/models/item/carrot_on_a_stick.json b/assets/minecraft/models/item/carrot_on_a_stick.json
@@ -1330,6 +1330,18 @@
             },
             "model": "item/carrot_on_a_stick"
         },
+        {
+            "predicate": {
+                "custom_model_data": 1112
+            },
+            "model": "item/artifact/carrot_on_a_stick/1112"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 1113
+            },
+            "model": "item/carrot_on_a_stick"
+        },
         {
             "predicate": {
                 "custom_model_data": 20187

diff --git a/assets/minecraft/textures/item/artifact/carrot_on_a_stick/1112.png b/assets/minecraft/textures/item/artifact/carrot_on_a_stick/1112.png