Skip to content

Commit

Permalink
add inventory textures/models; more blocks, better ao
Browse files Browse the repository at this point in the history
  • Loading branch information
null511 committed Feb 23, 2021
1 parent f08a51c commit 038d0d4
Show file tree
Hide file tree
Showing 478 changed files with 2,203 additions and 313 deletions.
7 changes: 7 additions & 0 deletions src/assets/minecraft/models/block/acacia_wood.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "block/acacia_wood",
"side": "block/acacia_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/brick_wall_inventory.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/bricks_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/cobblestone_inventory"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/crimson_button.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/button",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/button_inventory",
"textures": {
"texture": "block/stripped_crimson_wood_inventory"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/crimson_button_pressed.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/button_pressed",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/crimson_fence_gate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate_open",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate_wall",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate_wall_open",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "block/stripped_crimson_wood_inventory"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/crimson_fence_post.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/fence_post",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/crimson_fence_side.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/fence_side",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/crimson_pressure_plate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/pressure_plate_up",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/pressure_plate_down",
"textures": {
"texture": "block/stripped_crimson_wood"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/button_inventory",
"textures": {
"texture": "block/stripped_dark_oak_wood"
"texture": "block/stripped_dark_oak_wood_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "block/stripped_dark_oak_wood"
"texture": "block/stripped_dark_oak_wood_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/end_stone_bricks_inventory"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/granite_wall_inventory.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/granite_inventory"
}
}
34 changes: 34 additions & 0 deletions src/assets/minecraft/models/block/grass_block.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "block/cube_bottom_top",
"textures": {
"particle": "block/dirt",
"bottom": "block/dirt",
"top": "block/grass_block_top",
"side": "block/dirt",
"overlay": "block/grass_block_side_overlay"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up", "tintindex": 0 },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" }
}
}
]
}
11 changes: 7 additions & 4 deletions src/assets/minecraft/models/block/grass_path.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{ "parent": "block/block",
{
"parent": "block/cube_bottom_top",
"textures": {
"particle": "block/dirt",
"top": "block/grass_path_top",
"side": "block/grass_path_side",
"side": "block/dirt",
"bottom": "block/dirt",
"overlay": "block/grass_path_side_overlay"
},
"elements": [
{ "from": [ 0, 0, 0 ],
{
"from": [ 0, 0, 0 ],
"to": [ 16, 15, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
Expand All @@ -18,7 +20,8 @@
"east": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{ "from": [ 0, 0, 0 ],
{
"from": [ 0, 0, 0 ],
"to": [ 16, 15, 16 ],
"faces": {
"north": { "uv": [ 0, 1, 16, 16 ], "texture": "#overlay", "cullface": "north" },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/button_inventory",
"textures": {
"texture": "block/stripped_jungle_wood"
"texture": "block/stripped_jungle_wood_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "block/stripped_jungle_wood"
"texture": "block/stripped_jungle_wood_inventory"
}
}
7 changes: 7 additions & 0 deletions src/assets/minecraft/models/block/jungle_wood.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "block/jungle_wood",
"side": "block/jungle_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/mossy_cobblestone_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/mossy_stone_bricks_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "block/nether_bricks_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/nether_bricks_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/button_inventory",
"textures": {
"texture": "block/stripped_oak_wood"
"texture": "block/stripped_oak_wood_inventory"
}
}
2 changes: 1 addition & 1 deletion src/assets/minecraft/models/block/oak_fence_inventory.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "block/stripped_oak_wood"
"texture": "block/stripped_oak_wood_inventory"
}
}
8 changes: 8 additions & 0 deletions src/assets/minecraft/models/block/piston_inventory.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "block/cube_bottom_top",
"textures": {
"top": "block/piston_top_inventory",
"bottom": "block/piston_bottom_inventory",
"side": "block/piston_side_inventory"
}
}
32 changes: 32 additions & 0 deletions src/assets/minecraft/models/block/podzol.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "block/cube_bottom_top",
"textures": {
"particle": "block/dirt",
"top": "block/podzol_top",
"bottom": "block/dirt",
"side": "block/dirt",
"overlay": "block/podzol_side_overlay"
},
"elements": [
{ "from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up", "tintindex": 0 },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{ "from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" }
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/polished_blackstone_bricks_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "block/red_mushroom_block_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/red_nether_bricks_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "block/sandstone_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/button_inventory",
"textures": {
"texture": "block/stripped_spruce_wood"
"texture": "block/stripped_spruce_wood_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "block/stripped_spruce_wood"
"texture": "block/stripped_spruce_wood_inventory"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "block/cube_bottom_top",
"textures": {
"top": "block/piston_top_sticky_inventory",
"bottom": "block/piston_bottom_inventory",
"side": "block/piston_side_inventory"
}
}
Loading

0 comments on commit 038d0d4

Please sign in to comment.