Skip to content

Commit

Permalink
Fix blade models
Browse files Browse the repository at this point in the history
  • Loading branch information
tlm9201 committed Oct 21, 2024
1 parent 8a0629d commit 089570c
Show file tree
Hide file tree
Showing 3 changed files with 413 additions and 4 deletions.
239 changes: 238 additions & 1 deletion core/assets/mvndicraft/models/blacksmith/greatsword_blade.json
Original file line number Diff line number Diff line change
@@ -1 +1,238 @@
{"credit":"Made with Blockbench","textures":{"3":"mvndicraft:weapons/swords/spadone","4":"mvndicraft:weapons/swords/spadone_tip"},"elements":[{"from":[7.075,6.25,7.875],"to":[8.525,28.055,8.125],"rotation":{"angle":0,"axis":"y","origin":[8,25.775,8.025]},"faces":{"north":{"uv":[16,16,13.5,2.5],"rotation":180,"texture":"#3"},"east":{"uv":[13.5,16,14,2.5],"rotation":180,"texture":"#3"},"south":{"uv":[13.5,16,16,2.5],"rotation":180,"texture":"#3"},"west":{"uv":[15.5,16,16,2.5],"rotation":180,"texture":"#3"},"up":{"uv":[9.5,13.25,10.25,13.75],"texture":"#4"},"down":{"uv":[11,15.5,13.5,16],"texture":"#3"}}},{"from":[7.075,28.025,7.875],"to":[8.525,30.75,8.125],"rotation":{"angle":0,"axis":"y","origin":[14.975,38.75,15.25]},"faces":{"north":{"uv":[9,2.75,16,13.75],"texture":"#4"},"east":{"uv":[9.75,2.25,10,5],"texture":"#4"},"south":{"uv":[0,2.75,7,13.75],"texture":"#4"},"west":{"uv":[9.5,4,10.25,4.75],"texture":"#4"},"up":{"uv":[13.5,0,15,1],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[3.625,29.725,7.875],"to":[3.925,31.25,8.125],"rotation":{"angle":22.5,"axis":"z","origin":[10.375,40.45,15.25]},"faces":{"north":{"uv":[9.5,13.25,9.75,13.75],"texture":"#4"},"east":{"uv":[9.25,13.5,10,13.75],"texture":"#4"},"south":{"uv":[9.25,13.25,10.25,13.75],"texture":"#4"},"west":{"uv":[9.75,12.75,10.25,13.75],"texture":"#4"},"up":{"uv":[9.25,13.5,9.75,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[3.625,29.725,7.875],"to":[3.925,31.25,8.125],"rotation":{"angle":22.5,"axis":"z","origin":[10.375,40.45,15.25]},"faces":{"north":{"uv":[9.5,13.25,9.75,13.75],"texture":"#4"},"east":{"uv":[9.25,13.5,10,13.75],"texture":"#4"},"south":{"uv":[9.25,13.25,10.25,13.75],"texture":"#4"},"west":{"uv":[9.75,12.75,10.25,13.75],"texture":"#4"},"up":{"uv":[9.25,13.5,9.75,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[3.725,31.25,7.875],"to":[3.925,31.375,8.125],"rotation":{"angle":22.5,"axis":"z","origin":[10.375,40.45,15.25]},"faces":{"north":{"uv":[10,12,10.75,12.75],"texture":"#4"},"east":{"uv":[9.25,13.5,10,13.75],"texture":"#4"},"south":{"uv":[9.75,12.75,10.75,13.25],"texture":"#4"},"west":{"uv":[9.75,12.75,10.25,13.75],"texture":"#4"},"up":{"uv":[9.25,13.5,9.75,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[3.85,31.25,7.875],"to":[3.925,31.5,8.125],"rotation":{"angle":22.5,"axis":"z","origin":[10.375,40.45,15.25]},"faces":{"north":{"uv":[10,12,10.75,12.75],"texture":"#4"},"east":{"uv":[9.25,13.5,10,13.75],"texture":"#4"},"south":{"uv":[9.75,12.75,10.75,13.25],"texture":"#4"},"west":{"uv":[9.75,12.75,10.25,13.75],"texture":"#4"},"up":{"uv":[9.25,13.5,9.75,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[3.9,31.5,7.875],"to":[3.925,31.55,8.125],"rotation":{"angle":22.5,"axis":"z","origin":[10.375,40.45,15.25]},"faces":{"north":{"uv":[10,12,10.75,12.75],"texture":"#4"},"east":{"uv":[9.25,13.5,10,13.75],"texture":"#4"},"south":{"uv":[9.75,12.75,10.75,13.25],"texture":"#4"},"west":{"uv":[9.75,12.75,10.25,13.75],"texture":"#4"},"up":{"uv":[9.25,13.5,9.75,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[10.675,24.675,7.875],"to":[10.975,26.175,8.125],"rotation":{"angle":-22.5,"axis":"z","origin":[17.425,35.375,15.25]},"faces":{"north":{"uv":[9.25,13.25,10,13.75],"texture":"#4"},"east":{"uv":[10,13,10.25,13.75],"texture":"#4"},"south":{"uv":[9.5,13.25,10.5,13.75],"texture":"#4"},"west":{"uv":[9.5,13.25,10.25,13.75],"texture":"#4"},"up":{"uv":[9.75,13,10.25,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[10.675,26.175,7.875],"to":[10.775,26.425,8.125],"rotation":{"angle":-22.5,"axis":"z","origin":[17.425,35.375,15.25]},"faces":{"north":{"uv":[10,12.25,10.75,12.75],"texture":"#4"},"east":{"uv":[10,13,10.25,13.75],"texture":"#4"},"south":{"uv":[9.5,13.25,10.5,13.75],"texture":"#4"},"west":{"uv":[10,12.75,10.75,13.25],"texture":"#4"},"up":{"uv":[9.75,13,10.25,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[10.675,26.175,7.875],"to":[10.725,26.475,8.125],"rotation":{"angle":-22.5,"axis":"z","origin":[17.425,35.375,15.25]},"faces":{"north":{"uv":[10,12.25,10.75,12.75],"texture":"#4"},"east":{"uv":[10,13,10.25,13.75],"texture":"#4"},"south":{"uv":[9.5,13.25,10.5,13.75],"texture":"#4"},"west":{"uv":[10,12.75,10.75,13.25],"texture":"#4"},"up":{"uv":[9.75,13,10.25,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[10.675,26.425,7.875],"to":[10.71,26.5,8.125],"rotation":{"angle":-22.5,"axis":"z","origin":[17.425,35.375,15.25]},"faces":{"north":{"uv":[10,12.25,10.75,12.75],"texture":"#4"},"east":{"uv":[10,13,10.25,13.75],"texture":"#4"},"south":{"uv":[9.5,13.25,10.5,13.75],"texture":"#4"},"west":{"uv":[10,12.75,10.75,13.25],"texture":"#4"},"up":{"uv":[9.75,13,10.25,13.75],"texture":"#4"},"down":{"uv":[0,0,1.575,0.25],"texture":"#4"}}},{"from":[7.525,2.25,7.875],"to":[8.075,6.25,8.125],"rotation":{"angle":0,"axis":"y","origin":[6.625,2.25,7.875]},"faces":{"north":{"uv":[14.25,15.5,15.25,16],"texture":"#3"},"east":{"uv":[14.25,15.5,15.25,16],"texture":"#3"},"south":{"uv":[14.25,15.5,15.25,16],"texture":"#3"},"west":{"uv":[14.25,15.5,15.25,16],"texture":"#3"},"up":{"uv":[0,0,2,2],"texture":"#3"},"down":{"uv":[14.25,15.5,15.25,16],"texture":"#3"}}}],"gui_light":"front","display":{"thirdperson_righthand":{"rotation":[55.5,-90,55],"translation":[0,2,1.16]},"thirdperson_lefthand":{"rotation":[-180,-90,0],"translation":[0,-0.5,1.91]},"firstperson_righthand":{"rotation":[-15,100,0],"translation":[1,2.5,-0.25]},"firstperson_lefthand":{"rotation":[-24.25,80,180],"translation":[2,-0.25,-0.25]},"ground":{"rotation":[90,0,90],"translation":[6.25,-1.75,0]},"gui":{"rotation":[30,-27,-38],"translation":[-4.25,-4.5,0],"scale":[1.01328,1.01328,1.01328]},"fixed":{"rotation":[0,0,45],"translation":[2.5,-2,-2],"scale":[2,2,2]}},"groups":[{"name":"blade","origin":[7.93567,11.98615,8],"color":0,"children":[0,{"name":"group","origin":[7.93567,10.38615,8.01406],"color":0,"children":[{"name":"group","origin":[8.00045,10.03646,8],"color":0,"children":[]}]}]},{"name":"handle","origin":[8,8,8],"color":0,"children":[]},1,2,3,4,5,6,7,8,9,10,11]}
{
"credit": "Made with Blockbench",
"textures": {
"3": "mvndicraft:weapons/swords/spadone",
"4": "mvndicraft:weapons/swords/spadone_tip"
},
"elements": [
{
"from": [7.075, 6.25, 7.875],
"to": [8.525, 28.055, 8.125],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 25.775, 8.025]},
"faces": {
"north": {"uv": [16, 16, 13.5, 2.5], "rotation": 180, "texture": "#3"},
"east": {"uv": [13.5, 16, 14, 2.5], "rotation": 180, "texture": "#3"},
"south": {"uv": [13.5, 16, 16, 2.5], "rotation": 180, "texture": "#3"},
"west": {"uv": [15.5, 16, 16, 2.5], "rotation": 180, "texture": "#3"},
"up": {"uv": [9.5, 13.25, 10.25, 13.75], "texture": "#4"},
"down": {"uv": [11, 15.5, 13.5, 16], "texture": "#3"}
}
},
{
"from": [7.075, 28.025, 7.875],
"to": [8.525, 30.75, 8.125],
"rotation": {"angle": 0, "axis": "y", "origin": [14.975, 38.75, 15.25]},
"faces": {
"north": {"uv": [9, 2.75, 16, 13.75], "texture": "#4"},
"east": {"uv": [9.75, 2.25, 10, 5], "texture": "#4"},
"south": {"uv": [0, 2.75, 7, 13.75], "texture": "#4"},
"west": {"uv": [9.5, 4, 10.25, 4.75], "texture": "#4"},
"up": {"uv": [13.5, 0, 15, 1], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [3.625, 29.725, 7.875],
"to": [3.925, 31.25, 8.125],
"rotation": {"angle": 22.5, "axis": "z", "origin": [10.375, 40.45, 15.25]},
"faces": {
"north": {"uv": [9.5, 13.25, 9.75, 13.75], "texture": "#4"},
"east": {"uv": [9.25, 13.5, 10, 13.75], "texture": "#4"},
"south": {"uv": [9.25, 13.25, 10.25, 13.75], "texture": "#4"},
"west": {"uv": [9.75, 12.75, 10.25, 13.75], "texture": "#4"},
"up": {"uv": [9.25, 13.5, 9.75, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [3.625, 29.725, 7.875],
"to": [3.925, 31.25, 8.125],
"rotation": {"angle": 22.5, "axis": "z", "origin": [10.375, 40.45, 15.25]},
"faces": {
"north": {"uv": [9.5, 13.25, 9.75, 13.75], "texture": "#4"},
"east": {"uv": [9.25, 13.5, 10, 13.75], "texture": "#4"},
"south": {"uv": [9.25, 13.25, 10.25, 13.75], "texture": "#4"},
"west": {"uv": [9.75, 12.75, 10.25, 13.75], "texture": "#4"},
"up": {"uv": [9.25, 13.5, 9.75, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [3.725, 31.25, 7.875],
"to": [3.925, 31.375, 8.125],
"rotation": {"angle": 22.5, "axis": "z", "origin": [10.375, 40.45, 15.25]},
"faces": {
"north": {"uv": [10, 12, 10.75, 12.75], "texture": "#4"},
"east": {"uv": [9.25, 13.5, 10, 13.75], "texture": "#4"},
"south": {"uv": [9.75, 12.75, 10.75, 13.25], "texture": "#4"},
"west": {"uv": [9.75, 12.75, 10.25, 13.75], "texture": "#4"},
"up": {"uv": [9.25, 13.5, 9.75, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [3.85, 31.25, 7.875],
"to": [3.925, 31.5, 8.125],
"rotation": {"angle": 22.5, "axis": "z", "origin": [10.375, 40.45, 15.25]},
"faces": {
"north": {"uv": [10, 12, 10.75, 12.75], "texture": "#4"},
"east": {"uv": [9.25, 13.5, 10, 13.75], "texture": "#4"},
"south": {"uv": [9.75, 12.75, 10.75, 13.25], "texture": "#4"},
"west": {"uv": [9.75, 12.75, 10.25, 13.75], "texture": "#4"},
"up": {"uv": [9.25, 13.5, 9.75, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [3.9, 31.5, 7.875],
"to": [3.925, 31.55, 8.125],
"rotation": {"angle": 22.5, "axis": "z", "origin": [10.375, 40.45, 15.25]},
"faces": {
"north": {"uv": [10, 12, 10.75, 12.75], "texture": "#4"},
"east": {"uv": [9.25, 13.5, 10, 13.75], "texture": "#4"},
"south": {"uv": [9.75, 12.75, 10.75, 13.25], "texture": "#4"},
"west": {"uv": [9.75, 12.75, 10.25, 13.75], "texture": "#4"},
"up": {"uv": [9.25, 13.5, 9.75, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [10.675, 24.675, 7.875],
"to": [10.975, 26.175, 8.125],
"rotation": {"angle": -22.5, "axis": "z", "origin": [17.425, 35.375, 15.25]},
"faces": {
"north": {"uv": [9.25, 13.25, 10, 13.75], "texture": "#4"},
"east": {"uv": [10, 13, 10.25, 13.75], "texture": "#4"},
"south": {"uv": [9.5, 13.25, 10.5, 13.75], "texture": "#4"},
"west": {"uv": [9.5, 13.25, 10.25, 13.75], "texture": "#4"},
"up": {"uv": [9.75, 13, 10.25, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [10.675, 26.175, 7.875],
"to": [10.775, 26.425, 8.125],
"rotation": {"angle": -22.5, "axis": "z", "origin": [17.425, 35.375, 15.25]},
"faces": {
"north": {"uv": [10, 12.25, 10.75, 12.75], "texture": "#4"},
"east": {"uv": [10, 13, 10.25, 13.75], "texture": "#4"},
"south": {"uv": [9.5, 13.25, 10.5, 13.75], "texture": "#4"},
"west": {"uv": [10, 12.75, 10.75, 13.25], "texture": "#4"},
"up": {"uv": [9.75, 13, 10.25, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [10.675, 26.175, 7.875],
"to": [10.725, 26.475, 8.125],
"rotation": {"angle": -22.5, "axis": "z", "origin": [17.425, 35.375, 15.25]},
"faces": {
"north": {"uv": [10, 12.25, 10.75, 12.75], "texture": "#4"},
"east": {"uv": [10, 13, 10.25, 13.75], "texture": "#4"},
"south": {"uv": [9.5, 13.25, 10.5, 13.75], "texture": "#4"},
"west": {"uv": [10, 12.75, 10.75, 13.25], "texture": "#4"},
"up": {"uv": [9.75, 13, 10.25, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [10.675, 26.425, 7.875],
"to": [10.71, 26.5, 8.125],
"rotation": {"angle": -22.5, "axis": "z", "origin": [17.425, 35.375, 15.25]},
"faces": {
"north": {"uv": [10, 12.25, 10.75, 12.75], "texture": "#4"},
"east": {"uv": [10, 13, 10.25, 13.75], "texture": "#4"},
"south": {"uv": [9.5, 13.25, 10.5, 13.75], "texture": "#4"},
"west": {"uv": [10, 12.75, 10.75, 13.25], "texture": "#4"},
"up": {"uv": [9.75, 13, 10.25, 13.75], "texture": "#4"},
"down": {"uv": [0, 0, 1.575, 0.25], "texture": "#4"}
}
},
{
"from": [7.525, 2.25, 7.875],
"to": [8.075, 6.25, 8.125],
"rotation": {"angle": 0, "axis": "y", "origin": [6.625, 2.25, 7.875]},
"faces": {
"north": {"uv": [14.25, 15.5, 15.25, 16], "texture": "#3"},
"east": {"uv": [14.25, 15.5, 15.25, 16], "texture": "#3"},
"south": {"uv": [14.25, 15.5, 15.25, 16], "texture": "#3"},
"west": {"uv": [14.25, 15.5, 15.25, 16], "texture": "#3"},
"up": {"uv": [0, 0, 2, 2], "texture": "#3"},
"down": {"uv": [14.25, 15.5, 15.25, 16], "texture": "#3"}
}
}
],
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"rotation": [55.5, -90, 55],
"translation": [0, 2, 1.16]
},
"thirdperson_lefthand": {
"rotation": [55.5, -90, 55],
"translation": [0, 2, 1.16]
},
"firstperson_righthand": {
"rotation": [-15, 100, 0],
"translation": [1, 2.5, -0.25]
},
"firstperson_lefthand": {
"rotation": [-15, 100, 0],
"translation": [1, 2.5, -0.25]
},
"ground": {
"rotation": [90, 0, 90],
"translation": [6.25, -1.75, 0]
},
"gui": {
"rotation": [30, -27, -38],
"translation": [-4.25, -4.5, 0],
"scale": [1.01328, 1.01328, 1.01328]
},
"fixed": {
"rotation": [0, 0, 45],
"translation": [2.5, -2, -2],
"scale": [2, 2, 2]
}
},
"groups": [
{
"name": "blade",
"origin": [7.93567, 11.98615, 8],
"color": 0,
"children": [
0,
{
"name": "group",
"origin": [7.93567, 10.38615, 8.01406],
"color": 0,
"children": [
{
"name": "group",
"origin": [8.00045, 10.03646, 8],
"color": 0,
"children": []
}
]
}
]
},
{
"name": "handle",
"origin": [8, 8, 8],
"color": 0,
"children": []
},
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
4 changes: 2 additions & 2 deletions core/assets/mvndicraft/models/blacksmith/hammer.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"translation": [0, 2.5, 3],
"translation": [0, 3.75, 3],
"scale": [0.60938, 0.60938, 0.60938]
},
"thirdperson_lefthand": {
"translation": [0, 2.5, 3],
"translation": [0, 3.75, 3],
"scale": [0.60938, 0.60938, 0.60938]
},
"firstperson_righthand": {
Expand Down
Loading

0 comments on commit 089570c

Please sign in to comment.