From cdc0dbea86647e499099b23d3f2f420a0ada63f8 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 4 Feb 2023 11:56:52 +0100 Subject: [PATCH] fixed mistake 2 --- .../bausystem/utils/FlatteningWrapper15.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java index 7ea83656..7cbe7348 100644 --- a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java +++ b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java @@ -142,21 +142,21 @@ public class FlatteningWrapper15 implements FlatteningWrapper { if (pasteOptions.getColor() != Color.YELLOW) { changeColor(clipboard, pasteOptions.getColor()); } + + Set blocks = new HashSet<>(); + if (pasteOptions.isOnlyColors()) { + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_wool"); + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_terracotta"); + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_glazed_terracotta"); + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass"); + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass_pane"); + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete"); + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete_powder"); + blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_carpet"); + } e.setMask(new Mask() { @Override public boolean test(BlockVector3 blockVector3) { - Set blocks = new HashSet<>(); - if (pasteOptions.isOnlyColors()) { - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_wool"); - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_terracotta"); - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_glazed_terracotta"); - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass"); - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass_pane"); - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete"); - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete_powder"); - blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_carpet"); - } - BaseBlock block = clipboard.getFullBlock(blockVector3); String blockName = block.toString().toLowerCase(); return !blockName.equals("minecraft:water") || blocks.contains(blockName);