Skip to content

Commit

Permalink
PEDRO and gear sword
Browse files Browse the repository at this point in the history
  • Loading branch information
Porkyoot committed Jun 12, 2024
1 parent 9709e40 commit 3309762
Show file tree
Hide file tree
Showing 13 changed files with 337 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ...necraft/models/item/music_disc_fishe.json → ...t/models/item/disks/music_disc_fishe.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/template_music_disc",
"textures": {
"layer0": "minecraft:item/music_disc_fishe"
"layer0": "minecraft:item/disks/music_disc_fishe"
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/disks/music_disc_pedro.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/template_music_disc",
"textures": {
"layer0": "minecraft:item/disks/music_disc_pedro"
}
}
3 changes: 2 additions & 1 deletion assets/minecraft/models/item/music_disc_13.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"layer0": "minecraft:item/music_disc_13"
},
"overrides": [
{ "predicate": {"custom_model_data": 137500}, "model": "item/music_disc_fishe"}
{ "predicate": {"custom_model_data": 137500}, "model": "item/disks/music_disc_fishe"},
{ "predicate": {"custom_model_data": 137501}, "model": "item/disks/music_disc_pedro"}
]
}
1 change: 1 addition & 0 deletions assets/minecraft/models/item/weapons/gears_sword.bbmodel
View file

Large diffs are not rendered by default.

