diff --git a/build.gradle b/build.gradle index 6c15c0d3d..1a81c727e 100644 --- a/build.gradle +++ b/build.gradle @@ -62,18 +62,14 @@ def NMS_BINDINGS = Map.of( "v1_19_R2", "1.19.3-R0.1-SNAPSHOT", "v1_19_R1", "1.19.2-R0.1-SNAPSHOT" ) -def JVM_VERSION = Map.of( - "v1_21_R2", 21, - "v1_21_R1", 21, - "v1_20_R4", 21, -) +def JVM_VERSION = Map.of() NMS_BINDINGS.each { nms -> project(":nms:${nms.key}") { apply plugin: 'java' apply plugin: 'com.volmit.nmstools' nmsTools { - it.jvm = JVM_VERSION.getOrDefault(nms.key, 17) + it.jvm = JVM_VERSION.getOrDefault(nms.key, 21) it.version = nms.value } @@ -164,18 +160,18 @@ allprojects { } } -if (JavaVersion.current().toString() != "17") { +if (JavaVersion.current().toString() != "21") { System.err.println() System.err.println("=========================================================================================================") - System.err.println("You must run gradle on Java 17. You are using " + JavaVersion.current()) + System.err.println("You must run gradle on Java 21. You are using " + JavaVersion.current()) System.err.println() System.err.println("=== For IDEs ===") - System.err.println("1. Configure the project for Java 17") - System.err.println("2. Configure the bundled gradle to use Java 17 in settings") + System.err.println("1. Configure the project for Java 21") + System.err.println("2. Configure the bundled gradle to use Java 21 in settings") System.err.println() System.err.println("=== For Command Line (gradlew) ===") - System.err.println("1. Install JDK 17 from https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html") - System.err.println("2. Set JAVA_HOME environment variable to the new jdk installation folder such as C:\\Program Files\\Java\\jdk-17.0.1") + System.err.println("1. Install JDK 21 from https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html") + System.err.println("2. Set JAVA_HOME environment variable to the new jdk installation folder such as C:\\Program Files\\Java\\jdk-21.0.4") System.err.println("3. Open a new command prompt window to get the new environment variables if need be.") System.err.println("=========================================================================================================") System.err.println() diff --git a/core/src/main/java/com/volmit/iris/core/pregenerator/DeepSearchPregenerator.java b/core/src/main/java/com/volmit/iris/core/pregenerator/DeepSearchPregenerator.java index c60724d2a..e9d2b8f74 100644 --- a/core/src/main/java/com/volmit/iris/core/pregenerator/DeepSearchPregenerator.java +++ b/core/src/main/java/com/volmit/iris/core/pregenerator/DeepSearchPregenerator.java @@ -15,7 +15,6 @@ import com.volmit.iris.util.math.RollingSequence; import com.volmit.iris.util.math.Spiraler; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; -import lombok.Builder; import lombok.Data; import lombok.Getter; import org.bukkit.Bukkit; @@ -261,14 +260,14 @@ public class DeepSearchPregenerator extends Thread implements Listener { } @Data - @Builder + @lombok.Builder public static class DeepSearchJob { private World world; - @Builder.Default + @lombok.Builder.Default private int radiusBlocks = 5000; - @Builder.Default + @lombok.Builder.Default private int position = 0; - @Builder.Default + @lombok.Builder.Default boolean paused = false; } } diff --git a/core/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java b/core/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java index 20e3ace96..dc58f2ed5 100644 --- a/core/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java +++ b/core/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java @@ -12,7 +12,6 @@ import com.volmit.iris.util.math.Spiraler; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import io.papermc.lib.PaperLib; -import lombok.Builder; import lombok.Data; import lombok.Getter; import org.bukkit.Bukkit; @@ -264,22 +263,22 @@ public class LazyPregenerator extends Thread implements Listener { } @Data - @Builder + @lombok.Builder public static class LazyPregenJob { private String world; - @Builder.Default + @lombok.Builder.Default private int healingPosition = 0; - @Builder.Default + @lombok.Builder.Default private boolean healing = false; - @Builder.Default + @lombok.Builder.Default private int chunksPerMinute = 32; - @Builder.Default + @lombok.Builder.Default private int radiusBlocks = 5000; - @Builder.Default + @lombok.Builder.Default private int position = 0; - @Builder.Default + @lombok.Builder.Default boolean silent = false; - @Builder.Default + @lombok.Builder.Default boolean paused = false; } } diff --git a/core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java b/core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java index ba0c901bb..4588597c3 100644 --- a/core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java +++ b/core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java @@ -18,7 +18,6 @@ import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import io.papermc.lib.PaperLib; -import lombok.Builder; import lombok.Data; import lombok.Getter; import org.apache.logging.log4j.core.util.ExecutorServices; @@ -328,14 +327,14 @@ public class TurboPregenerator extends Thread implements Listener { } @Data - @Builder + @lombok.Builder public static class TurboPregenJob { private String world; - @Builder.Default + @lombok.Builder.Default private int radiusBlocks = 5000; - @Builder.Default + @lombok.Builder.Default private int position = 0; - @Builder.Default + @lombok.Builder.Default boolean paused = false; } } diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java index 6e88835be..a1de18768 100644 --- a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java @@ -20,12 +20,11 @@ import java.util.Map; import java.util.StringJoiner; import static com.volmit.iris.Iris.getJavaVersion; -import static com.volmit.iris.Iris.instance; import static com.volmit.iris.core.safeguard.IrisSafeguard.*; public class ServerBootSFG { public static final Map incompatibilities = new HashMap<>(); - public static boolean isJDK17 = true; + public static boolean isCorrectJDK = true; public static boolean hasEnoughDiskSpace = true; public static boolean isJRE = false; public static boolean hasPrivileges = true; @@ -87,8 +86,8 @@ public class ServerBootSFG { severityHigh++; } - if (!List.of(17, 21).contains(getJavaVersion())) { - isJDK17 = false; + if (!List.of(21).contains(getJavaVersion())) { + isCorrectJDK = false; joiner.add("Unsupported Java version"); severityMedium++; } diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java index a10152651..ceab86fe8 100644 --- a/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java @@ -51,13 +51,13 @@ public class UtilsSFG { Iris.safeguard(C.YELLOW + "Insufficient Disk Space"); Iris.safeguard(C.YELLOW + "- The server has insufficient Free DiskSpace to run iris required 3GB+."); } - if (!ServerBootSFG.isJDK17) { + if (!ServerBootSFG.isCorrectJDK) { Iris.safeguard(C.YELLOW + "Unsupported java version"); - Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 (or 21 for 1.20.6) Instead of JDK " + Iris.getJavaVersion()); + Iris.safeguard(C.YELLOW + "- Please consider using JDK 21 Instead of JDK " + Iris.getJavaVersion()); } if (ServerBootSFG.isJRE) { Iris.safeguard(C.YELLOW + "Unsupported Server JDK"); - Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 (or 21 for 1.20.6) Instead of JRE " + Iris.getJavaVersion()); + Iris.safeguard(C.YELLOW + "- Please consider using JDK 21 Instead of JRE " + Iris.getJavaVersion()); } } } diff --git a/core/src/main/java/com/volmit/iris/util/collection/KList.java b/core/src/main/java/com/volmit/iris/util/collection/KList.java index 573a5e552..9e00ea20d 100644 --- a/core/src/main/java/com/volmit/iris/util/collection/KList.java +++ b/core/src/main/java/com/volmit/iris/util/collection/KList.java @@ -80,15 +80,6 @@ public class KList extends ArrayList implements List { return indexOf(v); } - /** - * Remove the last element - */ - public KList removeLast() { - remove(last()); - - return this; - } - public void addMultiple(T t, int c) { for (int i = 0; i < c; i++) { add(t);