From 25b41fe62cb032b07e12591103245ebeca0cda94 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 15 Aug 2024 18:42:23 +0200 Subject: [PATCH 1/4] add 1.21.1 support --- core/src/main/java/com/volmit/iris/core/nms/INMS.java | 3 ++- .../src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/core/nms/INMS.java b/core/src/main/java/com/volmit/iris/core/nms/INMS.java index 36b26dcb9..741018d43 100644 --- a/core/src/main/java/com/volmit/iris/core/nms/INMS.java +++ b/core/src/main/java/com/volmit/iris/core/nms/INMS.java @@ -29,7 +29,8 @@ public class INMS { private static final Map REVISION = Map.of( "1.20.5", "v1_20_R4", "1.20.6", "v1_20_R4", - "1.21", "v1_21_R1" + "1.21", "v1_21_R1", + "1.21.1", "v1_21_R1" ); //@done private static final INMSBinding binding = bind(); 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 659c02bdd..a10152651 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 @@ -37,7 +37,7 @@ public class UtilsSFG { } if (ServerBootSFG.unsuportedversion) { Iris.safeguard(C.RED + "Server Version"); - Iris.safeguard(C.RED + "- Iris only supports 1.19.2 > 1.20.6"); + Iris.safeguard(C.RED + "- Iris only supports 1.19.2 > 1.21.1"); } if (!ServerBootSFG.passedserversoftware) { Iris.safeguard(C.YELLOW + "Unsupported Server Software"); From d0688782b1f122e4495894315f932257d2d7467d Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 15 Aug 2024 18:47:27 +0200 Subject: [PATCH 2/4] fix getEngineData NullPointer --- .../com/volmit/iris/engine/IrisEngine.java | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java index e1ea0a00e..54c9ce912 100644 --- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -254,30 +254,40 @@ public class IrisEngine implements Engine { return engineData.aquire(() -> { //TODO: Method this file File f = new File(getWorld().worldFolder(), "iris/engine-data/" + getDimension().getLoadKey() + ".json"); + IrisEngineData data = null; - if (!f.exists()) { + if (f.exists()) { try { - f.getParentFile().mkdirs(); - IrisEngineData data = new IrisEngineData(); - data.getStatistics().setVersion(Iris.instance.getIrisVersion()); - data.getStatistics().setMCVersion(Iris.instance.getMCVersion()); - data.getStatistics().setUpgradedVersion(Iris.instance.getIrisVersion()); - if (data.getStatistics().getVersion() == -1 || data.getStatistics().getMCVersion() == -1 ) { - Iris.error("Failed to setup Engine Data!"); + data = new Gson().fromJson(IO.readAll(f), IrisEngineData.class); + if (data == null) { + Iris.error("Failed to read Engine Data! Corrupted File? recreating..."); } - IO.writeAll(f, new Gson().toJson(data)); } catch (IOException e) { e.printStackTrace(); } } - try { - return new Gson().fromJson(IO.readAll(f), IrisEngineData.class); - } catch (Throwable e) { - e.printStackTrace(); + if (data == null) { + data = new IrisEngineData(); + data.getStatistics().setVersion(Iris.instance.getIrisVersion()); + data.getStatistics().setMCVersion(Iris.instance.getMCVersion()); + data.getStatistics().setUpgradedVersion(Iris.instance.getIrisVersion()); + if (data.getStatistics().getVersion() == -1 || data.getStatistics().getMCVersion() == -1 ) { + Iris.error("Failed to setup Engine Data!"); + } + + if (f.getParentFile().exists() || f.getParentFile().mkdirs()) { + try { + IO.writeAll(f, new Gson().toJson(data)); + } catch (IOException e) { + e.printStackTrace(); + } + } else { + Iris.error("Failed to setup Engine Data!"); + } } - return new IrisEngineData(); + return data; }); } From c3ac41f8941533ed8029395bc185efb86dfc5622 Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Thu, 15 Aug 2024 12:58:01 -0400 Subject: [PATCH 3/4] V+ lol --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cec0f1ee0..62e4c9025 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ plugins { id "de.undercouch.download" version "5.0.1" } -version '3.4.1-1.19.2-1.21' +version '3.4.1-1.19.2-1.21.1' // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ======================== WINDOWS ============================= From 9144606688ad58e826eccbb4d92a46eec55f9d9b Mon Sep 17 00:00:00 2001 From: repixelatedmc Date: Mon, 19 Aug 2024 19:36:35 +0200 Subject: [PATCH 4/4] Biggest 1 line fix ever --- core/src/main/java/com/volmit/iris/core/ServerConfigurator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java index 1a760d9d7..a1e273d65 100644 --- a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java +++ b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java @@ -58,7 +58,7 @@ public class ServerConfigurator { } private static void increaseKeepAliveSpigot() throws IOException, InvalidConfigurationException { - File spigotConfig = new File("config/spigot.yml"); + File spigotConfig = new File("spigot.yml"); FileConfiguration f = new YamlConfiguration(); f.load(spigotConfig); long tt = f.getLong("settings.timeout-time");