forked from SteamWar/SteamWar
Fix build
This commit is contained in:
+2
-2
@@ -105,7 +105,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.getArea().getResetFile()))
|
PasteBuilder pasteBuilder = new PasteBuilder()
|
||||||
.ignoreAir(true)
|
.ignoreAir(true)
|
||||||
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||||
region.getArea().reset(pasteBuilder, false);
|
region.getArea().reset(pasteBuilder, false);
|
||||||
@@ -127,7 +127,7 @@ public class RegionCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
|
PasteBuilder pasteBuilder = new PasteBuilder(PasteBuilder.ClipboardProvider.schematic(node))
|
||||||
.ignoreAir(true)
|
.ignoreAir(true)
|
||||||
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||||
region.getArea().reset(pasteBuilder, false);
|
region.getArea().reset(pasteBuilder, false);
|
||||||
|
|||||||
+2
-2
@@ -79,12 +79,12 @@ public class RegionLib implements LuaLib {
|
|||||||
Loader loader = Loader.getLoader(player);
|
Loader loader = Loader.getLoader(player);
|
||||||
table.set("loader", getter(() -> loader == null ? "OFF" : loader.getStage().name()));
|
table.set("loader", getter(() -> loader == null ? "OFF" : loader.getStage().name()));
|
||||||
|
|
||||||
table.set("copyPoint", getter(() -> toPos(region.get().getBuildArea().getCopyPoint())));
|
table.set("copyPoint", getter(() -> toPos(region.get().getBuildArea().getCopyPoint(false))));
|
||||||
table.set("minPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
|
table.set("minPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
|
||||||
table.set("maxPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
|
table.set("maxPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
|
||||||
table.set("minPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
|
table.set("minPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
|
||||||
table.set("maxPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
|
table.set("maxPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
|
||||||
table.set("testblockPoint", getter(() -> toPos(region.get().getTestblockArea().getCopyPoint())));
|
table.set("testblockPoint", getter(() -> toPos(region.get().getTestblockArea().getCopyPoint(false))));
|
||||||
table.set("minPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
|
table.set("minPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
|
||||||
table.set("maxPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
|
table.set("maxPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
|
||||||
table.set("minPointTestblockExtension", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(true))));
|
table.set("minPointTestblockExtension", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(true))));
|
||||||
|
|||||||
@@ -48,10 +48,18 @@ public class Point {
|
|||||||
return new Point(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
|
return new Point(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Point add(Point point) {
|
||||||
|
return add(point.x, point.y, point.z);
|
||||||
|
}
|
||||||
|
|
||||||
public Point add(int x, int y, int z) {
|
public Point add(int x, int y, int z) {
|
||||||
return new Point(this.x + x, this.y + y, this.z + z);
|
return new Point(this.x + x, this.y + y, this.z + z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Point subtract(Point point) {
|
||||||
|
return subtract(point.x, point.y, point.z);
|
||||||
|
}
|
||||||
|
|
||||||
public Point subtract(int x, int y, int z) {
|
public Point subtract(int x, int y, int z) {
|
||||||
return new Point(this.x - x, this.y - y, this.z - z);
|
return new Point(this.x - x, this.y - y, this.z - z);
|
||||||
}
|
}
|
||||||
@@ -60,6 +68,18 @@ public class Point {
|
|||||||
return new Point(x / factor, y / factor, z / factor);
|
return new Point(x / factor, y / factor, z / factor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Point setX(int x) {
|
||||||
|
return new Point(x, this.y, this.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Point setY(int y) {
|
||||||
|
return new Point(this.x, y, this.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Point setZ(int z) {
|
||||||
|
return new Point(this.x, this.y, z);
|
||||||
|
}
|
||||||
|
|
||||||
public Location toLocation(World world) {
|
public Location toLocation(World world) {
|
||||||
return new Location(world, x, y, z);
|
return new Location(world, x, y, z);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,11 +25,6 @@ tasks.compileJava {
|
|||||||
options.isWarnings = false
|
options.isWarnings = false
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.classindex)
|
compileOnly(libs.classindex)
|
||||||
annotationProcessor(libs.classindex)
|
annotationProcessor(libs.classindex)
|
||||||
@@ -37,13 +32,13 @@ dependencies {
|
|||||||
compileOnly(project(":BauSystem:BauSystem_Main", "default"))
|
compileOnly(project(":BauSystem:BauSystem_Main", "default"))
|
||||||
compileOnly(project(":SpigotCore", "default"))
|
compileOnly(project(":SpigotCore", "default"))
|
||||||
|
|
||||||
compileOnly(libs.spigotapi)
|
compileOnly(libs.paperapi)
|
||||||
compileOnly(libs.axiom)
|
compileOnly(libs.axiom)
|
||||||
compileOnly(libs.authlib)
|
compileOnly(libs.authlib)
|
||||||
compileOnly(libs.viaapi)
|
compileOnly(libs.viaapi)
|
||||||
|
|
||||||
compileOnly(libs.nms20)
|
compileOnly(libs.nms)
|
||||||
compileOnly(libs.fawe18)
|
compileOnly(libs.fawe)
|
||||||
|
|
||||||
implementation(libs.luaj)
|
implementation(libs.luaj)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -166,7 +166,6 @@ include(
|
|||||||
"BauSystem",
|
"BauSystem",
|
||||||
"BauSystem:BauSystem_Main",
|
"BauSystem:BauSystem_Main",
|
||||||
"BauSystem:BauSystem_RegionDynamic",
|
"BauSystem:BauSystem_RegionDynamic",
|
||||||
// "BauSystem:BauSystem_RegionDynamic2",
|
|
||||||
"BauSystem:BauSystem_RegionFixed"
|
"BauSystem:BauSystem_RegionFixed"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user