Skip to content

Commit

Permalink
siege weapon parts and nails
Browse files Browse the repository at this point in the history
  • Loading branch information
@ewof
ewof committed Nov 16, 2024
1 parent 6906374 commit 8b697b1
Show file tree
Hide file tree
Showing 15 changed files with 2,864 additions and 5 deletions.
81 changes: 76 additions & 5 deletions core/assets/minecraft/models/item/stick.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,11 +498,82 @@
},
"model": "mvndicraft:farming/mill_wheel_item"
},
{"predicate": {"custom_model_data":3000}, "model": "mvndicraft:placeables/barricade"},
{"predicate": {"custom_model_data":3001}, "model": "mvndicraft:placeables/bear_trap/bear_trap_open"},
{"predicate": {"custom_model_data":3002}, "model": "mvndicraft:placeables/bear_trap/bear_trap_closed"},
{"predicate": {"custom_model_data":3003}, "model": "mvndicraft:placeables/bear_trap/bear_trap_open_underground"},

{
"predicate": {
"custom_model_data": 98
},
"model": "mvndicraft:blacksmith/nail"
},
{
"predicate": {
"custom_model_data": 99
},
"model": "mvndicraft:siege/item/cannon_barrel"
},
{
"predicate": {
"custom_model_data": 100
},
"model": "mvndicraft:siege/item/cannon_butt"
},
{
"predicate": {
"custom_model_data": 101
},
"model": "mvndicraft:siege/item/cannon_wheel"
},
{
"predicate": {
"custom_model_data": 102
},
"model": "mvndicraft:siege/item/ballista_top"
},
{
"predicate": {
"custom_model_data": 103
},
"model": "mvndicraft:siege/item/rotating_turret"
},
{
"predicate": {
"custom_model_data": 104
},
"model": "mvndicraft:siege/item/siphon"
},
{
"predicate": {
"custom_model_data": 105
},
"model": "mvndicraft:siege/item/canister"
},
{
"predicate": {
"custom_model_data": 106
},
"model": "mvndicraft:siege/item/counterweight_carrier"
},
{
"predicate": {
"custom_model_data": 107
},
"model": "mvndicraft:siege/item/trebuchet_base"
},
{
"predicate": {
"custom_model_data": 108
},
"model": "mvndicraft:siege/item/trebuchet_arm"
},
{
"predicate": {
"custom_model_data": 109
},
"model": "mvndicraft:siege/item/trebuchet_sling"
},
{"predicate": {"custom_model_data":3000}, "model": "mvndicraft:placeables/barricade"},
{"predicate": {"custom_model_data":3001}, "model": "mvndicraft:placeables/bear_trap/bear_trap_open"},
{"predicate": {"custom_model_data":3002}, "model": "mvndicraft:placeables/bear_trap/bear_trap_closed"},
{"predicate": {"custom_model_data":3003}, "model": "mvndicraft:placeables/bear_trap/bear_trap_open_underground"},
{"predicate": {"custom_model_data":439020}, "model": "mvndicraft:siege/block/trebuchet/new/base_center"},
{"predicate": {"custom_model_data":439021}, "model": "mvndicraft:siege/block/trebuchet/new/base_top"},
{"predicate": {"custom_model_data":439022}, "model": "mvndicraft:siege/block/trebuchet/new/base_back_activated"},
Expand Down
Binary file modified core/assets/minecraft/textures/block/diamond_block.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.
7 changes: 7 additions & 0 deletions core/assets/mvndicraft/models/blacksmith/nail.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "mvndicraft:blacksmith/nail"
}
}

