Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-01-04 15:41:30 +00:00
Code Issues Releases Activity

update iris core to jdk 21

Browse Source
This commit is contained in:
Julian Krings
2024-12-14 16:23:29 +01:00
parent c83ac67b47
commit 1b76a66760
7 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/volmit/iris/core/pregenerator/DeepSearchPregenerator.java
View File

@@ -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;
}
}

17
core/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java
View File

@@ -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;
}
}

9
core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java
View File

@@ -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;
}
}

7
core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
View File

@@ -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<String, Boolean> 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++;
}

6
core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java
View File

@@ -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());
}
}
}

9
core/src/main/java/com/volmit/iris/util/collection/KList.java
View File

@@ -80,15 +80,6 @@ public class KList<T> extends ArrayList<T> implements List<T> {
return indexOf(v);
}
/**
* Remove the last element
*/
public KList<T> removeLast() {
remove(last());
return this;
}
public void addMultiple(T t, int c) {
for (int i = 0; i < c; i++) {
add(t);