diff --git a/patches/server/0054-Do-not-log-run-as-root-warning.patch b/patches/server/0054-Do-not-log-run-as-root-warning.patch index b8adc3a..a0b5961 100644 --- a/patches/server/0054-Do-not-log-run-as-root-warning.patch +++ b/patches/server/0054-Do-not-log-run-as-root-warning.patch @@ -16,7 +16,7 @@ Licensed under: MIT (https://opensource.org/licenses/MIT) Let users decide if we should warn while running in a root user diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 007fe6820e208c04e81acbd7bb7eaf0a22f6f64f..95a33f2e9c91831f1fdf903558a088594dcf41c4 100644 +index 007fe6820e208c04e81acbd7bb7eaf0a22f6f64f..8c7adc9edf941d5cc9aa2e427267eb035d4627d6 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -184,7 +184,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -24,19 +24,7 @@ index 007fe6820e208c04e81acbd7bb7eaf0a22f6f64f..95a33f2e9c91831f1fdf903558a08859 // Paper start - detect running as root - if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) { -+ if (GaleGlobalConfiguration.get().logToConsole.runningAsRootOrAdminWarning && io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) { // Gale - KeYi - do not log run as root warning ++ if (!"false".equalsIgnoreCase(System.getProperty("gale.log.warning.root")) && io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) { // Gale - KeYi - do not log run as root warning DedicatedServer.LOGGER.warn("****************************"); DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED."); DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS."); -diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index ce8c7032dff4e119d018d42fa579f9231cf41961..f4e20ea5f59e0709cf2dd485a0e5798822e5301d 100644 ---- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -61,6 +61,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { - public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks - public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes - public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization -+ public boolean runningAsRootOrAdminWarning = true; // Gale - KeYi - do not log run as root warning - - public Chat chat; - public class Chat extends ConfigurationPart { diff --git a/patches/server/0055-Do-not-log-offline-mode-warning.patch b/patches/server/0055-Do-not-log-offline-mode-warning.patch index a9afa4d..33520fa 100644 --- a/patches/server/0055-Do-not-log-offline-mode-warning.patch +++ b/patches/server/0055-Do-not-log-offline-mode-warning.patch @@ -16,7 +16,7 @@ Licensed under: MIT (https://opensource.org/licenses/MIT) Let users decide if we should warn while running in offline mode diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 95a33f2e9c91831f1fdf903558a088594dcf41c4..61ab44d572b3ef4b6837aafa7e184de7bc0a7327 100644 +index 8c7adc9edf941d5cc9aa2e427267eb035d4627d6..8e45f712968303b7864d61adbf7325142c83f582 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -298,7 +298,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -24,19 +24,7 @@ index 95a33f2e9c91831f1fdf903558a088594dcf41c4..61ab44d572b3ef4b6837aafa7e184de7 // CraftBukkit end - if (!this.usesAuthentication()) { -+ if (GaleGlobalConfiguration.get().logToConsole.offlineModeWarning && !this.usesAuthentication()) { // Gale - KeYi - do not log offline mode warning ++ if (!"false".equalsIgnoreCase(System.getProperty("gale.log.warning.offline.mode")) && !this.usesAuthentication()) { // Gale - KeYi - do not log offline mode warning DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); // Spigot start -diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index f4e20ea5f59e0709cf2dd485a0e5798822e5301d..cf4a354fd3a68f8a0639ed98c7c2e842c6459389 100644 ---- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -62,6 +62,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { - public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes - public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization - public boolean runningAsRootOrAdminWarning = true; // Gale - KeYi - do not log run as root warning -+ public boolean offlineModeWarning = true; // Gale - KeYi - do not log offline mode warning - - public Chat chat; - public class Chat extends ConfigurationPart { diff --git a/patches/server/0056-Softly-log-invalid-pool-element-errors.patch b/patches/server/0056-Softly-log-invalid-pool-element-errors.patch index e07aa95..0875920 100644 --- a/patches/server/0056-Softly-log-invalid-pool-element-errors.patch +++ b/patches/server/0056-Softly-log-invalid-pool-element-errors.patch @@ -38,7 +38,7 @@ index d2b4654a9095a678bbc9e004af969cf54da0fcab..d797bac97ec1adec7a25a26c8e052e70 }); this.rotation = Rotation.valueOf(nbt.getString("rotation")); diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index cf4a354fd3a68f8a0639ed98c7c2e842c6459389..bc44c8537ea69a7682584db57ec566ecb4e76b3b 100644 +index ce8c7032dff4e119d018d42fa579f9231cf41961..24ed4fb7ddacba24873755edfa88912ffdf81cc8 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -4,8 +4,12 @@ package org.galemc.gale.configuration; @@ -63,7 +63,7 @@ index cf4a354fd3a68f8a0639ed98c7c2e842c6459389..bc44c8537ea69a7682584db57ec566ec public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements -@@ -71,6 +75,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart { +@@ -69,6 +73,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart { public boolean notSecureMarker = true; // Gale - do not log Not Secure marker } diff --git a/patches/server/0098-Send-multiple-keep-alive-packets.patch b/patches/server/0098-Send-multiple-keep-alive-packets.patch index c0abdc1..038cb83 100644 --- a/patches/server/0098-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0098-Send-multiple-keep-alive-packets.patch @@ -84,10 +84,10 @@ index 9de597c11c3bd0f23e87c3a6187b2036987356e0..c171c272d5fcf0900514e18eafaa1b5e if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) { int i = (int) (Util.getMillis() - this.keepAliveTime); diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 0217977e15ae30918ce6e1dbddb5bdb5d4365c1c..5c0eaad8dd65917802dcd714f1af77bbd91d1651 100644 +index 0965f43068d12a85090906568e2c1b731730f015..024cf924592999726458976b4d73df4b71843a2e 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -93,4 +93,16 @@ public class GaleGlobalConfiguration extends ConfigurationPart { +@@ -91,4 +91,16 @@ public class GaleGlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0104-Show-last-tick-time-in-tps-command.patch b/patches/server/0104-Show-last-tick-time-in-tps-command.patch index fbc7977..8a1add0 100644 --- a/patches/server/0104-Show-last-tick-time-in-tps-command.patch +++ b/patches/server/0104-Show-last-tick-time-in-tps-command.patch @@ -12,10 +12,10 @@ As part of: YAPFA (https://github.com/tr7zw/YAPFA) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 5c0eaad8dd65917802dcd714f1af77bbd91d1651..e92a4fc4a503a420b09e5373a6c1f5d2d71d32d6 100644 +index 024cf924592999726458976b4d73df4b71843a2e..eb1a5b20810cbad9f47505a8534a42b20b8653d5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -103,6 +103,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart { +@@ -101,6 +101,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0110-CPU-cores-estimation.patch b/patches/server/0110-CPU-cores-estimation.patch index 1b9be6d..41525a6 100644 --- a/patches/server/0110-CPU-cores-estimation.patch +++ b/patches/server/0110-CPU-cores-estimation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CPU cores estimation License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 61ab44d572b3ef4b6837aafa7e184de7bc0a7327..62fba9eb2d4a8a0e6e77f463ee67add446099a5a 100644 +index 8e45f712968303b7864d61adbf7325142c83f582..b374f41b20b3ffa2ec2874a06715661f4fec83db 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -54,6 +54,7 @@ import net.minecraft.world.level.block.entity.SkullBlockEntity; @@ -44,13 +44,13 @@ index 947ad1463a973546bdaf68654086291a3414aa9b..69bde99acff7bdae9af7cfe60e222167 import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 6717384db82ac8615b8e9c8490fd6f3f3eae1ec9..f2a9c2a3a0ba42f94182421dcaf7287da3fb09be 100644 +index a6de617fa261aa1916afc412ac85edb0c2630cab..9ad030004a3ca79be3f8ffdaa5aa4d95ffe4cab7 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -307,6 +307,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { +@@ -305,6 +305,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { + public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks + public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization - public boolean runningAsRootOrAdminWarning = true; // Gale - KeYi - do not log run as root warning - public boolean offlineModeWarning = true; // Gale - KeYi - do not log offline mode warning + public boolean cpuCoresEstimation = true; // Gale - CPU core estimation public Chat chat;