249 changes: 249 additions & 0 deletions core/assets/mvndicraft/models/siege/item/ballista_top.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,249 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "mvndicraft:siege/block/ballista",
"particle": "mvndicraft:siege/block/ballista_particle"
},
"elements": [
{
"name": "front",
"from": [4, 0, 29],
"to": [12, 5, 32],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 6]},
"faces": {
"north": {"uv": [8.5, 11, 6.5, 12.25], "texture": "#0"},
"east": {"uv": [3.75, 11, 3, 12.25], "texture": "#0"},
"south": {"uv": [5.75, 11, 3.75, 12.25], "texture": "#0"},
"west": {"uv": [6.5, 11, 5.75, 12.25], "texture": "#0"},
"up": {"uv": [3.75, 11, 5.75, 10.25], "texture": "#0"},
"down": {"uv": [5.75, 11, 7.75, 10.25], "texture": "#0"}
}
},
{
"name": "mid",
"from": [5, 1, -9],
"to": [11, 3, 29],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]},
"faces": {
"north": {"uv": [16, 15.5, 14.5, 16], "texture": "#0"},
"east": {"uv": [12.5, 12.25, 3, 12.75], "texture": "#0"},
"south": {"uv": [16, 15.5, 14.5, 16], "texture": "#0"},
"west": {"uv": [12.5, 12.75, 3, 13.25], "texture": "#0"},
"up": {"uv": [0, 14.25, 1.5, 4.75], "texture": "#0"},
"down": {"uv": [1.5, 14.25, 3, 4.75], "texture": "#0", "cullface": "down"}
}
},
{
"name": "back_bottom",
"from": [1, -1, -15],
"to": [15, 3, -9],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 3]},
"faces": {
"north": {"uv": [7, 2.5, 3.5, 3.5], "texture": "#0"},
"east": {"uv": [8.5, 1, 7, 2], "texture": "#0"},
"south": {"uv": [3.5, 2.5, 0, 3.5], "texture": "#0"},
"west": {"uv": [8.5, 2, 7, 3], "texture": "#0"},
"up": {"uv": [0, 2.5, 3.5, 1], "texture": "#0"},
"down": {"uv": [3.5, 2.5, 7, 1], "texture": "#0"}
}
},
{
"name": "side_start",
"from": [10, -3, -14],
"to": [14, 5, -8],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 7, 7]},
"faces": {
"north": {"uv": [8, 8.25, 7, 10.25], "texture": "#0"},
"east": {"uv": [4.5, 8.25, 3, 10.25], "texture": "#0"},
"south": {"uv": [5.5, 8.25, 4.5, 10.25], "texture": "#0"},
"west": {"uv": [7, 8.25, 5.5, 10.25], "texture": "#0"},
"up": {"uv": [3, 8.25, 4, 6.75], "texture": "#0"},
"down": {"uv": [4, 8.25, 5, 6.75], "texture": "#0"}
}
},
{
"name": "side",
"from": [8, -0.5, -13],
"to": [27, 2.5, -10],
"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 1]},
"faces": {
"north": {"uv": [16, 2.25, 11.25, 3], "texture": "#0"},
"east": {"uv": [16, 3, 15.25, 3.75], "texture": "#0"},
"south": {"uv": [16, 1.5, 11.25, 2.25], "texture": "#0"},
"up": {"uv": [11.25, 0.75, 16, 0], "texture": "#0"},
"down": {"uv": [11.25, 1.5, 16, 0.75], "texture": "#0"}
}
},
{
"name": "string_start",
"from": [27.75, 2.4, -4],
"to": [29.75, 4.41, -2],
"rotation": {"angle": -22.5, "axis": "y", "origin": [31, 4, -3]},
"faces": {
"north": {"uv": [11.25, 2, 10.75, 2.5025], "texture": "#0"},
"east": {"uv": [11.25, 3, 10.75, 3.5025], "texture": "#0"},
"south": {"uv": [11.25, 1.5, 10.75, 2.0025], "texture": "#0"},
"west": {"uv": [11.25, 2.5, 10.75, 3.0025], "texture": "#0"},
"up": {"uv": [10.75, 1.5, 11.25, 1], "texture": "#0"}
}
},
{
"name": "side_start",
"from": [2, -3, -14],
"to": [6, 5, -8],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 7, 7]},
"faces": {
"north": {"uv": [7, 8.25, 8, 10.25], "texture": "#0"},
"east": {"uv": [5.5, 8.25, 7, 10.25], "texture": "#0"},
"south": {"uv": [4.5, 8.25, 5.5, 10.25], "texture": "#0"},
"west": {"uv": [3, 8.25, 4.5, 10.25], "texture": "#0"},
"up": {"uv": [4, 8.25, 3, 6.75], "texture": "#0"},
"down": {"uv": [5, 8.25, 4, 6.75], "texture": "#0"}
}
},
{
"name": "side",
"from": [-11, -0.5, -13],
"to": [8, 2.5, -10],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 1]},
"faces": {
"north": {"uv": [11.25, 2.25, 16, 3], "texture": "#0"},
"south": {"uv": [11.25, 1.5, 16, 2.25], "texture": "#0"},
"west": {"uv": [15.25, 3, 16, 3.75], "texture": "#0"},
"up": {"uv": [16, 0.75, 11.25, 0], "texture": "#0"},
"down": {"uv": [16, 1.5, 11.25, 0.75], "texture": "#0"}
}
},
{
"name": "string_start",
"from": [-13.75, 2.4, -4],
"to": [-11.75, 4.41, -2],
"rotation": {"angle": 22.5, "axis": "y", "origin": [-15, 4, -3]},
"faces": {
"north": {"uv": [10.75, 2, 11.25, 2.5025], "texture": "#0"},
"east": {"uv": [10.75, 2.5, 11.25, 3.0025], "texture": "#0"},
"south": {"uv": [10.75, 1.5, 11.25, 2.0025], "texture": "#0"},
"west": {"uv": [10.75, 3, 11.25, 3.5025], "texture": "#0"},
"up": {"uv": [11.25, 1.5, 10.75, 1], "texture": "#0"}
}
},
{
"name": "mid_5",
"from": [-0.5, 2.99, -4.501],
"to": [16.5, 4.99, -3],
"rotation": {"angle": 0, "axis": "y", "origin": [29, 4, -38]},
"faces": {
"north": {"uv": [10.25, 4.25, 10.75, 0], "rotation": 90, "texture": "#0"},
"east": {"uv": [10.75, 0.875, 11.25, 0.5], "rotation": 90, "texture": "#0"},
"south": {"uv": [9.75, 4.25, 10.25, 0], "rotation": 90, "texture": "#0"},
"west": {"uv": [10.75, 0.37525, 11.25, 0], "rotation": 90, "texture": "#0"},
"up": {"uv": [9.125, 0, 8.75, 4.25], "rotation": 90, "texture": "#0"},
"down": {"uv": [9.625, 0, 9.25, 4.25], "rotation": 90, "texture": "#0"}
}
},
{
"name": "mid_4",
"from": [6, 2.98, -6.49],
"to": [10, 5.98, -2.99],
"rotation": {"angle": 0, "axis": "y", "origin": [29, 4, -39]},
"faces": {
"north": {"uv": [2, 3.5, 1, 4.25], "texture": "#0"},
"east": {"uv": [4, 3.5, 3, 4.25], "texture": "#0"},
"south": {"uv": [1, 3.5, 0, 4.25], "texture": "#0"},
"west": {"uv": [3, 3.5, 2, 4.25], "texture": "#0"},
"up": {"uv": [3, 5, 4, 4.25], "texture": "#0"}
}
},
{
"name": "string_left",
"from": [16, 3, -4.5],
"to": [28.5, 4, -3.5],
"rotation": {"angle": 0, "axis": "y", "origin": [29, 4, -4]},
"faces": {
"north": {"uv": [3.125, 0.5, 0, 0.75], "texture": "#0"},
"south": {"uv": [3.125, 0, 0, 0.25], "texture": "#0"},
"up": {"uv": [0, 0.5, 3.125, 0.25], "texture": "#0"},
"down": {"uv": [0, 1, 3.125, 0.75], "texture": "#0"}
}
},
{
"name": "string_right",
"from": [-12.5, 3, -4.5],
"to": [0, 4, -3.5],
"rotation": {"angle": 0, "axis": "y", "origin": [-13, 4, -3]},
"faces": {
"north": {"uv": [3.125, 0, 0, 0.25], "texture": "#0"},
"south": {"uv": [3.125, 0.5, 0, 0.75], "texture": "#0"},
"up": {"uv": [0, 0.5, 3.125, 0.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 1, 3.125, 0.75], "rotation": 180, "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [90, 0, 0],
"translation": [0, 0, 5],
"scale": [0.5, 0.5, 0.5]
},
"thirdperson_lefthand": {
"rotation": [90, 0, 0],
"translation": [0, 0, 5],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_righthand": {
"rotation": [90, 0, 0],
"translation": [0, 4, 0],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [90, 0, 0],
"translation": [0, 4, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"translation": [0, 5, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [90, -90, 0],
"scale": [0.25, 0.25, 0.25]
},
"head": {
"rotation": [0, -180, 0],
"translation": [0, -13.75, 6.25],
"scale": [2, 2, 2]
},
"fixed": {
"rotation": [90, 90, 180],
"translation": [0, 0, -2.5],
"scale": [0.25, 0.25, 0.25]
}
},
"groups": [
{
"name": "center",
"origin": [14, 8, 8],
"color": 0,
"children": [0, 1, 2]
},
{
"name": "left_side",
"origin": [8, 8, 8],
"color": 0,
"children": [3, 4, 5]
},
{
"name": "right_side",
"origin": [8, 8, 8],
"color": 0,
"children": [6, 7, 8]
},
{
"name": "standby",
"origin": [8, 8, 8],
"color": 0,
"children": [9, 10, 11, 12]
}
]
}
Loading

0 comments on commit 8b697b1

Please sign in to comment.