From ef2251de9fbd6a5b923cd8c9f60865f340c1f5d3 Mon Sep 17 00:00:00 2001 From: JustAMatt Date: Mon, 24 May 2021 18:40:11 -0300 Subject: [PATCH] ares shield added --- assets/minecraft/models/item/aresshield.json | 5 + .../item/custom/shield/example_shield.json | 166 ------------------ .../shield/example_shield_blocking.json | 32 ---- assets/minecraft/models/item/shield.json | 53 +----- .../minecraft/textures/custom/aresshield.png | Bin 0 -> 560 bytes 5 files changed, 14 insertions(+), 242 deletions(-) create mode 100644 assets/minecraft/models/item/aresshield.json delete mode 100644 assets/minecraft/models/item/custom/shield/example_shield.json delete mode 100644 assets/minecraft/models/item/custom/shield/example_shield_blocking.json create mode 100644 assets/minecraft/textures/custom/aresshield.png diff --git a/assets/minecraft/models/item/aresshield.json b/assets/minecraft/models/item/aresshield.json new file mode 100644 index 0000000..c3ae753 --- /dev/null +++ b/assets/minecraft/models/item/aresshield.json @@ -0,0 +1,5 @@ +{ + "parent":"item/handheld", + "textures":{"layer0":"custom/aresshield" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/custom/shield/example_shield.json b/assets/minecraft/models/item/custom/shield/example_shield.json deleted file mode 100644 index 2d11f5a..0000000 --- a/assets/minecraft/models/item/custom/shield/example_shield.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "parent": "models/item/shield", - "textures": { - "back": "item/custom/example_shield_shape", - "base": "item/custom/example_shield" - }, - "elements": [ - { - "name": "Element", - "from": [1, 10, 7], - "to": [15, 12, 8], - "faces": { - "east": {"uv": [14, 4, 15, 6], "texture": "#back"}, - "west": {"uv": [1, 4, 2, 6], "texture": "#back"}, - "up": {"uv": [1, 4, 15, 5], "texture": "#back"} - } - }, - { - "name": "Element", - "from": [2, 12, 7], - "to": [14, 13, 8], - "faces": { - "east": {"uv": [13, 3, 14, 4], "texture": "#back"}, - "west": {"uv": [2, 3, 3, 4], "texture": "#back"}, - "up": {"uv": [2, 3, 14, 4], "texture": "#back"} - } - }, - { - "name": "Element", - "from": [4, 14, 7], - "to": [12, 15, 8], - "faces": { - "east": {"uv": [11, 1, 12, 2], "texture": "#back"}, - "west": {"uv": [4, 1, 5, 2], "texture": "#back"}, - "up": {"uv": [4, 1, 12, 2], "texture": "#back"} - } - }, - { - "name": "Element", - "from": [6, 15, 7], - "to": [10, 16, 8], - "faces": { - "east": {"uv": [9, 0, 10, 1], "texture": "#back"}, - "west": {"uv": [6, 0, 7, 1], "texture": "#back"}, - "up": {"uv": [6, 0, 10, 1], "texture": "#back"} - } - }, - { - "name": "Element", - "from": [0, 6, 7], - "to": [16, 10, 8], - "faces": { - "east": {"uv": [15, 6, 16, 10], "texture": "#back"}, - "west": {"uv": [0, 6, 1, 10], "texture": "#back"}, - "up": {"uv": [0, 6, 16, 7], "texture": "#back"}, - "down": {"uv": [0, 9, 16, 10], "rotation": 180, "texture": "#back"} - } - }, - { - "name": "Element", - "from": [1, 4, 7], - "to": [15, 6, 8], - "faces": { - "east": {"uv": [14, 10, 15, 12], "texture": "#back"}, - "west": {"uv": [1, 10, 2, 12], "texture": "#back"}, - "down": {"uv": [1, 11, 15, 12], "rotation": 180, "texture": "#back"} - } - }, - { - "name": "Element", - "from": [3, 2, 7], - "to": [13, 3, 8], - "faces": { - "east": {"uv": [12, 13, 13, 14], "texture": "#back"}, - "west": {"uv": [3, 13, 4, 14], "texture": "#back"}, - "down": {"uv": [3, 13, 13, 14], "rotation": 180, "texture": "#back"} - } - }, - { - "name": "Element", - "from": [4, 1, 7], - "to": [12, 2, 8], - "faces": { - "east": {"uv": [12, 14, 11, 15], "texture": "#back"}, - "west": {"uv": [5, 14, 4, 15], "texture": "#back"}, - "down": {"uv": [12, 15, 4, 14], "texture": "#back"} - } - }, - { - "name": "Element", - "from": [6, 0, 7], - "to": [10, 1, 8], - "faces": { - "east": {"uv": [9, 15, 10, 16], "texture": "#back"}, - "west": {"uv": [6, 15, 7, 16], "texture": "#back"}, - "down": {"uv": [6, 15, 10, 16], "rotation": 180, "texture": "#back"} - } - }, - { - "name": "Element", - "from": [0, 0, 7], - "to": [16, 16, 7], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#base"} - } - }, - { - "name": "Element", - "from": [0, 0, 8], - "to": [16, 16, 8], - "faces": { - "south": {"uv": [0, 0, 16, 16], "texture": "#back"} - } - }, - { - "name": "Element", - "from": [3, 13, 7], - "to": [13, 14, 8], - "faces": { - "east": {"uv": [12, 2, 13, 3], "texture": "#back"}, - "west": {"uv": [3, 2, 4, 3], "texture": "#back"}, - "up": {"uv": [3, 2, 13, 3], "texture": "#back"}, - "down": {"uv": [2, 3, 3, 13], "rotation": 90, "texture": "#back"} - } - }, - { - "name": "Element", - "from": [2, 3, 7], - "to": [14, 4, 8], - "faces": { - "east": {"uv": [13, 12, 14, 13], "texture": "#back"}, - "west": {"uv": [13, 12, 14, 13], "texture": "#back"}, - "up": {"uv": [2, 2, 3, 14], "rotation": 270, "texture": "#back"}, - "down": {"uv": [2, 12, 14, 13], "rotation": 180, "texture": "#back"} - } - } - ], - "gui_light": "front", - "overrides": [], - "display": { - "thirdperson_righthand": { - "rotation": [0, -90, 0], - "translation": [2, -2, 1], - "scale": [1.01, 1.01, 1.01] - }, - "thirdperson_lefthand": { - "rotation": [0, -90, 0], - "translation": [2, -2, 2], - "scale": [1.01, 1.01, 1.01] - }, - "firstperson_righthand": { - "translation": [-3, 0, 4], - "scale": [0.78, 0.78, 0.78] - }, - "ground": { - "translation": [0, 2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [0, -180, 0] - }, - "head": { - "translation": [0, 6, -7] - } - } -} \ No newline at end of file diff --git a/assets/minecraft/models/item/custom/shield/example_shield_blocking.json b/assets/minecraft/models/item/custom/shield/example_shield_blocking.json deleted file mode 100644 index daf452f..0000000 --- a/assets/minecraft/models/item/custom/shield/example_shield_blocking.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "item/custom/shield/example_shield", - "display": { - "thirdperson_righthand": { - "rotation": [ 30, -45, 0 ], - "translation": [ 1, -1, -1 ], - "scale": [ 1.01, 1.01, 1.01 ] - }, - "thirdperson_lefthand": { - "rotation": [ 30, -45, 0 ], - "translation": [ 1, -1, -1 ], - "scale": [ 1.01, 1.01, 1.01 ] - }, - "firstperson_righthand": { - "rotation": [ 10, 0, 15 ], - "translation": [ -3, 0, 1 ], - "scale": [ 0.78, 0.78, 0.78 ] - }, - "gui": { - "rotation": [ 0, -180, 0 ] - }, - "head": { - "translation": [ 0, 6, -7 ] - }, - "ground": { - "translation": [ 0, 2, 0 ], - "scale": [ 0.5, 0.5, 0.5 ] - } - }, - "overrides": [ - ] -} \ No newline at end of file diff --git a/assets/minecraft/models/item/shield.json b/assets/minecraft/models/item/shield.json index 47d902f..22611f3 100644 --- a/assets/minecraft/models/item/shield.json +++ b/assets/minecraft/models/item/shield.json @@ -1,49 +1,14 @@ { - "parent": "builtin/entity", - "gui_light": "front", + "parent": "entity/handheld", "textures": { - "particle": "block/dark_oak_planks" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 10, 6, -4 ], - "scale": [ 1, 1, 1 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 10, 6, 12 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 180, 5 ], - "translation": [ -10, 2, -10 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 180, 5 ], - "translation": [ 10, 0, -10 ], - "scale": [ 1.25, 1.25, 1.25 ] - }, - "gui": { - "rotation": [ 15, -25, -5 ], - "translation": [ 2, 3, 0 ], - "scale": [ 0.65, 0.65, 0.65 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ -2, 4, -5], - "scale":[ 0.5, 0.5, 0.5] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 4, 4, 2], - "scale":[ 0.25, 0.25, 0.25] - } + "layer0": "item/shield" }, "overrides": [ - {"predicate": {"blocking": 1},"model": "item/shield_blocking"}, - {"predicate": {"custom_model_data":1}, "model": "item/custom/shield/example_shield"}, - {"predicate": {"custom_model_data":1, "blocking": 1},"model": "item/custom/shield/example_shield_blocking"} + { + "predicate": { + "custom_model_data": 20229 + }, + "model": "item/aresshield" + } ] -} + } \ No newline at end of file diff --git a/assets/minecraft/textures/custom/aresshield.png b/assets/minecraft/textures/custom/aresshield.png new file mode 100644 index 0000000000000000000000000000000000000000..301899806c271a99ae4c37b8443ff3f8d2b5ce97 GIT binary patch literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1!2l#}zMw&+2tJ$a7rfExQ`{?>axhjX+%NnZ)$Oy`$`Kr&<)%CZO1gc%S zl%rl!vc8@zO+;j-oLo;2I}bY#Q2c!D(>x$0S`y?J{2vQo(7svw3aEgyz$3Dlfr0N3 z2s4Umcr^eW7wPHZ7!u+BcFN77W&8WsYWzI^u#;e zfQ5x~&M!YNu!4KpURRTYPqXdj$2RmQL^nK|uD(w3o$*tFgq8!_1hmZx4n8f~B$eRv zQ8eI4#KuPMHG;7X#T5|=?SgYd`WegP4l$dqnES(?an=W|1?4Q)j+#3*B{<1EJ}L$xqKJv(LZLs7g*ecO&Tw<_$HV*3QGXF dr#I=?|355xpwD6EUtq{Hc)I$ztaD0e0sxPc*_{9Y literal 0 HcmV?d00001