sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

change slabs

Browse source
This commit is contained in:
Sen 2025-06-30 13:10:18 +02:00
parent ea2d11ae3a
commit b2d3f5a641
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
13 changed files with 245 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

100
server/src/main/java/server/world/Converter.java
View file

@ -602,57 +602,57 @@ public abstract class Converter {
mapBlock(Blocks.red_mushroom, 40);
mapBlock(Blocks.gold_block, 41);
mapBlock(Blocks.iron_block, 42);
mapBlock(Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.concrete,
43);
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.sandstone,
43, 1);
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.oak_planks,
43, 2);
mapBlock(Blocks.cobblestone_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.cobblestone,
43, 3);
mapBlock(Blocks.brick_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.brick_block,
43, 4);
mapBlock(Blocks.stonebrick_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.stonebrick,
43, 5);
mapBlock(Blocks.blood_brick_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.blood_brick,
43, 6);
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.quartz_block,
43, 7);
mapBlock(Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, true),
mapBlock(Blocks.concrete,
43, 8);
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, true),
mapBlock(Blocks.sandstone,
43, 9);
mapBlock(Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.concrete_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44);
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44, 1);
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44, 2);
mapBlock(Blocks.cobblestone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.cobblestone_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44, 3);
mapBlock(Blocks.brick_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.brick_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44, 4);
mapBlock(Blocks.stonebrick_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.stonebrick_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44, 5);
mapBlock(Blocks.blood_brick_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.blood_brick_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44, 6);
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
44, 7);
mapBlock(Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.concrete_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 8);
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 9);
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 10);
mapBlock(Blocks.cobblestone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.cobblestone_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 11);
mapBlock(Blocks.brick_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.brick_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 12);
mapBlock(Blocks.stonebrick_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.stonebrick_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 13);
mapBlock(Blocks.blood_brick_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.blood_brick_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 14);
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
44, 15);
mapBlock(Blocks.brick_block, 45);
mapBlock(Blocks.tnt.getState().withProperty(BlockTNT.EXPLODE, false), 46);
@ -1058,41 +1058,41 @@ public abstract class Converter {
mapBlock(Blocks.dragon_egg, 122);
mapBlock(Blocks.redstone_lamp, 123);
mapBlock(Blocks.lit_redstone_lamp, 124);
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.oak_planks,
125);
mapBlock(Blocks.spruce_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.spruce_planks,
125, 1);
mapBlock(Blocks.birch_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.birch_planks,
125, 2);
mapBlock(Blocks.jungle_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.jungle_planks,
125, 3);
mapBlock(Blocks.acacia_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.acacia_planks,
125, 4);
mapBlock(Blocks.dark_oak_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.dark_oak_planks,
125, 5);
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
126);
mapBlock(Blocks.spruce_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.spruce_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
126, 1);
mapBlock(Blocks.birch_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.birch_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
126, 2);
mapBlock(Blocks.jungle_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.jungle_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
126, 3);
mapBlock(Blocks.acacia_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.acacia_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
126, 4);
mapBlock(Blocks.dark_oak_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.dark_oak_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
126, 5);
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.oak_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
126, 8);
mapBlock(Blocks.spruce_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.spruce_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
126, 9);
mapBlock(Blocks.birch_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.birch_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
126, 10);
mapBlock(Blocks.jungle_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.jungle_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
126, 11);
mapBlock(Blocks.acacia_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.acacia_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
126, 12);
mapBlock(Blocks.dark_oak_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.dark_oak_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
126, 13);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.SOUTH), 127, 0, 12);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.WEST), 127, 1, 13);
@ -1484,11 +1484,11 @@ public abstract class Converter {
mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 180, 5, 13);
mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 180, 6, 14);
mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 180, 7, 15);
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false),
mapBlock(Blocks.sandstone,
181);
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING,
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.FACING,
Facing.DOWN), 182);
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING,
mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.FACING,
Facing.UP), 182, 8);
mapBlock(Blocks.spruce_fence_gate.getState().withProperty(BlockFenceGate.FACING, Facing.SOUTH).withProperty(BlockFenceGate.OPEN, false).withProperty(BlockFenceGate.POWERED, false), 183, 0);
mapBlock(Blocks.spruce_fence_gate.getState().withProperty(BlockFenceGate.FACING, Facing.WEST).withProperty(BlockFenceGate.OPEN, false).withProperty(BlockFenceGate.POWERED, false), 183, 1);
@ -1594,10 +1594,10 @@ public abstract class Converter {
mapBlock(Blocks.quartz_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 203, 5, 13);
mapBlock(Blocks.quartz_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 203, 6, 14);
mapBlock(Blocks.quartz_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 203, 7, 15);
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false), 204);
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN),
mapBlock(Blocks.quartz_block, 204);
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.FACING, Facing.DOWN),
205);
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP),
mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
205, 8);
mapBlock(Blocks.stonebrick, 206);
mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 0), 207);

