From 12e55d9983134e235172bbe45a8a7dd5ab6715e3 Mon Sep 17 00:00:00 2001 From: Forstride Date: Tue, 25 Jun 2019 19:57:27 -0400 Subject: [PATCH] Added mud brick/white sandstone walls, cut/smooth sandstone slabs, and smooth sandstone stairs --- .../java/biomesoplenty/api/block/BOPBlocks.java | 5 +++++ src/main/java/biomesoplenty/init/ModBlocks.java | 13 +++++++++---- .../models/block/cut_white_sandstone_slab.json | 6 +++--- .../models/block/cut_white_sandstone_slab_top.json | 6 +++--- .../models/block/mud_brick_wall_inventory.json | 2 +- .../models/block/mud_brick_wall_post.json | 2 +- .../models/block/mud_brick_wall_side.json | 2 +- .../models/block/smooth_white_sandstone_slab.json | 6 +++--- .../block/smooth_white_sandstone_slab_top.json | 6 +++--- .../models/block/smooth_white_sandstone_stairs.json | 6 +++--- .../block/smooth_white_sandstone_stairs_inner.json | 6 +++--- .../block/smooth_white_sandstone_stairs_outer.json | 6 +++--- .../block/white_sandstone_wall_inventory.json | 2 +- .../models/block/white_sandstone_wall_post.json | 2 +- .../models/block/white_sandstone_wall_side.json | 2 +- 15 files changed, 41 insertions(+), 31 deletions(-) diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index a673fba6e..5ecd8dd5c 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -14,15 +14,20 @@ public class BOPBlocks public static Block white_sand; public static Block white_sandstone; public static Block cut_white_sandstone; + public static Block cut_white_sandstone_slab; public static Block chiseled_white_sandstone; public static Block smooth_white_sandstone; + public static Block smooth_white_sandstone_slab; + public static Block smooth_white_sandstone_stairs; public static Block white_sandstone_slab; public static Block white_sandstone_stairs; + public static Block white_sandstone_wall; public static Block mud; public static Block mud_bricks; public static Block mud_brick_slab; public static Block mud_brick_stairs; + public static Block mud_brick_wall; public static Block dried_sand; public static Block ash_block; diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index 88137d801..afe871c88 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -29,15 +29,20 @@ public class ModBlocks white_sandstone = registerBlock(new Block(Block.Properties.create(Material.ROCK, MaterialColor.QUARTZ).hardnessAndResistance(0.8F)), "white_sandstone"); chiseled_white_sandstone = registerBlock(new Block(Block.Properties.create(Material.ROCK, MaterialColor.QUARTZ).hardnessAndResistance(0.8F)), "chiseled_white_sandstone"); cut_white_sandstone = registerBlock(new Block(Block.Properties.create(Material.ROCK, MaterialColor.QUARTZ).hardnessAndResistance(0.8F)), "cut_white_sandstone"); + cut_white_sandstone_slab = registerBlock(new BlockSlabBOP(Block.Properties.from(cut_white_sandstone)), "cut_white_sandstone_slab"); smooth_white_sandstone = registerBlock(new Block(Block.Properties.create(Material.ROCK, MaterialColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "smooth_white_sandstone"); - white_sandstone_slab = registerBlock(new BlockSlabBOP(Block.Properties.create(Material.ROCK, MaterialColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "white_sandstone_slab"); + smooth_white_sandstone_slab = registerBlock(new BlockSlabBOP(Block.Properties.from(smooth_white_sandstone)), "smooth_white_sandstone_slab"); + smooth_white_sandstone_stairs = registerBlock(new BlockStairsBOP(white_sandstone.getDefaultState(), Block.Properties.from(smooth_white_sandstone)), "smooth_white_sandstone_stairs"); + white_sandstone_slab = registerBlock(new BlockSlabBOP(Block.Properties.from(white_sandstone)), "white_sandstone_slab"); white_sandstone_stairs = registerBlock(new BlockStairsBOP(white_sandstone.getDefaultState(), Block.Properties.from(white_sandstone)), "white_sandstone_stairs"); - + white_sandstone_wall = registerBlock(new WallBlock(Block.Properties.from(white_sandstone)),"white_sandstone_wall"); + mud = registerBlock(new BlockMud(Block.Properties.create(Material.EARTH, MaterialColor.BROWN_TERRACOTTA).hardnessAndResistance(0.6F)), "mud"); mud_bricks = registerBlock(new Block(Block.Properties.create(Material.ROCK, MaterialColor.BROWN_TERRACOTTA).hardnessAndResistance(1.0F)), "mud_bricks"); - mud_brick_slab = registerBlock(new BlockSlabBOP(Block.Properties.create(Material.ROCK, MaterialColor.BROWN_TERRACOTTA).hardnessAndResistance(2.0F, 6.0F)), "mud_brick_slab"); + mud_brick_slab = registerBlock(new BlockSlabBOP(Block.Properties.from(mud_bricks)), "mud_brick_slab"); mud_brick_stairs = registerBlock(new BlockStairsBOP(mud_bricks.getDefaultState(), Block.Properties.from(mud_bricks)), "mud_brick_stairs"); - + mud_brick_wall = registerBlock(new WallBlock(Block.Properties.from(mud_bricks)),"mud_brick_wall"); + dried_sand = registerBlock(new BlockDriedSand(Block.Properties.create(Material.EARTH, MaterialColor.WOOD).hardnessAndResistance(1.0F)), "dried_sand"); ash_block = registerBlock(new BlockAsh(Block.Properties.create(Material.SAND, MaterialColor.BLACK_TERRACOTTA).hardnessAndResistance(0.4F).sound(SoundType.SAND)), "ash_block"); flesh = registerBlock(new BlockFlesh(Block.Properties.create(Material.SPONGE, MaterialColor.RED_TERRACOTTA).hardnessAndResistance(0.4F).sound(SoundType.SLIME)), "flesh"); diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json index 62d345667..545f97dc8 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json +++ b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json @@ -1,8 +1,8 @@ { "parent": "block/slab", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_top", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/cut_white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_top", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/cut_white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json index 04b11639a..d73dde50b 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json +++ b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json @@ -1,8 +1,8 @@ { "parent": "block/slab_top", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_top", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/cut_white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_top", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/cut_white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json index cae6906e1..706661acc 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "block/wall_inventory", "textures": { - "wall": "biomesoplenty:block/mud_bricks" + "wall": "biomesoplenty:blocks/mud_bricks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json index dffb905ea..7ba887611 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_post", "textures": { - "wall": "biomesoplenty:block/mud_bricks" + "wall": "biomesoplenty:blocks/mud_bricks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json index 8a05aa667..1b14cb42c 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side", "textures": { - "wall": "biomesoplenty:block/mud_bricks" + "wall": "biomesoplenty:blocks/mud_bricks" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json index d2f414168..4d86a1188 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json @@ -1,8 +1,8 @@ { "parent": "block/slab", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_top", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone_top" + "bottom": "biomesoplenty:blocks/white_sandstone_top", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone_top" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json index e6845efd7..75a883621 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json @@ -1,8 +1,8 @@ { "parent": "block/slab_top", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_top", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone_top" + "bottom": "biomesoplenty:blocks/white_sandstone_top", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone_top" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json index bcd88f0f3..36a3d78b1 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_top", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone_top" + "bottom": "biomesoplenty:blocks/white_sandstone_top", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone_top" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json index 8a57baabf..c1482e76f 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_top", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone_top" + "bottom": "biomesoplenty:blocks/white_sandstone_top", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone_top" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json index f7fc574c4..dc682abc1 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_top", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone_top" + "bottom": "biomesoplenty:blocks/white_sandstone_top", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone_top" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json index 3affd5d8e..7abc97bdf 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "block/wall_inventory", "textures": { - "wall": "biomesoplenty:block/white_sandstone" + "wall": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json index d33c97b79..bceec43b6 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_post", "textures": { - "wall": "biomesoplenty:block/white_sandstone" + "wall": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json index 1ac490c34..25a3b154d 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json @@ -1,6 +1,6 @@ { "parent": "block/template_wall_side", "textures": { - "wall": "biomesoplenty:block/white_sandstone" + "wall": "biomesoplenty:blocks/white_sandstone" } }