mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-01 23:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into v3.4.3

Browse Source
This commit is contained in:
Julian Krings 2024-08-21 13:09:11 +02:00
commit 414f46a08d
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -32,7 +32,7 @@ plugins {
id "de.undercouch.download" version "5.0.1" 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 // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
// ======================== WINDOWS ============================= // ======================== WINDOWS =============================

2
core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
View File

@ -58,7 +58,7 @@ public class ServerConfigurator {
} }
private static void increaseKeepAliveSpigot() throws IOException, InvalidConfigurationException { private static void increaseKeepAliveSpigot() throws IOException, InvalidConfigurationException {
File spigotConfig = new File("config/spigot.yml"); File spigotConfig = new File("spigot.yml");
FileConfiguration f = new YamlConfiguration(); FileConfiguration f = new YamlConfiguration();
f.load(spigotConfig); f.load(spigotConfig);
long tt = f.getLong("settings.timeout-time"); long tt = f.getLong("settings.timeout-time");

3
core/src/main/java/com/volmit/iris/core/nms/INMS.java
View File

@ -29,7 +29,8 @@ public class INMS {
private static final Map<String, String> REVISION = Map.of( private static final Map<String, String> REVISION = Map.of(
"1.20.5", "v1_20_R4", "1.20.5", "v1_20_R4",
"1.20.6", "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 //@done
private static final INMSBinding binding = bind(); private static final INMSBinding binding = bind();

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

@ -37,7 +37,7 @@ public class UtilsSFG {
} }
if (ServerBootSFG.unsuportedversion) { if (ServerBootSFG.unsuportedversion) {
Iris.safeguard(C.RED + "Server Version"); 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) { if (!ServerBootSFG.passedserversoftware) {
Iris.safeguard(C.YELLOW + "Unsupported Server Software"); Iris.safeguard(C.YELLOW + "Unsupported Server Software");