From d3609dd2a03de1daa97dbbc386567c842a994c03 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 24 Feb 2023 22:13:34 +0100 Subject: [PATCH] Remove yellow color replace Signed-off-by: yoyosource --- .../bausystem/utils/FlatteningWrapper15.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java index cadcb72a..bcb52882 100644 --- a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java +++ b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java @@ -110,16 +110,11 @@ public class FlatteningWrapper15 implements FlatteningWrapper { } private static final BaseBlock WOOL = Objects.requireNonNull(BlockTypes.PINK_WOOL).getDefaultState().toBaseBlock(); - private static final BaseBlock WOOL2 = Objects.requireNonNull(BlockTypes.YELLOW_WOOL).getDefaultState().toBaseBlock(); private static final BaseBlock CLAY = Objects.requireNonNull(BlockTypes.PINK_TERRACOTTA).getDefaultState().toBaseBlock(); - private static final BaseBlock CLAY2 = Objects.requireNonNull(BlockTypes.YELLOW_TERRACOTTA).getDefaultState().toBaseBlock(); private static final BaseBlock GLAZED = Objects.requireNonNull(BlockTypes.PINK_GLAZED_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 GLASS_PANE2 = Objects.requireNonNull(BlockTypes.YELLOW_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(); @@ -139,7 +134,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper { @Override public EditSession paste(Clipboard clipboard, Point pastePoint, PasteOptions pasteOptions) { try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) { - if (pasteOptions.getColor() != Color.YELLOW) { + if (pasteOptions.getColor() != Color.PINK) { changeColor(clipboard, pasteOptions.getColor()); } if (pasteOptions.isOnlyColors()) { @@ -216,28 +211,18 @@ public class FlatteningWrapper15 implements FlatteningWrapper { BaseBlock block = clipboard.getFullBlock(pos); if (block.equals(WOOL)) { clipboard.setBlock(pos, wool); - } else if (block.equals(WOOL2)) { - clipboard.setBlock(pos, wool); } else if (block.equals(CLAY)) { clipboard.setBlock(pos, clay); - } else if (block.equals(CLAY2)) { - clipboard.setBlock(pos, clay); } else if (block.equals(GLAZED)) { clipboard.setBlock(pos, glazed); } 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(GLASS_PANE2)) { - 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); } -- 2.39.2