322 changes: 322 additions & 0 deletions assets/minecraft/models/item/weapons/gears_sword.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,322 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "item/weapons/gears_sword",
"1": "item/weapons/saw_gears_sword",
"particle": "item/weapons/gears_sword"
},
"elements": [
{
"from": [5.5, 0, 5.5],
"to": [10.5, 0, 10.5],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 16, 2.5, 16], "texture": "#0"},
"east": {"uv": [0, 16, 2.5, 16], "texture": "#0"},
"south": {"uv": [0, 16, 2.5, 16], "texture": "#0"},
"west": {"uv": [0, 16, 2.5, 16], "texture": "#0"},
"up": {"uv": [0, 13.5, 2.5, 16], "texture": "#0"},
"down": {"uv": [0, 13.5, 2.5, 16], "texture": "#0"}
}
},
{
"from": [6.5, 6.5, 6.5],
"to": [9.5, 9.5, 7.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]},
"faces": {
"north": {"uv": [0, 7.5, 1.5, 9], "texture": "#0"},
"east": {"uv": [0, 7.5, 0.5, 9], "texture": "#0"},
"south": {"uv": [1.5, 7.5, 0, 9], "texture": "#0"},
"west": {"uv": [1, 7.5, 1.5, 9], "texture": "#0"},
"up": {"uv": [1.5, 7.5, 0, 8], "texture": "#0"},
"down": {"uv": [1.5, 8.5, 0, 9], "texture": "#0"}
}
},
{
"from": [9.5, 7.5, 6.5],
"to": [10.5, 8.5, 7.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"from": [7.5, 9.5, 6.5],
"to": [8.5, 10.5, 7.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"from": [7.5, 5.5, 6.5],
"to": [8.5, 6.5, 7.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"from": [5.5, 7.5, 6.5],
"to": [6.5, 8.5, 7.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"from": [6.5, 6.5, 8.5],
"to": [9.5, 9.5, 9.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 9]},
"faces": {
"north": {"uv": [0, 7.5, 1.5, 9], "texture": "#0"},
"east": {"uv": [0, 7.5, 0.5, 9], "texture": "#0"},
"south": {"uv": [1.5, 7.5, 0, 9], "texture": "#0"},
"west": {"uv": [1, 7.5, 1.5, 9], "texture": "#0"},
"up": {"uv": [1.5, 7.5, 0, 8], "texture": "#0"},
"down": {"uv": [1.5, 8.5, 0, 9], "texture": "#0"}
}
},
{
"from": [9.5, 7.5, 8.5],
"to": [10.5, 8.5, 9.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 9]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"from": [7.5, 9.5, 8.5],
"to": [8.5, 10.5, 9.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 9]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"from": [7.5, 5.5, 8.5],
"to": [8.5, 6.5, 9.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 9]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"from": [5.5, 7.5, 8.5],
"to": [6.5, 8.5, 9.5],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 9]},
"faces": {
"north": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"south": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"west": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"up": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
"down": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"}
}
},
{
"name": "handle_left",
"from": [9, 7, 7.5],
"to": [11, 9, 8.5],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]},
"faces": {
"north": {"uv": [0, 9, 1, 10], "texture": "#0"},
"east": {"uv": [1, 9, 1.5, 10], "texture": "#0"},
"south": {"uv": [1, 9, 0, 10], "texture": "#0"},
"west": {"uv": [0.5, 9, 1, 10], "texture": "#0"},
"up": {"uv": [1, 9, 0, 9.5], "texture": "#0"},
"down": {"uv": [1, 9.5, 0, 10], "texture": "#0"}
}
},
{
"name": "handle_ext_left",
"from": [11, 6.5, 7],
"to": [11, 9.5, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 8]},
"faces": {
"north": {"uv": [2.5, 8.5, 2.5, 10], "texture": "#0"},
"east": {"uv": [2.5, 8.5, 3.5, 10], "texture": "#0"},
"south": {"uv": [2.5, 8.5, 2.5, 10], "texture": "#0"},
"west": {"uv": [3.5, 8.5, 2.5, 10], "texture": "#0"},
"up": {"uv": [2.5, 8.5, 2.5, 9.5], "texture": "#0"},
"down": {"uv": [2.5, 8.5, 2.5, 9.5], "texture": "#0"}
}
},
{
"name": "handle_right",
"from": [5, 7, 7.5],
"to": [7, 9, 8.5],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]},
"faces": {
"north": {"uv": [1, 9, 0, 10], "texture": "#0"},
"east": {"uv": [1, 9, 0.5, 10], "texture": "#0"},
"south": {"uv": [0, 9, 1, 10], "texture": "#0"},
"west": {"uv": [1.5, 9, 1, 10], "texture": "#0"},
"up": {"uv": [0, 9, 1, 9.5], "texture": "#0"},
"down": {"uv": [0, 9.5, 1, 10], "texture": "#0"}
}
},
{
"name": "handle_ext_right",
"from": [5, 6.5, 7],
"to": [5, 9.5, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]},
"faces": {
"north": {"uv": [2.5, 8.5, 2.5, 10], "texture": "#0"},
"east": {"uv": [2.5, 8.5, 3.5, 10], "texture": "#0"},
"south": {"uv": [2.5, 8.5, 2.5, 10], "texture": "#0"},
"west": {"uv": [3.5, 8.5, 2.5, 10], "texture": "#0"},
"up": {"uv": [2.5, 8.5, 2.5, 9.5], "texture": "#0"},
"down": {"uv": [2.5, 8.5, 2.5, 9.5], "texture": "#0"}
}
},
{
"name": "edge",
"from": [6, 9, 7.5],
"to": [8, 25, 8.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 7]},
"faces": {
"north": {"uv": [2.5, 0, 3.5, 8], "texture": "#0"},
"east": {"uv": [2.5, 0, 3, 8], "texture": "#0"},
"south": {"uv": [3.5, 0, 2.5, 8], "texture": "#0"},
"west": {"uv": [3, 0, 3.5, 8], "texture": "#0"},
"up": {"uv": [3.5, 0, 2.5, 0.5], "texture": "#0"},
"down": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"}
}
},
{
"name": "saw",
"from": [8, 9, 8],
"to": [11, 26, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 9, 7]},
"faces": {
"north": {"uv": [0, 0, 1.5, 8.5], "texture": "#1"},
"east": {"uv": [0, 0, 0, 8.5], "texture": "#1"},
"south": {"uv": [1.5, 0, 0, 8.5], "texture": "#1"},
"west": {"uv": [0, 0, 0, 8.5], "texture": "#1"},
"up": {"uv": [1.5, 0, 0, 0], "texture": "#1"},
"down": {"uv": [1.5, 0, 0, 0], "texture": "#1"}
}
},
{
"name": "handle",
"from": [7, 0, 7],
"to": [9, 7, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]},
"faces": {
"north": {"uv": [0.5, 10, 1.5, 13.5], "texture": "#0"},
"east": {"uv": [0.5, 10, 1.5, 13.5], "texture": "#0"},
"south": {"uv": [0.5, 10, 1.5, 13.5], "texture": "#0"},
"west": {"uv": [0.5, 10, 1.5, 13.5], "texture": "#0"},
"up": {"uv": [1.5, 11.5, 2.5, 12.5], "texture": "#0"},
"down": {"uv": [1.5, 12.5, 2.5, 13.5], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [0, -90, -30],
"translation": [0, 2, 3],
"scale": [0.85, 0.85, 0.85]
},
"thirdperson_lefthand": {
"rotation": [0, -90, -30],
"translation": [0, 2, 3],
"scale": [0.85, 0.85, 0.85]
},
"firstperson_righthand": {
"rotation": [0, -90, 25],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"firstperson_lefthand": {
"rotation": [0, 90, -25],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"ground": {
"translation": [0, 4.25, 0]
},
"gui": {
"rotation": [0, 0, -45],
"translation": [-3, -2.5, 0],
"scale": [0.75, 0.75, 0.75]
},
"head": {
"rotation": [0, 0, 156],
"translation": [7.5, -6.75, 4.25]
},
"fixed": {
"translation": [0, 0, -2]
}
},
"groups": [
{
"name": "pommel",
"origin": [8, 0, 8],
"color": 0,
"children": [0]
},
{
"name": "gear_front",
"origin": [6, 7, 7],
"color": 0,
"children": [1, 2, 3, 4, 5]
},
{
"name": "gear_back",
"origin": [6, 7, 7],
"color": 0,
"children": [6, 7, 8, 9, 10]
},
{
"name": "handle",
"origin": [8, 0, 5],
"color": 0,
"children": [11, 12, 13, 14]
},
{
"name": "blade",
"origin": [10, 9, 7],
"color": 0,
"children": [15, 16]
},
17
]
}
0 ...ecraft/textures/item/music_disc_fishe.png → .../textures/item/disks/music_disc_fishe.png
View file
File renamed without changes
0 ...ecraft/textures/item/music_disc_fishe.xcf → .../textures/item/disks/music_disc_fishe.xcf
View file
File renamed without changes.
Binary file added assets/minecraft/textures/item/disks/music_disc_pedro.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/disks/music_disc_pedro.xcf
View file
Binary file not shown.
Binary file added assets/minecraft/textures/item/weapons/gears_sword.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/weapons/saw_gears_sword.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.
5 changes: 5 additions & 0 deletions assets/minecraft/textures/item/weapons/saw_gears_sword.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 3
}
}
Binary file added assets/minecraft/textures/item/weapons/saw_gears_sword.xcf
View file
Binary file not shown.

0 comments on commit 3309762

Please sign in to comment.