From 361b936aa0568724b35643c8170763466f194a27 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Tue, 27 Apr 2021 11:58:49 +0200
Subject: [PATCH] Update ServerLib

---
 .github/FUNDING.yml                                        | 4 ++--
 Bukkit/build.gradle.kts                                    | 7 ++-----
 .../main/java/com/plotsquared/bukkit/BukkitPlatform.java   | 3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 9b0dbc13e..67079dc67 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [NotMyFault, dordsor21, SirYwell]
 patreon: IntellectualSites # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
+open_collective: IntellectualSites
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts
index 0ff48162f..fa4f8f06e 100644
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -28,9 +28,6 @@ repositories {
     maven {
         name = "IntellectualSites 3rd Party"
         url = uri("https://mvn.intellectualsites.com/content/repositories/thirdparty")
-        content {
-            includeGroup("de.notmyfault")
-        }
     }
 }
 
@@ -64,7 +61,7 @@ dependencies {
 
     // Other libraries
     implementation("com.sk89q:squirrelid:1.0.0-SNAPSHOT") { isTransitive = false }
-    implementation("de.notmyfault:serverlib:1.0.1")
+    implementation("org.incendo.serverlib:ServerLib:2.1.0")
 
     // Our libraries
     implementation("com.intellectualsites.arkitektonika:Arkitektonika-Client:2.0-SNAPSHOT")
@@ -101,7 +98,7 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("com.intellectualsites.arkitektonika", "com.plotsquared.core.arkitektonika")
     relocate("com.intellectualsites.http", "com.plotsquared.core.http")
     relocate("com.intellectualsites.paster", "com.plotsquared.core.paster")
-    relocate("de.notmyfault:serverlib", "com.plotsquared.bukkit.serverlib")
+    relocate("org.incendo.serverlib", "com.plotsquared.bukkit.serverlib")
 
     // Get rid of all the libs which are 100% unused.
     minimize()
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
index 243b60b52..0ed26be89 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -117,7 +117,6 @@ import com.plotsquared.core.uuid.CacheUUIDService;
 import com.plotsquared.core.uuid.UUIDPipeline;
 import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 import com.sk89q.worldedit.WorldEdit;
-import de.notmyfault.serverlib.ServerLib;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
@@ -141,6 +140,7 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.incendo.serverlib.ServerLib;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -546,6 +546,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         checkJvm();
         // Check if we are in a safe environment
         ServerLib.checkUnsafeForks();
+        ServerLib.checkJavaLTS();
     }
 
     private void unload() {