Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/noxhy/cp2-Pack
Browse files Browse the repository at this point in the history
  • Loading branch information
@en52sal
en52sal committed Oct 3, 2024
2 parents 01d604b + 9894124 commit b789883
Show file tree
Hide file tree
Showing 6 changed files with 164 additions and 2 deletions.
3 changes: 2 additions & 1 deletion assets/minecraft/models/item/gray_candle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}

]
}
75 changes: 75 additions & 0 deletions assets/minecraft/models/item/guns/deadlock/pixlii_deadlock.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "item/guns/deadlock/pixlii_deadlock",
"particle": "item/guns/deadlock/pixlii_deadlock"
},
"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 }
}
}
],
"gui_light": "front",
"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, 7, -2.25]
},
"firstperson_lefthand": {
"translation": [0, 7, -2.25]
},
"ground": {
"rotation": [0, 0, 90],
"translation": [0, 1, 0]
},
"gui": {
"rotation": [115.38, -64.98, 121.2],
"translation": [-0.5, 6.25, 0],
"scale": [1.15039, 1.15039, 1.15039]
}
}
}
85 changes: 85 additions & 0 deletions assets/minecraft/models/item/items/tracking_dart.json
View file
Original file line number Diff line number Diff line change
@@ -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]
}
]
}
3 changes: 2 additions & 1 deletion assets/minecraft/models/item/leather_leggings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/deadlock/pixlii_deadlock"}

]
}
Binary file added assets/minecraft/textures/item/guns/deadlock/pixlii_deadlock.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/item/items/tracking_dart.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b789883

Please sign in to comment.