SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
Archiviert
12
0
Fork 0
Code Issues 39 Pull-Requests Projekte Releases Wiki Aktivität

TestBlockPaste-Without-Water #146

Zusammengeführt
YoyoNow hat 25 Commits von TestBlockPaste-Without-Water nach master 2023-08-19 23:29:20 +02:00 zusammengeführt
Diskussion 1 Commits 25 Geänderte Dateien 12 +23 -27
1 geänderte Dateien mit 23 neuen und 27 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit 8a425cc435 werden angezeigt - Alle Commits anzeigen

50
BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
Datei anzeigen

@ -142,36 +142,32 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
if (pasteOptions.getColor() != Color.YELLOW) { if (pasteOptions.getColor() != Color.YELLOW) {
changeColor(clipboard, pasteOptions.getColor()); changeColor(clipboard, pasteOptions.getColor());
} }
if (pasteOptions.isOnlyColors()) { e.setMask(new Mask() {
Set<String> blocks = new HashSet<>(); @Override
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_wool"); public boolean test(BlockVector3 blockVector3) {
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_terracotta"); Set<String> blocks = new HashSet<>();
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_glazed_terracotta"); if (pasteOptions.isOnlyColors()) {
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass"); blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_wool");
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass_pane"); blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_terracotta");
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete"); blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_glazed_terracotta");
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete_powder"); blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass");
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_carpet"); blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass_pane");
blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete");
e.setMask(new Mask() { blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete_powder");
@Override blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_carpet");
public boolean test(BlockVector3 blockVector3) {
BaseBlock block = clipboard.getFullBlock(blockVector3);
String blockName = block.toString().toLowerCase();
return blocks.contains(blockName);
} }
@Nullable BaseBlock block = clipboard.getFullBlock(blockVector3);
@Override String blockName = block.toString().toLowerCase();
public Mask2D toMask2D() { return blockName.equals("minecraft:water") || blocks.contains(blockName);
return null; }
}
public Mask copy() { @Nullable
return this; @Override
} public Mask2D toMask2D() {
}); return null;
} }
});
ClipboardHolder ch = new ClipboardHolder(clipboard); ClipboardHolder ch = new ClipboardHolder(clipboard);
BlockVector3 dimensions = clipboard.getDimensions(); BlockVector3 dimensions = clipboard.getDimensions();