From 88a779478443743607dacb1baac7589f53a943c5 Mon Sep 17 00:00:00 2001 From: Noah Date: Thu, 3 Oct 2024 11:41:07 -0400 Subject: [PATCH 1/2] tracking dart --- assets/minecraft/models/item/gray_candle.json | 3 +- .../item/guns/deadlock/pixlii_deadlock.json | 74 +++++++++++++++ .../models/item/items/tracking_dart.json | 85 ++++++++++++++++++ .../models/item/leather_leggings.json | 3 +- .../textures/item/items/tracking_dart.png | Bin 0 -> 192 bytes 5 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json create mode 100644 assets/minecraft/models/item/items/tracking_dart.json create mode 100644 assets/minecraft/textures/item/items/tracking_dart.png diff --git a/assets/minecraft/models/item/gray_candle.json b/assets/minecraft/models/item/gray_candle.json index f88ff5f..abee447 100644 --- a/assets/minecraft/models/item/gray_candle.json +++ b/assets/minecraft/models/item/gray_candle.json @@ -13,7 +13,8 @@ {"predicate": {"custom_model_data":5}, "model": "item/items/decoy"}, {"predicate": {"custom_model_data":6}, "model": "item/items/safe_closed"}, {"predicate": {"custom_model_data":7}, "model": "item/items/safe_open_empty"}, - {"predicate": {"custom_model_data":8}, "model": "item/items/safe_open_full"} + {"predicate": {"custom_model_data":8}, "model": "item/items/safe_open_full"}, + {"predicate": {"custom_model_data":9}, "model": "item/items/tracking_dart"} ] } diff --git a/assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json b/assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json new file mode 100644 index 0000000..f2e9319 --- /dev/null +++ b/assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json @@ -0,0 +1,74 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "block/texture", + "particle": "block/texture" + }, + "elements": [ + { + "from": [7, 3, 3], + "to": [9, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 5]}, + "faces": { + "north": {"uv": [5.5, 4, 6.5, 5.5], "texture": "#0", "tintindex": 0}, + "east": {"uv": [0, 0, 6, 1.5], "texture": "#0", "tintindex": 0}, + "south": {"uv": [5.5, 5.5, 6.5, 7], "texture": "#0", "tintindex": 0}, + "west": {"uv": [0, 1.5, 6, 3], "texture": "#0", "tintindex": 0}, + "up": {"uv": [1, 9, 0, 3], "texture": "#0", "tintindex": 0}, + "down": {"uv": [2, 3, 1, 9], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [8, 1, 9], + "to": [8, 3, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 5]}, + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#0", "tintindex": 0}, + "east": {"uv": [5, 3, 6.5, 4], "texture": "#0", "tintindex": 0}, + "south": {"uv": [0, 0, 0, 1], "texture": "#0", "tintindex": 0}, + "west": {"uv": [4, 5, 5.5, 6], "texture": "#0", "tintindex": 0}, + "up": {"uv": [0, 1.5, 0, 0], "texture": "#0", "tintindex": 0}, + "down": {"uv": [0, 0, 0, 1.5], "texture": "#0", "tintindex": 0} + } + }, + { + "from": [7.01, -0.99, 11.01], + "to": [8.99, 2.99, 13.99], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 3, 11]}, + "faces": { + "north": {"uv": [2, 5, 3, 7], "texture": "#0", "tintindex": 0}, + "east": {"uv": [2, 3, 3.5, 5], "texture": "#0", "tintindex": 0}, + "south": {"uv": [3, 5, 4, 7], "texture": "#0", "tintindex": 0}, + "west": {"uv": [3.5, 3, 5, 5], "texture": "#0", "tintindex": 0}, + "up": {"uv": [7, 1.5, 6, 0], "texture": "#0", "tintindex": 0}, + "down": {"uv": [7, 1.5, 6, 3], "texture": "#0", "tintindex": 0} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 2.75, -1], + "scale": [0.6, 0.6, 0.6] + }, + "thirdperson_lefthand": { + "translation": [0, 2.75, -1], + "scale": [0.6, 0.6, 0.6] + }, + "firstperson_righthand": { + "translation": [0, 6.25, -2.25] + }, + "firstperson_lefthand": { + "translation": [0, 6.25, -2.25] + }, + "ground": { + "rotation": [0, 0, 90], + "translation": [0, 1, 0] + }, + "gui": { + "rotation": [115.38, -64.98, 121.2], + "translation": [-0.5, 6.75, 0], + "scale": [1.27734, 1.27734, 1.27734] + } + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/items/tracking_dart.json b/assets/minecraft/models/item/items/tracking_dart.json new file mode 100644 index 0000000..e8b6201 --- /dev/null +++ b/assets/minecraft/models/item/items/tracking_dart.json @@ -0,0 +1,85 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "item/items/tracking_dart" + }, + "elements": [ + { + "from": [8, 0, 0], + "to": [8, 6, 17], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3, 8.5]}, + "faces": { + "north": {"uv": [0, 0, 0, 12], "texture": "#missing"}, + "east": {"uv": [0, 0, 8, 2.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 12], "texture": "#missing"}, + "west": {"uv": [8, 0, 0, 2.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [8, 0, 0], + "to": [8, 6, 17], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 3, 8.5]}, + "faces": { + "north": {"uv": [0, 0, 0, 12], "texture": "#missing"}, + "east": {"uv": [0, 0, 8, 2.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 12], "texture": "#missing"}, + "west": {"uv": [8, 0, 0, 2.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [5.5, 0.5, 16], + "to": [10.5, 5.5, 16], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3, 16]}, + "faces": { + "north": {"uv": [0, 5, 2.5, 10], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "south": {"uv": [0, 2.5, 2.5, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 1.5, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 1.5, 0], "texture": "#0"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [90, 0, 0], + "translation": [0, 1, 5.5], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [90, 0, 0], + "translation": [0, 1, 5.5], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [106.75, 0, 0], + "translation": [4, 1.25, 2.25] + }, + "firstperson_lefthand": { + "rotation": [106.75, 0, 0], + "translation": [4, 1.25, 2.25] + }, + "ground": { + "translation": [0, 6, 0] + }, + "gui": { + "rotation": [74.69, -42.61, 22.29], + "translation": [-0.5, 3.5, 0], + "scale": [0.9, 0.9, 0.9] + } + }, + "groups": [ + { + "name": "bone", + "origin": [8, 3, 16], + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/assets/minecraft/models/item/leather_leggings.json b/assets/minecraft/models/item/leather_leggings.json index 5f66a75..980db05 100644 --- a/assets/minecraft/models/item/leather_leggings.json +++ b/assets/minecraft/models/item/leather_leggings.json @@ -11,7 +11,8 @@ {"predicate": {"custom_model_data":3}, "model": "item/guns/optimism"}, {"predicate": {"custom_model_data":4}, "model": "item/guns/chucky"}, {"predicate": {"custom_model_data":5}, "model": "item/guns/zedrick"}, - {"predicate": {"custom_model_data":6}, "model": "item/guns/bullseye"} + {"predicate": {"custom_model_data":6}, "model": "item/guns/bullseye"}, + {"predicate": {"custom_model_data":7}, "model": "item/guns/pixlii_deadlock"} ] } diff --git a/assets/minecraft/textures/item/items/tracking_dart.png b/assets/minecraft/textures/item/items/tracking_dart.png new file mode 100644 index 0000000000000000000000000000000000000000..c126111635fd5b9aa63e1c898de2b1b7aa037e33 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*Z&~E(ALJFqoV^919Qu7 z?KC*wqh4*#dRJI<4N#P|B*-rqNHZ`T%4XXLq!?7XzA+guipG13uL~htDnm{r-UW|mi#@~ literal 0 HcmV?d00001 From 98941243e777e70a835e42d5d0bfcfb2d5d25407 Mon Sep 17 00:00:00 2001 From: Noah Date: Thu, 3 Oct 2024 11:56:24 -0400 Subject: [PATCH 2/2] added deadlock --- .../item/guns/deadlock/pixlii_deadlock.json | 49 +++++++++--------- .../models/item/leather_leggings.json | 2 +- .../item/guns/deadlock/pixlii_deadlock.png | Bin 0 -> 494 bytes 3 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 assets/minecraft/textures/item/guns/deadlock/pixlii_deadlock.png diff --git a/assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json b/assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json index f2e9319..68eaa29 100644 --- a/assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json +++ b/assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "block/texture", - "particle": "block/texture" + "0": "item/guns/deadlock/pixlii_deadlock", + "particle": "item/guns/deadlock/pixlii_deadlock" }, "elements": [ { @@ -11,12 +11,12 @@ "to": [9, 6, 15], "rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 5]}, "faces": { - "north": {"uv": [5.5, 4, 6.5, 5.5], "texture": "#0", "tintindex": 0}, - "east": {"uv": [0, 0, 6, 1.5], "texture": "#0", "tintindex": 0}, - "south": {"uv": [5.5, 5.5, 6.5, 7], "texture": "#0", "tintindex": 0}, - "west": {"uv": [0, 1.5, 6, 3], "texture": "#0", "tintindex": 0}, - "up": {"uv": [1, 9, 0, 3], "texture": "#0", "tintindex": 0}, - "down": {"uv": [2, 3, 1, 9], "texture": "#0", "tintindex": 0} + "north": {"uv": [5.5, 4, 6.5, 5.5], "texture": "#0", "tintindex": 0 }, + "east": {"uv": [0, 0, 6, 1.5], "texture": "#0", "tintindex": 0 }, + "south": {"uv": [5.5, 5.5, 6.5, 7], "texture": "#0", "tintindex": 0 }, + "west": {"uv": [0, 1.5, 6, 3], "texture": "#0", "tintindex": 0 }, + "up": {"uv": [1, 9, 0, 3], "texture": "#0", "tintindex": 0 }, + "down": {"uv": [2, 3, 1, 9], "texture": "#0", "tintindex": 0 } } }, { @@ -24,12 +24,12 @@ "to": [8, 3, 12], "rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 5]}, "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#0", "tintindex": 0}, - "east": {"uv": [5, 3, 6.5, 4], "texture": "#0", "tintindex": 0}, - "south": {"uv": [0, 0, 0, 1], "texture": "#0", "tintindex": 0}, - "west": {"uv": [4, 5, 5.5, 6], "texture": "#0", "tintindex": 0}, - "up": {"uv": [0, 1.5, 0, 0], "texture": "#0", "tintindex": 0}, - "down": {"uv": [0, 0, 0, 1.5], "texture": "#0", "tintindex": 0} + "north": {"uv": [0, 0, 0, 1], "texture": "#0", "tintindex": 0 }, + "east": {"uv": [5, 3, 6.5, 4], "texture": "#0", "tintindex": 0 }, + "south": {"uv": [0, 0, 0, 1], "texture": "#0", "tintindex": 0 }, + "west": {"uv": [4, 5, 5.5, 6], "texture": "#0", "tintindex": 0 }, + "up": {"uv": [0, 1.5, 0, 0], "texture": "#0", "tintindex": 0 }, + "down": {"uv": [0, 0, 0, 1.5], "texture": "#0", "tintindex": 0 } } }, { @@ -37,15 +37,16 @@ "to": [8.99, 2.99, 13.99], "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 3, 11]}, "faces": { - "north": {"uv": [2, 5, 3, 7], "texture": "#0", "tintindex": 0}, - "east": {"uv": [2, 3, 3.5, 5], "texture": "#0", "tintindex": 0}, - "south": {"uv": [3, 5, 4, 7], "texture": "#0", "tintindex": 0}, - "west": {"uv": [3.5, 3, 5, 5], "texture": "#0", "tintindex": 0}, - "up": {"uv": [7, 1.5, 6, 0], "texture": "#0", "tintindex": 0}, - "down": {"uv": [7, 1.5, 6, 3], "texture": "#0", "tintindex": 0} + "north": {"uv": [2, 5, 3, 7], "texture": "#0", "tintindex": 0 }, + "east": {"uv": [2, 3, 3.5, 5], "texture": "#0", "tintindex": 0 }, + "south": {"uv": [3, 5, 4, 7], "texture": "#0", "tintindex": 0 }, + "west": {"uv": [3.5, 3, 5, 5], "texture": "#0", "tintindex": 0 }, + "up": {"uv": [7, 1.5, 6, 0], "texture": "#0", "tintindex": 0 }, + "down": {"uv": [7, 1.5, 6, 3], "texture": "#0", "tintindex": 0 } } } ], + "gui_light": "front", "display": { "thirdperson_righthand": { "translation": [0, 2.75, -1], @@ -56,10 +57,10 @@ "scale": [0.6, 0.6, 0.6] }, "firstperson_righthand": { - "translation": [0, 6.25, -2.25] + "translation": [0, 7, -2.25] }, "firstperson_lefthand": { - "translation": [0, 6.25, -2.25] + "translation": [0, 7, -2.25] }, "ground": { "rotation": [0, 0, 90], @@ -67,8 +68,8 @@ }, "gui": { "rotation": [115.38, -64.98, 121.2], - "translation": [-0.5, 6.75, 0], - "scale": [1.27734, 1.27734, 1.27734] + "translation": [-0.5, 6.25, 0], + "scale": [1.15039, 1.15039, 1.15039] } } } \ No newline at end of file diff --git a/assets/minecraft/models/item/leather_leggings.json b/assets/minecraft/models/item/leather_leggings.json index 980db05..cee4c88 100644 --- a/assets/minecraft/models/item/leather_leggings.json +++ b/assets/minecraft/models/item/leather_leggings.json @@ -12,7 +12,7 @@ {"predicate": {"custom_model_data":4}, "model": "item/guns/chucky"}, {"predicate": {"custom_model_data":5}, "model": "item/guns/zedrick"}, {"predicate": {"custom_model_data":6}, "model": "item/guns/bullseye"}, - {"predicate": {"custom_model_data":7}, "model": "item/guns/pixlii_deadlock"} + {"predicate": {"custom_model_data":7}, "model": "item/guns/deadlock/pixlii_deadlock"} ] } diff --git a/assets/minecraft/textures/item/guns/deadlock/pixlii_deadlock.png b/assets/minecraft/textures/item/guns/deadlock/pixlii_deadlock.png new file mode 100644 index 0000000000000000000000000000000000000000..d47820acc69cd4a9c17fb342e8e4f50b4dd606fd GIT binary patch literal 494 zcmVPx$s7XXYR9J=Wl`%`hKorM+krE-45`suku}~a3I2DJkfJ|o+7)lWeIG&5+xv0LRCkAAI&d5fo7ZdqD0_cO4x|;&X zWN1TYWc$y$dZPf@^$o;*o8#qa3m(c<4r+%0oLpbQf(Jl$!9(>W(J%IEfM``cF@R4z zp%bUvv{?WErC#Wa7X9E*3O`}A_bE4e#P4M3TM$fs+r9~HDin&o>x*04lZ(r9BR2pb zp&hTKE4J-<0LJ52#M2#7P-6h9F9||8P7>RmXFPuOK^!MZvsJfNS2D&S5<#*_#+2 zMElhW1P0L2=^4CN8=V2O@PhSRE{B}G*k~BL<3G{dUncuZiBfm!fm!`-zXeEVa{!3@ k_P+qciWMtXtXQ$$0JAx{Qo(XDr~m)}07*qoM6N<$f;@`Z^Z)<= literal 0 HcmV?d00001