43
server/src/main/java/server/worldgen/structure/StructureStronghold.java
View file

@ -5,7 +5,6 @@ import java.util.Map;
import common.block.artificial.BlockDoor;
import common.block.artificial.BlockLadder;
import common.block.artificial.BlockSlab;
import common.block.artificial.BlockStairs;
import common.block.tech.BlockButton;
import common.collect.Lists;
@ -524,14 +523,14 @@ public class StructureStronghold
this.fillWithRandomizedBlocks(worldIn, structureBoundingBoxIn, 8, 1, 5, 8, 4, 9, false, randomIn, StructureStronghold.strongholdStones);
this.fillWithRandomizedBlocks(worldIn, structureBoundingBoxIn, 1, 4, 7, 3, 4, 9, false, randomIn, StructureStronghold.strongholdStones);
this.fillWithRandomizedBlocks(worldIn, structureBoundingBoxIn, 1, 3, 5, 3, 3, 6, false, randomIn, StructureStronghold.strongholdStones);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 3, 4, 3, 3, 4, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 4, 6, 3, 4, 6, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 3, 4, 3, 3, 4, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 4, 6, 3, 4, 6, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithRandomizedBlocks(worldIn, structureBoundingBoxIn, 5, 1, 7, 7, 1, 8, false, randomIn, StructureStronghold.strongholdStones);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 1, 9, 7, 1, 9, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 2, 7, 7, 2, 7, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 5, 7, 4, 5, 9, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 5, 7, 8, 5, 9, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 5, 7, 7, 5, 9, Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true), Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 1, 9, 7, 1, 9, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 2, 7, 7, 2, 7, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 5, 7, 4, 5, 9, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 5, 7, 8, 5, 9, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 5, 7, 7, 5, 9, Blocks.concrete.getState(), Blocks.concrete.getState(), false);
this.setBlockState(worldIn, Blocks.torch.getState(), 6, 5, 6, structureBoundingBoxIn);
return true;
}
@ -1080,14 +1079,14 @@ public class StructureStronghold
this.setBlockState(worldIn, Blocks.torch.getState(), 6, 3, 5, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.torch.getState(), 5, 3, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.torch.getState(), 5, 3, 6, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 4, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 4, 1, 5, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 4, 1, 6, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 6, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 6, 1, 5, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 6, 1, 6, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 5, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 5, 1, 6, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 4, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 4, 1, 5, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 4, 1, 6, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 6, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 6, 1, 5, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 6, 1, 6, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 5, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 5, 1, 6, structureBoundingBoxIn);
break;
case 1:
@ -1241,21 +1240,21 @@ public class StructureStronghold
this.placeDoor(worldIn, randomIn, structureBoundingBoxIn, StructureStronghold.Stronghold.Door.OPENING, 1, 1, 4);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 2, 6, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 1, 5, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 1, 6, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 1, 6, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 1, 5, 2, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 1, 4, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 1, 5, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 1, 5, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 2, 4, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 3, 3, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 3, 4, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 3, 4, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 3, 3, 2, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 3, 2, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 3, 3, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 3, 3, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 2, 2, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 1, 1, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 1, 2, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 1, 2, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick.getState(), 1, 1, 2, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState(), 1, 1, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete_slab.getState(), 1, 1, 3, structureBoundingBoxIn);
return true;
}
}

