From 8d0faf719239b5a2e5accf57fb3e22a02ef7667d Mon Sep 17 00:00:00 2001 From: Vaern Date: Fri, 9 Feb 2024 23:40:51 -0800 Subject: [PATCH] fixes --- .../hbm/world/gen/component/CivilianFeatures.java | 13 +++++++------ .../java/com/hbm/world/gen/component/Component.java | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java b/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java index 3495e6291..1417f35ff 100644 --- a/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java +++ b/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java @@ -1023,7 +1023,8 @@ public class CivilianFeatures { //Webs randomlyFillWithBlocks(world, box, rand, 0.05F, 12, 3, 3, 12, 3, 8, Blocks.web); randomlyFillWithBlocks(world, box, rand, 0.05F, 10, 4, 3, 11, 4, 8, Blocks.web); - randomlyFillWithBlocks(world, box, rand, 0.05F, 5, 3, 2, 9, 3, 8, Blocks.web); + randomlyFillWithBlocks(world, box, rand, 0.05F, 5, 3, 2, 8, 3, 2, Blocks.web); + randomlyFillWithBlocks(world, box, rand, 0.05F, 5, 3, 3, 9, 3, 8, Blocks.web); randomlyFillWithBlocks(world, box, rand, 0.05F, 2, 3, 5, 4, 3, 8, Blocks.web); randomlyFillWithBlocks(world, box, rand, 0.05F, 2, 3, 10, 7, 3, 12, Blocks.web); //Doors @@ -1049,11 +1050,11 @@ public class CivilianFeatures { fillWithMetadataBlocks(world, box, 7, 1, 5, 8, 1, 5, Blocks.oak_stairs, stairS | 4); //Table placeBlockAtCurrentPosition(world, Blocks.oak_stairs, stairE | 4, 8, 1, 4, box); placeBlockAtCurrentPosition(world, Blocks.wooden_slab, 8, 7, 1, 4, box); - placeBlockAtCurrentPosition(world, Blocks.stone_slab, 0, 8, 1, 2, box); //Kitchen Counter + placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, 8, 1, 2, box); //Kitchen Counter placeBlockAtCurrentPosition(world, Blocks.cauldron, 1, 7, 1, 2, box); - fillWithBlocks(world, box, 5, 1, 2, 6, 1, 2, Blocks.stone_slab); + fillWithBlocks(world, box, 5, 1, 2, 6, 1, 2, Blocks.double_stone_slab); placeBlockAtCurrentPosition(world, Blocks.furnace, 5, 5, 1, 3, box); - placeBlockAtCurrentPosition(world, Blocks.stone_slab, 0, 5, 1, 4, box); + placeBlockAtCurrentPosition(world, Blocks.double_stone_slab, 0, 5, 1, 4, box); placeBlockAtCurrentPosition(world, Blocks.oak_stairs, stairE, 9, 1, 8, box); //Bookshelf placeBlockAtCurrentPosition(world, Blocks.oak_stairs, stairE | 4, 9, 2, 8, box); fillWithBlocks(world, box, 7, 1, 8, 8, 2, 8, Blocks.bookshelf); @@ -1065,13 +1066,13 @@ public class CivilianFeatures { fillWithBlocks(world, box, 2, 1, 5, 3, 1, 5, Blocks.bookshelf); placeBlockAtCurrentPosition(world, ModBlocks.radiorec, getDecoMeta(2), 2, 2, 5, box); - placeBlockAtCurrentPosition(world, Blocks.bed, 0, 2, 1, 11, box); + placeBed(world, box, 0, 2, 1, 11); placeBlockAtCurrentPosition(world, Blocks.dark_oak_stairs, stairN | 4, 3, 1, 12, box); //Nightstand placeBlockAtCurrentPosition(world, Blocks.oak_stairs, stairW | 4, 5, 1, 12, box); //Desk placeBlockAtCurrentPosition(world, Blocks.oak_stairs, stairN | 4, 6, 1, 12, box); placeBlockAtCurrentPosition(world, Blocks.oak_stairs, stairW | 4, 7, 1, 12, box); placeBlockAtCurrentPosition(world, Blocks.dark_oak_stairs, stairS, 6, 1, 11, box); //Chair - placeBlockAtCurrentPosition(world, ModBlocks.deco_computer, 0, 6, 2, 12, box); + placeBlockAtCurrentPosition(world, ModBlocks.deco_computer, getDecoModelMeta(0), 6, 2, 12, box); placeBlockAtCurrentPosition(world, ModBlocks.crate, 0, 7, 5, 12, box); placeBlockAtCurrentPosition(world, ModBlocks.crate_can, 0, 5, 5, 12, box); diff --git a/src/main/java/com/hbm/world/gen/component/Component.java b/src/main/java/com/hbm/world/gen/component/Component.java index 505ff6b83..8607d2323 100644 --- a/src/main/java/com/hbm/world/gen/component/Component.java +++ b/src/main/java/com/hbm/world/gen/component/Component.java @@ -38,7 +38,7 @@ abstract public class Component extends StructureComponent { protected Component(Random rand, int minX, int minY, int minZ, int maxX, int maxY, int maxZ ) { super(0); - this.coordBaseMode = 0;//rand.nextInt(4); + this.coordBaseMode = rand.nextInt(4); switch(this.coordBaseMode) { case 0: