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

added check if it actually is a tb

Quellcode durchsuchen
Dieser Commit ist enthalten in:
BuildTools 2023-02-04 12:12:10 +01:00
Ursprung cdc0dbea86
Commit d2a3483d31
4 geänderte Dateien mit 11 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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

@ -159,7 +159,8 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
public boolean test(BlockVector3 blockVector3) {
BaseBlock block = clipboard.getFullBlock(blockVector3);
String blockName = block.toString().toLowerCase();
return !blockName.equals("minecraft:water") || blocks.contains(blockName);
if (pasteOptions.isTestBlock() && blockName.equals("minecraft.water")) return true;
return blocks.contains(blockName);
}
@Nullable

2
BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
Datei anzeigen

@ -86,7 +86,7 @@ public class TestblockCommand extends SWCommand {
}
try {
region.reset(node, RegionType.TESTBLOCK, regionExtensionType);
region.reset(node, RegionType.TESTBLOCK, regionExtensionType, true);
RegionUtils.message(region, "REGION_TB_DONE");
} catch (IOException e) {
BauSystem.MESSAGE.send("REGION_TB_ERROR", p);

2
BauSystem_Main/src/de/steamwar/bausystem/region/PasteOptions.java
Datei anzeigen

@ -67,4 +67,6 @@ public class PasteOptions {
* Used in 1.15
*/
private final int waterLevel;
private final boolean testBlock;
}

12
BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
Datei anzeigen

@ -425,8 +425,8 @@ public class Region {
reset(null, regionType, regionExtensionType, false);
}
public void reset(SchematicNode schematic, RegionType regionType, RegionExtensionType regionExtensionType) throws IOException {
reset(schematic, regionType, regionExtensionType, false);
public void reset(SchematicNode schematic, RegionType regionType, RegionExtensionType regionExtensionType, boolean isTestBlock) throws IOException {
reset(schematic, regionType, regionExtensionType, false, isTestBlock);
}
public void reset(File file) {
@ -435,11 +435,11 @@ public class Region {
undoSessions.push(editSession);
}
public void reset(SchematicNode schematic, RegionType regionType, RegionExtensionType regionExtensionType, boolean ignoreAir) throws IOException {
reset(schematic, regionType, regionExtensionType, ignoreAir, false);
public void reset(SchematicNode schematic, RegionType regionType, RegionExtensionType regionExtensionType, boolean ignoreAir, boolean isTestBlock) throws IOException {
reset(schematic, regionType, regionExtensionType, ignoreAir, false, isTestBlock);
}
public void reset(SchematicNode schematic, RegionType regionType, RegionExtensionType regionExtensionType, boolean ignoreAir, boolean onlyColors) throws IOException {
public void reset(SchematicNode schematic, RegionType regionType, RegionExtensionType regionExtensionType, boolean ignoreAir, boolean onlyColors, boolean isTestBlock) throws IOException {
if (!hasReset(regionType)) {
return;
}
@ -447,7 +447,7 @@ public class Region {
regionExtensionType = RegionExtensionType.NORMAL;
}
PasteOptions pasteOptions = new PasteOptions((schematic != null && (schematic.getSchemtype().fightType() || schematic.getSchemtype().check())), ignoreAir, getPlain(Flag.COLOR, ColorMode.class).getColor(), onlyColors, regionExtensionType == RegionExtensionType.EXTENSION, getMinPoint(regionType, regionExtensionType), getMaxPoint(regionType, regionExtensionType), waterLevel);
PasteOptions pasteOptions = new PasteOptions((schematic != null && (schematic.getSchemtype().fightType() || schematic.getSchemtype().check())), ignoreAir, getPlain(Flag.COLOR, ColorMode.class).getColor(), onlyColors, regionExtensionType == RegionExtensionType.EXTENSION, getMinPoint(regionType, regionExtensionType), getMaxPoint(regionType, regionExtensionType), waterLevel, isTestBlock);
Point pastePoint;
File tempFile = null;