From 76fe677c3bb9b4007d6e2e118ea3285cc4dd6e85 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sat, 31 Jul 2021 13:02:19 +0200 Subject: [PATCH] Fix Region_15 Signed-off-by: yoyosource --- .../steamwar/bausystem/region/Region_15.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/BauSystem_15/src/de/steamwar/bausystem/region/Region_15.java b/BauSystem_15/src/de/steamwar/bausystem/region/Region_15.java index e296bdcb..f36804dc 100644 --- a/BauSystem_15/src/de/steamwar/bausystem/region/Region_15.java +++ b/BauSystem_15/src/de/steamwar/bausystem/region/Region_15.java @@ -55,8 +55,10 @@ public class Region_15 { private static final BaseBlock WOOL = Objects.requireNonNull(BlockTypes.PINK_WOOL).getDefaultState().toBaseBlock(); private static final BaseBlock CLAY = Objects.requireNonNull(BlockTypes.PINK_TERRACOTTA).getDefaultState().toBaseBlock(); private static final BaseBlock GLASS = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS).getDefaultState().toBaseBlock(); + private static final BaseBlock GLASS2 = Objects.requireNonNull(BlockTypes.YELLOW_STAINED_GLASS).getDefaultState().toBaseBlock(); private static final BaseBlock GLASS_PANE = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock(); private static final BaseBlock CONCRETE = Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock(); + private static final BaseBlock CONCRETE2 = Objects.requireNonNull(BlockTypes.YELLOW_CONCRETE).getDefaultState().toBaseBlock(); private static final BaseBlock CONCRETE_POWDER = Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock(); private static final BaseBlock CARPET = Objects.requireNonNull(BlockTypes.PINK_CARPET).getDefaultState().toBaseBlock(); @@ -143,32 +145,22 @@ public class Region_15 { clipboard.setBlock(pos, clay); } else if (block.equals(GLASS)) { clipboard.setBlock(pos, glass); + } else if (block.equals(GLASS2)) { + clipboard.setBlock(pos, glass); } else if (block.equals(GLASS_PANE)) { clipboard.setBlock(pos, glassPane); } else if (block.equals(CARPET)) { clipboard.setBlock(pos, carpet); } else if (block.equals(CONCRETE)) { clipboard.setBlock(pos, concrete); + } else if (block.equals(CONCRETE2)) { + clipboard.setBlock(pos, concrete); } else if (block.equals(CONCRETE_POWDER)) { clipboard.setBlock(pos, concretePowder); } } } } - - /*for (int x = 0; x < clipboard.getDimensions().getX(); x++) { - for (int y = 0; y < clipboard.getDimensions().getY(); y++) { - for (int z = 0; z < clipboard.getDimensions().getZ(); z++) { - BlockVector3 blockPointer = clipboard.getMinimumPoint().add(x, y, z); - BaseBlock baseBlock = clipboard.getFullBlock(blockPointer); - BlockType blockType = baseBlock.getBlockType(); - if (blockType != BlockTypes.YELLOW_CONCRETE && blockType != BlockTypes.YELLOW_STAINED_GLASS) { - continue; - } - clipboard.setBlock(blockPointer, RegionUtils_15.mapColor(blockType, color).getDefaultState().toBaseBlock()); - } - } - }*/ } boolean backup(Point minPoint, Point maxPoint, File file) {