13
server/src/main/java/server/worldgen/structure/StructureVillage.java
View file

@ -6,7 +6,6 @@ import java.util.List;
import common.biome.Biome;
import common.block.artificial.BlockDoor;
import common.block.artificial.BlockLadder;
import common.block.artificial.BlockSlab;
import common.block.artificial.BlockStairs;
import common.block.foliage.BlockCrops;
import common.block.foliage.BlockLog;
@ -674,9 +673,9 @@ public class StructureVillage
this.setBlockState(worldIn, Blocks.oak_planks.getState(), 1, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, this.getMetadataWithOffset(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH)), 2, 1, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, this.getMetadataWithOffset(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST)), 1, 1, 3, structureBoundingBoxIn);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 0, 1, 7, 0, 3, Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true), Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true), false);
this.setBlockState(worldIn, Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true), 6, 1, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true), 6, 1, 2, structureBoundingBoxIn);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 0, 1, 7, 0, 3, Blocks.concrete.getState(), Blocks.concrete.getState(), false);
this.setBlockState(worldIn, Blocks.concrete.getState(), 6, 1, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete.getState(), 6, 1, 2, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.air.getState(), 2, 1, 0, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.air.getState(), 2, 2, 0, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.torch.getState().withProperty(BlockTorch.FACING, this.coordBaseMode), 2, 3, 1, structureBoundingBoxIn);
@ -884,7 +883,7 @@ public class StructureVillage
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 1, 0, 9, 4, 6, Blocks.air.getState(), Blocks.air.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 0, 0, 9, 0, 6, Blocks.cobblestone.getState(), Blocks.cobblestone.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 4, 0, 9, 4, 6, Blocks.cobblestone.getState(), Blocks.cobblestone.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 5, 0, 9, 5, 6, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 5, 0, 9, 5, 6, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 5, 1, 8, 5, 5, Blocks.air.getState(), Blocks.air.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 1, 0, 2, 3, 0, Blocks.oak_planks.getState(), Blocks.oak_planks.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 1, 0, 0, 4, 0, Blocks.oak_log.getState(), Blocks.oak_log.getState(), false);
@ -906,7 +905,7 @@ public class StructureVillage
this.setBlockState(worldIn, Blocks.cobblestone.getState(), 6, 1, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.furnace.getState(), 6, 2, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.furnace.getState(), 6, 3, 3, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stone_slab.getState().withProperty(BlockSlab.DOUBLE, true), 8, 1, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.concrete.getState(), 8, 1, 1, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.glass_pane.getState(), 0, 2, 2, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.glass_pane.getState(), 0, 2, 4, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.glass_pane.getState(), 2, 2, 6, structureBoundingBoxIn);
@ -1956,7 +1955,7 @@ public class StructureVillage
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 1, 1, 3, 4, 3, Blocks.air.getState(), Blocks.air.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 0, 0, 4, 0, 4, Blocks.cobblestone.getState(), Blocks.cobblestone.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 5, 0, 4, 5, 4, Blocks.stone_slab.getState(), Blocks.stone_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 5, 0, 4, 5, 4, Blocks.concrete_slab.getState(), Blocks.concrete_slab.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 1, 0, 0, 4, 0, Blocks.oak_log.getState(), Blocks.oak_log.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 1, 4, 0, 4, 4, Blocks.oak_log.getState(), Blocks.oak_log.getState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 1, 0, 4, 4, 0, Blocks.oak_log.getState(), Blocks.oak_log.getState(), false);