Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1cb2e70ede
|
||
|
|
8ce25ec19f
|
||
|
|
a7adfe378f
|
||
|
|
9aa363de6f
|
||
|
|
5a5090c74d
|
||
|
|
99ca7205fb
|
||
|
|
e85604fdc4 | ||
|
|
936ee38503
|
@@ -51,7 +51,6 @@ jobs:
|
||||
rm -rf deploy
|
||||
mkdir -p deploy
|
||||
|
||||
cp "AccessWidener/build/libs/AccessWidener-all.jar" "deploy/AccessWidener.jar"
|
||||
cp "BauSystem/build/libs/BauSystem-all.jar" "deploy/BauSystem.jar"
|
||||
cp "FightSystem/build/libs/FightSystem-all.jar" "deploy/FightSystem.jar"
|
||||
cp "KotlinCore/build/libs/KotlinCore-all.jar" "deploy/KotlinCore.jar"
|
||||
|
||||
@@ -15,11 +15,6 @@ bin/
|
||||
.vscode
|
||||
.settings
|
||||
|
||||
# Language Server
|
||||
**/.project
|
||||
**/.factorypath
|
||||
**/.classpath
|
||||
|
||||
# Other
|
||||
lib
|
||||
/WebsiteBackend/data
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
plugins {
|
||||
`java-library`
|
||||
alias(libs.plugins.shadow)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.ow2.asm:asm:9.7")
|
||||
implementation("org.ow2.asm:asm-commons:9.7")
|
||||
}
|
||||
|
||||
tasks.shadowJar {
|
||||
manifest {
|
||||
attributes(
|
||||
"Manifest-Version" to "1.0",
|
||||
"Build-Jdk-Spec" to "21",
|
||||
"Main-Class" to "de.steamwar.Main",
|
||||
"Premain-Class" to "de.steamwar.Agent",
|
||||
"Can-Retransform-Classes" to "true",
|
||||
"Can-Redefine-Classes" to "true",
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
tasks.build {
|
||||
dependsOn(tasks.shadowJar)
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
/**
|
||||
* A single parsed line from a .accesswidener file.
|
||||
* <p>
|
||||
* Examples:
|
||||
* accessible class net/minecraft/server/level/ServerPlayer
|
||||
* accessible method net/minecraft/server/level/ServerPlayer getStats ()V
|
||||
* mutable field net/minecraft/world/entity/Entity id I
|
||||
* extendable class net/minecraft/world/level/chunk/LevelChunk
|
||||
*/
|
||||
public record AccessWidenerEntry(
|
||||
/** accessible | mutable | extendable (may have "transitive-" prefix) */
|
||||
String directive,
|
||||
/** class | method | field */
|
||||
String memberType,
|
||||
/** Internal class name, e.g. net/minecraft/server/level/ServerPlayer */
|
||||
String target,
|
||||
/** Method/field name, null for class entries */
|
||||
String name,
|
||||
/** Descriptor, null for class entries */
|
||||
String descriptor) {
|
||||
/**
|
||||
* Returns true if this entry targets the class with the given internal name.
|
||||
*/
|
||||
public boolean targets(String internalName) {
|
||||
return target.equals(internalName);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Parses Fabric-compatible .accesswidener files.
|
||||
* <p>
|
||||
* Supported format:
|
||||
* <pre>
|
||||
* accessWidener v2 named
|
||||
*
|
||||
* # comments are supported
|
||||
* accessible class net/minecraft/Foo
|
||||
* accessible method net/minecraft/Foo someMethod ()V
|
||||
* accessible field net/minecraft/Foo someField I
|
||||
* mutable field net/minecraft/Foo someField I
|
||||
* extendable class net/minecraft/Foo
|
||||
* extendable method net/minecraft/Foo someMethod ()V
|
||||
*
|
||||
* # transitive variants (expose widening to dependents)
|
||||
* transitive-accessible class net/minecraft/Foo
|
||||
* </pre>
|
||||
*/
|
||||
public final class AccessWidenerParser {
|
||||
|
||||
private AccessWidenerParser() {
|
||||
}
|
||||
|
||||
public static List<AccessWidenerEntry> parse(InputStream in) throws IOException {
|
||||
List<AccessWidenerEntry> entries = new ArrayList<>();
|
||||
|
||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
|
||||
|
||||
String line;
|
||||
boolean headerSeen = false;
|
||||
|
||||
while ((line = reader.readLine()) != null) {
|
||||
// Strip inline comments
|
||||
int commentIdx = line.indexOf('#');
|
||||
if (commentIdx >= 0) line = line.substring(0, commentIdx);
|
||||
line = line.strip();
|
||||
|
||||
if (line.isEmpty()) continue;
|
||||
|
||||
if (!headerSeen) {
|
||||
// First non-blank, non-comment line must be the header
|
||||
if (!line.startsWith("accessWidener")) {
|
||||
throw new IOException("Missing accessWidener header, got: " + line);
|
||||
}
|
||||
headerSeen = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
AccessWidenerEntry entry = parseLine(line);
|
||||
if (entry != null) entries.add(entry);
|
||||
}
|
||||
}
|
||||
|
||||
return entries;
|
||||
}
|
||||
|
||||
private static AccessWidenerEntry parseLine(String line) {
|
||||
String[] parts = line.split("\\s+");
|
||||
if (parts.length < 3) return null;
|
||||
|
||||
String directive = parts[0]; // accessible / mutable / extendable / transitive-*
|
||||
String memberType = parts[1]; // class / method / field
|
||||
String target = parts[2]; // internal class name
|
||||
|
||||
return switch (memberType) {
|
||||
case "class" -> new AccessWidenerEntry(directive, "class", target, null, null);
|
||||
case "method", "field" -> {
|
||||
if (parts.length < 5) yield null;
|
||||
yield new AccessWidenerEntry(directive, memberType, target, parts[3], parts[4]);
|
||||
}
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.instrument.Instrumentation;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* Java agent entry point.
|
||||
* <p>
|
||||
* At JVM startup: java -javaagent:paper-access-widener-agent.jar -jar server.jar
|
||||
* <p>
|
||||
* On attach the agent:
|
||||
* <ol>
|
||||
* <li>Find all .jar files inside the plugins folder</li>
|
||||
* <li>Scan all found jars for *.accesswidener resources</li>
|
||||
* <li>Transform any class during loading</li>
|
||||
* </ol>
|
||||
*/
|
||||
public class Agent {
|
||||
private Agent() {
|
||||
throw new IllegalStateException("Utility class");
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.getLogger("AccessWidenerAgent");
|
||||
|
||||
// -javaagent: startup
|
||||
public static void premain(String args, Instrumentation inst) {
|
||||
init(inst);
|
||||
}
|
||||
|
||||
private static void init(Instrumentation inst) {
|
||||
LOG.info("[AccessWidener] Agent initialising.");
|
||||
|
||||
List<AccessWidenerEntry> entries = new ArrayList<>();
|
||||
File file = new File(new File(".").getAbsoluteFile(), "plugins/");
|
||||
File[] files = file.listFiles();
|
||||
if (files == null) files = new File[0];
|
||||
for (File jarFile : files) {
|
||||
if (!jarFile.isFile()) continue;
|
||||
if (!jarFile.getName().endsWith(".jar")) continue;
|
||||
try {
|
||||
entries.addAll(Utils.findAndParseAccessWideners(jarFile.toPath()));
|
||||
} catch (IOException e) {
|
||||
LOG.warning("Failed to parse access wideners from " + jarFile.getAbsolutePath());
|
||||
}
|
||||
}
|
||||
LOG.info("[AccessWidener] Loaded " + entries.size() + " access wideners.");
|
||||
|
||||
inst.addTransformer(new WideningTransformer(entries), false);
|
||||
LOG.info("[AccessWidener] Agent ready.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* Uses ASM to patch class bytecode according to a list of access widener entries.
|
||||
*
|
||||
* Returns {@code null} if the class is not targeted by any entry (no-op signal
|
||||
* to the caller so it can skip the write).
|
||||
*/
|
||||
public class ClassPatcher {
|
||||
|
||||
private static final Logger LOG = Logger.getLogger("ClassPatcher");
|
||||
|
||||
private final List<AccessWidenerEntry> entries;
|
||||
|
||||
/** Pre-computed set of targeted internal names for fast filtering. */
|
||||
private final Set<String> targets;
|
||||
|
||||
private final Set<String> targetsPublicConstructor;
|
||||
|
||||
public ClassPatcher(List<AccessWidenerEntry> entries) {
|
||||
this.entries = entries;
|
||||
this.targets = entries.stream()
|
||||
.map(AccessWidenerEntry::target)
|
||||
.flatMap(s -> {
|
||||
if (!s.contains("$")) return Stream.of(s);
|
||||
int index = s.lastIndexOf('$');
|
||||
return Stream.of(s, s.substring(0, index));
|
||||
})
|
||||
.collect(Collectors.toSet());
|
||||
this.targetsPublicConstructor = entries.stream()
|
||||
.filter(entry -> entry.directive().equals("transitive-extendable"))
|
||||
.map(AccessWidenerEntry::target)
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
/**
|
||||
* Patches {@code classBytes} if {@code className} is targeted.
|
||||
*
|
||||
* @return patched bytes, or {@code null} if no changes were needed
|
||||
*/
|
||||
public byte[] patch(String className, byte[] classBytes) {
|
||||
if (!targets.contains(className)) return null;
|
||||
|
||||
try {
|
||||
ClassReader cr = new ClassReader(classBytes);
|
||||
ClassWriter cw = new ClassWriter(cr, 0);
|
||||
cr.accept(new ClassTransformer(cw, className, entries, targetsPublicConstructor.contains(className)), ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
||||
return cw.toByteArray();
|
||||
} catch (Exception e) {
|
||||
LOG.warning("[AccessWidener] Failed to transform " + className + ": " + e.getMessage());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,125 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ClassTransformer extends ClassVisitor {
|
||||
|
||||
private final String internalName;
|
||||
private final List<AccessWidenerEntry> entries;
|
||||
private final boolean appendPublicConstructor;
|
||||
|
||||
public ClassTransformer(ClassVisitor cv, String internalName, List<AccessWidenerEntry> entries, boolean appendPublicConstructor) {
|
||||
super(Opcodes.ASM9, cv);
|
||||
this.internalName = internalName;
|
||||
this.entries = entries;
|
||||
this.appendPublicConstructor = appendPublicConstructor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||
int newAccess = access;
|
||||
for (AccessWidenerEntry e : entries) {
|
||||
if (!e.targets(internalName) || !"class".equals(e.memberType())) continue;
|
||||
newAccess = applyDirective(e.directive(), newAccess, false);
|
||||
}
|
||||
if (appendPublicConstructor) {
|
||||
MethodVisitor methodVisitor = visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
|
||||
methodVisitor.visitCode();
|
||||
methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
|
||||
methodVisitor.visitMethodInsn(
|
||||
Opcodes.INVOKESPECIAL,
|
||||
"java/lang/Object",
|
||||
"<init>",
|
||||
"()V",
|
||||
false
|
||||
);
|
||||
methodVisitor.visitInsn(Opcodes.RETURN);
|
||||
methodVisitor.visitMaxs(1, 1);
|
||||
methodVisitor.visitEnd();
|
||||
}
|
||||
super.visit(version, newAccess, name, signature, superName, interfaces);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitInnerClass(String name, String outerName, String innerName, int access) {
|
||||
int newAccess = access;
|
||||
for (AccessWidenerEntry e : entries) {
|
||||
if (!e.target().equals(name) || !"class".equals(e.memberType())) continue;
|
||||
newAccess = applyDirective(e.directive(), newAccess, false);
|
||||
}
|
||||
super.visitInnerClass(name, outerName, innerName, newAccess);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
|
||||
int newAccess = access;
|
||||
for (AccessWidenerEntry e : entries) {
|
||||
if (!e.targets(internalName) || !"method".equals(e.memberType())) continue;
|
||||
if (!name.equals(e.name()) || !descriptor.equals(e.descriptor())) continue;
|
||||
newAccess = applyDirective(e.directive(), newAccess, false);
|
||||
}
|
||||
return super.visitMethod(newAccess, name, descriptor, signature, exceptions);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
|
||||
int newAccess = access;
|
||||
for (AccessWidenerEntry e : entries) {
|
||||
if (!e.targets(internalName) || !"field".equals(e.memberType())) continue;
|
||||
if (!name.equals(e.name())) continue;
|
||||
newAccess = applyDirective(e.directive(), newAccess, true);
|
||||
}
|
||||
return super.visitField(newAccess, name, descriptor, signature, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply a directive to an access bitmask.
|
||||
*
|
||||
* @param directive accessible / mutable / extendable (with optional "transitive-" prefix)
|
||||
* @param access current access flags
|
||||
* @param isField true when processing a field (mutable removes final)
|
||||
*/
|
||||
private static int applyDirective(String directive, int access, boolean isField) {
|
||||
// Strip transitive- prefix — the widening itself is the same
|
||||
String effective = directive.startsWith("transitive-") ? directive.substring("transitive-".length()) : directive;
|
||||
|
||||
return switch (effective) {
|
||||
case "accessible" -> makePublic(access);
|
||||
case "extendable" -> makePublic(removeFinal(access));
|
||||
case "mutable" -> isField ? removeFinal(access) : access;
|
||||
default -> access;
|
||||
};
|
||||
}
|
||||
|
||||
private static int makePublic(int access) {
|
||||
return (access & ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) | Opcodes.ACC_PUBLIC;
|
||||
}
|
||||
|
||||
private static int removeFinal(int access) {
|
||||
return access & ~Opcodes.ACC_FINAL;
|
||||
}
|
||||
}
|
||||
@@ -1,125 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Command-line tool that produces a widened copy of a JAR for use as a
|
||||
* compile-time stub in IntelliJ / Gradle.
|
||||
*
|
||||
* Usage:
|
||||
* java -jar jar-widener.jar <input.jar> <output.jar> [file.accesswidener ...]
|
||||
*
|
||||
* The output JAR is identical to the input JAR except that every class
|
||||
* targeted by the access widener entries has its access flags patched:
|
||||
* accessible → public
|
||||
* extendable → public + non-final
|
||||
* mutable → non-final field
|
||||
*
|
||||
* Intended for use as a Gradle task so IntelliJ sees the already-widened
|
||||
* class when you Ctrl+click NMS code, and javac compiles without complaints.
|
||||
*/
|
||||
public class Main {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
if (args.length < 2) {
|
||||
System.err.println("Usage: jar-widener <input.jar> <output.jar> [*.accesswidener ...]");
|
||||
System.exit(1);
|
||||
}
|
||||
|
||||
Path inputJar = Path.of(args[0]);
|
||||
Path outputJar = Path.of(args[1]);
|
||||
|
||||
if (!Files.exists(inputJar)) {
|
||||
System.err.println("Input JAR not found: " + inputJar);
|
||||
System.exit(1);
|
||||
}
|
||||
|
||||
// --- Collect all access widener entries ---
|
||||
List<AccessWidenerEntry> entries = new ArrayList<>();
|
||||
|
||||
if (args.length > 2) {
|
||||
for (int i = 2; i < args.length; i++) {
|
||||
Path awFile = Path.of(args[i]);
|
||||
if (!Files.exists(awFile)) {
|
||||
System.err.println("Warning: access widener file not found, skipping: " + awFile);
|
||||
continue;
|
||||
}
|
||||
try (InputStream in = Files.newInputStream(awFile)) {
|
||||
List<AccessWidenerEntry> parsed = AccessWidenerParser.parse(in);
|
||||
System.out.println("Loaded " + parsed.size() + " entries from " + awFile.getFileName());
|
||||
entries.addAll(parsed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (entries.isEmpty()) {
|
||||
System.out.println("No access widener entries found — copying JAR unchanged.");
|
||||
Files.createDirectories(outputJar.getParent());
|
||||
Files.copy(inputJar, outputJar, StandardCopyOption.REPLACE_EXISTING);
|
||||
return;
|
||||
}
|
||||
|
||||
System.out.println("Widening " + inputJar.getFileName()
|
||||
+ " with " + entries.size() + " total entr"
|
||||
+ (entries.size() == 1 ? "y" : "ies") + "...");
|
||||
|
||||
// --- Copy input → output, transforming .class files in place ---
|
||||
Files.createDirectories(outputJar.getParent());
|
||||
Files.copy(inputJar, outputJar, StandardCopyOption.REPLACE_EXISTING);
|
||||
|
||||
ClassPatcher patcher = new ClassPatcher(entries);
|
||||
|
||||
try (FileSystem fs = FileSystems.newFileSystem(outputJar)) {
|
||||
// Walk every .class entry in the JAR
|
||||
try (var stream = Files.walk(fs.getPath("/"))) {
|
||||
stream.filter(p -> p.toString().endsWith(".class"))
|
||||
.forEach(classPath -> patchClass(fs, classPath, patcher));
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("Done. Widened JAR written to " + outputJar);
|
||||
}
|
||||
|
||||
private static void patchClass(FileSystem fs, Path classPath, ClassPatcher patcher) {
|
||||
// Derive internal class name from path e.g. /net/minecraft/Foo.class → net/minecraft/Foo
|
||||
String internalName = classPath.toString()
|
||||
.replaceFirst("^/", "")
|
||||
.replace(".class", "");
|
||||
|
||||
try {
|
||||
byte[] original = Files.readAllBytes(classPath);
|
||||
byte[] patched = patcher.patch(internalName, original);
|
||||
|
||||
if (patched != null) {
|
||||
Files.write(classPath, patched);
|
||||
System.out.println(" Widened: " + internalName);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
System.err.println(" Warning: failed to patch " + internalName + ": " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipFile;
|
||||
|
||||
public class Utils {
|
||||
|
||||
private static final Logger LOG = Logger.getLogger("AccessWidenerAgent");
|
||||
|
||||
private Utils() {
|
||||
throw new IllegalStateException("Utility class");
|
||||
}
|
||||
|
||||
public static List<AccessWidenerEntry> findAndParseAccessWideners(Path jarPath) throws IOException {
|
||||
List<AccessWidenerEntry> results = new ArrayList<>();
|
||||
|
||||
try (ZipFile zip = new ZipFile(jarPath.toFile())) {
|
||||
Enumeration<? extends ZipEntry> entries = zip.entries();
|
||||
while (entries.hasMoreElements()) {
|
||||
ZipEntry entry = entries.nextElement();
|
||||
if (entry.isDirectory() || !entry.getName().endsWith(".accesswidener")) continue;
|
||||
|
||||
try (InputStream in = zip.getInputStream(entry)) {
|
||||
results.addAll(AccessWidenerParser.parse(in));
|
||||
} catch (IOException e) {
|
||||
LOG.warning("[AccessWidener] Failed to parse " + entry.getName()
|
||||
+ " in " + jarPath.getFileName() + ": " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar;
|
||||
|
||||
import java.lang.instrument.ClassFileTransformer;
|
||||
import java.security.ProtectionDomain;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Transforms class bytecode to apply access widening rules.
|
||||
* <p>
|
||||
* Also monitors for new plugin ClassLoaders appearing (when plugins load after
|
||||
* the agent attaches) and automatically picks up their .accesswidener files.
|
||||
*/
|
||||
public class WideningTransformer implements ClassFileTransformer {
|
||||
|
||||
private final ClassPatcher patcher;
|
||||
|
||||
public WideningTransformer(List<AccessWidenerEntry> entries) {
|
||||
patcher = new ClassPatcher(entries);
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
|
||||
return patcher.patch(className, classfileBuffer);
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
plugins {
|
||||
steamwar.java
|
||||
widener
|
||||
}
|
||||
|
||||
tasks.compileJava {
|
||||
@@ -35,7 +34,6 @@ dependencies {
|
||||
compileOnly(libs.classindex)
|
||||
annotationProcessor(libs.classindex)
|
||||
compileOnly(project(":SpigotCore", "default"))
|
||||
compileOnly(project(":KotlinCore", "default"))
|
||||
|
||||
compileOnly(libs.axiom)
|
||||
compileOnly(libs.authlib)
|
||||
@@ -49,7 +47,3 @@ dependencies {
|
||||
implementation(libs.luaj)
|
||||
implementation(files("$projectDir/../libs/YAPION-SNAPSHOT.jar"))
|
||||
}
|
||||
|
||||
widener {
|
||||
fromCatalog(libs.nms)
|
||||
}
|
||||
|
||||
@@ -834,10 +834,6 @@ SKIN_NO_REGION = §7You are not in a region with a changealbe skin
|
||||
SKIN_ALREADY_EXISTS = §cThis skin already exists like this
|
||||
SKIN_MESSAGE = §7Skin created
|
||||
SKIN_MESSAGE_HOVER = §eClick to copy for YoyoNow and send
|
||||
# Blast Resistance
|
||||
BLASTRESISTANCE_HELP = §8/§eblastresistance §8-§7 Calculate min/max and average blast resistance of current clipboard
|
||||
BLASTRESISTANCE_NO_CLIPBOARD = §cYou currently do not have a clipboard to be used.
|
||||
BLASTRESISTANCE_RESULT = §7BlastResistance §8>>§7 Min§8: §e{0}§7 Max§8: §e{1}§7 Avg§8: §e{2}
|
||||
# Panzern
|
||||
PANZERN_HELP = §8/§epanzern §8[§7Block§8] §8[§7Slab§8] §8- §7Armor your WorldEdit selection
|
||||
PANZERN_PREPARE1 = §71. Check, if barrels reach until border of armor.
|
||||
|
||||
@@ -772,10 +772,6 @@ SKIN_NO_REGION = §7Du steht in keiner Region, welche mit einem Skin versehen we
|
||||
SKIN_ALREADY_EXISTS = §cDieser Skin existiert in der Form bereits
|
||||
SKIN_MESSAGE = §7Skin erstellt
|
||||
SKIN_MESSAGE_HOVER = §eKlicken zum kopieren für YoyoNow und an diesen senden
|
||||
# Blast Resistance
|
||||
BLASTRESISTANCE_HELP = §8/§eblastresistance §8-§7 Minimal-, Maximal- und durchschnittliche Sprengfestigkeit des aktuellen Inhalts der Zwischenablage berechnen
|
||||
BLASTRESISTANCE_NO_CLIPBOARD = §cDerzeit steht Ihnen keine Zwischenablage zur Verfügung.
|
||||
BLASTRESISTANCE_RESULT = §7BlastResistance §8>>§7 Min§8: §e{0}§7 Max§8: §e{1}§7 Avg§8: §e{2}
|
||||
# Panzern
|
||||
PANZERN_HELP = §8/§epanzern §8[§7Block§8] §8[§7Slab§8] §8- §7Panzer deine WorldEdit Auswahl
|
||||
PANZERN_PREPARE1 = §71. Gucke nochmal nach, ob Läufe auch bis zur Panzergrenze führen.
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
accessWidener v2 named
|
||||
|
||||
# For NoClipCommand
|
||||
accessible field net/minecraft/server/level/ServerPlayerGameMode gameModeForPlayer Lnet/minecraft/world/level/GameType;
|
||||
|
||||
# For PlaceItemUtils
|
||||
accessible field org/bukkit/craftbukkit/block/CraftBlockState position Lnet/minecraft/core/BlockPos;
|
||||
mutable field org/bukkit/craftbukkit/block/CraftBlockState position Lnet/minecraft/core/BlockPos;
|
||||
accessible field org/bukkit/craftbukkit/block/CraftBlockState world Lorg/bukkit/craftbukkit/CraftWorld;
|
||||
mutable field org/bukkit/craftbukkit/block/CraftBlockState world Lorg/bukkit/craftbukkit/CraftWorld;
|
||||
|
||||
# For TickManager
|
||||
accessible field net/minecraft/server/ServerTickRateManager remainingSprintTicks J
|
||||
@@ -38,6 +38,7 @@ import de.steamwar.bausystem.utils.TickManager;
|
||||
import de.steamwar.bausystem.worlddata.WorldData;
|
||||
import de.steamwar.command.AbstractValidator;
|
||||
import de.steamwar.command.SWCommandUtils;
|
||||
import de.steamwar.core.CRIUSleepEvent;
|
||||
import de.steamwar.core.Core;
|
||||
import de.steamwar.core.WorldEditRendererCUIEditor;
|
||||
import de.steamwar.core.WorldIdentifier;
|
||||
@@ -50,6 +51,8 @@ import org.bukkit.Bukkit;
|
||||
import org.bukkit.GameRule;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
@@ -62,7 +65,7 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class BauSystem extends JavaPlugin {
|
||||
public class BauSystem extends JavaPlugin implements Listener {
|
||||
|
||||
// This should be treated as final!
|
||||
public static Message MESSAGE;
|
||||
@@ -130,14 +133,25 @@ public class BauSystem extends JavaPlugin {
|
||||
|
||||
Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
|
||||
|
||||
String identifier = BauServerInfo.getOwnerUser().getUUID().toString().replace("-", "");
|
||||
String identifier;
|
||||
if (BauServerInfo.getWorldId() != null) {
|
||||
identifier = BauServerInfo.getWorldId().toString().replace("-", "");
|
||||
} else {
|
||||
identifier = BauServerInfo.getOwnerUser().getUUID().toString().replace("-", "");
|
||||
}
|
||||
WorldIdentifier.set("bau/" + Core.getVersion() + "/" + identifier);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onCRIUSleep(CRIUSleepEvent event) {
|
||||
RegionSystem.INSTANCE.save();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
linker.unlink();
|
||||
WorldData.write();
|
||||
RegionSystem.INSTANCE.save();
|
||||
Config.getInstance().saveAll();
|
||||
}
|
||||
|
||||
@@ -215,4 +229,4 @@ public class BauSystem extends JavaPlugin {
|
||||
AtomicReference<BukkitTask> task = new AtomicReference<>();
|
||||
task.set(runTaskTimer(plugin, () -> consumer.accept(task.get()), delay, period));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,11 +60,16 @@ public enum Permission {
|
||||
}
|
||||
|
||||
public boolean hasPermission(Player member) {
|
||||
if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
|
||||
SteamwarUser steamwarUser = SteamwarUser.get(member.getUniqueId());
|
||||
BauServer server = BauServer.getInstance();
|
||||
if (!server.isTeamWorld() && steamwarUser.getId() == server.getOwnerID()) {
|
||||
return this != SPECTATOR;
|
||||
}
|
||||
BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
|
||||
if (server.isTeamWorld() && steamwarUser.getTeam() == server.getTeamID()) {
|
||||
return this != SPECTATOR;
|
||||
}
|
||||
BauweltMember bauweltMember = BauweltMember.getBauMember(server.getWorldID(), steamwarUser.getId());
|
||||
if (bauweltMember == null) return this == SPECTATOR;
|
||||
return permissionPredicate.test(bauweltMember);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,16 +34,41 @@ public class BauServer {
|
||||
}
|
||||
|
||||
private Integer owner;
|
||||
private UUID world;
|
||||
private Integer team;
|
||||
|
||||
public UUID getOwner() {
|
||||
return SteamwarUser.byId(getOwnerID()).getUUID();
|
||||
Integer ownerId = getOwnerID();
|
||||
return ownerId == null ? null : SteamwarUser.byId(ownerId).getUUID();
|
||||
}
|
||||
|
||||
public int getOwnerID() {
|
||||
public Integer getOwnerID() {
|
||||
//Lazy loading to improve startup time of the server in 1.15
|
||||
if (owner == null) {
|
||||
owner = BauServerInfo.getOwnerId();
|
||||
}
|
||||
return owner;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean hasOwner() {
|
||||
return getOwnerID() != null;
|
||||
}
|
||||
|
||||
public UUID getWorldID() {
|
||||
if (world == null) {
|
||||
world = BauServerInfo.getWorldId();
|
||||
}
|
||||
return world;
|
||||
}
|
||||
|
||||
public Integer getTeamID() {
|
||||
if (team == null) {
|
||||
team = BauServerInfo.getTeamId();
|
||||
}
|
||||
return team;
|
||||
}
|
||||
|
||||
public boolean isTeamWorld() {
|
||||
return getTeamID() != null;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-2
@@ -47,7 +47,7 @@ public class BauInfoBauGuiItem extends BauGuiItem {
|
||||
@Override
|
||||
public ItemStack getItem(Player player) {
|
||||
SWItem itemStack;
|
||||
if (!player.getName().endsWith("⍇")) {
|
||||
if (!player.getName().endsWith("⍇") && !BauServer.getInstance().isTeamWorld()) {
|
||||
itemStack = SWItem.getPlayerSkull(SteamwarUser.get(BauServer.getInstance().getOwner()).getUserName());
|
||||
} else {
|
||||
itemStack = new SWItem(Material.PLAYER_HEAD, "");
|
||||
@@ -56,7 +56,6 @@ public class BauInfoBauGuiItem extends BauGuiItem {
|
||||
Region region = Region.getRegion(player.getLocation());
|
||||
List<String> stringList = new ArrayList<>();
|
||||
for (Flag flag : Flag.getFlags()) {
|
||||
if (flag == Flag.CHANGED) continue;
|
||||
if (!region.getRegionData().has(flag).isApplicable()) continue;
|
||||
FlagOptional<?> value = region.getRegionData().get(flag);
|
||||
if (value.isPresent()) {
|
||||
|
||||
@@ -47,7 +47,9 @@ public class InfoCommand extends SWCommand {
|
||||
|
||||
@Register(description = "BAU_INFO_COMMAND_HELP")
|
||||
public void genericCommand(Player p) {
|
||||
BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.byId(bauServer.getOwnerID()).getUserName());
|
||||
if (!bauServer.isTeamWorld()) {
|
||||
BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.byId(bauServer.getOwnerID()).getUserName());
|
||||
}
|
||||
Region region = Region.getRegion(p.getLocation());
|
||||
for (Flag flag : Flag.getFlags()) {
|
||||
if (!region.getRegionData().has(flag).isApplicable()) continue;
|
||||
@@ -58,7 +60,7 @@ public class InfoCommand extends SWCommand {
|
||||
}
|
||||
|
||||
if (Permission.BUILD.hasPermission(p)) {
|
||||
List<BauweltMember> members = BauweltMember.getMembers(bauServer.getOwnerID());
|
||||
List<BauweltMember> members = BauweltMember.getWorldMembers(bauServer.getWorldID());
|
||||
Map<Permission, List<BauweltMember>> memberByPermission = new HashMap<>();
|
||||
members.forEach(member -> {
|
||||
if (Permission.SUPERVISOR.hasPermission(member)) {
|
||||
|
||||
-31
@@ -1,31 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.features.experimental;
|
||||
|
||||
import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.linkage.Linked;
|
||||
|
||||
@Linked
|
||||
public class ExperimentalCommand extends SWCommand {
|
||||
|
||||
public ExperimentalCommand() {
|
||||
super("experimental", "experiment");
|
||||
}
|
||||
}
|
||||
-135
@@ -1,135 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.features.experimental.redstone_engine;
|
||||
|
||||
import de.steamwar.bausystem.features.experimental.ExperimentalCommand;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.bausystem.utils.ScoreboardElement;
|
||||
import de.steamwar.command.AbstractSWCommand;
|
||||
import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import io.papermc.paper.configuration.WorldConfiguration;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import net.kyori.adventure.title.TitlePart;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.CraftWorld;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
@AbstractSWCommand.PartOf(ExperimentalCommand.class)
|
||||
@Linked
|
||||
public class RedstoneEngine extends SWCommand implements Listener, ScoreboardElement {
|
||||
|
||||
public RedstoneEngine() {
|
||||
super("");
|
||||
}
|
||||
|
||||
private WorldConfiguration.Misc getConfig() {
|
||||
return ((CraftWorld) Bukkit.getWorlds().get(0)).getHandle().paperConfig().misc;
|
||||
}
|
||||
|
||||
@Register("redstone")
|
||||
@Register("redstoneengine")
|
||||
public void setRedstoneEngine(Player player, @StaticValue("alternate_current") String __, WorldConfiguration.Misc.AlternateCurrentUpdateOrder updateOrder) {
|
||||
WorldConfiguration.Misc misc = getConfig();
|
||||
misc.redstoneImplementation = WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT;
|
||||
misc.alternateCurrentUpdateOrder = updateOrder;
|
||||
broadcastTitle(Bukkit.getOnlinePlayers());
|
||||
}
|
||||
|
||||
@Register("redstone")
|
||||
@Register("redstoneengine")
|
||||
public void setRedstoneEngine(Player player, WorldConfiguration.Misc.RedstoneImplementation implementation) {
|
||||
getConfig().redstoneImplementation = implementation;
|
||||
broadcastTitle(Bukkit.getOnlinePlayers());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
WorldConfiguration.Misc misc = getConfig();
|
||||
if (misc.redstoneImplementation != WorldConfiguration.Misc.RedstoneImplementation.EIGENCRAFT) {
|
||||
broadcastTitle(List.of(event.getPlayer()));
|
||||
}
|
||||
}
|
||||
|
||||
private void broadcastTitle(Collection<? extends Player> players) {
|
||||
WorldConfiguration.Misc misc = getConfig();
|
||||
Component title = switch (misc.redstoneImplementation) {
|
||||
case VANILLA -> Component.text("⚠").color(NamedTextColor.RED).append(Component.text(" Redstone: Vanilla ").color(NamedTextColor.WHITE)).append(Component.text("⚠").color(NamedTextColor.RED));
|
||||
case EIGENCRAFT -> Component.text("Redstone: Eigencraft");
|
||||
case ALTERNATE_CURRENT -> Component.text("⚠").color(NamedTextColor.RED).append(Component.text(" Redstone: AC ").color(NamedTextColor.WHITE)).append(Component.text("⚠").color(NamedTextColor.RED));
|
||||
};
|
||||
Component subtitle;
|
||||
if (misc.redstoneImplementation != WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) {
|
||||
subtitle = Component.text().build();
|
||||
} else {
|
||||
subtitle = switch (misc.alternateCurrentUpdateOrder) {
|
||||
case VERTICAL_FIRST_INWARD -> Component.text("Y first inwards"); // Y before XZ
|
||||
case VERTICAL_FIRST_OUTWARD -> Component.text("Y first outwards"); // XZ before Y
|
||||
case HORIZONTAL_FIRST_INWARD -> Component.text("XZ first inwards"); // Y before XZ
|
||||
case HORIZONTAL_FIRST_OUTWARD -> Component.text("XZ first outwards"); // XZ before Y
|
||||
};
|
||||
}
|
||||
players.forEach(player -> {
|
||||
player.sendTitlePart(TitlePart.TITLE, title);
|
||||
player.sendTitlePart(TitlePart.SUBTITLE, subtitle);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public ScoreboardGroup getGroup() {
|
||||
return ScoreboardGroup.FOOTER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int order() {
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
WorldConfiguration.Misc misc = getConfig();
|
||||
switch (misc.redstoneImplementation) {
|
||||
case ALTERNATE_CURRENT:
|
||||
switch (misc.alternateCurrentUpdateOrder) {
|
||||
case VERTICAL_FIRST_INWARD:
|
||||
return "§eRedstone§8: §cAC §8(§7Y in§8)";
|
||||
case VERTICAL_FIRST_OUTWARD:
|
||||
return "§eRedstone§8: §cAC §8(§7Y out§8)";
|
||||
case HORIZONTAL_FIRST_INWARD:
|
||||
return "§eRedstone§8: §cAC §8(§7XZ in§8)";
|
||||
case HORIZONTAL_FIRST_OUTWARD:
|
||||
return "§eRedstone§8: §cAC §8(§7XZ out§8)";
|
||||
}
|
||||
return "§eRedstone§8: §cAC";
|
||||
case EIGENCRAFT:
|
||||
return null;
|
||||
case VANILLA:
|
||||
default:
|
||||
return "§eRedstone§8: §cVanilla";
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -290,7 +290,7 @@ public class KillcheckerVisualizer {
|
||||
}
|
||||
rEntities.get(point).die();
|
||||
}
|
||||
RBlockDisplay entity = new RBlockDisplay(outlinePoints.contains(point) ? outline : inner, point.toLocation(WORLD, 0, 0, 0));
|
||||
RBlockDisplay entity = new RBlockDisplay(outlinePoints.contains(point) ? outline : inner, point.toLocation(WORLD, 0.5, 0, 0.5));
|
||||
entity.setBlock(MATERIALS[Math.min(count - 1, MATERIALS.length) - 1].createBlockData());
|
||||
rEntities.put(point, entity);
|
||||
if (outlinePoints.contains(point)) outlinePointsCache.add(point);
|
||||
|
||||
+5
-1
@@ -20,6 +20,7 @@
|
||||
package de.steamwar.bausystem.features.region;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.Permission;
|
||||
import de.steamwar.bausystem.config.BauServer;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.bausystem.region.RegionUtils;
|
||||
@@ -63,7 +64,7 @@ public class ColorCommand extends SWCommand {
|
||||
}
|
||||
region.getRegionData().set(Flag.COLOR, color);
|
||||
try {
|
||||
PasteBuilder pasteBuilder = new PasteBuilder()
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
|
||||
.ignoreAir(true)
|
||||
.onlyColors(true)
|
||||
.color(color);
|
||||
@@ -83,6 +84,9 @@ public class ColorCommand extends SWCommand {
|
||||
@ClassValidator(value = Player.class, local = true)
|
||||
public TypeValidator<Player> validator() {
|
||||
return (commandSender, player, messageSender) -> {
|
||||
if (bauServer.isTeamWorld()) {
|
||||
return !messageSender.send(!Permission.SUPERVISOR.hasPermission(player), "NO_PERMISSION");
|
||||
}
|
||||
return !messageSender.send(!bauServer.getOwner().equals(player.getUniqueId()), "NO_PERMISSION");
|
||||
};
|
||||
}
|
||||
|
||||
@@ -60,7 +60,6 @@ public class FireListener implements Listener, ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.FIRE).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FIRE).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
|
||||
@@ -249,7 +249,6 @@ public class FreezeListener implements Listener, ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.FREEZE).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
|
||||
@@ -52,7 +52,6 @@ public class ItemsListener implements Listener, ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.ITEMS).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
|
||||
-1
@@ -54,7 +54,6 @@ public class NoGravityListener implements Listener, ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.NO_GRAVITY).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
|
||||
-1
@@ -70,7 +70,6 @@ public class ProtectListener implements Listener, ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.PROTECT).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
|
||||
+10
-15
@@ -30,7 +30,6 @@ import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.features.util.SelectCommand;
|
||||
import de.steamwar.bausystem.region.Point;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.bausystem.region.RegionHistory;
|
||||
import de.steamwar.bausystem.region.RegionUtils;
|
||||
import de.steamwar.bausystem.region.flags.Flag;
|
||||
import de.steamwar.bausystem.shared.Pair;
|
||||
@@ -72,10 +71,7 @@ public class RegionCommand extends SWCommand {
|
||||
@Register(value = "undo", description = "REGION_REGION_HELP_UNDO")
|
||||
public void undoCommand(@Validator Player p) {
|
||||
Region region = Region.getRegion(p.getLocation());
|
||||
if (region.getHistory() == RegionHistory.EMPTY) {
|
||||
BauSystem.MESSAGE.send("REGION_REGION_NO_REGION", p);
|
||||
return;
|
||||
}
|
||||
if (checkGlobalRegion(region, p)) return;
|
||||
|
||||
if (region.getHistory().undo()) {
|
||||
RegionUtils.message(region, "REGION_REGION_UNDID");
|
||||
@@ -87,8 +83,7 @@ public class RegionCommand extends SWCommand {
|
||||
@Register(value = "redo", description = "REGION_REGION_HELP_REDO")
|
||||
public void redoCommand(@Validator Player p) {
|
||||
Region region = Region.getRegion(p.getLocation());
|
||||
if (region.getHistory() == RegionHistory.EMPTY) {
|
||||
BauSystem.MESSAGE.send("REGION_REGION_NO_REGION", p);
|
||||
if (checkGlobalRegion(region, p)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -105,7 +100,7 @@ public class RegionCommand extends SWCommand {
|
||||
if (checkGlobalRegion(region, p)) return;
|
||||
|
||||
try {
|
||||
PasteBuilder pasteBuilder = new PasteBuilder()
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
|
||||
.ignoreAir(true)
|
||||
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||
region.getArea().reset(pasteBuilder, false);
|
||||
@@ -127,7 +122,7 @@ public class RegionCommand extends SWCommand {
|
||||
}
|
||||
|
||||
try {
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(PasteBuilder.ClipboardProvider.schematic(node))
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
|
||||
.ignoreAir(true)
|
||||
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||
region.getArea().reset(pasteBuilder, false);
|
||||
@@ -148,7 +143,7 @@ public class RegionCommand extends SWCommand {
|
||||
BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
|
||||
return;
|
||||
}
|
||||
p.teleport(region.getBuildArea().getCopyPoint(false).toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
|
||||
p.teleport(region.getBuildArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
|
||||
BauSystem.MESSAGE.send("REGION_REGION_TP_COPY", p);
|
||||
}
|
||||
|
||||
@@ -163,7 +158,7 @@ public class RegionCommand extends SWCommand {
|
||||
BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
|
||||
return;
|
||||
}
|
||||
p.teleport(region.getTestblockArea().getCopyPoint(false).toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
|
||||
p.teleport(region.getTestblockArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
|
||||
BauSystem.MESSAGE.send("REGION_REGION_TP_TEST_BLOCK", p);
|
||||
}
|
||||
|
||||
@@ -196,7 +191,7 @@ public class RegionCommand extends SWCommand {
|
||||
break;
|
||||
}
|
||||
|
||||
Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getBuildArea().getCopyPoint(false));
|
||||
Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getBuildArea().getCopyPoint());
|
||||
WorldEdit.getInstance()
|
||||
.getSessionManager()
|
||||
.get(BukkitAdapter.adapt(p))
|
||||
@@ -241,13 +236,13 @@ public class RegionCommand extends SWCommand {
|
||||
}
|
||||
|
||||
try (EditSession e = WorldEditUtils.getEditSession(p)) {
|
||||
Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.getBuildArea().getCopyPoint(false))).build());
|
||||
Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.getBuildArea().getCopyPoint())).build());
|
||||
WorldEditUtils.addToPlayer(p, e);
|
||||
|
||||
if (selectPasted) {
|
||||
Clipboard clipboard = clipboardHolder.getClipboards().get(0);
|
||||
BlockVector3 minPointSelection = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint(false)));
|
||||
BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint(false)));
|
||||
BlockVector3 minPointSelection = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint()));
|
||||
BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint()));
|
||||
FlatteningWrapper.impl.setSelection(p, Point.fromBlockVector3(minPointSelection), Point.fromBlockVector3(maxPointSelection));
|
||||
}
|
||||
BauSystem.MESSAGE.send("REGION_REGION_PASTE_DONE", p);
|
||||
|
||||
+33
-1
@@ -29,6 +29,9 @@ import de.steamwar.bausystem.utils.PasteBuilder;
|
||||
import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import de.steamwar.linkage.LinkedInstance;
|
||||
import de.steamwar.sql.Punishment;
|
||||
import de.steamwar.sql.SchematicNode;
|
||||
import de.steamwar.sql.SteamwarUser;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
@@ -49,7 +52,7 @@ public class ResetCommand extends SWCommand {
|
||||
Region region = regionCheck(p);
|
||||
if (region == null) return;
|
||||
try {
|
||||
PasteBuilder pasteBuilder = new PasteBuilder()
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
|
||||
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||
region.getArea().reset(pasteBuilder, false);
|
||||
region.getRegionData().clear();
|
||||
@@ -60,6 +63,35 @@ public class ResetCommand extends SWCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Register(description = "REGION_RESET_HELP_SCHEMATIC")
|
||||
public void schematicResetCommand(@Validator Player p, SchematicNode node) {
|
||||
Region region = regionCheck(p);
|
||||
if (region == null) return;
|
||||
|
||||
if (bauServer.hasOwner() && !p.getUniqueId().equals(bauServer.getOwner())) {
|
||||
if (Punishment.isPunished(SteamwarUser.get(bauServer.getOwner()), Punishment.PunishmentType.NoSchemReceiving, punishment -> BauSystem.MESSAGE.send("REGION_TB_NO_SCHEMRECEIVING", p, punishment.getEndTime()))) {
|
||||
return;
|
||||
}
|
||||
if (Punishment.isPunished(SteamwarUser.get(p.getUniqueId()), Punishment.PunishmentType.NoSchemSharing, punishment -> BauSystem.MESSAGE.send("REGION_TB_NO_SCHEMSHARING", p, punishment.getEndTime()))) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (node.isDir()) {
|
||||
BauSystem.MESSAGE.send("ONLY_SCHEMS", p);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
|
||||
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||
region.getArea().reset(pasteBuilder, true);
|
||||
RegionUtils.message(region, "REGION_RESET_RESETED");
|
||||
} catch (SecurityException e) {
|
||||
BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
|
||||
Bukkit.getLogger().log(Level.WARNING, "Failed reset", e);
|
||||
}
|
||||
}
|
||||
|
||||
private Region regionCheck(Player player) {
|
||||
Region region = Region.getRegion(player.getLocation());
|
||||
if (region == RegionSystem.INSTANCE.getGlobalRegion()) {
|
||||
|
||||
@@ -82,7 +82,6 @@ public class TNTListener implements Listener, ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.TNT).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.TNT).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
|
||||
+15
-21
@@ -21,11 +21,9 @@ package de.steamwar.bausystem.features.region;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.config.BauServer;
|
||||
import de.steamwar.bausystem.region.Point;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.bausystem.region.RegionUtils;
|
||||
import de.steamwar.bausystem.region.flags.Flag;
|
||||
import de.steamwar.bausystem.region.flags.TestblockMode;
|
||||
import de.steamwar.bausystem.region.utils.RegionExtensionType;
|
||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
||||
import de.steamwar.command.PreviousArguments;
|
||||
@@ -57,12 +55,12 @@ public class TestblockCommand extends SWCommand {
|
||||
super("testblock", "tb", "dummy");
|
||||
}
|
||||
|
||||
@Register(description = {"REGION_TB_HELP_RESET", "REGION_TB_HELP_RESET_EXTENSION"})
|
||||
@Register
|
||||
public void schematicTestblockCommand(@Validator Player p, TestblockParameterType... testblockParameterTypes) {
|
||||
schematicTestblockCommand(p, null, testblockParameterTypes);
|
||||
}
|
||||
|
||||
@Register(description = {"REGION_TB_HELP_SCHEMATIC", "REGION_TB_HELP_SCHEMATIC_EXTENSION"})
|
||||
@Register
|
||||
public void schematicTestblockCommand(@Validator Player p, @Mapper("withPublic") SchematicNode node, TestblockParameterType... testblockParameterTypes) {
|
||||
Set<TestblockParameterType> testblockParameterTypesSet = new HashSet<>(Arrays.asList(testblockParameterTypes));
|
||||
boolean isExtension = testblockParameterTypesSet.contains(TestblockParameterType.EXTENSION);
|
||||
@@ -93,7 +91,7 @@ public class TestblockCommand extends SWCommand {
|
||||
}
|
||||
}
|
||||
|
||||
if (!p.getUniqueId().equals(bauServer.getOwner())) {
|
||||
if (bauServer.hasOwner() && !p.getUniqueId().equals(bauServer.getOwner())) {
|
||||
if (Punishment.isPunished(SteamwarUser.get(bauServer.getOwner()), Punishment.PunishmentType.NoSchemReceiving, punishment -> BauSystem.MESSAGE.send("REGION_TB_NO_SCHEMRECEIVING", p, punishment.getEndTime()))) {
|
||||
return;
|
||||
}
|
||||
@@ -108,7 +106,13 @@ public class TestblockCommand extends SWCommand {
|
||||
region.getRegionData().setTestblockSchematic(node);
|
||||
}
|
||||
|
||||
PasteBuilder.ClipboardProvider clipboardProvider = node == null ? PasteBuilder.ClipboardProvider.EMPTY : PasteBuilder.ClipboardProvider.schematic(node);
|
||||
PasteBuilder.ClipboardProvider clipboardProvider;
|
||||
if (node == null) {
|
||||
clipboardProvider = new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile());
|
||||
} else {
|
||||
clipboardProvider = new PasteBuilder.SchematicProvider(node);
|
||||
}
|
||||
|
||||
try {
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
|
||||
.ignoreAir(ignoreAir)
|
||||
@@ -169,17 +173,6 @@ public class TestblockCommand extends SWCommand {
|
||||
|
||||
private Region regionCheck(Player player) {
|
||||
Region region = Region.getRegion(player.getLocation());
|
||||
if (region.getRegionData().has(Flag.TESTBLOCK).isWritable() && region.getRegionData().get(Flag.TESTBLOCK).isWithDefault(TestblockMode.NO_VALUE)) {
|
||||
Point minPoint = region.getArea().getMinPoint(false);
|
||||
Point maxPoint = region.getArea().getMaxPoint(false);
|
||||
// TODO: Check if empty!
|
||||
int half = minPoint.getZ() + (maxPoint.getZ() - minPoint.getZ()) / 2;
|
||||
if (player.getLocation().getBlockZ() <= half) {
|
||||
region.getRegionData().set(Flag.TESTBLOCK, TestblockMode.SOUTH);
|
||||
} else {
|
||||
region.getRegionData().set(Flag.TESTBLOCK, TestblockMode.NORTH);
|
||||
}
|
||||
}
|
||||
if (region.getTestblockArea().isEmpty()) {
|
||||
BauSystem.MESSAGE.send("REGION_TB_NO_REGION", player);
|
||||
return null;
|
||||
@@ -192,16 +185,17 @@ public class TestblockCommand extends SWCommand {
|
||||
return new TypeMapper<SchematicNode>() {
|
||||
@Override
|
||||
public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
|
||||
List<String> stringList = new ArrayList<>();
|
||||
List<String> stringList = new ArrayList<>(SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s));
|
||||
stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.byId(0), s));
|
||||
stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s));
|
||||
return stringList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SchematicNode map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
|
||||
SchematicNode node = SchematicNode.getNodeFromPath(SteamwarUser.byId(0), s);
|
||||
if (node == null) node = SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
|
||||
SchematicNode node = SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
|
||||
if (node == null) {
|
||||
node = SchematicNode.getNodeFromPath(SteamwarUser.byId(0), s);
|
||||
}
|
||||
return node;
|
||||
}
|
||||
};
|
||||
|
||||
-49
@@ -1,49 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.features.region;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.bausystem.region.flags.Flag;
|
||||
import de.steamwar.bausystem.region.flags.TestblockMode;
|
||||
import de.steamwar.bausystem.utils.ScoreboardElement;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
@Linked
|
||||
public class TestblockScoreboardElement implements ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public ScoreboardGroup getGroup() {
|
||||
return ScoreboardGroup.REGION;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int order() {
|
||||
return 6;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.TESTBLOCK).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.TESTBLOCK).is(TestblockMode.NO_VALUE)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.TESTBLOCK.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.TESTBLOCK).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
}
|
||||
-1
@@ -53,7 +53,6 @@ public class WaterDestroyListener implements Listener, ScoreboardElement {
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (region.getRegionData().has(Flag.WATER_DESTROY).notVisibleInScoreboard()) return null;
|
||||
if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.ALLOW)) return null;
|
||||
return "§e" + BauSystem.MESSAGE.parse(Flag.WATER_DESTROY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.WATER_DESTROY).getWithDefault().getChatValue(), p);
|
||||
}
|
||||
|
||||
+10
-2
@@ -50,8 +50,16 @@ public class ResetBauGuiItem extends BauGuiItem {
|
||||
|
||||
@Override
|
||||
public boolean click(ClickType click, Player p) {
|
||||
p.closeInventory();
|
||||
resetCommand.genericResetCommand(p);
|
||||
if (click == ClickType.LEFT) {
|
||||
p.closeInventory();
|
||||
resetCommand.genericResetCommand(p);
|
||||
} else {
|
||||
SchematicSelector selector = new SchematicSelector(p, SchematicSelector.selectSchematic(), node -> {
|
||||
p.closeInventory();
|
||||
resetCommand.schematicResetCommand(p, node);
|
||||
});
|
||||
selector.open();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -79,12 +79,12 @@ public class RegionLib implements LuaLib {
|
||||
Loader loader = Loader.getLoader(player);
|
||||
table.set("loader", getter(() -> loader == null ? "OFF" : loader.getStage().name()));
|
||||
|
||||
table.set("copyPoint", getter(() -> toPos(region.get().getBuildArea().getCopyPoint(false))));
|
||||
table.set("copyPoint", getter(() -> toPos(region.get().getBuildArea().getCopyPoint())));
|
||||
table.set("minPointBuild", 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("maxPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
|
||||
table.set("testblockPoint", getter(() -> toPos(region.get().getTestblockArea().getCopyPoint(false))));
|
||||
table.set("testblockPoint", getter(() -> toPos(region.get().getTestblockArea().getCopyPoint())));
|
||||
table.set("minPointTestblock", 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))));
|
||||
|
||||
+239
-135
@@ -19,7 +19,7 @@
|
||||
|
||||
package de.steamwar.bausystem.features.simulator;
|
||||
|
||||
import com.destroystokyo.paper.event.server.ServerTickEndEvent;
|
||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.Permission;
|
||||
import de.steamwar.bausystem.SWUtils;
|
||||
@@ -38,88 +38,77 @@ import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
|
||||
import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
|
||||
import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
|
||||
import de.steamwar.bausystem.utils.ItemUtils;
|
||||
import de.steamwar.core.SWPlayer;
|
||||
import de.steamwar.cursor.Cursor;
|
||||
import de.steamwar.bausystem.utils.RayTraceUtils;
|
||||
import de.steamwar.entity.REntity;
|
||||
import de.steamwar.entity.REntityServer;
|
||||
import de.steamwar.entity.RFallingBlockEntity;
|
||||
import de.steamwar.inventory.SWAnvilInv;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.inventory.InventoryDragEvent;
|
||||
import org.bukkit.event.player.*;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Linked
|
||||
public class SimulatorCursor implements Listener {
|
||||
|
||||
private static final Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
|
||||
private static final Map<Player, REntityServer> emptyTargetServers = Collections.synchronizedMap(new HashMap<>());
|
||||
private static final World WORLD = Bukkit.getWorlds().get(0);
|
||||
|
||||
private static Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
|
||||
private static Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
|
||||
private static final Set<Player> calculating = new HashSet<>();
|
||||
|
||||
public static boolean isSimulatorItem(ItemStack itemStack) {
|
||||
return ItemUtils.isItem(itemStack, "simulator");
|
||||
}
|
||||
|
||||
private static boolean hasSimulatorItem(Player player) {
|
||||
return isSimulatorItem(player.getInventory().getItemInMainHand()) || isSimulatorItem(player.getInventory().getItemInOffHand());
|
||||
}
|
||||
|
||||
private static Set<Player> scheduledUpdates = new HashSet<>();
|
||||
|
||||
private static void scheduleCursorUpdate(Player player) {
|
||||
scheduledUpdates.add(player);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onServerTickEnd(ServerTickEndEvent event) {
|
||||
scheduledUpdates.forEach(SimulatorCursor::calcCursor);
|
||||
scheduledUpdates.clear();
|
||||
public SimulatorCursor() {
|
||||
BiFunction<Player, ServerboundMovePlayerPacket, Object> function = (player, object) -> {
|
||||
calcCursor(player);
|
||||
return object;
|
||||
};
|
||||
TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, function);
|
||||
TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Rot.class, function);
|
||||
TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, function);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
|
||||
scheduleCursorUpdate(event.getPlayer());
|
||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
||||
calcCursor(event.getPlayer());
|
||||
}, 0);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerDropItem(PlayerDropItemEvent event) {
|
||||
if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
|
||||
scheduleCursorUpdate(event.getPlayer());
|
||||
calcCursor(event.getPlayer());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerItemHeld(PlayerItemHeldEvent event) {
|
||||
if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
|
||||
scheduleCursorUpdate(event.getPlayer());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onInventoryClick(InventoryClickEvent event) {
|
||||
if (!(event.getWhoClicked() instanceof Player player)) return;
|
||||
if (!Permission.BUILD.hasPermission(player)) return;
|
||||
scheduleCursorUpdate(player);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onInventoryDrag(InventoryDragEvent event) {
|
||||
if (!(event.getWhoClicked() instanceof Player player)) return;
|
||||
if (!Permission.BUILD.hasPermission(player)) return;
|
||||
scheduleCursorUpdate(player);
|
||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
||||
calcCursor(event.getPlayer());
|
||||
}, 1);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
@@ -130,8 +119,10 @@ public class SimulatorCursor implements Listener {
|
||||
@EventHandler
|
||||
public void onPlayerQuit(PlayerQuitEvent event) {
|
||||
cursorType.remove(event.getPlayer());
|
||||
removeCursor(event.getPlayer());
|
||||
scheduledUpdates.remove(event.getPlayer());
|
||||
cursors.remove(event.getPlayer());
|
||||
synchronized (calculating) {
|
||||
calculating.remove(event.getPlayer());
|
||||
}
|
||||
}
|
||||
|
||||
private static final Map<Player, Long> LAST_SNEAKS = new HashMap<>();
|
||||
@@ -147,7 +138,7 @@ public class SimulatorCursor implements Listener {
|
||||
public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
|
||||
if (!event.isSneaking()) return;
|
||||
Player player = event.getPlayer();
|
||||
if (!hasSimulatorItem(player)) {
|
||||
if (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand())) {
|
||||
return;
|
||||
}
|
||||
if (LAST_SNEAKS.containsKey(player)) {
|
||||
@@ -173,10 +164,17 @@ public class SimulatorCursor implements Listener {
|
||||
}
|
||||
|
||||
public static void calcCursor(Player player) {
|
||||
if (!Permission.BUILD.hasPermission(player) || !hasSimulatorItem(player)) {
|
||||
if (removeCursor(player) | SimulatorWatcher.show(null, player)) {
|
||||
synchronized (calculating) {
|
||||
if (calculating.contains(player)) return;
|
||||
calculating.add(player);
|
||||
}
|
||||
if (!Permission.BUILD.hasPermission(player) || (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand()))) {
|
||||
if (removeCursor(player) || SimulatorWatcher.show(null, player)) {
|
||||
SWUtils.sendToActionbar(player, "");
|
||||
}
|
||||
synchronized (calculating) {
|
||||
calculating.remove(player);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -185,98 +183,203 @@ public class SimulatorCursor implements Listener {
|
||||
removeCursor(player);
|
||||
SimulatorWatcher.show(null, player);
|
||||
SWUtils.sendToActionbar(player, "§cGenerating Stab");
|
||||
synchronized (calculating) {
|
||||
calculating.remove(player);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
SimulatorWatcher.show(simulator, player);
|
||||
Cursor cursor = getOrCreateCursor(player, simulator, cursorType.getOrDefault(player, CursorType.TNT));
|
||||
cursor.renderDeduplicated();
|
||||
}
|
||||
|
||||
private static Cursor getOrCreateCursor(Player player, Simulator simulator, CursorType type) {
|
||||
REntityServer targetServer = simulator == null ? emptyTargetServers.computeIfAbsent(player, __ -> new REntityServer()) : SimulatorWatcher.getEntityServerOfSimulator(simulator);
|
||||
SWPlayer swPlayer = SWPlayer.of(player);
|
||||
Optional<Cursor> activeCursor = swPlayer.getComponent(Cursor.class);
|
||||
|
||||
Cursor cursor = activeCursor.orElse(null);
|
||||
if (cursor == null || cursor.getTargetServer() != targetServer) {
|
||||
swPlayer.removeComponent(Cursor.class);
|
||||
cursor = new Cursor(
|
||||
targetServer,
|
||||
player,
|
||||
Material.GLASS,
|
||||
type.material,
|
||||
type.cursorModes,
|
||||
(location, hitEntity, action) -> handlePlayerClick(player, location, hitEntity, action),
|
||||
(location, hitEntity) -> sendCursorActionbar(player, SimulatorStorage.getSimulator(player), location != null, hitEntity.isPresent())
|
||||
);
|
||||
} else {
|
||||
cursor.setCursorMaterial(type.material);
|
||||
cursor.setAllowedCursorModes(type.cursorModes);
|
||||
List<REntity> entities = SimulatorWatcher.getEntitiesOfSimulator(simulator);
|
||||
RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), entities);
|
||||
if (rayTraceResult == null) {
|
||||
removeCursor(player);
|
||||
if (simulator == null) {
|
||||
SWUtils.sendToActionbar(player, "§eSelect Simulator");
|
||||
} else {
|
||||
SWUtils.sendToActionbar(player, "§eOpen Simulator");
|
||||
}
|
||||
synchronized (calculating) {
|
||||
calculating.remove(player);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
return cursor;
|
||||
showCursor(player, rayTraceResult, simulator != null);
|
||||
synchronized (calculating) {
|
||||
calculating.remove(player);
|
||||
}
|
||||
}
|
||||
|
||||
private static synchronized boolean removeCursor(Player player) {
|
||||
Optional<Cursor> cursor = SWPlayer.of(player).getComponent(Cursor.class);
|
||||
cursor.ifPresent(__ -> SWPlayer.of(player).removeComponent(Cursor.class));
|
||||
REntityServer emptyTargetServer = emptyTargetServers.remove(player);
|
||||
if (emptyTargetServer != null) {
|
||||
emptyTargetServer.close();
|
||||
REntityServer entityServer = cursors.get(player);
|
||||
boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
|
||||
if (entityServer != null) {
|
||||
entityServer.getEntities().forEach(REntity::die);
|
||||
}
|
||||
return cursor.isPresent();
|
||||
return hadCursor;
|
||||
}
|
||||
|
||||
private static void sendCursorActionbar(Player player, Simulator simulator, boolean hasCursorLocation, boolean hasHitEntity) {
|
||||
if (!hasCursorLocation) {
|
||||
SWUtils.sendToActionbar(player, simulator == null ? "§eSelect Simulator" : "§eOpen Simulator");
|
||||
} else if (simulator == null) {
|
||||
SWUtils.sendToActionbar(player, "§eCreate new Simulator");
|
||||
} else if (hasHitEntity) {
|
||||
SWUtils.sendToActionbar(player, "§eEdit Position");
|
||||
} else {
|
||||
SWUtils.sendToActionbar(player, "§eAdd new " + cursorType.getOrDefault(player, CursorType.TNT).name);
|
||||
private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
|
||||
REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
|
||||
REntityServer rEntityServer = new REntityServer();
|
||||
rEntityServer.addPlayer(player);
|
||||
return rEntityServer;
|
||||
});
|
||||
|
||||
CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
|
||||
REntity hitEntity = rayTraceResult.getHitEntity();
|
||||
Location location = hitEntity != null ? new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()).toLocation(WORLD) :
|
||||
type.position.apply(player, rayTraceResult).toLocation(WORLD);
|
||||
|
||||
Material material = hitEntity != null ? Material.GLASS : type.getMaterial();
|
||||
List<RFallingBlockEntity> entities = entityServer.getEntitiesByType(RFallingBlockEntity.class);
|
||||
entities.removeIf(rFallingBlockEntity -> {
|
||||
if (rFallingBlockEntity.getMaterial() != material) {
|
||||
rFallingBlockEntity.die();
|
||||
return true;
|
||||
}
|
||||
rFallingBlockEntity.move(location);
|
||||
return false;
|
||||
});
|
||||
if (entities.isEmpty()) {
|
||||
RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(entityServer, location, material);
|
||||
rFallingBlockEntity.setNoGravity(true);
|
||||
if (material == Material.GLASS) {
|
||||
rFallingBlockEntity.setGlowing(true);
|
||||
}
|
||||
}
|
||||
|
||||
if (hasSimulatorSelected) {
|
||||
if (hitEntity != null) {
|
||||
SWUtils.sendToActionbar(player, "§eEdit Position");
|
||||
} else {
|
||||
SWUtils.sendToActionbar(player, "§eAdd new " + type.name);
|
||||
}
|
||||
} else {
|
||||
SWUtils.sendToActionbar(player, "§eCreate new Simulator");
|
||||
}
|
||||
}
|
||||
|
||||
public static Vector getPosFree(Player player, RayTraceUtils.RRayTraceResult result) {
|
||||
Vector pos = result.getHitPosition();
|
||||
|
||||
BlockFace face = result.getHitBlockFace();
|
||||
if (face != null) {
|
||||
switch (face) {
|
||||
case DOWN:
|
||||
pos.setY(pos.getY() - 0.98);
|
||||
break;
|
||||
case EAST:
|
||||
pos.setX(pos.getX() + 0.49);
|
||||
break;
|
||||
case WEST:
|
||||
pos.setX(pos.getX() - 0.49);
|
||||
break;
|
||||
case NORTH:
|
||||
pos.setZ(pos.getZ() - 0.49);
|
||||
break;
|
||||
case SOUTH:
|
||||
pos.setZ(pos.getZ() + 0.49);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (face.getModY() == 0 && player.isSneaking()) {
|
||||
pos.setY(pos.getY() - 0.49);
|
||||
}
|
||||
}
|
||||
|
||||
if (!player.isSneaking()) {
|
||||
pos.setX(pos.getBlockX() + 0.5);
|
||||
if (face == null || face.getModY() == 0) {
|
||||
pos.setY(pos.getBlockY() + 0.0);
|
||||
}
|
||||
pos.setZ(pos.getBlockZ() + 0.5);
|
||||
}
|
||||
|
||||
return pos;
|
||||
}
|
||||
|
||||
private static Vector getPosBlockAligned(Player player, RayTraceUtils.RRayTraceResult result) {
|
||||
Vector pos = result.getHitPosition();
|
||||
|
||||
BlockFace face = result.getHitBlockFace();
|
||||
if (face != null) {
|
||||
switch (face) {
|
||||
case DOWN:
|
||||
pos.setY(pos.getY() - 0.98);
|
||||
break;
|
||||
case EAST:
|
||||
pos.setX(pos.getX() + 0.49);
|
||||
break;
|
||||
case WEST:
|
||||
pos.setX(pos.getX() - 0.49);
|
||||
break;
|
||||
case NORTH:
|
||||
pos.setZ(pos.getZ() - 0.49);
|
||||
break;
|
||||
case SOUTH:
|
||||
pos.setZ(pos.getZ() + 0.49);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
pos.setX(pos.getBlockX() + 0.5);
|
||||
if (pos.getY() - pos.getBlockY() != 0 && face == BlockFace.UP) {
|
||||
pos.setY(pos.getBlockY() + 1.0);
|
||||
} else {
|
||||
pos.setY(pos.getBlockY());
|
||||
}
|
||||
pos.setZ(pos.getBlockZ() + 0.5);
|
||||
return pos;
|
||||
}
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum CursorType {
|
||||
TNT(Material.TNT, Material.GUNPOWDER, List.of(Cursor.CursorMode.FREE, Cursor.CursorMode.SURFACE_ALIGNED), "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
|
||||
REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
|
||||
OBSERVER(Material.OBSERVER, Material.QUARTZ, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
|
||||
TNT(Material.TNT, Material.GUNPOWDER, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
|
||||
REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
|
||||
OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
|
||||
;
|
||||
|
||||
public final Material material;
|
||||
public final Material nonSelectedMaterial;
|
||||
public final List<Cursor.CursorMode> cursorModes;
|
||||
public final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
|
||||
public final String name;
|
||||
public final Function<Vector, SimulatorElement<?>> elementFunction;
|
||||
}
|
||||
|
||||
private static void handlePlayerClick(Player player, Location cursorLocation, Optional<REntity> hitEntity, Action action) {
|
||||
if (!Permission.BUILD.hasPermission(player)) return;
|
||||
if (!hasSimulatorItem(player)) {
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
|
||||
if (!ItemUtils.isItem(event.getItem(), "simulator")) {
|
||||
return;
|
||||
}
|
||||
|
||||
event.setCancelled(true);
|
||||
Player player = event.getPlayer();
|
||||
Simulator simulator = SimulatorStorage.getSimulator(player);
|
||||
|
||||
if (action == Action.LEFT_CLICK_BLOCK || action == Action.LEFT_CLICK_AIR) {
|
||||
if (event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_AIR) {
|
||||
if (simulator == null) {
|
||||
return;
|
||||
}
|
||||
SimulatorExecutor.run(player, simulator, null);
|
||||
SimulatorExecutor.run(event.getPlayer(), simulator, null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) {
|
||||
if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), SimulatorWatcher.getEntitiesOfSimulator(simulator));
|
||||
if (simulator == null) {
|
||||
if (cursorLocation == null) {
|
||||
if (rayTraceResult == null) {
|
||||
SimulatorStorage.openSimulatorSelector(player);
|
||||
} else {
|
||||
SWAnvilInv anvilInv = new SWAnvilInv(player, "Name");
|
||||
@@ -292,7 +395,7 @@ public class SimulatorCursor implements Listener {
|
||||
}
|
||||
sim = new Simulator(s);
|
||||
SimulatorStorage.addSimulator(s, sim);
|
||||
createElement(player, cursorLocation, sim);
|
||||
createElement(player, rayTraceResult, sim);
|
||||
SimulatorStorage.setSimulator(player, sim);
|
||||
});
|
||||
anvilInv.open();
|
||||
@@ -300,56 +403,57 @@ public class SimulatorCursor implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
if (cursorLocation == null) {
|
||||
if (rayTraceResult == null) {
|
||||
new SimulatorGui(player, simulator).open();
|
||||
return;
|
||||
}
|
||||
|
||||
if (hitEntity.isPresent()) {
|
||||
openElement(player, simulator, hitEntity.get());
|
||||
if (rayTraceResult.getHitEntity() != null) {
|
||||
REntity hitEntity = rayTraceResult.getHitEntity();
|
||||
Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
|
||||
List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
|
||||
return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
switch (elements.size()) {
|
||||
case 0:
|
||||
return;
|
||||
case 1:
|
||||
// Open single element present in Simulator
|
||||
SimulatorElement<?> element = elements.get(0);
|
||||
SimulatorGroup group1 = element.getGroup(simulator);
|
||||
SimulatorBaseGui back = new SimulatorGui(player, simulator);
|
||||
if (group1.getElements().size() > 1) {
|
||||
back = new SimulatorGroupGui(player, simulator, group1, back);
|
||||
}
|
||||
element.open(player, simulator, group1, back);
|
||||
break;
|
||||
default:
|
||||
List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
|
||||
if (parents.size() == 1) {
|
||||
// Open multi element present in Simulator in existing group
|
||||
SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
|
||||
new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
|
||||
} else {
|
||||
// Open multi element present in Simulator in implicit group
|
||||
SimulatorGroup group2 = new SimulatorGroup();
|
||||
group2.setMaterial(null);
|
||||
group2.getElements().addAll(elements);
|
||||
SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
|
||||
new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
|
||||
}
|
||||
break;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
createElement(player, cursorLocation, simulator);
|
||||
// Add new Element to current simulator
|
||||
createElement(player, rayTraceResult, simulator);
|
||||
}
|
||||
|
||||
private static void openElement(Player player, Simulator simulator, REntity hitEntity) {
|
||||
Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
|
||||
List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
|
||||
return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
switch (elements.size()) {
|
||||
case 0:
|
||||
return;
|
||||
case 1:
|
||||
SimulatorElement<?> element = elements.get(0);
|
||||
SimulatorGroup group1 = element.getGroup(simulator);
|
||||
SimulatorBaseGui back = new SimulatorGui(player, simulator);
|
||||
if (group1.getElements().size() > 1) {
|
||||
back = new SimulatorGroupGui(player, simulator, group1, back);
|
||||
}
|
||||
element.open(player, simulator, group1, back);
|
||||
break;
|
||||
default:
|
||||
List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
|
||||
if (parents.size() == 1) {
|
||||
SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
|
||||
new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
|
||||
} else {
|
||||
SimulatorGroup group2 = new SimulatorGroup();
|
||||
group2.setMaterial(null);
|
||||
group2.getElements().addAll(elements);
|
||||
SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
|
||||
new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private static void createElement(Player player, Location cursorLocation, Simulator simulator) {
|
||||
private void createElement(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, Simulator simulator) {
|
||||
CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
|
||||
Vector vector = cursorLocation.toVector();
|
||||
Vector vector = type.position.apply(player, rayTraceResult);
|
||||
if (type == CursorType.REDSTONE_BLOCK) {
|
||||
vector.subtract(new Vector(0.5, 0, 0.5));
|
||||
}
|
||||
|
||||
-7
@@ -124,11 +124,4 @@ public class SimulatorWatcher {
|
||||
}
|
||||
return entityServer.getEntities();
|
||||
}
|
||||
|
||||
synchronized REntityServer getEntityServerOfSimulator(Simulator simulator) {
|
||||
if (simulator == null) {
|
||||
return null;
|
||||
}
|
||||
return entityServers.computeIfAbsent(simulator, __ -> createSim(new REntityServer(), simulator));
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ public class StabFinalizer extends StabStep {
|
||||
@Override
|
||||
protected void start() {
|
||||
try {
|
||||
PasteBuilder.ClipboardProvider clipboardProvider = PasteBuilder.ClipboardProvider.clipboard(data.clipboard);
|
||||
PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
|
||||
if (data.region.getRegionData().has(Flag.COLOR).isReadable()) {
|
||||
pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ public class StabGenerator extends StabStep implements Listener {
|
||||
@Override
|
||||
protected void start() {
|
||||
try {
|
||||
PasteBuilder.ClipboardProvider clipboardProvider = PasteBuilder.ClipboardProvider.clipboard(data.clipboard);
|
||||
PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
|
||||
PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
|
||||
if (data.region.getRegionData().has(Flag.COLOR).isReadable()) {
|
||||
pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ public class StabSetup extends StabStep {
|
||||
if (TraceRecorder.instance.isAutoTraceEnabledInRegion(data.region)) {
|
||||
TraceRecorder.instance.removeAutoTraceRegion(data.region);
|
||||
}
|
||||
data.clipboard = FlatteningWrapper.impl.copy(data.region.getTestblockArea().getMinPoint(true), data.region.getTestblockArea().getMaxPoint(true), data.region.getTestblockArea().getCopyPoint(false));
|
||||
data.clipboard = FlatteningWrapper.impl.copy(data.region.getTestblockArea().getMinPoint(true), data.region.getTestblockArea().getMaxPoint(true), data.region.getTestblockArea().getCopyPoint());
|
||||
|
||||
new StabDirection(data);
|
||||
}
|
||||
|
||||
-72
@@ -1,72 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.features.slaves.blastresistance;
|
||||
|
||||
import com.google.common.util.concurrent.AtomicDouble;
|
||||
import com.sk89q.worldedit.LocalSession;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
@Linked
|
||||
public class BlastResistanceCommand extends SWCommand {
|
||||
|
||||
public BlastResistanceCommand() {
|
||||
super("blastresistance");
|
||||
}
|
||||
|
||||
@Register(description = "BLASTRESISTANCE_HELP")
|
||||
public void command(@Validator Player player) {
|
||||
LocalSession localSession = WorldEdit.getInstance().getSessionManager().get(BukkitAdapter.adapt(player));
|
||||
Clipboard clipboard;
|
||||
try {
|
||||
clipboard = localSession.getClipboard().getClipboards().getFirst();
|
||||
} catch (WorldEditException e) {
|
||||
BauSystem.MESSAGE.send("BLASTRESISTANCE_NO_CLIPBOARD", player);
|
||||
return;
|
||||
}
|
||||
|
||||
AtomicDouble min = new AtomicDouble(0);
|
||||
AtomicDouble max = new AtomicDouble(0);
|
||||
AtomicDouble sum = new AtomicDouble(0);
|
||||
AtomicInteger count = new AtomicInteger(0);
|
||||
clipboard.forEach(blockVector3 -> {
|
||||
BlockState blockState = clipboard.getBlock(blockVector3);
|
||||
Material material = BukkitAdapter.adapt(blockState).getMaterial();
|
||||
if (material == Material.WATER || material == Material.LAVA) return;
|
||||
double blastResistance = BukkitAdapter.adapt(blockState).getMaterial().getBlastResistance();
|
||||
min.set(Math.min(min.get(), blastResistance));
|
||||
max.set(Math.max(max.get(), blastResistance));
|
||||
sum.addAndGet(blastResistance);
|
||||
count.getAndIncrement();
|
||||
});
|
||||
|
||||
BauSystem.MESSAGE.send("BLASTRESISTANCE_RESULT", player, min.get(), max.get(), sum.get() / count.get());
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -31,7 +31,6 @@ import de.steamwar.command.TypeMapper;
|
||||
import de.steamwar.core.CraftbukkitWrapper;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import de.steamwar.linkage.LinkedInstance;
|
||||
import de.steamwar.techhider.legacy.TechHider;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@@ -39,6 +38,7 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
import de.steamwar.techhider.legacy.TechHider;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -165,7 +165,6 @@ public class TPSSystem implements Listener {
|
||||
}
|
||||
|
||||
@Register(value = "default", description = "TPSLIMIT_DEFAULT_HELP")
|
||||
@Register(value = "rate")
|
||||
public void reset(@Validator Player player) {
|
||||
TickManager.impl.setTickRate(20.0F);
|
||||
sendTickRateChange();
|
||||
@@ -188,18 +187,15 @@ public class TPSSystem implements Listener {
|
||||
}
|
||||
|
||||
@Register(value = {"rate", "0"}, description = "TICK_FREEZE_HELP")
|
||||
public void rate(@Validator Player player) {
|
||||
@Register(value = "freeze", description = "TICK_FREEZE_HELP_2")
|
||||
public void freeze(@Validator Player player) {
|
||||
TickManager.impl.setFreeze(true);
|
||||
sendTickRateChange();
|
||||
}
|
||||
|
||||
@Register(value = "freeze", description = "TICK_FREEZE_HELP_2")
|
||||
public void freezeToggle(@Validator Player player) {
|
||||
if (TickManager.impl.isFrozen()) {
|
||||
TickManager.impl.setTickRate(20.0F);
|
||||
} else {
|
||||
TickManager.impl.setFreeze(true);
|
||||
}
|
||||
@Register(value = "unfreeze", description = "TICK_UNFREEZE_HELP")
|
||||
public void unfreeze(@Validator Player player) {
|
||||
TickManager.impl.setTickRate(20.0F);
|
||||
sendTickRateChange();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import de.steamwar.bausystem.features.tracer.rendering.TraceEntity;
|
||||
import de.steamwar.bausystem.features.tracer.rendering.ViewFlag;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.entity.REntity;
|
||||
import de.steamwar.entity.REntityAction;
|
||||
import de.steamwar.entity.REntityServer;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
+1
-5
@@ -153,11 +153,7 @@ public class TraceCommand extends SWCommand {
|
||||
|
||||
@Register(value = "isolate", description = "TRACE_COMMAND_HELP_ISOLATE")
|
||||
public void isolate(@Validator Player player, Trace trace, @ErrorMessage("TRACE_RECORD_ID_INVALID") TNTPoint... records) {
|
||||
if (records.length == 0) {
|
||||
TraceManager.instance.isolate(player, trace, trace.getRecords().toArray(TNTPoint[]::new));
|
||||
} else {
|
||||
TraceManager.instance.isolate(player, trace, records);
|
||||
}
|
||||
TraceManager.instance.isolate(player, records);
|
||||
BauSystem.MESSAGE.send("TRACE_MESSAGE_ISOLATE", player);
|
||||
}
|
||||
|
||||
|
||||
+6
-15
@@ -347,10 +347,9 @@ public class TraceManager implements Listener {
|
||||
* Toggles the isolated render for the given records and player
|
||||
*
|
||||
* @param player the player the trace is shown to
|
||||
* @param ptrace the trace for whitch isolation is toggled
|
||||
* @param records the records of the trace for which isolation is toggled
|
||||
* @param records the record for which isolation is toggled
|
||||
*/
|
||||
public void isolate(Player player, Trace ptrace, TNTPoint... records) {
|
||||
public void isolate(Player player, TNTPoint... records) {
|
||||
unfollow(player);
|
||||
|
||||
Region region = Region.getRegion(player.getLocation());
|
||||
@@ -375,20 +374,12 @@ public class TraceManager implements Listener {
|
||||
isolateFlag.toggleId(record.getTntId());
|
||||
}
|
||||
|
||||
if (isolateFlag.isEmpty() && playerTraceShowData.hasViewFlagOnly(IsolateFlag.class) && records.length != 0) {
|
||||
playerTraceShowData.removeViewFlag(IsolateFlag.class);
|
||||
}
|
||||
|
||||
PlayerTraceShowData finalPlayerTraceShowData = playerTraceShowData;
|
||||
tracesByRegion.getOrDefault(region, Collections.emptyMap()).forEach((integer, trace) -> {
|
||||
if (trace.getUuid() == ptrace.getUuid() || finalPlayerTraceShowData.hasNoViewFlags()) {
|
||||
trace.render(player, finalPlayerTraceShowData);
|
||||
followerMap.getOrDefault(player, Collections.emptySet()).forEach(follower -> {
|
||||
trace.render(follower, finalPlayerTraceShowData);
|
||||
});
|
||||
} else {
|
||||
trace.hide(player);
|
||||
}
|
||||
trace.render(player, finalPlayerTraceShowData);
|
||||
followerMap.getOrDefault(player, Collections.emptySet()).forEach(follower -> {
|
||||
trace.render(follower, finalPlayerTraceShowData);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -135,13 +135,6 @@ public class TraceRecorder implements Listener {
|
||||
Iterator<TNTPrimed> iter = trackedTNT.getOrDefault(region, Collections.emptyList()).iterator();
|
||||
while (iter.hasNext()) {
|
||||
TNTPrimed tnt = iter.next();
|
||||
if (tnt.isDead()) {
|
||||
iter.remove();
|
||||
tntSpawnRegion.remove(tnt);
|
||||
historyMap.remove(tnt);
|
||||
tntSpawnRegion.remove(tnt);
|
||||
continue;
|
||||
}
|
||||
if (tnt.getFuseTicks() == 80) continue;
|
||||
TNTPoint record = record(tnt, wrappedTrace, Collections.emptyList());
|
||||
if (record == null) {
|
||||
|
||||
-4
@@ -95,8 +95,4 @@ public class PlayerTraceShowData {
|
||||
public void addViewFlag(ViewFlag viewFlag) {
|
||||
viewFlags.put(viewFlag.getClass(), viewFlag);
|
||||
}
|
||||
|
||||
public <T extends ViewFlag> void removeViewFlag(Class<T> clazz) {
|
||||
viewFlags.remove(clazz);
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -48,9 +48,9 @@ import static de.steamwar.bausystem.features.util.TNTClickListener.TNT_CLICK_DET
|
||||
*/
|
||||
public class TraceEntity extends RBlockDisplay {
|
||||
|
||||
public static final float TNT_VISUAL_SCALE = 0.98F;
|
||||
public static final float TNT_VISUAL_OFFSET = -TNT_VISUAL_SCALE / 2.0F;
|
||||
public static final Transformation TNT_VISUAL_TRANSFORM = new Transformation(
|
||||
private static final float TNT_VISUAL_SCALE = 0.98F;
|
||||
private static final float TNT_VISUAL_OFFSET = -TNT_VISUAL_SCALE / 2.0F;
|
||||
private static final Transformation TNT_VISUAL_TRANSFORM = new Transformation(
|
||||
new Vector3f(TNT_VISUAL_OFFSET, 0.0F, TNT_VISUAL_OFFSET),
|
||||
new Quaternionf(0, 0, 0, 1),
|
||||
new Vector3f(TNT_VISUAL_SCALE, TNT_VISUAL_SCALE, TNT_VISUAL_SCALE),
|
||||
|
||||
-2
@@ -131,7 +131,6 @@ public abstract class ViewFlag {
|
||||
if (yLocation.distanceSquared(representative.getLocation()) >= 1.0 / 256.0 && yLocation.distanceSquared(previous.getLocation()) >= 1.0 / 256.0) {
|
||||
RBlockDisplay y = new RBlockDisplay(server, yLocation);
|
||||
y.setBlock(Material.WHITE_STAINED_GLASS.createBlockData());
|
||||
y.setTransform(TraceEntity.TNT_VISUAL_TRANSFORM);
|
||||
}
|
||||
|
||||
Location secoundLocation;
|
||||
@@ -144,7 +143,6 @@ public abstract class ViewFlag {
|
||||
if (secoundLocation.distanceSquared(representative.getLocation()) >= 1.0 / 256.0 && secoundLocation.distanceSquared(previous.getLocation()) >= 1.0 / 256.0) {
|
||||
RBlockDisplay second = new RBlockDisplay(server, secoundLocation);
|
||||
second.setBlock(Material.WHITE_STAINED_GLASS.createBlockData());
|
||||
second.setTransform(TraceEntity.TNT_VISUAL_TRANSFORM);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-4
@@ -51,10 +51,6 @@ public class IsolateFlag extends ViewFlag {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isEmpty() {
|
||||
return tntToIsolate.isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Stream<TNTPoint> filter(Stream<TNTPoint> records) {
|
||||
if (tntToIsolate.isEmpty()) return records;
|
||||
|
||||
@@ -38,7 +38,6 @@ import org.bukkit.Bukkit;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.command.CommandMap;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
@@ -48,6 +47,7 @@ import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.persistence.PersistentDataType;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -73,7 +73,19 @@ public class BindCommand extends SWCommand implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
private static final CommandMap commandMap = ((CraftServer) Bukkit.getServer()).getCommandMap();
|
||||
private static final CommandMap commandMap;
|
||||
|
||||
static {
|
||||
Field knownCommandsField;
|
||||
try {
|
||||
knownCommandsField = Bukkit.getServer().getClass().getDeclaredField("commandMap");
|
||||
knownCommandsField.setAccessible(true);
|
||||
commandMap = (CommandMap) knownCommandsField.get(Bukkit.getServer());
|
||||
} catch (IllegalAccessException | NoSuchFieldException var2) {
|
||||
Bukkit.shutdown();
|
||||
throw new SecurityException("Oh shit. Commands cannot be registered.", var2);
|
||||
}
|
||||
}
|
||||
|
||||
private static final NamespacedKey KEY = SWUtils.getNamespaceKey("command");
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.util;
|
||||
|
||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import de.steamwar.Reflection;
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.features.tpslimit.TPSUtils;
|
||||
import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
|
||||
@@ -29,6 +30,7 @@ import de.steamwar.core.ProtocolWrapper;
|
||||
import de.steamwar.core.SWPlayer;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import net.minecraft.network.protocol.game.*;
|
||||
import net.minecraft.server.level.ServerPlayerGameMode;
|
||||
import net.minecraft.world.entity.player.Abilities;
|
||||
import net.minecraft.world.level.GameType;
|
||||
import org.bukkit.Bukkit;
|
||||
@@ -101,8 +103,10 @@ public class NoClipCommand extends SWCommand implements Listener {
|
||||
TinyProtocol.instance.addFilter(ServerboundSetCreativeModeSlotPacket.class, third);
|
||||
}
|
||||
|
||||
private static final Reflection.Field<GameType> playerGameMode = Reflection.getField(ServerPlayerGameMode.class, GameType.class, 0);
|
||||
|
||||
private void setInternalGameMode(Player player, GameMode gameMode) {
|
||||
((CraftPlayer) player).getHandle().gameMode.gameModeForPlayer = GameType.byId(gameMode.getValue());
|
||||
playerGameMode.set(((CraftPlayer) player).getHandle().gameMode, GameType.byId(gameMode.getValue()));
|
||||
}
|
||||
|
||||
@Register(help = true)
|
||||
@@ -139,7 +143,6 @@ public class NoClipCommand extends SWCommand implements Listener {
|
||||
|
||||
@EventHandler(ignoreCancelled = true)
|
||||
public void onBlock(BlockCanBuildEvent event) {
|
||||
if (event.getPlayer() == null) return;
|
||||
if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
|
||||
event.setBuildable(true);
|
||||
}
|
||||
|
||||
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.warp;
|
||||
import de.steamwar.bausystem.region.RegionSystem;
|
||||
import de.steamwar.bausystem.worlddata.WorldData;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||
@@ -36,20 +35,14 @@ public class Warp {
|
||||
private static Map<String, Warp> warpMap = new HashMap<>();
|
||||
|
||||
public static void enable() {
|
||||
Warp worldSpawn = new Warp("WorldSpawn") {
|
||||
@Override
|
||||
public Location getLocation() {
|
||||
return RegionSystem.INSTANCE.getWorldSpawn();
|
||||
}
|
||||
};
|
||||
Warp worldSpawn = new Warp("WorldSpawn");
|
||||
worldSpawn.setLocation(RegionSystem.INSTANCE.getWorldSpawn());
|
||||
worldSpawn.setMat(Material.NETHER_STAR);
|
||||
warpMap.put("WorldSpawn", worldSpawn);
|
||||
}
|
||||
|
||||
private String name;
|
||||
@Setter
|
||||
private Location location;
|
||||
@Setter
|
||||
private Material mat;
|
||||
|
||||
private Warp(String name) {
|
||||
@@ -98,13 +91,21 @@ public class Warp {
|
||||
return warpMap.get(name);
|
||||
}
|
||||
|
||||
public void setMat(Material mat) {
|
||||
this.mat = mat;
|
||||
}
|
||||
|
||||
public void setLocation(Location location) {
|
||||
this.location = location;
|
||||
}
|
||||
|
||||
public void delete() {
|
||||
warpMap.remove(name);
|
||||
WorldData.getWarpData().remove(name);
|
||||
}
|
||||
|
||||
public void teleport(Player player) {
|
||||
player.teleport(getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
|
||||
player.playSound(getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1, 1);
|
||||
player.teleport(location, PlayerTeleportEvent.TeleportCause.PLUGIN);
|
||||
player.playSound(location, Sound.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,10 +99,10 @@ public class WarpListener implements Listener {
|
||||
});
|
||||
Region region = Region.getRegion(p.getLocation());
|
||||
if (!region.getBuildArea().isEmpty()) {
|
||||
locations.put("Copy", region.getBuildArea().getCopyPoint(false).toLocation(p).add(0.5, 0, 0.5));
|
||||
locations.put("Copy", region.getBuildArea().getCopyPoint().toLocation(p).add(0.5, 0, 0.5));
|
||||
}
|
||||
if (!region.getTestblockArea().isEmpty()) {
|
||||
locations.put("TestBlock", region.getTestblockArea().getCopyPoint(false).toLocation(p).add(0.5, 0, 0.5));
|
||||
locations.put("TestBlock", region.getTestblockArea().getCopyPoint().toLocation(p).add(0.5, 0, 0.5));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+5
-3
@@ -20,6 +20,7 @@
|
||||
package de.steamwar.bausystem.features.world;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.Permission;
|
||||
import de.steamwar.bausystem.config.BauServer;
|
||||
import de.steamwar.core.CRIUWakeupEvent;
|
||||
import de.steamwar.linkage.Linked;
|
||||
@@ -36,12 +37,13 @@ public class AntiBauAddMemberFix implements Listener {
|
||||
@EventHandler(priority = EventPriority.LOW)
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
if (BauSystem.DEV_SERVER) return;
|
||||
if (event.getPlayer().getUniqueId().equals(BauServer.getInstance().getOwner())) {
|
||||
if (Permission.SUPERVISOR.hasPermission(event.getPlayer())) {
|
||||
return;
|
||||
}
|
||||
if (BauweltMember.getBauMember(BauServer.getInstance().getOwner(), event.getPlayer().getUniqueId()) == null) {
|
||||
if (BauweltMember.getBauMember(BauServer.getInstance().getWorldID(), event.getPlayer().getUniqueId()) == null) {
|
||||
event.getPlayer().kickPlayer("");
|
||||
throw new SecurityException("The player " + event.getPlayer().getName() + " joined on the server of " + SteamwarUser.byId(BauServer.getInstance().getOwnerID()).getUserName() + " without being added!");
|
||||
String owner = BauServer.getInstance().isTeamWorld() ? "team " + BauServer.getInstance().getTeamID() : SteamwarUser.byId(BauServer.getInstance().getOwnerID()).getUserName();
|
||||
throw new SecurityException("The player " + event.getPlayer().getName() + " joined on the server of " + owner + " without being added!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ public class AxiomPermissionCheck implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onAxiomHandshake(AxiomHandshakeEvent event) {
|
||||
if (Permission.SUPERVISOR.hasPermission(event.getPlayer()) || BauServer.getInstance().getOwner().equals(event.getPlayer().getUniqueId())) {
|
||||
if (Permission.SUPERVISOR.hasPermission(event.getPlayer()) || (BauServer.getInstance().hasOwner() && BauServer.getInstance().getOwner().equals(event.getPlayer().getUniqueId()))) {
|
||||
event.setMaxBufferSize(Short.MAX_VALUE);
|
||||
return;
|
||||
}
|
||||
|
||||
+5
-4
@@ -28,7 +28,7 @@ import de.steamwar.data.BauLockState;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import de.steamwar.network.packets.PacketHandler;
|
||||
import de.steamwar.network.packets.server.BaulockUpdatePacket;
|
||||
import de.steamwar.sql.UserConfig;
|
||||
import de.steamwar.sql.SteamwarWorld;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
@@ -37,13 +37,13 @@ import org.bukkit.event.Listener;
|
||||
@Linked
|
||||
public class BauLockStateScoreboard extends PacketHandler implements ScoreboardElement, Listener {
|
||||
|
||||
private static final String BAU_LOCK_CONFIG_NAME = "baulockstate";
|
||||
|
||||
@Getter
|
||||
private BauLockState lockState = loadLockState();
|
||||
|
||||
private BauLockState loadLockState() {
|
||||
String state = UserConfig.getConfig(BauServer.getInstance().getOwner(), BAU_LOCK_CONFIG_NAME);
|
||||
if (BauServer.getInstance().isTeamWorld()) return BauLockState.OPEN;
|
||||
SteamwarWorld world = SteamwarWorld.getWorld(BauServer.getInstance().getWorldID());
|
||||
String state = world == null ? null : world.getLockState();
|
||||
return state == null ? BauLockState.OPEN : BauLockState.valueOf(state);
|
||||
}
|
||||
|
||||
@@ -69,6 +69,7 @@ public class BauLockStateScoreboard extends PacketHandler implements ScoreboardE
|
||||
|
||||
@Override
|
||||
public String get(Region region, Player p) {
|
||||
if (BauServer.getInstance().isTeamWorld()) return null;
|
||||
if (!BauServer.getInstance().getOwner().equals(p.getUniqueId())) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -36,6 +36,8 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||
import org.bukkit.event.inventory.ClickType;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.player.PlayerItemConsumeEvent;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
|
||||
+5
-2
@@ -119,8 +119,11 @@ public class BauScoreboard implements Listener {
|
||||
@Override
|
||||
public String getTitle() {
|
||||
Region region = Region.getRegion(player.getLocation());
|
||||
if (region.getRegionData().has(Flag.COLOR).notVisibleInScoreboard()) return "§eSteam§8War";
|
||||
String colorCode = "§" + region.getRegionData().get(Flag.COLOR).getWithDefault().getColorCode();
|
||||
if (region.getType().isGlobal()) return "§eSteam§8War";
|
||||
String colorCode = "§e";
|
||||
if (region.getRegionData().has(Flag.COLOR).isReadable()) {
|
||||
colorCode = "§" + region.getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK).getColorCode();
|
||||
}
|
||||
return colorCode + "■ §eSteam§8War " + colorCode + "■"; // ■
|
||||
}
|
||||
});
|
||||
|
||||
+5
-1
@@ -42,7 +42,11 @@ public class KickallCommand extends SWCommand {
|
||||
if (!Permission.OWNER.hasPermission(player)) return;
|
||||
|
||||
Bukkit.getOnlinePlayers().forEach(p -> {
|
||||
if (!bauServer.getOwner().equals(p.getUniqueId())) p.kickPlayer("");
|
||||
if (bauServer.isTeamWorld()) {
|
||||
if (!Permission.SUPERVISOR.hasPermission(p)) p.kickPlayer("");
|
||||
} else if (!bauServer.getOwner().equals(p.getUniqueId())) {
|
||||
p.kickPlayer("");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
+3
-6
@@ -25,7 +25,6 @@ import de.steamwar.bausystem.config.BauServer;
|
||||
import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import de.steamwar.sql.BauweltMember;
|
||||
import de.steamwar.techhider.legacy.TechHider;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@@ -40,6 +39,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
|
||||
import org.bukkit.event.entity.EntityPickupItemEvent;
|
||||
import org.bukkit.event.player.*;
|
||||
import org.bukkit.util.Vector;
|
||||
import de.steamwar.techhider.legacy.TechHider;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
@@ -143,17 +143,14 @@ public class SpectatorListener implements Listener {
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
enableOrDisableTechhider();
|
||||
if (BauSystem.DEV_SERVER) return;
|
||||
if (event.getPlayer().getUniqueId().equals(BauServer.getInstance().getOwner())) {
|
||||
if (Permission.SUPERVISOR.hasPermission(event.getPlayer())) {
|
||||
return;
|
||||
}
|
||||
BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), event.getPlayer().getUniqueId());
|
||||
BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getWorldID(), event.getPlayer().getUniqueId());
|
||||
if (bauweltMember == null) {
|
||||
event.getPlayer().kickPlayer("");
|
||||
return;
|
||||
}
|
||||
if (Permission.SUPERVISOR.hasPermission(event.getPlayer())) {
|
||||
return;
|
||||
}
|
||||
if (!anySupervisorOnline(null)) {
|
||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
||||
event.getPlayer().kickPlayer("");
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ public class WorldEditListener implements Listener {
|
||||
|
||||
private static final Set<String> commands = new HashSet<>();
|
||||
private static final Set<String> commandExclusions = new HashSet<>();
|
||||
private static final String[] shortcutCommands = {"//1", "//2", "//90", "//-90", "//180", "//p", "//c", "//flopy", "//floppy", "//flopyp", "//floppyp", "//u", "//r", "//download", "/download"};
|
||||
private static final String[] shortcutCommands = {"//1", "//2", "//90", "//-90", "//180", "//p", "//c", "//flopy", "//floppy", "//flopyp", "//floppyp", "//u", "//r"};
|
||||
|
||||
public static boolean isWorldEditCommand(String command) {
|
||||
for (String shortcut : shortcutCommands) {
|
||||
|
||||
@@ -28,7 +28,6 @@ import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.core.CraftbukkitWrapper;
|
||||
import de.steamwar.linkage.Linked;
|
||||
import de.steamwar.linkage.LinkedInstance;
|
||||
import de.steamwar.techhider.legacy.TechHider;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
@@ -41,6 +40,7 @@ import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
import de.steamwar.techhider.legacy.TechHider;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
@@ -28,7 +28,6 @@ import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Linked
|
||||
public class BackupScheduler implements Enable {
|
||||
@@ -44,7 +43,6 @@ public class BackupScheduler implements Enable {
|
||||
Iterator<Region> regionsToBackup = RegionSystem.INSTANCE.getRegions()
|
||||
.filter(region -> region.getRegionData().has(Flag.CHANGED).isReadable())
|
||||
.filter(region -> region.getRegionData().get(Flag.CHANGED).isWithDefault(ChangedMode.HAS_CHANGE))
|
||||
.collect(Collectors.toList())
|
||||
.iterator();
|
||||
if (!regionsToBackup.hasNext()) return;
|
||||
doBackup(regionsToBackup);
|
||||
|
||||
@@ -48,18 +48,10 @@ public class Point {
|
||||
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) {
|
||||
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) {
|
||||
return new Point(this.x - x, this.y - y, this.z - z);
|
||||
}
|
||||
@@ -68,18 +60,6 @@ public class Point {
|
||||
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) {
|
||||
return new Location(world, x, y, z);
|
||||
}
|
||||
|
||||
@@ -24,16 +24,16 @@ import de.steamwar.bausystem.utils.FlatteningWrapper;
|
||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
||||
import de.steamwar.sql.GameModeConfig;
|
||||
import lombok.NonNull;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.File;
|
||||
import java.util.UUID;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public interface Region extends RegionDataStore {
|
||||
public interface Region {
|
||||
|
||||
static Stream<Region> getRegions() {
|
||||
return RegionSystem.INSTANCE.getRegions();
|
||||
@@ -74,14 +74,11 @@ public interface Region extends RegionDataStore {
|
||||
@NonNull
|
||||
RegionBackups getBackups();
|
||||
|
||||
abstract class Area {
|
||||
interface Area {
|
||||
|
||||
public static final int WORLD_MIN_Y = Bukkit.getWorlds().get(0).getMinHeight();
|
||||
public static final int WORLD_MAX_Y = Bukkit.getWorlds().get(0).getMaxHeight();
|
||||
|
||||
public static final Area EMPTY = new Area() {
|
||||
Area EMPTY = new Area() {
|
||||
@Override
|
||||
protected boolean isEmptyInternal() {
|
||||
public boolean isEmpty() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -96,7 +93,7 @@ public interface Region extends RegionDataStore {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Point getCopyPoint(boolean extension) {
|
||||
public Point getCopyPoint() {
|
||||
return Point.ZERO;
|
||||
}
|
||||
|
||||
@@ -105,18 +102,18 @@ public interface Region extends RegionDataStore {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean inRegion(int x, int z, boolean extension) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Clipboard copy(boolean extension) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void place(PasteBuilder pasteBuilder, boolean extension) {
|
||||
public File getResetFile() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reset(PasteBuilder pasteBuilder, boolean extension) {
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -129,24 +126,20 @@ public interface Region extends RegionDataStore {
|
||||
}
|
||||
};
|
||||
|
||||
public final boolean isEmpty() {
|
||||
return isEmptyInternal();
|
||||
}
|
||||
|
||||
boolean isEmptyInternal() {
|
||||
default boolean isEmpty() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
public abstract Point getMinPoint(boolean extension);
|
||||
Point getMinPoint(boolean extension);
|
||||
|
||||
@NonNull
|
||||
public abstract Point getMaxPoint(boolean extension);
|
||||
Point getMaxPoint(boolean extension);
|
||||
|
||||
@NonNull
|
||||
public abstract Point getCopyPoint(boolean extension);
|
||||
Point getCopyPoint();
|
||||
|
||||
public boolean inRegion(Location location, boolean extension) {
|
||||
default boolean inRegion(Location location, boolean extension) {
|
||||
Point minPoint = getMinPoint(extension);
|
||||
Point maxPoint = getMaxPoint(extension);
|
||||
if (location.getBlockX() < minPoint.getX() || location.getBlockX() > maxPoint.getX()) return false;
|
||||
@@ -155,26 +148,17 @@ public interface Region extends RegionDataStore {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean inRegion(int x, int z, boolean extension) {
|
||||
Point minPoint = getMinPoint(extension);
|
||||
Point maxPoint = getMaxPoint(extension);
|
||||
if (x < minPoint.getX() || x > maxPoint.getX()) return false;
|
||||
if (z < minPoint.getZ() || z > maxPoint.getZ()) return false;
|
||||
return true;
|
||||
@Nullable
|
||||
default Clipboard copy(boolean extension) {
|
||||
return FlatteningWrapper.impl.copy(getMinPoint(extension), getMaxPoint(extension), getCopyPoint());
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public Clipboard copy(boolean extension) {
|
||||
return FlatteningWrapper.impl.copy(getMinPoint(extension), getMaxPoint(extension), getCopyPoint(extension));
|
||||
}
|
||||
File getResetFile();
|
||||
|
||||
public void reset(PasteBuilder pasteBuilder, boolean extension) {
|
||||
place(pasteBuilder, extension);
|
||||
}
|
||||
void reset(PasteBuilder pasteBuilder, boolean extension);
|
||||
|
||||
public abstract void place(PasteBuilder pasteBuilder, boolean extension);
|
||||
|
||||
public void forEachChunk(BiConsumer<Integer, Integer> executor) {
|
||||
default void forEachChunk(BiConsumer<Integer, Integer> executor) {
|
||||
Point minPoint = getMinPoint(false);
|
||||
Point maxPoint = getMaxPoint(false);
|
||||
for (int x = (int) Math.floor(minPoint.getX() / 16.0); x <= (int) Math.ceil(maxPoint.getX() / 16.0); x++) {
|
||||
@@ -184,7 +168,7 @@ public interface Region extends RegionDataStore {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isChunkOutside(int chunkX, int chunkZ) {
|
||||
default boolean isChunkOutside(int chunkX, int chunkZ) {
|
||||
Point minPoint = getMinPoint(true);
|
||||
Point maxPoint = getMaxPoint(true);
|
||||
return Math.floor(minPoint.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPoint.getX() / 16.0) ||
|
||||
|
||||
@@ -25,15 +25,11 @@ import lombok.RequiredArgsConstructor;
|
||||
|
||||
import javax.annotation.CheckReturnValue;
|
||||
import javax.annotation.Nullable;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.function.Function;
|
||||
|
||||
public interface RegionBackups {
|
||||
|
||||
DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy.MM.dd' 'HH:mm:ss");
|
||||
|
||||
@RequiredArgsConstructor
|
||||
enum BackupType {
|
||||
MANUAL(5),
|
||||
@@ -43,43 +39,21 @@ public interface RegionBackups {
|
||||
public final int maxBackups;
|
||||
}
|
||||
|
||||
@RequiredArgsConstructor
|
||||
@Getter
|
||||
abstract class Backup implements RegionDataStore, Comparable<Backup> {
|
||||
abstract class Backup {
|
||||
@NonNull
|
||||
protected final BackupType type;
|
||||
private final BackupType type;
|
||||
|
||||
@NonNull
|
||||
protected final String name;
|
||||
private final String name;
|
||||
|
||||
@NonNull
|
||||
protected final RegionData regionData;
|
||||
|
||||
protected Backup(@NonNull BackupType type, @NonNull String name, @NonNull Function<Backup, RegionData> regionDataConstructor) {
|
||||
this.type = type;
|
||||
this.name = name;
|
||||
regionData = regionDataConstructor.apply(this);
|
||||
}
|
||||
private final RegionData data;
|
||||
|
||||
@CheckReturnValue
|
||||
public abstract boolean load();
|
||||
|
||||
@Override
|
||||
public final void save() {
|
||||
}
|
||||
|
||||
public abstract long getCreationTime();
|
||||
|
||||
@Override
|
||||
public int compareTo(Backup o) {
|
||||
return Long.compare(getCreationTime(), o.getCreationTime());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void load(RegionData regionData) {
|
||||
}
|
||||
|
||||
@SuppressWarnings("java:S3038") // This forces everybody to implement 'deleteRegion' for Backups!
|
||||
@Override
|
||||
public abstract void delete();
|
||||
}
|
||||
|
||||
@@ -90,7 +64,7 @@ public interface RegionBackups {
|
||||
List<Backup> list();
|
||||
|
||||
@Nullable
|
||||
Backup get(@NonNull String name);
|
||||
Backup get(String name);
|
||||
|
||||
RegionBackups EMPTY = new RegionBackups() {
|
||||
@Override
|
||||
@@ -105,7 +79,7 @@ public interface RegionBackups {
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public Backup get(@NonNull String name) {
|
||||
public Backup get(String name) {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -22,42 +22,81 @@ package de.steamwar.bausystem.region;
|
||||
import de.steamwar.bausystem.region.flags.Flag;
|
||||
import de.steamwar.sql.SchematicNode;
|
||||
import lombok.NonNull;
|
||||
import yapion.hierarchy.types.YAPIONObject;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public abstract class RegionData {
|
||||
|
||||
protected RegionDataStore store;
|
||||
|
||||
private final List<Property<?, ?>> properties = new ArrayList<>();
|
||||
|
||||
protected final YAPIONObject data;
|
||||
protected final YAPIONObject flagData;
|
||||
protected final Runnable onChange;
|
||||
protected final Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
|
||||
// TODO: These should be turned into an ECS like System because not every Region has them or should have them!
|
||||
protected final Property<SchematicNode, Integer> testblockSchematic = new Property<>("testblockSchematic", SchematicNode::byId, SchematicNode::getId);
|
||||
|
||||
protected RegionData(RegionDataStore store) {
|
||||
this.store = store;
|
||||
initialize();
|
||||
store.load(this);
|
||||
private final class Property<T, K> {
|
||||
private final String field;
|
||||
private final Function<K, T> loader;
|
||||
private final Function<T, K> writer;
|
||||
|
||||
private T value;
|
||||
|
||||
public Property(String field, Function<K, T> loader, Function<T, K> writer) {
|
||||
this.field = field;
|
||||
this.loader = loader;
|
||||
this.writer = writer;
|
||||
properties.add(this);
|
||||
}
|
||||
|
||||
public void load() {
|
||||
if (flagData.containsKey(field)) {
|
||||
value = loader.apply(flagData.getPlainValue(field));
|
||||
} else {
|
||||
value = null;
|
||||
}
|
||||
}
|
||||
|
||||
public T get() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void set(T value) {
|
||||
this.value = value;
|
||||
if (value == null) {
|
||||
flagData.remove(field);
|
||||
} else {
|
||||
flagData.put(field, writer.apply(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public final void setStore(RegionDataStore store) {
|
||||
this.store = store;
|
||||
store.save();
|
||||
private Property<SchematicNode, Integer> testblockSchematic = new Property<>("testblockSchematic", SchematicNode::byId, SchematicNode::getId);
|
||||
|
||||
protected RegionData(YAPIONObject data, Runnable onChange) {
|
||||
this.data = data;
|
||||
this.flagData = data.getObjectOrSetDefault("flagStorage", new YAPIONObject());
|
||||
this.onChange = onChange;
|
||||
initialize();
|
||||
for (final Flag flag : Flag.getFlags()) {
|
||||
if (!has(flag).isWritable()) continue;
|
||||
try {
|
||||
String s = flagData.getPlainValue(flag.name());
|
||||
flagMap.put(flag, flag.valueOfValue(s));
|
||||
} catch (Exception e) {
|
||||
flagMap.put(flag, (Flag.Value<?>) flag.getDefaultValue());
|
||||
}
|
||||
}
|
||||
properties.forEach(Property::load);
|
||||
}
|
||||
|
||||
protected void initialize() {
|
||||
}
|
||||
|
||||
/**
|
||||
* All connected Regions are required to have the same type as their RegionData.
|
||||
*/
|
||||
protected Stream<Region> connectedRegions() {
|
||||
return Stream.empty();
|
||||
}
|
||||
|
||||
@NonNull
|
||||
public abstract <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag);
|
||||
|
||||
@@ -66,15 +105,11 @@ public abstract class RegionData {
|
||||
*/
|
||||
public final <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
|
||||
if (has(flag).isWritable()) {
|
||||
boolean needsSave = flagMap.put(flag, value) != value;
|
||||
if (needsSave) store.save();
|
||||
|
||||
connectedRegions().forEach(region -> {
|
||||
if (region.getRegionData().flagMap.put(flag, value) != value) {
|
||||
region.save();
|
||||
}
|
||||
});
|
||||
return needsSave;
|
||||
if (flagMap.put(flag, value) != value) {
|
||||
flagData.put(flag.name(), value.name());
|
||||
onChange.run();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -85,94 +120,33 @@ public abstract class RegionData {
|
||||
}
|
||||
|
||||
public final void clear() {
|
||||
Set<Flag> remove = new HashSet<>();
|
||||
for (Flag flag : Flag.getFlags()) {
|
||||
if (has(flag).isWritable()) {
|
||||
flagMap.remove(flag);
|
||||
remove.add(flag);
|
||||
flagData.remove(flag.name());
|
||||
}
|
||||
}
|
||||
initialize();
|
||||
properties.forEach(property -> property.set(null));
|
||||
store.save();
|
||||
|
||||
connectedRegions().forEach(region -> {
|
||||
region.getRegionData().flagMap.keySet().removeAll(remove);
|
||||
region.getRegionData().initialize();
|
||||
region.getRegionData().properties.forEach(property -> property.set(null));
|
||||
region.save();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* This method only copies all flags and properties from this into other without saving other afterward.
|
||||
* TODO: If {@link #connectedRegions()} is overridden this method will not work correctly!
|
||||
*/
|
||||
public final void copyInto(RegionData other) {
|
||||
if (this == other) return;
|
||||
other.flagMap.clear();
|
||||
other.flagMap.putAll(flagMap);
|
||||
// TODO: This might not be correct, needs to be investigated
|
||||
other.properties.clear();
|
||||
other.properties.addAll(properties);
|
||||
onChange.run();
|
||||
}
|
||||
|
||||
public final Map<Flag<?>, Flag.Value<?>> getBackedMap() {
|
||||
return flagMap;
|
||||
}
|
||||
|
||||
public final List<Property<Object, Object>> getBackedProperties() {
|
||||
return (List) properties;
|
||||
}
|
||||
|
||||
public final SchematicNode getTestblockSchematic() {
|
||||
public SchematicNode getTestblockSchematic() {
|
||||
return testblockSchematic.get();
|
||||
}
|
||||
|
||||
public final void setTestblockSchematic(SchematicNode schematic) {
|
||||
public void setTestblockSchematic(SchematicNode schematic) {
|
||||
testblockSchematic.set(schematic);
|
||||
store.save();
|
||||
onChange.run();
|
||||
}
|
||||
|
||||
@Override
|
||||
public final String toString() {
|
||||
StringBuilder st = new StringBuilder();
|
||||
st.append(getClass().getSimpleName()).append("{");
|
||||
st.append("flagMap=").append(flagMap);
|
||||
for (Property<?, ?> p : properties) {
|
||||
st.append(p);
|
||||
}
|
||||
st.append("}");
|
||||
return st.toString();
|
||||
}
|
||||
|
||||
public final class Property<T, K> {
|
||||
public final String field;
|
||||
public final Function<K, T> loader;
|
||||
public final Function<T, K> writer;
|
||||
|
||||
private T value;
|
||||
|
||||
private Property(String field, Function<K, T> loader, Function<T, K> writer) {
|
||||
this.field = field;
|
||||
this.loader = loader;
|
||||
this.writer = writer;
|
||||
properties.add(this);
|
||||
}
|
||||
|
||||
public T get() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void set(T value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
Object value = this.value;
|
||||
if (value != null) value = writer.apply((T) value);
|
||||
return ", " + field + "=" + value;
|
||||
}
|
||||
return getClass().getSimpleName() + "{" +
|
||||
"flagMap=" + flagMap +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region;
|
||||
|
||||
public interface RegionDataStore {
|
||||
void save();
|
||||
void load(RegionData regionData);
|
||||
default void delete() {
|
||||
}
|
||||
}
|
||||
@@ -35,8 +35,4 @@ public enum RegionFlagPolicy {
|
||||
public boolean isApplicable() {
|
||||
return readable || writable;
|
||||
}
|
||||
|
||||
public boolean notVisibleInScoreboard() {
|
||||
return !writable;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
package de.steamwar.bausystem.region;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.core.Core;
|
||||
import lombok.NonNull;
|
||||
import org.bukkit.Location;
|
||||
|
||||
@@ -28,15 +26,10 @@ import javax.annotation.CheckReturnValue;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public interface RegionSystem {
|
||||
|
||||
Logger LOGGER = BauSystem.getInstance().getLogger();
|
||||
|
||||
UUID GLOBAL_REGION_ID = new UUID(0, 0);
|
||||
|
||||
RegionSystem INSTANCE = init();
|
||||
|
||||
/**
|
||||
@@ -44,6 +37,11 @@ public interface RegionSystem {
|
||||
*/
|
||||
void load();
|
||||
|
||||
/**
|
||||
* Saves anything that should be written to file on either CRIUSleepEvent or plugin disable.
|
||||
*/
|
||||
void save();
|
||||
|
||||
/**
|
||||
* Returns the Location to teleport players to when they first join or Warp to "WorldSpawn"
|
||||
*/
|
||||
@@ -76,63 +74,47 @@ public interface RegionSystem {
|
||||
@NonNull
|
||||
Stream<Region> getRegions();
|
||||
|
||||
/**
|
||||
* Only contains Regions of the same Type as the one you inputted.
|
||||
*/
|
||||
@NonNull
|
||||
Stream<Region> getConnectedRegions(@NonNull Region region);
|
||||
|
||||
private static RegionSystem init() {
|
||||
if (Core.getVersion() >= 21) {
|
||||
// TODO: Add some kind of detection if the DynamicRegionSystem should be used!
|
||||
try {
|
||||
return (RegionSystem) Class.forName("de.steamwar.bausystem.region.DynamicRegionSystem").getConstructor().newInstance();
|
||||
} catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException |
|
||||
InvocationTargetException e) {
|
||||
// Ignore
|
||||
}
|
||||
}
|
||||
try {
|
||||
return (RegionSystem) Class.forName("de.steamwar.bausystem.region.FixedRegionSystem").getConstructor().newInstance();
|
||||
} catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException |
|
||||
InvocationTargetException e) {
|
||||
// Ignore
|
||||
return new RegionSystem() {
|
||||
@Override
|
||||
public void load() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Location getWorldSpawn() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Region getGlobalRegion() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Region get(Location location) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<Region> getRegion(UUID id) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Stream<Region> getRegions() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
};
|
||||
}
|
||||
return new RegionSystem() {
|
||||
@Override
|
||||
public void load() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Location getWorldSpawn() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Region getGlobalRegion() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Region get(Location location) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<Region> getRegion(UUID id) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Stream<Region> getRegions() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Stream<Region> getConnectedRegions(@NonNull Region region) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,50 +26,9 @@ import lombok.RequiredArgsConstructor;
|
||||
@Getter
|
||||
public enum RegionType {
|
||||
|
||||
GLOBAL(ConnectionType.Global),
|
||||
/**
|
||||
* This should not be used by the DynamicRegionSystem
|
||||
*/
|
||||
NORMAL(ConnectionType.Closed),
|
||||
|
||||
SPAWN(ConnectionType.Closed),
|
||||
SPAWN_PATH(ConnectionType.Path),
|
||||
SPAWN_EXTENSION(ConnectionType.Closed),
|
||||
PATH(ConnectionType.Path),
|
||||
|
||||
DRY(ConnectionType.Closed),
|
||||
DRY_SPECIAL(ConnectionType.Closed),
|
||||
WET(ConnectionType.Water),
|
||||
WET_SPECIAL(ConnectionType.Water),
|
||||
GLOBAL(true),
|
||||
NORMAL(false),
|
||||
;
|
||||
|
||||
private final ConnectionType connectionType;
|
||||
|
||||
public boolean isGlobal() {
|
||||
return this == GLOBAL;
|
||||
}
|
||||
|
||||
public boolean isDeletable() {
|
||||
return this == NORMAL || this == SPAWN_EXTENSION || this == PATH || this == DRY || this == DRY_SPECIAL || this == WET || this == WET_SPECIAL;
|
||||
}
|
||||
|
||||
public boolean isSpecial() {
|
||||
return this == DRY_SPECIAL || this == WET_SPECIAL;
|
||||
}
|
||||
|
||||
public boolean isSpawn() {
|
||||
return this == SPAWN || this == SPAWN_PATH || this == SPAWN_EXTENSION;
|
||||
}
|
||||
|
||||
public boolean isPath() {
|
||||
return this == PATH || this == SPAWN_PATH;
|
||||
}
|
||||
|
||||
public enum ConnectionType {
|
||||
Closed,
|
||||
Path,
|
||||
Water,
|
||||
Global,
|
||||
Garden,
|
||||
}
|
||||
private final boolean global;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,6 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@UtilityClass
|
||||
public class RegionUtils {
|
||||
@@ -59,12 +58,10 @@ public class RegionUtils {
|
||||
}
|
||||
|
||||
public void forEachInRegion(Region region, Consumer<Player> consumer) {
|
||||
Stream<? extends Player> players = Bukkit.getOnlinePlayers().stream();
|
||||
if (region.getType().isGlobal()) {
|
||||
players = players.filter(player -> Region.getRegion(player.getLocation()).getType().isGlobal());
|
||||
} else {
|
||||
players = players.filter(player -> region.getArea().inRegion(player.getLocation(), false));
|
||||
}
|
||||
players.forEach(consumer);
|
||||
Bukkit.getOnlinePlayers()
|
||||
.stream()
|
||||
.filter(player -> region.getArea().inRegion(player.getLocation(), false))
|
||||
.filter(player -> !region.getType().isGlobal() || Region.getRegion(player.getLocation()).getType().isGlobal())
|
||||
.forEach(consumer);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ import java.util.function.BiPredicate;
|
||||
@Getter
|
||||
public class PasteBuilder {
|
||||
|
||||
private ClipboardProvider clipboardProvider;
|
||||
private final ClipboardProvider clipboardProvider;
|
||||
private Point pastPoint;
|
||||
private boolean rotate;
|
||||
private boolean ignoreAir;
|
||||
@@ -53,20 +53,10 @@ public class PasteBuilder {
|
||||
private List<BiPredicate<BaseBlock, String>> predicates = new ArrayList<>();
|
||||
private List<BiConsumer<Clipboard, BlockVector3>> mappers = new ArrayList<>();
|
||||
|
||||
public PasteBuilder() {
|
||||
clipboardProvider = ClipboardProvider.EMPTY;
|
||||
}
|
||||
|
||||
public PasteBuilder(@NonNull ClipboardProvider clipboardProvider) {
|
||||
this.clipboardProvider = clipboardProvider;
|
||||
}
|
||||
|
||||
public PasteBuilder with(@NonNull ClipboardProvider clipboardProvider) {
|
||||
if (this.clipboardProvider != ClipboardProvider.EMPTY) return this;
|
||||
this.clipboardProvider = clipboardProvider;
|
||||
return this;
|
||||
}
|
||||
|
||||
public PasteBuilder pastePoint(Point point) {
|
||||
this.pastPoint = point;
|
||||
return this;
|
||||
@@ -102,16 +92,6 @@ public class PasteBuilder {
|
||||
return this;
|
||||
}
|
||||
|
||||
private PasteBuilder predicates(List<BiPredicate<BaseBlock, String>> predicates) {
|
||||
this.predicates = predicates;
|
||||
return this;
|
||||
}
|
||||
|
||||
public PasteBuilder mappers(List<BiConsumer<Clipboard, BlockVector3>> mappers) {
|
||||
this.mappers = mappers;
|
||||
return this;
|
||||
}
|
||||
|
||||
public PasteBuilder only(BiPredicate<BaseBlock, String> predicate) {
|
||||
predicates.add(predicate);
|
||||
return this;
|
||||
@@ -202,27 +182,13 @@ public class PasteBuilder {
|
||||
}
|
||||
|
||||
public EditSession run() {
|
||||
if (pastPoint != null || minPoint != null) {
|
||||
return FlatteningWrapper.impl.paste(this);
|
||||
if (pastPoint == null) {
|
||||
throw new IllegalStateException("pastePoint is null");
|
||||
}
|
||||
throw new IllegalStateException("pastePoint is null");
|
||||
return FlatteningWrapper.impl.paste(this);
|
||||
}
|
||||
|
||||
public interface ClipboardProvider {
|
||||
ClipboardProvider EMPTY = new EmptyProvider();
|
||||
|
||||
static ClipboardProvider file(File file) {
|
||||
return new FileProvider(file);
|
||||
}
|
||||
|
||||
static ClipboardProvider schematic(SchematicNode schematic) {
|
||||
return new SchematicProvider(schematic);
|
||||
}
|
||||
|
||||
static ClipboardProvider clipboard(Clipboard clipboard) {
|
||||
return new ClipboardProviderImpl(clipboard);
|
||||
}
|
||||
|
||||
Clipboard getClipboard();
|
||||
|
||||
default <T extends ClipboardProvider> boolean is(Class<T> clazz) {
|
||||
@@ -234,22 +200,12 @@ public class PasteBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
private static class EmptyProvider implements ClipboardProvider {
|
||||
private EmptyProvider() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Clipboard getClipboard() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Getter
|
||||
public static class FileProvider implements ClipboardProvider {
|
||||
private final File file;
|
||||
private final Clipboard clipboard;
|
||||
|
||||
private FileProvider(File file) {
|
||||
public FileProvider(File file) {
|
||||
this.file = file;
|
||||
this.clipboard = FlatteningWrapper.impl.loadSchematic(file);
|
||||
}
|
||||
@@ -265,7 +221,7 @@ public class PasteBuilder {
|
||||
private final SchematicNode schematic;
|
||||
private final Clipboard clipboard;
|
||||
|
||||
private SchematicProvider(SchematicNode schematic) {
|
||||
public SchematicProvider(SchematicNode schematic) {
|
||||
this.schematic = schematic;
|
||||
try {
|
||||
this.clipboard = new SchematicData(schematic).load();
|
||||
@@ -284,7 +240,7 @@ public class PasteBuilder {
|
||||
public static class ClipboardProviderImpl implements ClipboardProvider {
|
||||
private final Clipboard clipboard;
|
||||
|
||||
private ClipboardProviderImpl(Clipboard clipboard) {
|
||||
public ClipboardProviderImpl(Clipboard clipboard) {
|
||||
this.clipboard = clipboard;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
package de.steamwar.bausystem.utils;
|
||||
|
||||
import de.steamwar.Reflection;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.experimental.UtilityClass;
|
||||
@@ -85,6 +86,9 @@ public class PlaceItemUtils {
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
private static final Reflection.Field<?> positionAccessor = Reflection.getField(CraftBlockState.class, BlockPos.class, 0);
|
||||
private static final Reflection.Field<?> worldAccessor = Reflection.getField(CraftBlockState.class, CraftWorld.class, 0);
|
||||
|
||||
/**
|
||||
* Attempt to place an {@link ItemStack} the {@link Player} is holding against a {@link Block} inside the World.
|
||||
* This can be easily used inside the {@link org.bukkit.event.player.PlayerInteractEvent} to mimik placing a
|
||||
@@ -284,9 +288,8 @@ public class PlaceItemUtils {
|
||||
} else {
|
||||
// If a BlockState is present set the Position and World to the Block you want to place
|
||||
Location blockLocation = block.getLocation();
|
||||
CraftBlockState craftBlockState = (CraftBlockState) blockState;
|
||||
craftBlockState.position = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());
|
||||
craftBlockState.world = (CraftWorld) blockLocation.getWorld();
|
||||
positionAccessor.set(blockState, new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ()));
|
||||
worldAccessor.set(blockState, blockLocation.getWorld());
|
||||
}
|
||||
|
||||
if (blockData.getMaterial().isSolid()) {
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -17,7 +17,7 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.cursor;
|
||||
package de.steamwar.bausystem.utils;
|
||||
|
||||
import de.steamwar.entity.REntity;
|
||||
import lombok.Data;
|
||||
@@ -20,6 +20,7 @@
|
||||
package de.steamwar.bausystem.utils;
|
||||
|
||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
||||
import de.steamwar.Reflection;
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import net.minecraft.network.protocol.game.ClientboundTickingStatePacket;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
@@ -32,6 +33,7 @@ public class TickManager implements Listener {
|
||||
public static final TickManager impl = new TickManager();
|
||||
|
||||
private static final ServerTickRateManager manager = MinecraftServer.getServer().tickRateManager();
|
||||
private static final Reflection.Field<Long> remainingSprintTicks = Reflection.getField(ServerTickRateManager.class, long.class, 0);
|
||||
|
||||
private boolean blockTpsPacket = true;
|
||||
private int totalSteps;
|
||||
@@ -119,7 +121,7 @@ public class TickManager implements Listener {
|
||||
|
||||
public long getRemainingTicks() {
|
||||
if (isSprinting()) {
|
||||
return manager.remainingSprintTicks;
|
||||
return remainingSprintTicks.get(manager);
|
||||
} else {
|
||||
return manager.frozenTicksToRun();
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
package de.steamwar.bausystem.utils;
|
||||
|
||||
import com.fastasyncworldedit.core.regions.selector.PolyhedralRegionSelector;
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
import com.sk89q.worldedit.IncompleteRegionException;
|
||||
import com.sk89q.worldedit.LocalSession;
|
||||
@@ -33,19 +32,16 @@ import com.sk89q.worldedit.internal.registry.InputParser;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
import com.sk89q.worldedit.regions.RegionSelector;
|
||||
import com.sk89q.worldedit.regions.selector.*;
|
||||
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import de.steamwar.Reflection;
|
||||
import de.steamwar.bausystem.shared.Pair;
|
||||
import lombok.SneakyThrows;
|
||||
import lombok.experimental.UtilityClass;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@UtilityClass
|
||||
@@ -95,36 +91,17 @@ public class WorldEditUtils {
|
||||
.getRegionSelector(BukkitAdapter.adapt(player.getWorld()));
|
||||
return new Pair<>(regionSelector.getClass(), regionSelector.getVertices()
|
||||
.stream()
|
||||
.map(blockVector3 -> {
|
||||
if (blockVector3 == null) {
|
||||
return null;
|
||||
} else {
|
||||
return BukkitAdapter.adapt(player.getWorld(), blockVector3);
|
||||
}
|
||||
})
|
||||
.map(blockVector3 -> blockVector3 == null ? null : adapt(player.getWorld(), blockVector3))
|
||||
.collect(Collectors.toList()));
|
||||
}
|
||||
|
||||
private static final Map<Class<? extends RegionSelector>, Function<World, RegionSelector>> constructors = new HashMap<>();
|
||||
static {
|
||||
constructors.put(CuboidRegionSelector.class, CuboidRegionSelector::new);
|
||||
constructors.put(ExtendingCuboidRegionSelector.class, ExtendingCuboidRegionSelector::new);
|
||||
constructors.put(Polygonal2DRegionSelector.class, Polygonal2DRegionSelector::new);
|
||||
constructors.put(EllipsoidRegionSelector.class, EllipsoidRegionSelector::new);
|
||||
constructors.put(SphereRegionSelector.class, SphereRegionSelector::new);
|
||||
constructors.put(CylinderRegionSelector.class, CylinderRegionSelector::new);
|
||||
constructors.put(ConvexPolyhedralRegionSelector.class, ConvexPolyhedralRegionSelector::new);
|
||||
constructors.put(PolyhedralRegionSelector.class, PolyhedralRegionSelector::new);
|
||||
}
|
||||
|
||||
public void setVertices(Player player, Class<? extends RegionSelector> clazz, List<Location> vertices) {
|
||||
LocalSession localSession = WorldEdit.getInstance()
|
||||
.getSessionManager()
|
||||
.get(BukkitAdapter.adapt(player));
|
||||
|
||||
Function<World, RegionSelector> constructor = constructors.get(clazz);
|
||||
if (constructor == null) return;
|
||||
RegionSelector regionSelector = constructor.apply(BukkitAdapter.adapt(player.getWorld()));
|
||||
Reflection.Constructor constructorInvoker = Reflection.getConstructor(clazz, com.sk89q.worldedit.world.World.class);
|
||||
RegionSelector regionSelector = (RegionSelector) constructorInvoker.invoke(BukkitAdapter.adapt(player.getWorld()));
|
||||
localSession.setRegionSelector(BukkitAdapter.adapt(player.getWorld()), regionSelector);
|
||||
|
||||
if (vertices.isEmpty()) return;
|
||||
@@ -150,9 +127,13 @@ public class WorldEditUtils {
|
||||
try {
|
||||
BlockVector3 min = regionSelector.getRegion().getMinimumPoint();
|
||||
BlockVector3 max = regionSelector.getRegion().getMaximumPoint();
|
||||
return new Pair<>(BukkitAdapter.adapt(player.getWorld(), min), BukkitAdapter.adapt(player.getWorld(), max));
|
||||
return new Pair<>(adapt(player.getWorld(), min), adapt(player.getWorld(), max));
|
||||
} catch (IncompleteRegionException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private Location adapt(World world, BlockVector3 blockVector3) {
|
||||
return new Location(world, blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ version: "2.0"
|
||||
depend: [ WorldEdit, SpigotCore ]
|
||||
load: POSTWORLD
|
||||
main: de.steamwar.bausystem.BauSystem
|
||||
api-version: "1.21"
|
||||
api-version: "1.13"
|
||||
website: "https://steamwar.de"
|
||||
description: "So unseriös wie wir sind: BauSystem nur besser."
|
||||
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2024 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
plugins {
|
||||
steamwar.java
|
||||
}
|
||||
|
||||
tasks.compileJava {
|
||||
options.isWarnings = false
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly(libs.classindex)
|
||||
annotationProcessor(libs.classindex)
|
||||
|
||||
compileOnly(project(":BauSystem:BauSystem_Main", "default"))
|
||||
compileOnly(project(":SpigotCore", "default"))
|
||||
|
||||
compileOnly(libs.paperapi)
|
||||
compileOnly(libs.axiom)
|
||||
compileOnly(libs.authlib)
|
||||
compileOnly(libs.viaapi)
|
||||
|
||||
compileOnly(libs.nms)
|
||||
compileOnly(libs.fawe)
|
||||
|
||||
implementation(libs.luaj)
|
||||
}
|
||||
-77
@@ -1,77 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.features.region;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.region.Point;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.bausystem.region.RegionUtils;
|
||||
import de.steamwar.bausystem.region.flags.Flag;
|
||||
import de.steamwar.bausystem.region.flags.TestblockMode;
|
||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
||||
import de.steamwar.command.SWCommand;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class WireframeCommand extends SWCommand {
|
||||
|
||||
public WireframeCommand() {
|
||||
super("wireframe");
|
||||
}
|
||||
|
||||
@Register(description = "REGION_WIREFRAME_HELP_RESET")
|
||||
public void wireframeCommand(@Validator Player p) {
|
||||
Region region = regionCheck(p);
|
||||
if (region == null) return;
|
||||
|
||||
try {
|
||||
PasteBuilder pasteBuilder = new PasteBuilder()
|
||||
.ignoreAir(true)
|
||||
.color(region.getRegionData().get(Flag.COLOR).getWithDefault());
|
||||
region.getBuildArea().reset(pasteBuilder, false);
|
||||
RegionUtils.message(region, "REGION_WIREFRAME_DONE");
|
||||
} catch (SecurityException e) {
|
||||
BauSystem.MESSAGE.send("REGION_WIREFRAME_ERROR", p);
|
||||
Bukkit.getLogger().log(Level.WARNING, "Failed wireframe", e);
|
||||
}
|
||||
}
|
||||
|
||||
private Region regionCheck(Player player) {
|
||||
Region region = Region.getRegion(player.getLocation());
|
||||
if (region.getRegionData().has(Flag.TESTBLOCK).isWritable() && region.getRegionData().get(Flag.TESTBLOCK).isWithDefault(TestblockMode.NO_VALUE)) {
|
||||
Point minPoint = region.getArea().getMinPoint(false);
|
||||
Point maxPoint = region.getArea().getMaxPoint(false);
|
||||
// TODO: Check if empty!
|
||||
int half = minPoint.getZ() + (maxPoint.getZ() - minPoint.getZ()) / 2;
|
||||
if (player.getLocation().getBlockZ() <= half) {
|
||||
region.getRegionData().set(Flag.TESTBLOCK, TestblockMode.SOUTH);
|
||||
} else {
|
||||
region.getRegionData().set(Flag.TESTBLOCK, TestblockMode.NORTH);
|
||||
}
|
||||
}
|
||||
if (region.getTestblockArea().isEmpty()) {
|
||||
BauSystem.MESSAGE.send("REGION_WIREFRAME_NO_REGION", player);
|
||||
return null;
|
||||
}
|
||||
return region;
|
||||
}
|
||||
}
|
||||
-9
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"flags": {
|
||||
"TNT": "DENY",
|
||||
"FREEZE": "INACTIVE"
|
||||
},
|
||||
"properties": {
|
||||
"testblockSchematic": 0
|
||||
}
|
||||
}
|
||||
-9
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"region_identifier": "SpawnRegion",
|
||||
"tiles": [
|
||||
{
|
||||
"tile_x": 0,
|
||||
"tile_z": 0
|
||||
}
|
||||
]
|
||||
}
|
||||
-50
@@ -1,50 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region;
|
||||
|
||||
import de.steamwar.bausystem.Permission;
|
||||
import de.steamwar.bausystem.features.region.RegionCommand;
|
||||
import de.steamwar.bausystem.region.dynamic.Tile;
|
||||
import de.steamwar.command.AbstractSWCommand;
|
||||
import de.steamwar.command.SWCommand;
|
||||
import de.steamwar.core.SWPlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
@AbstractSWCommand.PartOf(RegionCommand.class)
|
||||
public class DynamicRegionCommand extends SWCommand {
|
||||
|
||||
public DynamicRegionCommand() {
|
||||
super("");
|
||||
}
|
||||
|
||||
@Register({"dynamic"})
|
||||
public void visualizeRegions(Player player) {
|
||||
SWPlayer swPlayer = SWPlayer.of(player);
|
||||
if (swPlayer.hasComponent(DynamicRegionVisualizer.class)) {
|
||||
swPlayer.removeComponent(DynamicRegionVisualizer.class);
|
||||
swPlayer.removeComponent(DynamicRegionEditor.class);
|
||||
} else {
|
||||
swPlayer.setComponent(DynamicRegionVisualizer.INSTANCE);
|
||||
if (Permission.SUPERVISOR.hasPermission(player)) {
|
||||
swPlayer.setComponent(new DynamicRegionEditor(player.getPlayer()));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-522
@@ -1,522 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region;
|
||||
|
||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
||||
import de.steamwar.Reflection;
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.Permission;
|
||||
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
||||
import de.steamwar.bausystem.region.dynamic.DynamicRegionRepository;
|
||||
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
||||
import de.steamwar.bausystem.region.dynamic.Tile;
|
||||
import de.steamwar.bausystem.region.dynamic.spawn.SpawnRegion;
|
||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
||||
import de.steamwar.core.SWPlayer;
|
||||
import de.steamwar.entity.CArea;
|
||||
import de.steamwar.entity.REntityServer;
|
||||
import de.steamwar.entity.RInteraction;
|
||||
import de.steamwar.inventory.SWInventory;
|
||||
import de.steamwar.inventory.SWItem;
|
||||
import de.steamwar.inventory.SWListInv;
|
||||
import lombok.NonNull;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
import org.bukkit.event.player.PlayerSwapHandItemsEvent;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.bukkit.util.Vector;
|
||||
import org.joml.RayAabIntersection;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
public class DynamicRegionEditor implements SWPlayer.Component, Listener {
|
||||
|
||||
private static final Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
|
||||
private static final Class<?> look = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot");
|
||||
private static final Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
|
||||
|
||||
static {
|
||||
BiFunction<Player, Object, Object> function = (player, object) -> {
|
||||
SWPlayer.of(player).getComponent(DynamicRegionEditor.class).ifPresent(DynamicRegionEditor::calcCursor);
|
||||
return object;
|
||||
};
|
||||
TinyProtocol.instance.addFilter(position, function);
|
||||
TinyProtocol.instance.addFilter(look, function);
|
||||
TinyProtocol.instance.addFilter(positionLook, function);
|
||||
}
|
||||
|
||||
private final REntityServer entityServer = new REntityServer();
|
||||
private final CArea area = new CArea(entityServer);
|
||||
|
||||
private static final BlockData DELETE = Material.RED_CONCRETE.createBlockData();
|
||||
private static final BlockData INVALID = Material.YELLOW_CONCRETE.createBlockData();
|
||||
private static final BlockData PLACE = Material.LIME_CONCRETE.createBlockData();
|
||||
|
||||
{
|
||||
area.hide(true);
|
||||
}
|
||||
|
||||
private final Player player;
|
||||
|
||||
private final BukkitTask task;
|
||||
private Type type = new Empty();
|
||||
|
||||
public DynamicRegionEditor(Player player) {
|
||||
this.player = player;
|
||||
entityServer.addPlayer(player);
|
||||
|
||||
Bukkit.getPluginManager().registerEvents(this, BauSystem.getInstance());
|
||||
|
||||
for (int i = 0; i < 121; i++) {
|
||||
new RInteraction(entityServer, player.getLocation());
|
||||
}
|
||||
moveInteractionEntities(Point.fromLocation(player.getLocation()));
|
||||
|
||||
CArea area = new CArea(entityServer);
|
||||
area.setPos1And2(new Location(null, -Tile.maxTile, 1, -Tile.maxTile), new Location(null, Tile.maxTile, 1, Tile.maxTile));
|
||||
area.setBlock(Material.BEDROCK.createBlockData());
|
||||
|
||||
task = Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), this::showHotbar, 0, 20);
|
||||
}
|
||||
|
||||
private void showHotbar() {
|
||||
entityServer.tick();
|
||||
|
||||
StringBuilder st = new StringBuilder();
|
||||
st.append(type.title());
|
||||
st.append(" §8(§7Change with §eSwap Hands§8)");
|
||||
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(st.toString()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUnmount(SWPlayer player) {
|
||||
entityServer.close();
|
||||
task.cancel();
|
||||
PlayerMoveEvent.getHandlerList().unregister(this);
|
||||
PlayerSwapHandItemsEvent.getHandlerList().unregister(this);
|
||||
PlayerInteractEvent.getHandlerList().unregister(this);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerMove(PlayerMoveEvent event) {
|
||||
if (event.getPlayer() != player) return;
|
||||
if (!Permission.SUPERVISOR.hasPermission(player)) {
|
||||
SWPlayer.of(player).removeComponent(DynamicRegionEditor.class);
|
||||
return;
|
||||
}
|
||||
if (event.getTo() == null) return;
|
||||
if (event.getFrom().getBlockX() == event.getTo().getBlockX() && event.getFrom().getBlockZ() == event.getTo().getBlockZ()) {
|
||||
return;
|
||||
}
|
||||
moveInteractionEntities(Point.fromLocation(event.getTo()));
|
||||
}
|
||||
|
||||
private void moveInteractionEntities(Point position) {
|
||||
List<RInteraction> interactionList = entityServer.getEntitiesByType(RInteraction.class);
|
||||
for (int x = -5; x <= 5; x++) {
|
||||
for (int z = -5; z <= 5; z++) {
|
||||
interactionList.removeFirst().move(position.getX() + x + 0.5, 0, position.getZ() + z + 0.5, 0, 0, (byte) 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
|
||||
if (event.getPlayer() != player) return;
|
||||
event.setCancelled(true);
|
||||
|
||||
List<SWListInv.SWListEntry<Type>> list = new ArrayList<>();
|
||||
list.add(new SWListInv.SWListEntry<>(new SWItem(Material.STRUCTURE_VOID, "§6Deselect"), new Empty()));
|
||||
list.add(new SWListInv.SWListEntry<>(new SWItem(Material.BARRIER, "§cDelete"), new Delete(false)));
|
||||
list.add(new SWListInv.SWListEntry<>(new SWItem(Material.COMMAND_BLOCK, "§4§lForce Delete", List.of("§7Force deletes enables §cdeleting", "§7of §6Special§7 regions without", "§7confirmation§8."), false, null), new Delete(true)));
|
||||
list.add(new SWListInv.SWListEntry<>(new SWItem(Material.LODESTONE, "§fBig Spawn"), new Spawn()));
|
||||
|
||||
DynamicRegionSystem.constructorDataMap.values()
|
||||
.stream()
|
||||
.filter(RegionConstructorData::placeable)
|
||||
.sorted(Comparator.comparing(RegionConstructorData::name))
|
||||
.forEach(data -> {
|
||||
list.add(new SWListInv.SWListEntry<>(new SWItem(data.material(), "§f" + data.name()), new Place(data)));
|
||||
});
|
||||
|
||||
SWListInv<Type> inventory = new SWListInv<>(player, "Select Region to place", list, (click, type) -> {
|
||||
if (type instanceof Delete delete) {
|
||||
delete.confirmForceDelete(player, () -> {
|
||||
player.closeInventory();
|
||||
this.type = delete;
|
||||
area.hide(true);
|
||||
showHotbar();
|
||||
});
|
||||
} else {
|
||||
player.closeInventory();
|
||||
this.type = type;
|
||||
area.hide(true);
|
||||
showHotbar();
|
||||
}
|
||||
});
|
||||
inventory.open();
|
||||
}
|
||||
|
||||
private void calcCursor() {
|
||||
Location startPos = player.getLocation().clone().add(0.0, player.getEyeHeight(), 0.0);
|
||||
Vector direction = player.getLocation().getDirection();
|
||||
|
||||
RayAabIntersection intersection = new RayAabIntersection((float) startPos.getX(), (float) startPos.getY(), (float) startPos.getZ(), (float) direction.getX(), (float) direction.getY(), (float) direction.getZ());
|
||||
for (RInteraction interaction : entityServer.getEntitiesByType(RInteraction.class)) {
|
||||
float x = (float) (interaction.getX() - 0.5);
|
||||
float z = (float) (interaction.getZ() - 0.5);
|
||||
if (intersection.test(x, (float) 0.95, z, x + 1, (float) 1.05, z + 1)) {
|
||||
int tileX = (int) x;
|
||||
int tileZ = (int) z;
|
||||
if (type.visualize(area, tileX, tileZ)) {
|
||||
area.hide(false);
|
||||
return;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
area.hide(true);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
if (event.getPlayer() != player) return;
|
||||
Location startPos = player.getLocation().clone().add(0.0, player.getEyeHeight(), 0.0);
|
||||
Vector direction = player.getLocation().getDirection();
|
||||
if (direction.getY() > 0) return;
|
||||
|
||||
RayAabIntersection intersection = new RayAabIntersection((float) startPos.getX(), (float) startPos.getY(), (float) startPos.getZ(), (float) direction.getX(), (float) direction.getY(), (float) direction.getZ());
|
||||
for (RInteraction interaction : entityServer.getEntitiesByType(RInteraction.class)) {
|
||||
float x = (float) (interaction.getX() - 0.5);
|
||||
float z = (float) (interaction.getZ() - 0.5);
|
||||
if (intersection.test(x, (float) 0.95, z, x + 1, (float) 1.05, z + 1)) {
|
||||
int tileX = (int) x;
|
||||
int tileZ = (int) z;
|
||||
type.run(event.getPlayer(), tileX, tileZ);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private interface Type {
|
||||
|
||||
String title();
|
||||
|
||||
boolean visualize(CArea area, int tileX, int tileZ);
|
||||
|
||||
void run(Player player, int tileX, int tileZ);
|
||||
}
|
||||
|
||||
private static class Empty implements Type {
|
||||
|
||||
private Empty() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String title() {
|
||||
return "§6---";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visualize(CArea area, int tileX, int tileZ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(Player player, int tileX, int tileZ) {
|
||||
}
|
||||
}
|
||||
|
||||
private static class Delete implements Type {
|
||||
|
||||
protected static final String CONFIRM_DELETE = "Confirm delete: ";
|
||||
protected static final String ACCEPT_DELETE = "§cDelete: ";
|
||||
|
||||
private final boolean force;
|
||||
private boolean valid = false;
|
||||
|
||||
private Delete(boolean force) {
|
||||
this.force = force;
|
||||
}
|
||||
|
||||
public void confirmForceDelete(Player player, Runnable callback) {
|
||||
if (force) {
|
||||
confirmInventory(player, "Enable Force Delete", "§cEnable", "", callback);
|
||||
} else {
|
||||
callback.run();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String title() {
|
||||
if (force) {
|
||||
return "§4§lForce Delete";
|
||||
} else {
|
||||
return "§cDelete";
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isBigSpawn() {
|
||||
if (!DynamicRegionSystem.INSTANCE.get(Tile.ZERO).getType().isSpawn()) return false;
|
||||
return Tile.ZERO.neighboursRing()
|
||||
.map(DynamicRegionSystem.INSTANCE::get)
|
||||
.map(Region::getType)
|
||||
.allMatch(RegionType::isSpawn);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visualize(CArea area, int tileX, int tileZ) {
|
||||
// TODO: Special case for big Spawn!
|
||||
|
||||
Tile tile = Tile.fromTile(tileX, tileZ).orElse(null);
|
||||
if (tile == null) {
|
||||
valid = false;
|
||||
return false;
|
||||
}
|
||||
Region region = DynamicRegionSystem.INSTANCE.get(tile);
|
||||
if (region.getType().isGlobal()) {
|
||||
valid = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (region.getType().isSpawn()) {
|
||||
if (!isBigSpawn()) {
|
||||
valid = false;
|
||||
return false;
|
||||
}
|
||||
return selectSpawn(area);
|
||||
} else {
|
||||
return selectRegion(area, region);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean selectSpawn(CArea area) {
|
||||
Location minLoc = new Location(null, -1, 1, -1);
|
||||
Location maxLoc = new Location(null, 1, 1, 1);
|
||||
area.setBlock(DELETE);
|
||||
area.setPos1And2(minLoc, maxLoc);
|
||||
valid = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean selectRegion(CArea area, Region region) {
|
||||
Tile minTile = Tile.fromPoint(region.getArea().getMinPoint(false)).orElse(null);
|
||||
Tile maxTile = Tile.fromPoint(region.getArea().getMaxPoint(false)).orElse(null);
|
||||
if (minTile == null || maxTile == null) {
|
||||
valid = false;
|
||||
return false;
|
||||
}
|
||||
Location minLoc = new Location(null, minTile.getTileX(), 1, minTile.getTileZ());
|
||||
Location maxLoc = new Location(null, maxTile.getTileX(), 1, maxTile.getTileZ());
|
||||
area.setBlock(DELETE);
|
||||
area.setPos1And2(minLoc, maxLoc);
|
||||
valid = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(Player player, int tileX, int tileZ) {
|
||||
if (!valid) return;
|
||||
Tile tile = Tile.fromTile(tileX, tileZ).orElse(null);
|
||||
if (tile == null) return;
|
||||
Region region = DynamicRegionSystem.INSTANCE.get(tile);
|
||||
if (region.getType().isGlobal()) return;
|
||||
|
||||
if (region.getType().isSpawn()) {
|
||||
if (isBigSpawn()) deleteSpawn(player);
|
||||
return;
|
||||
}
|
||||
|
||||
if (region.getType().isPath() || (force && region.getType().isSpecial())) {
|
||||
region.delete();
|
||||
} else {
|
||||
deleteRegion(player, tile, region);
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteSpawn(Player player) {
|
||||
confirmInventory(player, CONFIRM_DELETE, ACCEPT_DELETE, "Big Spawn", () -> {
|
||||
checkSpawnRegionAndDelete(Tile.TILE_NN);
|
||||
checkSpawnRegionAndDelete(Tile.TILE_NP);
|
||||
checkSpawnRegionAndDelete(Tile.TILE_PN);
|
||||
checkSpawnRegionAndDelete(Tile.TILE_PP);
|
||||
});
|
||||
}
|
||||
|
||||
private void checkSpawnRegionAndDelete(Tile tile) {
|
||||
Region region = DynamicRegionSystem.INSTANCE.get(tile);
|
||||
if (region.getType().isSpawn()) region.delete();
|
||||
}
|
||||
|
||||
private void deleteRegion(Player player, Tile tile, Region region) {
|
||||
RegionConstructorData data = DynamicRegionSystem.constructorDataMap.get(region.getClass());
|
||||
confirmInventory(player, CONFIRM_DELETE, ACCEPT_DELETE, data.name(), () -> {
|
||||
Region checkRegion = DynamicRegionSystem.INSTANCE.get(tile);
|
||||
if (region == checkRegion) region.delete();
|
||||
});
|
||||
}
|
||||
|
||||
private void confirmInventory(Player player, String title, String accept, String name, Runnable deleteCallback) {
|
||||
SWInventory inventory = new SWInventory(player, 9, title + name);
|
||||
inventory.setItem(0, new SWItem(Material.GRAY_CONCRETE, "§7Cancel", click -> {
|
||||
player.closeInventory();
|
||||
}));
|
||||
inventory.setItem(8, new SWItem(Material.RED_CONCRETE, accept + name, click -> {
|
||||
player.closeInventory();
|
||||
deleteCallback.run();
|
||||
}));
|
||||
inventory.open();
|
||||
}
|
||||
}
|
||||
|
||||
private static class Spawn extends Place {
|
||||
|
||||
private Spawn() {
|
||||
super(3, 3);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String title() {
|
||||
return "§ePlace§8: §aBig Spawn";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean validPlacement(int tileX, int tileZ) {
|
||||
if (tileX != -1 || tileZ != -1) return false;
|
||||
if (!DynamicRegionSystem.INSTANCE.get(Tile.TILE_NN).getType().isGlobal()) return false;
|
||||
if (!DynamicRegionSystem.INSTANCE.get(Tile.TILE_NP).getType().isGlobal()) return false;
|
||||
if (!DynamicRegionSystem.INSTANCE.get(Tile.TILE_PN).getType().isGlobal()) return false;
|
||||
if (!DynamicRegionSystem.INSTANCE.get(Tile.TILE_PP).getType().isGlobal()) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(Player player, int tileX, int tileZ) {
|
||||
if (!valid) return;
|
||||
// Center Tile placement!
|
||||
tileX -= widthX / 2;
|
||||
tileZ -= widthZ / 2;
|
||||
if (!validPlacement(tileX, tileZ)) return;
|
||||
|
||||
constructSpawnRegion(Tile.TILE_NN);
|
||||
constructSpawnRegion(Tile.TILE_NP);
|
||||
constructSpawnRegion(Tile.TILE_PN);
|
||||
constructSpawnRegion(Tile.TILE_PP);
|
||||
}
|
||||
|
||||
private void constructSpawnRegion(Tile tile) {
|
||||
DynamicRegion region = DynamicRegionRepository.constructRegion(SpawnRegion.class, tile);
|
||||
if (region == null) return;
|
||||
region.getArea().place(new PasteBuilder(), false);
|
||||
region.updateNeighbours();
|
||||
}
|
||||
}
|
||||
|
||||
private static class Place implements Type {
|
||||
|
||||
private final RegionConstructorData data;
|
||||
protected final int widthX;
|
||||
protected final int widthZ;
|
||||
|
||||
protected boolean valid = false;
|
||||
|
||||
private Place(@NonNull RegionConstructorData data) {
|
||||
this(data, data.widthX(), data.widthZ());
|
||||
}
|
||||
|
||||
private Place(int widthX, int widthZ) {
|
||||
this(null, widthX, widthZ);
|
||||
}
|
||||
|
||||
private Place(RegionConstructorData data, int widthX, int widthZ) {
|
||||
this.data = data;
|
||||
this.widthX = widthX - 1;
|
||||
this.widthZ = widthZ - 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String title() {
|
||||
return "§ePlace§8: §a" + data.name();
|
||||
}
|
||||
|
||||
public boolean validPlacement(int tileX, int tileZ) {
|
||||
for (int x = 0; x <= widthX; x++) {
|
||||
for (int z = 0; z <= widthZ; z++) {
|
||||
Tile tile = Tile.fromTile(tileX + x, tileZ + z).orElse(null);
|
||||
if (tile == null) return false;
|
||||
Region region = DynamicRegionSystem.INSTANCE.get(tile);
|
||||
if (!region.getType().isGlobal()) return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visualize(CArea area, int tileX, int tileZ) {
|
||||
Tile tile = Tile.fromTile(tileX, tileZ).orElse(null);
|
||||
if (tile == null) {
|
||||
valid = false;
|
||||
return false;
|
||||
}
|
||||
// Center Tile placement!
|
||||
tileX -= widthX / 2;
|
||||
tileZ -= widthZ / 2;
|
||||
// Validate placements!
|
||||
if (validPlacement(tileX, tileZ)) {
|
||||
area.setBlock(PLACE);
|
||||
valid = true;
|
||||
} else {
|
||||
area.setBlock(INVALID);
|
||||
valid = false;
|
||||
}
|
||||
area.setPos1And2(new Location(null, tileX, 1, tileZ), new Location(null, tileX + widthX, 1, tileZ + widthZ));
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(Player player, int tileX, int tileZ) {
|
||||
if (!valid) return;
|
||||
// Center Tile placement!
|
||||
tileX -= widthX / 2;
|
||||
tileZ -= widthZ / 2;
|
||||
if (!validPlacement(tileX, tileZ)) return;
|
||||
Tile tile = Tile.fromTile(tileX, tileZ).orElse(null);
|
||||
if (tile == null) return;
|
||||
DynamicRegion region = DynamicRegionRepository.constructRegion(DynamicRegionSystem.identifierDataMap.get(data.identifier()), tile);
|
||||
if (region == null) return;
|
||||
region.getArea().place(new PasteBuilder(), false);
|
||||
region.updateNeighbours();
|
||||
}
|
||||
}
|
||||
}
|
||||
-250
@@ -1,250 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region;
|
||||
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.features.region.WireframeCommand;
|
||||
import de.steamwar.bausystem.region.dynamic.*;
|
||||
import de.steamwar.bausystem.region.dynamic.global.GlobalRegion;
|
||||
import lombok.NonNull;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class DynamicRegionSystem implements RegionSystem {
|
||||
|
||||
public static DynamicRegionSystem INSTANCE;
|
||||
|
||||
private static final Map<Long, Region> regionCache = new LinkedHashMap<>(16, 0.75f, true) {
|
||||
@Override
|
||||
protected boolean removeEldestEntry(Map.Entry<Long, Region> eldest) {
|
||||
return size() > 8192; // Tweak this number if needed!
|
||||
}
|
||||
}; // Will be cleared on region add/delete/remove!
|
||||
private static final Map<UUID, Region> regionMap = new HashMap<>();
|
||||
private static final Map<RegionType, Set<Region>> regionTypeMap = new EnumMap<>(RegionType.class);
|
||||
|
||||
public void add(DynamicRegion region) {
|
||||
regionCache.clear();
|
||||
regionMap.put(region.getID(), region);
|
||||
regionTypeMap.computeIfAbsent(region.getType(), __ -> new HashSet<>()).add(region);
|
||||
DynamicRegionVisualizer.INSTANCE.addRegion(region);
|
||||
}
|
||||
|
||||
public void remove(DynamicRegion region) {
|
||||
regionCache.clear();
|
||||
regionMap.remove(region.getID());
|
||||
regionTypeMap.getOrDefault(region.getType(), Collections.emptySet()).remove(region);
|
||||
DynamicRegionVisualizer.INSTANCE.removeRegion(region);
|
||||
}
|
||||
|
||||
public static Map<Class<? extends DynamicRegion>, RegionConstructorData> constructorDataMap = new HashMap<>();
|
||||
public static Map<String, Class<? extends DynamicRegion>> identifierDataMap = new HashMap<>();
|
||||
|
||||
@Override
|
||||
public void load() {
|
||||
INSTANCE = this;
|
||||
|
||||
// Loading all Region Constructor Data that are defined inside the Code
|
||||
constructorDataMap = new BufferedReader(new InputStreamReader(BauSystem.getInstance().getClass().getResourceAsStream("/META-INF/annotations/de.steamwar.bausystem.region.dynamic.RegionConstructorData")))
|
||||
.lines()
|
||||
.map(s -> {
|
||||
try {
|
||||
return Class.forName(s, false, BauSystem.getInstance().getClass().getClassLoader());
|
||||
} catch (ClassNotFoundException | NoClassDefFoundError e) {
|
||||
throw new SecurityException(e.getMessage(), e);
|
||||
}
|
||||
})
|
||||
.filter(DynamicRegion.class::isAssignableFrom)
|
||||
.map(clazz -> (Class<? extends DynamicRegion>) clazz)
|
||||
.collect(Collectors.toUnmodifiableMap(Function.identity(), clazz -> clazz.getAnnotation(RegionConstructorData.class)));
|
||||
identifierDataMap = constructorDataMap.entrySet()
|
||||
.stream()
|
||||
.collect(Collectors.toUnmodifiableMap(entry -> entry.getValue().identifier(), Map.Entry::getKey));
|
||||
|
||||
DynamicRegionRepository.loadRegions();
|
||||
new DynamicRegionCommand();
|
||||
new WireframeCommand();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Location getWorldSpawn() {
|
||||
return Bukkit.getWorlds().get(0).getSpawnLocation(); // TODO: Temporary
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Region getGlobalRegion() {
|
||||
return GlobalRegion.INSTANCE;
|
||||
}
|
||||
|
||||
public Set<Tile> getTilesOfRegion(@NonNull Region region) {
|
||||
Point minPoint = region.getArea().getMinPoint(false);
|
||||
Point maxPoint = region.getArea().getMaxPoint(false);
|
||||
|
||||
Set<Tile> tiles = new HashSet<>();
|
||||
for (int x = minPoint.getX(); x < maxPoint.getX(); x += Tile.tileSize) {
|
||||
for (int z = minPoint.getZ(); z < maxPoint.getZ(); z += Tile.tileSize) {
|
||||
tiles.add(Tile.fromXZ(x, z).orElse(null));
|
||||
}
|
||||
}
|
||||
tiles.remove(null);
|
||||
return Collections.unmodifiableSet(tiles);
|
||||
}
|
||||
|
||||
public @NonNull Region get(@Nullable Tile tile) {
|
||||
return get(tile, true, regionMap.values());
|
||||
}
|
||||
|
||||
private Region get(@Nullable Tile tile, boolean fastCache, Collection<Region> regions) {
|
||||
if (tile == null) return getGlobalRegion();
|
||||
if (regionCache.containsKey(tile.getId())) {
|
||||
Region region = regionCache.get(tile.getId());
|
||||
if (fastCache || regions.contains(region)) return region;
|
||||
}
|
||||
Location location = tile.getCenterLocation();
|
||||
Region region = regions.stream()
|
||||
.filter(rg -> rg.getArea().inRegion(location, false))
|
||||
.findFirst()
|
||||
.orElseGet(this::getGlobalRegion);
|
||||
if (fastCache || regions.contains(region)) {
|
||||
regionCache.put(tile.getId(), region);
|
||||
}
|
||||
return region;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Region get(@NonNull Location location) {
|
||||
return get(Tile.fromLocation(location).orElse(null), true, regionMap.values());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<Region> getRegion(@NonNull UUID id) {
|
||||
return Optional.ofNullable(regionMap.get(id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Stream<Region> getRegions() {
|
||||
return regionMap.values().stream();
|
||||
}
|
||||
|
||||
public @NonNull Stream<Region> getRegionsByType(RegionType type) {
|
||||
return regionTypeMap.getOrDefault(type, Collections.emptySet()).stream();
|
||||
}
|
||||
|
||||
public record Neighbour<T extends Region>(T region, Tile tile, NeighbourDirection direction) {
|
||||
public <O extends Region> Neighbour<O> as(Class<O> clazz) {
|
||||
if (!clazz.isInstance(region)) {
|
||||
return null;
|
||||
} else {
|
||||
return (Neighbour<O>) this;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (!(o instanceof Neighbour<?> neighbour)) return false;
|
||||
return Objects.equals(tile, neighbour.tile) && direction == neighbour.direction;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(tile, direction);
|
||||
}
|
||||
}
|
||||
|
||||
private Stream<Neighbour<Region>> getNeighbours(Region region, boolean noCorners, boolean fastCache, Collection<Region> regions) {
|
||||
Tile minTile = Tile.fromPoint(region.getArea().getMinPoint(false)).orElse(null);
|
||||
Tile maxTile = Tile.fromPoint(region.getArea().getMaxPoint(false)).orElse(null);
|
||||
if (minTile == null || maxTile == null) return Stream.empty();
|
||||
|
||||
Set<Neighbour<Region>> neighbours = new HashSet<>();
|
||||
|
||||
if (!noCorners) {
|
||||
neighbours.add(new Neighbour<>(get(minTile.add(-1, -1).orElse(null), fastCache, regions), minTile, NeighbourDirection.NorthWest));
|
||||
|
||||
Tile.fromTile(minTile.getTileX(), maxTile.getTileZ()).ifPresent(cornerMinMaxSelf -> {
|
||||
neighbours.add(new Neighbour<>(get(cornerMinMaxSelf.add(-1, 1).orElse(null), fastCache, regions), cornerMinMaxSelf, NeighbourDirection.SouthWest));
|
||||
});
|
||||
|
||||
Tile.fromTile(maxTile.getTileX(), minTile.getTileZ()).ifPresent(cornerMaxMinSelf -> {
|
||||
neighbours.add(new Neighbour<>(get(cornerMaxMinSelf.add(1, -1).orElse(null), fastCache, regions), cornerMaxMinSelf, NeighbourDirection.NorthEast));
|
||||
});
|
||||
|
||||
neighbours.add(new Neighbour<>(get(maxTile.add(1, 1).orElse(null), fastCache, regions), maxTile, NeighbourDirection.SouthEast));
|
||||
}
|
||||
|
||||
for (int x = minTile.getTileX(); x <= maxTile.getTileX(); x++) {
|
||||
Tile.fromTile(x, minTile.getTileZ()).ifPresent(tileMinZSelf -> {
|
||||
neighbours.add(new Neighbour<>(get(tileMinZSelf.add(0, -1).orElse(null), fastCache, regions), tileMinZSelf, NeighbourDirection.North));
|
||||
});
|
||||
|
||||
Tile.fromTile(x, maxTile.getTileZ()).ifPresent(tileMaxZSelf -> {
|
||||
neighbours.add(new Neighbour<>(get(tileMaxZSelf.add(0, 1).orElse(null), fastCache, regions), tileMaxZSelf, NeighbourDirection.South));
|
||||
});
|
||||
}
|
||||
|
||||
for (int z = minTile.getTileZ(); z <= maxTile.getTileZ(); z++) {
|
||||
Tile.fromTile(minTile.getTileX(), z).ifPresent(tileMinXSelf -> {
|
||||
neighbours.add(new Neighbour<>(get(tileMinXSelf.add(-1, 0).orElse(null), fastCache, regions), tileMinXSelf, NeighbourDirection.West));
|
||||
});
|
||||
|
||||
Tile.fromTile(maxTile.getTileX(), z).ifPresent(tileMaxXSelf -> {
|
||||
neighbours.add(new Neighbour<>(get(tileMaxXSelf.add(1, 0).orElse(null), fastCache, regions), tileMaxXSelf, NeighbourDirection.East));
|
||||
});
|
||||
}
|
||||
|
||||
neighbours.removeIf(neighbour -> neighbour.region.getType().isGlobal());
|
||||
return neighbours.stream();
|
||||
}
|
||||
|
||||
public Stream<Neighbour<DynamicRegion>> getNeighbours(Region region) {
|
||||
return getNeighbours(region, false, true, regionMap.values())
|
||||
.map(neighbour -> neighbour.as(DynamicRegion.class))
|
||||
.filter(Objects::nonNull);
|
||||
}
|
||||
|
||||
@Override
|
||||
@NotNull
|
||||
public Stream<Region> getConnectedRegions(@NonNull Region region) {
|
||||
Set<Region> regions = regionTypeMap.get(region.getType());
|
||||
|
||||
Set<Region> connected = new HashSet<>();
|
||||
LinkedHashSet<Region> current = new LinkedHashSet<>();
|
||||
current.add(region);
|
||||
|
||||
while (!current.isEmpty()) {
|
||||
Region r = current.removeFirst();
|
||||
if (!connected.add(r)) continue;
|
||||
getNeighbours(r, true, false, regions)
|
||||
.map(neighbour -> neighbour.region)
|
||||
.forEach(current::add);
|
||||
}
|
||||
|
||||
return connected.stream();
|
||||
}
|
||||
}
|
||||
-114
@@ -1,114 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region;
|
||||
|
||||
import de.steamwar.bausystem.region.dynamic.DynamicRegion;
|
||||
import de.steamwar.bausystem.region.dynamic.RegionConstructorData;
|
||||
import de.steamwar.bausystem.region.dynamic.Tile;
|
||||
import de.steamwar.core.SWPlayer;
|
||||
import de.steamwar.entity.*;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Display;
|
||||
import org.bukkit.util.Transformation;
|
||||
import org.joml.Quaternionf;
|
||||
import org.joml.Vector3f;
|
||||
|
||||
public class DynamicRegionVisualizer implements SWPlayer.Component {
|
||||
|
||||
public static final DynamicRegionVisualizer INSTANCE = new DynamicRegionVisualizer();
|
||||
|
||||
private final REntityServer entityServer = new REntityServer();
|
||||
|
||||
private DynamicRegionVisualizer() {
|
||||
RTextDisplay text = new RTextDisplay(entityServer, new Location(null, 0.5, 1.1, 0.5));
|
||||
text.setText("Spawn");
|
||||
text.setBillboard(Display.Billboard.VERTICAL);
|
||||
text.setBackgroundColor(0);
|
||||
text.setShadowed(false);
|
||||
text.setTransform(new Transformation(new Vector3f(0, 0, 0), new Quaternionf().rotationX((float) Math.toRadians(270)), new Vector3f(1, 1, 1), new Quaternionf()));
|
||||
}
|
||||
|
||||
public void addRegion(DynamicRegion region) {
|
||||
new CRegion(entityServer, region);
|
||||
}
|
||||
|
||||
public void removeRegion(DynamicRegion region) {
|
||||
entityServer.getEntitiesByType(CRegion.class)
|
||||
.stream()
|
||||
.filter(cRegion -> cRegion.region == region)
|
||||
.forEach(CRegion::die);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMount(SWPlayer player) {
|
||||
entityServer.addPlayer(player.getPlayer());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUnmount(SWPlayer player) {
|
||||
entityServer.removePlayer(player.getPlayer());
|
||||
}
|
||||
|
||||
private static final Vector3f VEC_ZERO = new Vector3f(0, 0, 0);
|
||||
private static final Quaternionf QUT_ZERO = new Quaternionf(0, 0, 0, 1);
|
||||
|
||||
public static Point toVisualization(Location worldLocation) {
|
||||
Tile tile = Tile.fromLocation(worldLocation).orElseThrow();
|
||||
return new Point(tile.getTileX(), 0, tile.getTileZ());
|
||||
}
|
||||
|
||||
private static class CRegion extends CEntity {
|
||||
|
||||
private final DynamicRegion region;
|
||||
|
||||
private CRegion(REntityServer server, DynamicRegion region) {
|
||||
super(server);
|
||||
this.region = region;
|
||||
|
||||
RegionConstructorData data = DynamicRegionSystem.constructorDataMap.get(region.getClass());
|
||||
int widthX = data.widthX();
|
||||
int widthZ = data.widthZ();
|
||||
|
||||
Point point = toVisualization(region.getArea().getMinPoint(false).toLocation((World) null));
|
||||
|
||||
if (widthX != 1 || widthZ != 1) {
|
||||
CArea area = new CArea(server);
|
||||
area.setBlock(Material.WHITE_CONCRETE.createBlockData());
|
||||
area.setPos1And2(point.toLocation((World) null).add(0, 1 - CArea.DEFAULT_WIDTH, 0), point.toLocation((World) null).add(widthX - 1, 1 - CArea.DEFAULT_WIDTH, widthZ - 1));
|
||||
entities.add(area);
|
||||
|
||||
RTextDisplay text = new RTextDisplay(server, point.toLocation((World) null).add(widthX / 2.0, 1.1, widthZ / 2.0));
|
||||
text.setText(data.name());
|
||||
text.setBillboard(Display.Billboard.VERTICAL);
|
||||
text.setBackgroundColor(0);
|
||||
text.setShadowed(false);
|
||||
text.setTransform(new Transformation(new Vector3f(0, 0, 0), new Quaternionf().rotationX((float) Math.toRadians(270)), new Vector3f(1, 1, 1), new Quaternionf()));
|
||||
entities.add(text);
|
||||
}
|
||||
|
||||
RBlockDisplay display = new RBlockDisplay(server, point.toLocation((World) null));
|
||||
display.setTransform(new Transformation(VEC_ZERO, QUT_ZERO, new Vector3f(widthX, 1, widthZ), QUT_ZERO));
|
||||
display.setBlock(data.material().createBlockData());
|
||||
entities.add(display);
|
||||
}
|
||||
}
|
||||
}
|
||||
-147
@@ -1,147 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
import de.steamwar.bausystem.region.DynamicRegionSystem;
|
||||
import de.steamwar.bausystem.region.Point;
|
||||
import de.steamwar.bausystem.region.Region;
|
||||
import de.steamwar.bausystem.region.RegionData;
|
||||
import de.steamwar.bausystem.region.dynamic.path.PathRegion;
|
||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
||||
import lombok.Getter;
|
||||
import lombok.NonNull;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
public abstract class DynamicRegion implements Region {
|
||||
|
||||
protected final UUID id;
|
||||
|
||||
@Getter
|
||||
protected RegionData regionData = null;
|
||||
|
||||
/**
|
||||
* This Constructor should be used if a Region is placed newly onto the world!
|
||||
*
|
||||
* @param tile this parameter is never used but forces the implementor to have it as a parameter
|
||||
*/
|
||||
protected DynamicRegion(Tile tile) {
|
||||
this.id = UUID.randomUUID();
|
||||
}
|
||||
|
||||
/**
|
||||
* This constructor is used for loading the Region from a file
|
||||
*
|
||||
* @param id
|
||||
* @param tileData this parameter is never used but forces the implementor to have it as a parameter
|
||||
*/
|
||||
protected DynamicRegion(UUID id, JsonArray tileData) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method should be called when a Region is created and needs to be saved afterward
|
||||
*/
|
||||
protected final void finishCreate() {
|
||||
finishLoad();
|
||||
save();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method should be called when a Region is loaded from file!
|
||||
*/
|
||||
protected final void finishLoad() {
|
||||
DynamicRegionSystem.INSTANCE.add(this);
|
||||
}
|
||||
|
||||
public abstract void writeTileData(JsonWriter writer) throws IOException;
|
||||
|
||||
public final void updateNeighbours() {
|
||||
List<DynamicRegionSystem.Neighbour<PathRegion>> list = DynamicRegionSystem.INSTANCE.getNeighbours(this)
|
||||
.map(neighbour -> neighbour.as(PathRegion.class))
|
||||
.filter(Objects::nonNull)
|
||||
.toList();
|
||||
// Calculate Garden State for all neighbouring PathRegions
|
||||
Set<UUID> needsFullReset = new HashSet<>();
|
||||
list.forEach(data -> {
|
||||
boolean previousGardenState = data.region().isGarden();
|
||||
data.region().calculateGardenState();
|
||||
if (data.region().isGarden() != previousGardenState) {
|
||||
needsFullReset.add(data.region().getID());
|
||||
}
|
||||
});
|
||||
// Updating world state for all neighbouring PathRegions
|
||||
list.forEach(data -> {
|
||||
if (needsFullReset.contains(data.region().getID())) {
|
||||
data.region().getArea().reset(new PasteBuilder(), false);
|
||||
} else {
|
||||
data.region().update(this, data.direction().opposite());
|
||||
}
|
||||
});
|
||||
// All full reset regions need to update their neighbours!
|
||||
needsFullReset.forEach(uuid -> {
|
||||
Region region = DynamicRegionSystem.INSTANCE.getRegion(uuid).orElse(null);
|
||||
if (!(region instanceof DynamicRegion dynamicRegion)) return;
|
||||
DynamicRegionSystem.INSTANCE.getNeighbours(dynamicRegion)
|
||||
.map(neighbour -> neighbour.as(PathRegion.class))
|
||||
.filter(Objects::nonNull)
|
||||
.forEach(data -> {
|
||||
if (data.region().isGarden()) return;
|
||||
data.region().update(dynamicRegion, data.direction().opposite());
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public void setRegionData(@NonNull RegionData regionData) {
|
||||
this.regionData = regionData;
|
||||
regionData.setStore(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete() {
|
||||
if (!getType().isDeletable()) return;
|
||||
DynamicRegionSystem.INSTANCE.remove(this);
|
||||
DynamicRegionRepository.deleteRegion(this);
|
||||
|
||||
Point minPoint = getArea().getMinPoint(false);
|
||||
Point maxPoint = getArea().getMaxPoint(false);
|
||||
PasteUtils.reset(minPoint, maxPoint);
|
||||
|
||||
this.updateNeighbours();
|
||||
}
|
||||
|
||||
@Override
|
||||
public final @NonNull UUID getID() {
|
||||
return id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void save() {
|
||||
DynamicRegionRepository.saveRegion(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void load(RegionData regionData) {
|
||||
DynamicRegionRepository.loadRegionData(this, regionData);
|
||||
}
|
||||
}
|
||||
-361
@@ -1,361 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import com.google.gson.*;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
import de.steamwar.bausystem.region.*;
|
||||
import de.steamwar.bausystem.region.dynamic.path.PathRegion;
|
||||
import de.steamwar.bausystem.region.dynamic.path.PathRegionData;
|
||||
import de.steamwar.bausystem.region.flags.Flag;
|
||||
import lombok.Cleanup;
|
||||
import lombok.SneakyThrows;
|
||||
import lombok.experimental.UtilityClass;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
import java.io.*;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.nio.file.FileVisitResult;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.SimpleFileVisitor;
|
||||
import java.nio.file.attribute.BasicFileAttributes;
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Level;
|
||||
|
||||
@UtilityClass
|
||||
public class DynamicRegionRepository {
|
||||
|
||||
// Example regions:
|
||||
// steamwar_regions/
|
||||
// \- 00000000-0000-0000-0000-000000000000/
|
||||
// | \- flags.json
|
||||
// \- 9494bbf6-b22c-4050-b62b-4be0594ed8ba/
|
||||
// \- meta.json
|
||||
// \- flags.json
|
||||
// \- backups/
|
||||
// \- MANUAL/
|
||||
// | \- 2026.03.01 14:40:00/
|
||||
// | \- flags.json
|
||||
// | \- backup.schem
|
||||
// \- AUTOMATIC/
|
||||
// \- 2026.02.30 12:00:00/
|
||||
// | \- flags.json
|
||||
// | \- backup.schem
|
||||
// \- 2026.02.28 19:39:00/
|
||||
// \- flags.json
|
||||
// \- backup.schem
|
||||
|
||||
public static final File REGION_DATA_FOLDER = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "steamwar_regions");
|
||||
|
||||
public static final String META_FILE_NAME = "meta.json";
|
||||
public static final String META_FILE_REGION_IDENTIFIER = "region_identifier";
|
||||
@Deprecated
|
||||
private static final String META_FILE_TILE_X = "tile_x";
|
||||
@Deprecated
|
||||
private static final String META_FILE_TILE_Z = "tile_z";
|
||||
public static final String META_FILES_TILES = "tiles";
|
||||
|
||||
public static final String FLAG_FILE_NAME = "flags.json";
|
||||
public static final String BACKUPS_DIR_NAME = "backups";
|
||||
public static final String BACKUP_FILE_NAME = "backup.schem";
|
||||
public static final String FLAGS_KEY = "flags";
|
||||
public static final String PROPERTIES_KEY = "properties";
|
||||
|
||||
static {
|
||||
REGION_DATA_FOLDER.mkdirs();
|
||||
}
|
||||
|
||||
public static void loadRegions() {
|
||||
// Loading all saved regions from the files
|
||||
File[] regions = REGION_DATA_FOLDER.listFiles();
|
||||
for (File region : regions) {
|
||||
UUID regionUUID;
|
||||
try {
|
||||
regionUUID = UUID.fromString(region.getName());
|
||||
} catch (IllegalArgumentException e) {
|
||||
RegionSystem.LOGGER.log(Level.WARNING, "Failed to resolve region id: " + region.getName());
|
||||
continue;
|
||||
}
|
||||
if (regionUUID.equals(RegionSystem.GLOBAL_REGION_ID) || regionUUID.equals(PathRegionData.PATH_REGION_ID)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
File metaFile = new File(region, META_FILE_NAME);
|
||||
if (!metaFile.exists() || !metaFile.isFile()) {
|
||||
RegionSystem.LOGGER.log(Level.WARNING, "Failed to resolve " + region.getName());
|
||||
continue;
|
||||
}
|
||||
|
||||
JsonObject metaData;
|
||||
try {
|
||||
metaData = JsonParser.parseReader(new FileReader(metaFile)).getAsJsonObject();
|
||||
} catch (JsonIOException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (unknown)");
|
||||
continue;
|
||||
} catch (JsonSyntaxException | IllegalStateException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (invalid json)");
|
||||
continue;
|
||||
} catch (FileNotFoundException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (not found)");
|
||||
continue;
|
||||
}
|
||||
|
||||
String identifier;
|
||||
try {
|
||||
identifier = metaData.getAsJsonPrimitive(META_FILE_REGION_IDENTIFIER).getAsString();
|
||||
} catch (ClassCastException | NumberFormatException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (invalid json)");
|
||||
continue;
|
||||
}
|
||||
|
||||
// TODO: Maybe add static method to DynamicRegionSystem
|
||||
Class<? extends DynamicRegion> regionClass = DynamicRegionSystem.identifierDataMap.get(identifier);
|
||||
if (regionClass == null) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (region no longer exists)");
|
||||
continue;
|
||||
}
|
||||
|
||||
JsonArray tileData = metaData.getAsJsonArray(META_FILES_TILES);
|
||||
if (tileData == null) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (tile is no longer in bounds)");
|
||||
continue;
|
||||
}
|
||||
constructRegion(regionClass, regionUUID, tileData);
|
||||
}
|
||||
|
||||
// Calculate Garden State for all PathRegions
|
||||
DynamicRegionSystem.INSTANCE.getRegionsByType(RegionType.PATH)
|
||||
.forEach(region -> {
|
||||
((PathRegion) region).calculateGardenState();
|
||||
});
|
||||
}
|
||||
|
||||
public static DynamicRegion constructRegion(Class<? extends DynamicRegion> clazz, Tile tile) {
|
||||
Constructor<? extends DynamicRegion> regionConstructor;
|
||||
try {
|
||||
regionConstructor = clazz.getConstructor(Tile.class);
|
||||
} catch (NoSuchMethodException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to create region (region constructor not found)");
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return regionConstructor.newInstance(tile);
|
||||
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException |
|
||||
InvocationTargetException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to create region (invalid data)");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static DynamicRegion constructRegion(Class<? extends DynamicRegion> clazz, UUID uuid, JsonArray tileData) {
|
||||
Constructor<? extends DynamicRegion> regionConstructor;
|
||||
try {
|
||||
regionConstructor = clazz.getConstructor(UUID.class, JsonArray.class);
|
||||
} catch (NoSuchMethodException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (region constructor not found)");
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return regionConstructor.newInstance(uuid, tileData);
|
||||
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException |
|
||||
InvocationTargetException e) {
|
||||
e.printStackTrace();
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (invalid data)");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static File getRegionDirectory(UUID uuid) {
|
||||
return new File(REGION_DATA_FOLDER, uuid.toString());
|
||||
}
|
||||
|
||||
public static File getRegionDirectory(Region region) {
|
||||
return getRegionDirectory(region.getID());
|
||||
}
|
||||
|
||||
public static File getBackupsTypeDirectory(Region region, RegionBackups.BackupType backupType) {
|
||||
File regionDirectory = getRegionDirectory(region);
|
||||
File backupsDirectory = new File(regionDirectory, BACKUPS_DIR_NAME);
|
||||
return new File(backupsDirectory, backupType.name());
|
||||
}
|
||||
|
||||
public static File getBackupDirectory(Region region, RegionBackups.Backup backup) {
|
||||
return new File(getBackupsTypeDirectory(region, backup.getType()), backup.getName());
|
||||
}
|
||||
|
||||
public static void loadRegionData(UUID uuid, RegionData regionData) {
|
||||
File regionDirectory = getRegionDirectory(uuid);
|
||||
if (!regionDirectory.exists()) return;
|
||||
loadRegionData(regionDirectory, regionData);
|
||||
}
|
||||
|
||||
public static void loadRegionData(Region region, RegionData regionData) {
|
||||
if (region.getRegionData() instanceof PathRegionData) {
|
||||
return;
|
||||
}
|
||||
|
||||
File regionDirectory = getRegionDirectory(region);
|
||||
if (!regionDirectory.exists()) return;
|
||||
loadRegionData(regionDirectory, regionData);
|
||||
}
|
||||
|
||||
public static void loadRegionData(Region region, RegionBackups.Backup backup, RegionData regionData) {
|
||||
File backupDirectory = getBackupDirectory(region, backup);
|
||||
if (!backupDirectory.exists()) return;
|
||||
loadRegionData(backupDirectory, regionData);
|
||||
}
|
||||
|
||||
private static void loadRegionData(File regionDirectory, RegionData regionData) {
|
||||
JsonObject flagsData;
|
||||
try {
|
||||
flagsData = JsonParser.parseReader(new FileReader(new File(regionDirectory, FLAG_FILE_NAME))).getAsJsonObject();
|
||||
} catch (JsonIOException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (unknown)");
|
||||
return;
|
||||
} catch (JsonSyntaxException | IllegalStateException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (invalid json)");
|
||||
return;
|
||||
} catch (FileNotFoundException e) {
|
||||
RegionSystem.LOGGER.log(Level.SEVERE, "Failed to read region metadata file (not found)");
|
||||
return;
|
||||
}
|
||||
|
||||
JsonObject flags = flagsData.getAsJsonObject(FLAGS_KEY);
|
||||
for (String key : flags.keySet()) {
|
||||
Flag flag;
|
||||
try {
|
||||
flag = Flag.valueOf(key);
|
||||
} catch (IllegalArgumentException e) {
|
||||
continue;
|
||||
}
|
||||
String value = flags.getAsJsonPrimitive(key).getAsString();
|
||||
Flag.Value<?> flagValue;
|
||||
try {
|
||||
flagValue = flag.valueOfValue(value);
|
||||
} catch (IllegalArgumentException e) {
|
||||
continue;
|
||||
}
|
||||
regionData.getBackedMap().put(flag, flagValue);
|
||||
}
|
||||
|
||||
JsonObject properties = flagsData.getAsJsonObject(PROPERTIES_KEY);
|
||||
// TODO: Implement!
|
||||
}
|
||||
|
||||
public static void saveRegion(Region region) {
|
||||
if (!(region.getType().isGlobal() || region instanceof DynamicRegion)) {
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
File regionDirectory = getRegionDirectory(region);
|
||||
if (!regionDirectory.exists()) regionDirectory.mkdir();
|
||||
|
||||
if (region instanceof DynamicRegion dynamicRegion) {
|
||||
RegionConstructorData constructorData = DynamicRegionSystem.constructorDataMap.get(region.getClass());
|
||||
writeMetaFile(regionDirectory, constructorData, dynamicRegion);
|
||||
}
|
||||
|
||||
if (region.getRegionData() instanceof PathRegionData) {
|
||||
return;
|
||||
}
|
||||
writeFlagsFile(regionDirectory, region.getRegionData());
|
||||
}
|
||||
|
||||
public static void saveBackup(Region region, RegionBackups.Backup backup) {
|
||||
File backupDirectory = getBackupDirectory(region, backup);
|
||||
if (!backupDirectory.exists()) {
|
||||
backupDirectory.mkdirs();
|
||||
}
|
||||
writeFlagsFile(backupDirectory, backup.getRegionData());
|
||||
}
|
||||
|
||||
public static void saveData(UUID uuid, RegionData regionData) {
|
||||
File regionDirectory = getRegionDirectory(uuid);
|
||||
writeFlagsFile(regionDirectory, regionData);
|
||||
}
|
||||
|
||||
@SneakyThrows
|
||||
private static void writeMetaFile(File regionDirectory, RegionConstructorData constructorData, DynamicRegion dynamicRegion) {
|
||||
@Cleanup
|
||||
JsonWriter jsonWriter = new JsonWriter(new FileWriter(new File(regionDirectory, META_FILE_NAME)));
|
||||
jsonWriter.setIndent(" ");
|
||||
jsonWriter.beginObject();
|
||||
jsonWriter.name(META_FILE_REGION_IDENTIFIER);
|
||||
jsonWriter.value(constructorData.identifier());
|
||||
jsonWriter.name(META_FILES_TILES);
|
||||
jsonWriter.beginArray();
|
||||
dynamicRegion.writeTileData(jsonWriter);
|
||||
jsonWriter.endArray();
|
||||
jsonWriter.endObject();
|
||||
}
|
||||
|
||||
@SneakyThrows
|
||||
private static void writeFlagsFile(File directory, RegionData regionData) {
|
||||
JsonWriter jsonWriter = new JsonWriter(new FileWriter(new File(directory, FLAG_FILE_NAME)));
|
||||
jsonWriter.setIndent(" ");
|
||||
jsonWriter.beginObject();
|
||||
|
||||
jsonWriter.name(FLAGS_KEY);
|
||||
jsonWriter.beginObject();
|
||||
for (Flag<?> flag : Flag.getFlags()) {
|
||||
if (!regionData.has(flag).isApplicable()) continue;
|
||||
jsonWriter.name(flag.name());
|
||||
jsonWriter.value(regionData.get(flag).nameWithDefault());
|
||||
}
|
||||
jsonWriter.endObject();
|
||||
|
||||
jsonWriter.name(PROPERTIES_KEY);
|
||||
jsonWriter.beginObject();
|
||||
// TODO: Write out needed properties!
|
||||
jsonWriter.endObject();
|
||||
|
||||
jsonWriter.endObject();
|
||||
jsonWriter.close();
|
||||
}
|
||||
|
||||
public static void deleteRegion(Region region) {
|
||||
deleteDir(getRegionDirectory(region));
|
||||
}
|
||||
|
||||
public static void deleteBackup(Region region, RegionBackups.Backup backup) {
|
||||
deleteDir(getBackupDirectory(region, backup));
|
||||
}
|
||||
|
||||
@SneakyThrows
|
||||
private static void deleteDir(File file) {
|
||||
Files.walkFileTree(file.toPath(), new SimpleFileVisitor<>() {
|
||||
@Override
|
||||
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
|
||||
Files.delete(file);
|
||||
return FileVisitResult.CONTINUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
|
||||
Files.delete(dir);
|
||||
return FileVisitResult.CONTINUE;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-59
@@ -1,59 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import de.steamwar.bausystem.region.dynamic.path.PathCorner;
|
||||
import de.steamwar.bausystem.region.dynamic.path.PathSide;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
public enum NeighbourDirection {
|
||||
North(0, -1, Set.of(PathSide.North), Set.of(PathCorner.NorthEast, PathCorner.NorthWest)),
|
||||
South(0, 1, Set.of(PathSide.South), Set.of(PathCorner.SouthEast, PathCorner.SouthWest)),
|
||||
West(-1, 0, Set.of(PathSide.West), Set.of(PathCorner.NorthWest, PathCorner.SouthWest)),
|
||||
East(1, 0, Set.of(PathSide.East), Set.of(PathCorner.NorthEast, PathCorner.SouthEast)),
|
||||
NorthWest(-1, -1, Set.of(), Set.of(PathCorner.NorthWest)),
|
||||
NorthEast(1, -1, Set.of(), Set.of(PathCorner.NorthEast)),
|
||||
SouthWest(-1, 1, Set.of(), Set.of(PathCorner.SouthWest)),
|
||||
SouthEast(1, 1, Set.of(), Set.of(PathCorner.SouthEast)),
|
||||
;
|
||||
|
||||
private final int tileOffsetX;
|
||||
private final int tileOffsetZ;
|
||||
private final Set<PathSide> sideUpdates;
|
||||
private final Set<PathCorner> cornerUpdates;
|
||||
|
||||
public NeighbourDirection opposite() {
|
||||
return switch (this) {
|
||||
case North -> South;
|
||||
case South -> North;
|
||||
case East -> West;
|
||||
case West -> East;
|
||||
case NorthWest -> SouthEast;
|
||||
case NorthEast -> SouthWest;
|
||||
case SouthWest -> NorthEast;
|
||||
case SouthEast -> NorthWest;
|
||||
};
|
||||
}
|
||||
}
|
||||
-62
@@ -1,62 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.math.transform.AffineTransform;
|
||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||
import de.steamwar.bausystem.region.Point;
|
||||
import de.steamwar.bausystem.utils.FlatteningWrapper;
|
||||
import lombok.experimental.UtilityClass;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@UtilityClass
|
||||
public class PasteUtils {
|
||||
|
||||
public static void reset(Point minPoint, Point maxPoint) {
|
||||
EditSession editSession = WorldEdit.getInstance()
|
||||
.newEditSessionBuilder()
|
||||
.world(BukkitAdapter.adapt(Bukkit.getWorlds().get(0)))
|
||||
.checkMemory(false)
|
||||
.allowedRegionsEverywhere()
|
||||
.limitUnlimited()
|
||||
.changeSetNull()
|
||||
.build();
|
||||
editSession.setBlocks((com.sk89q.worldedit.regions.Region) new CuboidRegion(minPoint.toBlockVector3(), maxPoint.toBlockVector3()), BlockTypes.AIR.getDefaultState());
|
||||
editSession.close();
|
||||
}
|
||||
|
||||
public static EditSession paste(File file, Point minPoint, int rotate) {
|
||||
try (Clipboard clipboard = FlatteningWrapper.impl.loadSchematic(file)) {
|
||||
BlockVector3 offset = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin());
|
||||
BlockVector3 to = minPoint.toBlockVector3().subtract(offset);
|
||||
return clipboard.paste(BukkitAdapter.adapt(Bukkit.getWorlds().get(0)), to, false, true, new AffineTransform().rotateY(rotate));
|
||||
} catch (SecurityException exception) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
-40
@@ -1,40 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import org.atteo.classindex.IndexAnnotated;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
@IndexAnnotated
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.TYPE)
|
||||
public @interface RegionConstructorData {
|
||||
String identifier();
|
||||
String name();
|
||||
Material material();
|
||||
int widthX();
|
||||
int widthZ();
|
||||
boolean placeable() default true;
|
||||
}
|
||||
@@ -1,192 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import de.steamwar.bausystem.region.Point;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Location;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@Getter
|
||||
@EqualsAndHashCode
|
||||
public class Tile {
|
||||
|
||||
public static final Tile ZERO = new Tile(0, 0);
|
||||
|
||||
public static final Tile TILE_PZ = new Tile(1, 0);
|
||||
public static final Tile TILE_NZ = new Tile(-1, 0);
|
||||
public static final Tile TILE_ZP = new Tile(0, 1);
|
||||
public static final Tile TILE_ZN = new Tile(0, -1);
|
||||
|
||||
public static final Tile TILE_PP = new Tile(1, 1);
|
||||
public static final Tile TILE_PN = new Tile(1, -1);
|
||||
public static final Tile TILE_NP = new Tile(-1, 1);
|
||||
public static final Tile TILE_NN = new Tile(-1, -1);
|
||||
|
||||
public static final int tileSize = 21;
|
||||
public static final int tileOffset = tileSize / 2;
|
||||
public static final int maxTile = 127;
|
||||
public static final int minTile = -maxTile;
|
||||
public static final int tilesPerAxis = maxTile * 2 + 1;
|
||||
|
||||
private final int tileX;
|
||||
private final int tileZ;
|
||||
|
||||
private Tile(int tileX, int tileZ) {
|
||||
this.tileX = tileX;
|
||||
this.tileZ = tileZ;
|
||||
}
|
||||
|
||||
public static Optional<Tile> fromTile(int tileX, int tileZ) {
|
||||
if (tileX < minTile || tileZ < minTile) return Optional.empty();
|
||||
if (tileX > maxTile || tileZ > maxTile) return Optional.empty();
|
||||
return Optional.of(new Tile(tileX, tileZ));
|
||||
}
|
||||
|
||||
public static Optional<Tile> fromLocation(Location location) {
|
||||
return fromXZ(location.getBlockX(), location.getBlockZ());
|
||||
}
|
||||
|
||||
public static Optional<Tile> fromPoint(Point point) {
|
||||
return fromXZ(point.getX(), point.getZ());
|
||||
}
|
||||
|
||||
public static Optional<Tile> fromXZ(int x, int z) {
|
||||
x = (int) Math.floor((x + tileOffset) / (double) tileSize);
|
||||
z = (int) Math.floor((z + tileOffset) / (double) tileSize);
|
||||
return fromTile(x, z);
|
||||
}
|
||||
|
||||
public static int getMinX(int tileX) {
|
||||
return tileX * tileSize - tileOffset;
|
||||
}
|
||||
|
||||
public int getMinX() {
|
||||
return getMinX(tileX);
|
||||
}
|
||||
|
||||
public static int getMinZ(int tileZ) {
|
||||
return tileZ * tileSize - tileOffset;
|
||||
}
|
||||
|
||||
public int getMinZ() {
|
||||
return getMinZ(tileZ);
|
||||
}
|
||||
|
||||
public static int getMaxX(int tileX) {
|
||||
return tileX * tileSize + tileOffset;
|
||||
}
|
||||
|
||||
public int getMaxX() {
|
||||
return getMaxX(tileX);
|
||||
}
|
||||
|
||||
public static int getMaxZ(int tileZ) {
|
||||
return tileZ * tileSize + tileOffset;
|
||||
}
|
||||
|
||||
public int getMaxZ() {
|
||||
return getMaxZ(tileZ);
|
||||
}
|
||||
|
||||
public static Location getMinLocation(int tileX, int tileZ) {
|
||||
return new Location(null, getMinX(tileX), 0, getMinZ(tileZ));
|
||||
}
|
||||
|
||||
public Location getMinLocation() {
|
||||
return getMinLocation(tileX, tileZ);
|
||||
}
|
||||
|
||||
public static Location getMaxLocation(int tileX, int tileZ) {
|
||||
return new Location(null, getMaxX(tileX), 0, getMaxZ(tileZ));
|
||||
}
|
||||
|
||||
public Location getMaxLocation() {
|
||||
return getMaxLocation(tileX, tileZ);
|
||||
}
|
||||
|
||||
public static Location getCenterLocation(int tileX, int tileZ) {
|
||||
return new Location(null, tileX * tileSize, 0, tileZ * tileSize);
|
||||
}
|
||||
|
||||
public Location getCenterLocation() {
|
||||
return getCenterLocation(tileX, tileZ);
|
||||
}
|
||||
|
||||
public Optional<Tile> add(int offsetX, int offsetZ) {
|
||||
return fromTile(tileX + offsetX, tileZ + offsetZ);
|
||||
}
|
||||
|
||||
public static long getId(int tileX, int tileZ) {
|
||||
return (tileX + maxTile) * tilesPerAxis + tileZ + maxTile;
|
||||
}
|
||||
|
||||
public long getId() {
|
||||
return getId(tileX, tileZ);
|
||||
}
|
||||
|
||||
public Stream<Tile> neighboursPlus() {
|
||||
List<Tile> tiles = new ArrayList<>();
|
||||
add(-1, 0).ifPresent(tiles::add);
|
||||
add(1, 0).ifPresent(tiles::add);
|
||||
add(0, -1).ifPresent(tiles::add);
|
||||
add(0, 1).ifPresent(tiles::add);
|
||||
return tiles.stream();
|
||||
}
|
||||
|
||||
public Stream<Tile> neighboursRing() {
|
||||
List<Tile> tiles = new ArrayList<>();
|
||||
add(-1, -1).ifPresent(tiles::add);
|
||||
add(-1, 0).ifPresent(tiles::add);
|
||||
add(-1, 1).ifPresent(tiles::add);
|
||||
add(0, -1).ifPresent(tiles::add);
|
||||
add(0, 1).ifPresent(tiles::add);
|
||||
add(1, -1).ifPresent(tiles::add);
|
||||
add(1, 0).ifPresent(tiles::add);
|
||||
add(1, 1).ifPresent(tiles::add);
|
||||
return tiles.stream();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return tileX + ":" + tileZ;
|
||||
}
|
||||
|
||||
public String display() {
|
||||
StringBuilder st = new StringBuilder();
|
||||
if (tileX >= 0) {
|
||||
st.append("+");
|
||||
}
|
||||
st.append(tileX);
|
||||
|
||||
st.append(" / ");
|
||||
|
||||
if (tileZ >= 0) {
|
||||
st.append("+");
|
||||
}
|
||||
st.append(tileZ);
|
||||
return st.toString();
|
||||
}
|
||||
}
|
||||
-62
@@ -1,62 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonPrimitive;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
import lombok.experimental.UtilityClass;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@UtilityClass
|
||||
public class TileUtils {
|
||||
|
||||
private static Tile readTile(JsonObject tileData, String prefix) {
|
||||
JsonPrimitive xData = tileData.getAsJsonPrimitive(prefix + "_x");
|
||||
JsonPrimitive zData = tileData.getAsJsonPrimitive(prefix + "_z");
|
||||
if (xData == null || zData == null) return null;
|
||||
return Tile.fromTile(xData.getAsInt(), zData.getAsInt())
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
public static Tile readTile(JsonArray tileData) {
|
||||
if (tileData.size() != 1) return null;
|
||||
try {
|
||||
return readTile(tileData.get(0).getAsJsonObject(), "tile");
|
||||
} catch (IllegalStateException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static void writeTile(JsonWriter writer, Tile tile, String prefix) throws IOException {
|
||||
writer.name(prefix + "_x");
|
||||
writer.value(tile.getTileX());
|
||||
writer.name(prefix + "_z");
|
||||
writer.value(tile.getTileZ());
|
||||
}
|
||||
|
||||
public static void writeTile(JsonWriter writer, Tile tile) throws IOException {
|
||||
writer.beginObject();
|
||||
writeTile(writer, tile, "tile");
|
||||
writer.endObject();
|
||||
}
|
||||
}
|
||||
-96
@@ -1,96 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2026 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic;
|
||||
|
||||
import lombok.NonNull;
|
||||
|
||||
import java.io.File;
|
||||
import java.time.LocalDate;
|
||||
import java.time.Month;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.Optional;
|
||||
import java.util.Random;
|
||||
|
||||
public abstract class VariantSelector {
|
||||
|
||||
private static final Random RANDOM = new Random();
|
||||
public static final VariantSelector EMPTY = new VariantSelector() {
|
||||
@Override
|
||||
public Optional<File> select() {
|
||||
return Optional.empty();
|
||||
}
|
||||
};
|
||||
|
||||
private VariantSelector() {
|
||||
}
|
||||
|
||||
public abstract Optional<File> select();
|
||||
|
||||
public final VariantSelector or(VariantSelector other) {
|
||||
if (this == EMPTY) return other;
|
||||
VariantSelector self = this;
|
||||
return new VariantSelector() {
|
||||
@Override
|
||||
public Optional<File> select() {
|
||||
return self.select().or(() -> other.select());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public final VariantSelector atDate(int day, Month month) {
|
||||
if (this == EMPTY) return this;
|
||||
VariantSelector self = this;
|
||||
return new VariantSelector() {
|
||||
@Override
|
||||
public Optional<File> select() {
|
||||
LocalDate date = LocalDate.now();
|
||||
if (date.getDayOfMonth() == day && date.getMonth() == month) {
|
||||
return self.select();
|
||||
} else {
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public static VariantSelector Get(@NonNull File directory) {
|
||||
final File[] files = directory.listFiles();
|
||||
if (files == null || files.length == 0) return EMPTY;
|
||||
if (files.length == 1) {
|
||||
final File file = files[0];
|
||||
return new VariantSelector() {
|
||||
@Override
|
||||
public Optional<File> select() {
|
||||
return Optional.of(file);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Arrays.sort(files, Comparator.comparing(File::getName));
|
||||
final int filesCount = files.length;
|
||||
return new VariantSelector() {
|
||||
@Override
|
||||
public Optional<File> select() {
|
||||
return Optional.of(files[RANDOM.nextInt(filesCount)]);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
-139
@@ -1,139 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic.global;
|
||||
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import de.steamwar.bausystem.region.*;
|
||||
import de.steamwar.bausystem.region.dynamic.DynamicRegionRepository;
|
||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
||||
import de.steamwar.sql.GameModeConfig;
|
||||
import lombok.NonNull;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.UUID;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
public class GlobalRegion implements Region {
|
||||
|
||||
public static final GlobalRegion INSTANCE = new GlobalRegion();
|
||||
|
||||
private static final Point MIN_POINT = new Point(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
|
||||
private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
|
||||
|
||||
private static final Region.Area GLOBAL_AREA = new Region.Area() {
|
||||
@Override
|
||||
public @NonNull Point getMinPoint(boolean extension) {
|
||||
return MIN_POINT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Point getMaxPoint(boolean extension) {
|
||||
return MAX_POINT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Point getCopyPoint(boolean extension) {
|
||||
return Point.ZERO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean inRegion(Location location, boolean extension) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public Clipboard copy(boolean extension) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void place(PasteBuilder pasteBuilder, boolean extension) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void forEachChunk(BiConsumer<Integer, Integer> executor) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isChunkOutside(int chunkX, int chunkZ) {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
private static final GlobalRegionData REGION_DATA = new GlobalRegionData(INSTANCE);
|
||||
|
||||
@Override
|
||||
public @NonNull UUID getID() {
|
||||
return RegionSystem.GLOBAL_REGION_ID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull RegionType getType() {
|
||||
return RegionType.GLOBAL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull RegionData getRegionData() {
|
||||
return REGION_DATA;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Area getArea() {
|
||||
return GLOBAL_AREA;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Area getBuildArea() {
|
||||
return Area.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Area getTestblockArea() {
|
||||
return Area.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull GameModeConfig<Material, String> getGameModeConfig() {
|
||||
return GameModeConfig.getDefaults();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull RegionHistory getHistory() {
|
||||
return RegionHistory.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull RegionBackups getBackups() {
|
||||
return RegionBackups.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save() {
|
||||
DynamicRegionRepository.saveRegion(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void load(RegionData regionData) {
|
||||
DynamicRegionRepository.loadRegionData(this, regionData);
|
||||
}
|
||||
}
|
||||
-55
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.bausystem.region.dynamic.global;
|
||||
|
||||
import de.steamwar.bausystem.region.RegionData;
|
||||
import de.steamwar.bausystem.region.RegionFlagPolicy;
|
||||
import de.steamwar.bausystem.region.flags.Flag;
|
||||
import de.steamwar.bausystem.region.flags.ProtectMode;
|
||||
import de.steamwar.bausystem.region.flags.TNTMode;
|
||||
import de.steamwar.core.Core;
|
||||
import lombok.NonNull;
|
||||
|
||||
public class GlobalRegionData extends RegionData {
|
||||
|
||||
public GlobalRegionData(GlobalRegion globalRegion) {
|
||||
super(globalRegion);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initialize() {
|
||||
flagMap.put(Flag.TNT, TNTMode.DENY);
|
||||
flagMap.put(Flag.PROTECT, ProtectMode.INACTIVE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
|
||||
if (flag.oneOf(Flag.PROTECT)) {
|
||||
return RegionFlagPolicy.READ_ONLY;
|
||||
}
|
||||
if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
|
||||
return RegionFlagPolicy.WRITABLE;
|
||||
}
|
||||
if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.WATER_DESTROY)) {
|
||||
return RegionFlagPolicy.WRITABLE;
|
||||
}
|
||||
return RegionFlagPolicy.NOT_APPLICABLE;
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user