Skip to content

Commit

Permalink
Item render cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shoeboxam
Shoeboxam committed Jan 7, 2018
1 parent bc31aaa commit d157e11
Show file tree
Hide file tree
Showing 20 changed files with 123 additions and 43 deletions.
14 changes: 7 additions & 7 deletions assets/minecraft/models/block/door/dark_oak_item.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"elements": [
{ "from": [ 0, 0, 0 ],
"to": [ 3, 16, 16 ],
"to": [ 2, 16, 16 ],
"faces": {
"up": { "uv": [ 7, 0, 9, 16 ], "texture": "#bottom", "cullface": "up" },
"north": { "uv": [ 0, 0, 3, 16 ], "texture": "#top", "cullface": "north" },
Expand All @@ -18,7 +18,7 @@
}
},
{ "from": [ -0.75, 1, 2 ],
"to": [ 3.75, 14.25, 7 ],
"to": [ 2.75, 14.25, 7 ],
"faces": {
"up": { "uv": [ 2, 1.75, 7, 6.75 ], "texture": "#bottom" },
"down": { "uv": [ 2, 1.75, 7, 6.75 ], "texture": "#bottom" },
Expand All @@ -29,7 +29,7 @@
}
},
{ "from": [ -0.75, 1, 9 ],
"to": [ 3.75, 14.25, 14 ],
"to": [ 2.75, 14.25, 14 ],
"faces": {
"up": { "uv": [ 2, 1.75, 7, 6.75 ], "texture": "#bottom" },
"down": { "uv": [ 2, 1.75, 7, 6.75 ], "texture": "#bottom" },
Expand All @@ -40,7 +40,7 @@
}
},
{ "from": [ -0.5, -0.25, 13 ],
"to": [ 3.5, 0.75, 15.25 ],
"to": [ 2.5, 0.75, 15.25 ],
"faces": {
"up": { "uv": [ 4, 4, 8, 6.25 ], "texture": "#handle" },
"down": { "uv": [ 4, 4, 8, 6.25 ], "texture": "#handle" },
Expand All @@ -54,7 +54,7 @@


{ "from": [ 0, -16, 0 ],
"to": [ 3, 0, 16 ],
"to": [ 2, 0, 16 ],
"faces": {
"down": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "up" },
"north": { "uv": [ 0, 0, 3, 16 ], "texture": "#bottom", "cullface": "north" },
Expand All @@ -64,7 +64,7 @@
}
},
{ "from": [ -0.75, -14, 2 ],
"to": [ 3.75, -0.75, 7 ],
"to": [ 2.75, -0.75, 7 ],
"faces": {
"up": { "uv": [ 2, 0.75, 7, 5.75 ], "texture": "#bottom" },
"down": { "uv": [ 2, 0.75, 7, 5.75 ], "texture": "#bottom" },
Expand All @@ -75,7 +75,7 @@
}
},
{ "from": [ -0.75, -14, 9 ],
"to": [ 3.75, -0.75, 14 ],
"to": [ 2.75, -0.75, 14 ],
"faces": {
"up": { "uv": [ 2, 0.75, 7, 5.75 ], "texture": "#bottom" },
"down": { "uv": [ 2, 0.75, 7, 5.75 ], "texture": "#bottom" },
Expand Down
52 changes: 46 additions & 6 deletions assets/minecraft/models/block/door/oak_item.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,51 @@
"textures": {
"particle": "blocks/door_wood_lower",
"bottom": "blocks/door_wood_lower",
"top": "blocks/door_wood_upper"
"top": "blocks/door_wood_upper",
"trim": "blocks/door_wood_trim"
},
"elements": [
{ "from": [ 0, 0, 0 ],
{ "from": [ 0, 11.25, 0 ],
"to": [ 3, 16, 16 ],
"faces": {
"up": { "uv": [ 0, 1.5, 16, 0 ], "texture": "#top", "cullface": "up", "rotation": 90 },
"north": { "uv": [ 0, 0, 3.75, 16 ], "texture": "#top", "cullface": "north" },
"south": { "uv": [ 0, 0, 3.75, 16 ], "texture": "#top", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "west" },
"east": { "uv": [ 16, 0, 0, 16 ], "texture": "#top" }
"down": { "uv": [ 0, 3, 5.5, 0 ], "texture": "#trim", "rotation": 90 },
"north": { "uv": [ 0, 0, 3.75, 4.75 ], "texture": "#top", "cullface": "north" },
"south": { "uv": [ 0, 0, 3.75, 4.75 ], "texture": "#top", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 4.75 ], "texture": "#top", "cullface": "west" },
"east": { "uv": [ 16, 0, 0, 4.75 ], "texture": "#top" }
}
},
{ "from": [ 0, 0, 0 ],
"to": [ 3, 5.75, 16 ],
"faces": {
"up": { "uv": [ 0, 3, 5.5, 0 ], "texture": "#trim", "rotation": 90 },
"north": { "uv": [ 0, 10.25, 3.75, 16 ], "texture": "#top", "cullface": "north" },
"south": { "uv": [ 0, 10.25, 3.75, 16 ], "texture": "#top", "cullface": "south" },
"west": { "uv": [ 0, 10.25, 16, 16 ], "texture": "#top", "cullface": "west" },
"east": { "uv": [ 16, 10.25, 0, 16 ], "texture": "#top" }
}
},
{ "from": [ 0, 5.75, 0 ],
"to": [ 3, 11.25, 5.25 ],
"faces": {
"north": { "uv": [ 0, 4.75, 3.75, 10.25 ], "texture": "#top", "cullface": "north" },
"south": { "uv": [ 0, 3, 5.5, 0 ], "texture": "#trim", "rotation": 90 },
"west": { "uv": [ 0, 4.75, 5.25, 10.25 ], "texture": "#top", "cullface": "west" },
"east": { "uv": [ 5.25, 4.75, 0, 10.25 ], "texture": "#top" }
}
},
{ "from": [ 0, 5.75, 10.75 ],
"to": [ 3, 11.25, 16 ],
"faces": {
"north": { "uv": [ 0, 0, 5.5, 3 ], "texture": "#trim", "rotation": 90 },
"south": { "uv": [ 0, 4.75, 3.75, 10.25 ], "texture": "#top", "cullface": "south" },
"west": { "uv": [ 10.75, 4.75, 16, 10.25 ], "texture": "#top", "cullface": "west" },
"east": { "uv": [ 16, 4.75, 10.75, 10.25 ], "texture": "#top" }
}
},


{ "from": [ -1, 12.75, 0 ],
"to": [ 0, 14, 16 ],
"faces": {
Expand All @@ -38,6 +70,14 @@
"east": { "uv": [ 16, 2, 0, 3.25 ], "texture": "#top" }
}
},
{ "from": [ 1.5, 0, 0 ],
"to": [ 1.5, 16, 16 ],
"faces": {

"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "west" },
"east": { "uv": [ 16, 0, 0, 16 ], "texture": "#top" }
}
},


{ "from": [ 0, -16, 0 ],
Expand Down
7 changes: 6 additions & 1 deletion assets/minecraft/models/block/fence/fence_inventory.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
"gui": {
"rotation": [ 30, 135, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.625, 0.625, 0.625 ]
"scale": [ 0.625, 0.625, 0.625 ]
},
"fixed": {
"rotation": [ 0, 90, 0 ],
"translation": [ 0, 0, 0],
"scale": [ 0.625, 0.625, 0.625 ]
}
},
"ambientocclusion": false,
Expand Down
5 changes: 5 additions & 0 deletions assets/minecraft/models/item/acacia_door.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"rotation": [ 0, 0, 0 ],
"translation": [ 3.5, 8, 0 ],
"scale": [ 0.45, 0.45, 0.45 ]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"translation": [ 0, 4, 3.5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/acacia_trapdoor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"translation": [ 0, 0, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"translation": [ 0, 3, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 3.5 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
Expand Down
5 changes: 5 additions & 0 deletions assets/minecraft/models/item/birch_door.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"rotation": [ 0, 0, 0 ],
"translation": [ 3.5, 8, 0 ],
"scale": [ 0.45, 0.45, 0.45 ]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"translation": [ 0, 4, 3.5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/birch_trapdoor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"translation": [ 0, 0, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"translation": [ 0, 3, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 3.5 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/item/boat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"fixed": {
"rotation": [ 270, 0, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5 ]
"scale":[ 0.82, 0.82, 0.82 ]
},
"thirdperson_righthand": {
"rotation": [ 75, 45, 0 ],
Expand Down
5 changes: 5 additions & 0 deletions assets/minecraft/models/item/dark_oak_door.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"rotation": [ 0, 0, 0 ],
"translation": [ 3.5, 8, 0 ],
"scale": [ 0.45, 0.45, 0.45 ]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"translation": [ 0, 4, 3.5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/dark_oak_trapdoor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"translation": [ 0, 0, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"translation": [ 0, 3, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 3.5 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
Expand Down
5 changes: 5 additions & 0 deletions assets/minecraft/models/item/iron_door.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"rotation": [ 0, 0, 0 ],
"translation": [ 3.5, 8, 0 ],
"scale": [ 0.45, 0.45, 0.45 ]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"translation": [ 0, 4, 3.5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/iron_trapdoor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"translation": [ 0, 0, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"translation": [ 0, 3, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 3.5 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
Expand Down
5 changes: 5 additions & 0 deletions assets/minecraft/models/item/jungle_door.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"rotation": [ 0, 0, 0 ],
"translation": [ 3.5, 8, 0 ],
"scale": [ 0.45, 0.45, 0.45 ]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"translation": [ 0, 4, 3.5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/jungle_trapdoor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"translation": [ 0, 0, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"translation": [ 0, 3, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 3.5 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
Expand Down
5 changes: 5 additions & 0 deletions assets/minecraft/models/item/oak_door.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"rotation": [ 0, 0, 0 ],
"translation": [ 3.5, 8, 0 ],
"scale": [ 0.45, 0.45, 0.45 ]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"translation": [ 0, 4, 3.5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/oak_trapdoor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"translation": [ 0, 0, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"translation": [ 0, 3, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 3.5 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
Expand Down
5 changes: 5 additions & 0 deletions assets/minecraft/models/item/spruce_door.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"rotation": [ 0, 0, 0 ],
"translation": [ 3.5, 8, 0 ],
"scale": [ 0.45, 0.45, 0.45 ]
},
"fixed": {
"rotation": [ 0, 270, 0 ],
"translation": [ 0, 4, 3.5],
"scale":[ 0.5, 0.5, 0.5 ]
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions assets/minecraft/models/item/spruce_trapdoor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"translation": [ 0, 0, 0 ],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"translation": [ 0, 3, 0 ],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"rotation": [ 90, 0, 0 ],
"translation": [ 0, 0, 3.5 ],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
Expand Down
Binary file modified assets/minecraft/textures/blocks/brown_mushroom_block/1.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 modified assets/minecraft/textures/blocks/brown_mushroom_block/2.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 d157e11

Please sign in to comment.