Skip to content

Commit

Permalink
Model changes \o/
Browse files Browse the repository at this point in the history
- Add broomstick
- Remove bb8 (isn't needed in USO)
  • Loading branch information
marcdif committed Dec 8, 2018
1 parent 203bfbf commit 7fa735d
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 8 deletions.
3 changes: 0 additions & 3 deletions assets/minecraft/models/item/bb8.json

This file was deleted.

3 changes: 0 additions & 3 deletions assets/minecraft/models/item/bb8head.json

This file was deleted.

91 changes: 91 additions & 0 deletions assets/minecraft/models/item/broomstick.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "blocks/hay_block_side",
"1": "blocks/hardened_clay_stained_brown",
"particle": "blocks/hay_block_side"
},
"elements": [
{
"from": [7.9, -0.1, 0],
"to": [9.1, 1.1, 14],
"faces": {
"north": {"uv": [0, 0, 1.2, 1.2], "texture": "#1"},
"east": {"uv": [0, 0, 14, 1.2], "texture": "#1"},
"south": {"uv": [0, 0, 1.2, 1.2], "texture": "#1"},
"west": {"uv": [0, 0, 14, 1.2], "texture": "#1"},
"up": {"uv": [0, 0, 1.2, 14], "texture": "#1"},
"down": {"uv": [0, 0, 1.2, 14], "texture": "#1"}
}
},
{
"from": [7, -1, 10.5],
"to": [10, 2, 15.6],
"faces": {
"north": {"uv": [0, 0, 3, 3], "texture": "#0"},
"east": {"uv": [0, 0, 5.1, 3], "texture": "#0"},
"south": {"uv": [0, 0, 3, 3], "texture": "#0"},
"west": {"uv": [0, 0, 5.1, 3], "texture": "#0"},
"up": {"uv": [0, 0, 16, 15.6], "texture": "#0"},
"down": {"uv": [0, 0, 3, 5.1], "texture": "#0"}
}
},
{
"from": [3.25, -1, 14.35],
"to": [4.15, 2, 17.35],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 5.5]},
"faces": {
"north": {"uv": [0, 0, 0.9, 3], "texture": "#0"},
"east": {"uv": [0, 0, 3, 3], "texture": "#0"},
"south": {"uv": [0, 0, 0.9, 3], "texture": "#0"},
"west": {"uv": [0, 0, 3, 3], "texture": "#0"},
"up": {"uv": [0, 0, 16, 15.6], "texture": "#0"},
"down": {"uv": [0, 0, 0.9, 3], "texture": "#0"}
}
},
{
"from": [13.05, -1, 13.95],
"to": [13.65, 2, 17.25],
"rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 5.5]},
"faces": {
"north": {"uv": [0, 0, 0.6, 3], "texture": "#0"},
"east": {"uv": [0, 0, 3.3, 3], "texture": "#0"},
"south": {"uv": [0, 0, 0.6, 3], "texture": "#0"},
"west": {"uv": [0, 0, 3.3, 3], "texture": "#0"},
"up": {"uv": [0, 0, 16, 15.6], "texture": "#0"},
"down": {"uv": [0, 0, 0.6, 3.3], "texture": "#0"}
}
},
{
"from": [8.05, -1, 13.95],
"to": [9.35, 2, 16.75],
"faces": {
"north": {"uv": [0, 0, 1.3, 3], "texture": "#0"},
"east": {"uv": [0, 0, 2.8, 3], "texture": "#0"},
"south": {"uv": [0, 0, 1.3, 3], "texture": "#0"},
"west": {"uv": [0, 0, 2.8, 3], "texture": "#0"},
"up": {"uv": [0, 0, 16, 15.6], "texture": "#0"},
"down": {"uv": [0, 0, 1.3, 2.8], "texture": "#0"}
}
},
{
"from": [8.05, -1, 15.95],
"to": [8.95, 2, 17.15],
"faces": {
"north": {"uv": [0, 0, 0.9, 3], "texture": "#0"},
"east": {"uv": [0, 0, 1.2, 3], "texture": "#0"},
"south": {"uv": [0, 0, 0.9, 3], "texture": "#0"},
"west": {"uv": [0, 0, 1.2, 3], "texture": "#0"},
"up": {"uv": [0, 0, 16, 15.6], "texture": "#0"},
"down": {"uv": [0, 0, 0.9, 1.2], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"scale": [1.525, 1, 1.675],
"rotation": [90, 0, 90],
"translation": [-13.5, -4, -2]
}
}
}
3 changes: 1 addition & 2 deletions assets/minecraft/models/item/shears.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"layer0": "items/shears"
},
"overrides": [
{ "predicate": { "damage": 0.004201680672 }, "model": "item/bb8head" },
{ "predicate": { "damage": 0.008403361345 }, "model": "item/bb8" }
{ "predicate": { "damage": 0.004201680672 }, "model": "item/broomstick" }
]
}

0 comments on commit 7fa735d

Please sign in to comment.