forked from SteamWar/SteamWar
Fix some more errors
This commit is contained in:
+1
-1
@@ -65,7 +65,7 @@ public class ColorCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
region.getFlags().set(Flag.COLOR, color);
|
region.getFlags().set(Flag.COLOR, color);
|
||||||
try {
|
try {
|
||||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
|
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
|
||||||
.ignoreAir(true)
|
.ignoreAir(true)
|
||||||
.onlyColors(true)
|
.onlyColors(true)
|
||||||
.color(color);
|
.color(color);
|
||||||
|
|||||||
+1
-1
@@ -108,7 +108,7 @@ public class RegionCommand extends SWCommand {
|
|||||||
if(checkGlobalRegion(region, p)) return;
|
if(checkGlobalRegion(region, p)) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
|
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
|
||||||
.ignoreAir(true)
|
.ignoreAir(true)
|
||||||
.color(region.getFlags().get(Flag.COLOR).getWithDefault());
|
.color(region.getFlags().get(Flag.COLOR).getWithDefault());
|
||||||
region.getArea().reset(pasteBuilder, true);
|
region.getArea().reset(pasteBuilder, true);
|
||||||
|
|||||||
+1
-1
@@ -54,7 +54,7 @@ public class ResetCommand extends SWCommand {
|
|||||||
Region region = regionCheck(p);
|
Region region = regionCheck(p);
|
||||||
if (region == null) return;
|
if (region == null) return;
|
||||||
try {
|
try {
|
||||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
|
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
|
||||||
.color(region.getFlags().get(Flag.COLOR).getWithDefault());
|
.color(region.getFlags().get(Flag.COLOR).getWithDefault());
|
||||||
region.getArea().reset(pasteBuilder, false);
|
region.getArea().reset(pasteBuilder, false);
|
||||||
for (Flag value : Flag.getFlags()) {
|
for (Flag value : Flag.getFlags()) {
|
||||||
|
|||||||
+1
-1
@@ -94,7 +94,7 @@ public class TestblockCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PasteBuilder.ClipboardProvider clipboardProvider = node == null ? new PasteBuilder.FileProvider(region.getResetFile(RegionType.TESTBLOCK)) : new PasteBuilder.SchematicProvider(node);
|
PasteBuilder.ClipboardProvider clipboardProvider = node == null ? new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile()) : new PasteBuilder.SchematicProvider(node);
|
||||||
PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
|
PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
|
||||||
.ignoreAir(ignoreAir)
|
.ignoreAir(ignoreAir)
|
||||||
.onlyColors(onlyColors)
|
.onlyColors(onlyColors)
|
||||||
|
|||||||
@@ -94,6 +94,11 @@ public interface Region {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public File getResetFile() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void reset(PasteBuilder pasteBuilder, boolean extension) {
|
public void reset(PasteBuilder pasteBuilder, boolean extension) {
|
||||||
}
|
}
|
||||||
@@ -122,6 +127,8 @@ public interface Region {
|
|||||||
|
|
||||||
EditSession copy(boolean extension);
|
EditSession copy(boolean extension);
|
||||||
|
|
||||||
|
File getResetFile();
|
||||||
|
|
||||||
void reset(PasteBuilder pasteBuilder, boolean extension);
|
void reset(PasteBuilder pasteBuilder, boolean extension);
|
||||||
|
|
||||||
void forEachChunk(BiConsumer<Integer, Integer> executor);
|
void forEachChunk(BiConsumer<Integer, Integer> executor);
|
||||||
|
|||||||
Reference in New Issue
Block a user