Skip to content

Commit

Permalink
1.13 port building blocks (2) slabs/stairs/walls
Browse files Browse the repository at this point in the history
  • Loading branch information
Shoeboxam committed Jan 3, 2018
1 parent a27595f commit 7a62161
Show file tree
Hide file tree
Showing 89 changed files with 149 additions and 276 deletions.
5 changes: 0 additions & 5 deletions assets/minecraft/blockstates/acacia_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/acacia_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/acacia_lower" },
"half=top": { "model": "slab/acacia_upper" }
"type=bottom": { "model": "slab/acacia_lower" },
"type=top": { "model": "slab/acacia_upper" },
"type=double": { "model": "slab/acacia_double" }
}
}
5 changes: 0 additions & 5 deletions assets/minecraft/blockstates/birch_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/birch_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/birch_lower" },
"half=top": { "model": "slab/birch_upper" }
"type=bottom": { "model": "slab/birch_lower" },
"type=top": { "model": "slab/birch_upper" },
"type=double": { "model": "slab/birch_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/brick_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/brick_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/brick_lower" },
"half=top": { "model": "slab/brick_upper" }
"type=bottom": { "model": "slab/brick_lower" },
"type=top": { "model": "slab/brick_upper" },
"type=double": { "model": "slab/brick_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/cobblestone_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/cobblestone_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/cobblestone_lower" },
"half=top": { "model": "slab/cobblestone_upper" }
"type=bottom": { "model": "slab/cobblestone_lower" },
"type=top": { "model": "slab/cobblestone_upper" },
"type=double": { "model": "slab/cobblestone_double" }
}
}
5 changes: 0 additions & 5 deletions assets/minecraft/blockstates/dark_oak_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/dark_oak_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/dark_oak_lower" },
"half=top": { "model": "slab/dark_oak_upper" }
"type=bottom": { "model": "slab/dark_oak_lower" },
"type=top": { "model": "slab/dark_oak_upper" },
"type=double": { "model": "slab/dark_oak_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/nether_brick_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/nether_brick_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/nether_brick_lower" },
"half=top": { "model": "slab/nether_brick_upper" }
"type=bottom": { "model": "slab/nether_brick_lower" },
"type=top": { "model": "slab/nether_brick_upper" },
"type=double": { "model": "slab/nether_brick_double" }
}
}
5 changes: 0 additions & 5 deletions assets/minecraft/blockstates/oak_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/oak_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/oak_lower" },
"half=top": { "model": "slab/oak_upper" }
"type=bottom": { "model": "slab/oak_lower" },
"type=top": { "model": "slab/oak_upper" },
"type=double": { "model": "slab/oak_double" }
}
}
7 changes: 7 additions & 0 deletions assets/minecraft/blockstates/petrified_oak_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"type=bottom": { "model": "slab/petrified_oak_lower" },
"type=top": { "model": "slab/petrified_oak_upper" },
"type=double": { "model": "slab/petrified_oak_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/quartz_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/quartz_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/quartz_lower" },
"half=top": { "model": "slab/quartz_upper" }
"type=bottom": { "model": "slab/quartz_lower" },
"type=top": { "model": "slab/quartz_upper" },
"type=double": { "model": "slab/quartz_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/red_sandstone_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/red_sandstone_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/red_sandstone_lower" },
"half=top": { "model": "slab/red_sandstone_upper" }
"type=bottom": { "model": "slab/red_sandstone_lower" },
"type=top": { "model": "slab/red_sandstone_upper" },
"type=double": { "model": "slab/red_sandstone_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/sandstone_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/sandstone_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/sandstone_lower" },
"half=top": { "model": "slab/sandstone_upper" }
"type=bottom": { "model": "slab/sandstone_lower" },
"type=top": { "model": "slab/sandstone_upper" },
"type=double": { "model": "slab/sandstone_double" }
}
}
5 changes: 0 additions & 5 deletions assets/minecraft/blockstates/spruce_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/spruce_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/spruce_lower" },
"half=top": { "model": "slab/spruce_upper" }
"type=bottom": { "model": "slab/spruce_lower" },
"type=top": { "model": "slab/spruce_upper" },
"type=double": { "model": "slab/spruce_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/stone_brick_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/stone_brick_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/stone_brick_lower" },
"half=top": { "model": "slab/stone_brick_upper" }
"type=bottom": { "model": "slab/stone_brick_lower" },
"type=top": { "model": "slab/stone_brick_upper" },
"type=double": { "model": "slab/stone_brick_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/stone_double_slab.json

This file was deleted.

5 changes: 3 additions & 2 deletions assets/minecraft/blockstates/stone_slab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"variants": {
"half=bottom": { "model": "slab/stone_lower" },
"half=top": { "model": "slab/stone_upper" }
"type=bottom": { "model": "slab/stone_lower" },
"type=top": { "model": "slab/stone_upper" },
"type=double": { "model": "slab/stone_double" }
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/blockstates/wood_old_double_slab.json

This file was deleted.

7 changes: 0 additions & 7 deletions assets/minecraft/blockstates/wood_old_slab.json

This file was deleted.

2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/acacia_lower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/half_slab",
"parent": "block/slab",
"textures": {
"bottom": "blocks/slab/acacia_top",
"top": "blocks/slab/acacia_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/acacia_upper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/upper_slab",
"parent": "block/slab_top",
"textures": {
"bottom": "blocks/slab/acacia_top",
"top": "blocks/slab/acacia_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/birch_lower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/half_slab",
"parent": "block/slab",
"textures": {
"bottom": "blocks/slab/birch_top",
"top": "blocks/slab/birch_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/birch_upper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/upper_slab",
"parent": "block/slab_top",
"textures": {
"bottom": "blocks/slab/birch_top",
"top": "blocks/slab/birch_top",
Expand Down
6 changes: 0 additions & 6 deletions assets/minecraft/models/block/slab/brick_all.json

This file was deleted.

2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/brick_lower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/half_slab",
"parent": "block/slab",
"textures": {
"bottom": "blocks/slab/brick_top",
"top": "blocks/slab/brick_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/brick_upper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/upper_slab",
"parent": "block/slab_top",
"textures": {
"bottom": "blocks/brick",
"top": "blocks/slab/brick_top",
Expand Down
6 changes: 0 additions & 6 deletions assets/minecraft/models/block/slab/cobblestone_all.json

This file was deleted.

2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/cobblestone_lower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/half_slab",
"parent": "block/slab",
"textures": {
"bottom": "blocks/cobblestone/1",
"top": "blocks/slab/cobblestone_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/cobblestone_upper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/upper_slab",
"parent": "block/slab_top",
"textures": {
"bottom": "blocks/cobblestone",
"top": "blocks/slab/cobblestone_top",
Expand Down
6 changes: 0 additions & 6 deletions assets/minecraft/models/block/slab/dark_oak_all.json

This file was deleted.

4 changes: 2 additions & 2 deletions assets/minecraft/models/block/slab/dark_oak_double.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "blocks/slab/big_oak",
"side": "blocks/planks_big_oak"
"end": "blocks/slab/dark_oak",
"side": "blocks/dark_oak_planks"
}
}
8 changes: 4 additions & 4 deletions assets/minecraft/models/block/slab/dark_oak_lower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parent": "block/half_slab",
"parent": "block/slab",
"textures": {
"bottom": "blocks/slab/big_oak",
"top": "blocks/slab/big_oak",
"side": "blocks/planks_big_oak"
"bottom": "blocks/slab/dark_oak",
"top": "blocks/slab/dark_oak",
"side": "blocks/dark_oak_planks"
}
}
8 changes: 4 additions & 4 deletions assets/minecraft/models/block/slab/dark_oak_upper.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parent": "block/upper_slab",
"parent": "block/slab_top",
"textures": {
"bottom": "blocks/slab/big_oak",
"top": "blocks/slab/big_oak",
"side": "blocks/planks_big_oak"
"bottom": "blocks/slab/dark_oak",
"top": "blocks/slab/dark_oak",
"side": "blocks/dark_oak_planks"
}
}
6 changes: 0 additions & 6 deletions assets/minecraft/models/block/slab/nether_brick_all.json

This file was deleted.

2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/nether_brick_lower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/half_slab",
"parent": "block/slab",
"textures": {
"bottom": "blocks/slab/nether_brick_top",
"top": "blocks/slab/nether_brick_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/nether_brick_upper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/upper_slab",
"parent": "block/slab_top",
"textures": {
"bottom": "blocks/slab/nether_brick_top",
"top": "blocks/slab/nether_brick_top",
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/models/block/slab/oak_lower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "block/half_slab",
"parent": "block/slab",
"textures": {
"bottom": "blocks/slab/oak_top",
"top": "blocks/slab/oak_top",
Expand Down
8 changes: 0 additions & 8 deletions assets/minecraft/models/block/slab/oak_old_lower.json

This file was deleted.

8 changes: 0 additions & 8 deletions assets/minecraft/models/block/slab/oak_old_upper.json

This file was deleted.

Loading

0 comments on commit 7a62161

Please sign in to comment.