From 823beaf26805f1e1cdb5e9affe18d0fbef236819 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Tue, 27 Apr 2021 11:46:14 +0200
Subject: [PATCH] Update a few dependencies

---
 .github/FUNDING.yml                                         | 4 ++--
 Bukkit/build.gradle                                         | 6 +++---
 Bukkit/pom.xml                                              | 6 +++---
 Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java | 3 ++-
 4 files changed, 10 insertions(+), 9 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 b/Bukkit/build.gradle
index 3e7aca2db..8b4503914 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false }
     compile('com.sk89q:squirrelid:1.0.0-SNAPSHOT'){ transitive = false }
     compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1'){ transitive = false }
-    implementation("de.notmyfault:serverlib:1.0.1")
+    implementation("org.incendo.serverlib:ServerLib:2.1.0")
 }
 
 sourceCompatibility = 1.8
@@ -102,7 +102,7 @@ shadowJar {
         include(dependency("org.khelekore:prtree:1.7.0-SNAPSHOT"))
         include(dependency("com.sk89q:squirrelid:1.0.0-SNAPSHOT"))
         include(dependency("com.intellectualsites.paster:Paster:1.0.2-SNAPSHOT"))
-        include(dependency("de.notmyfault:serverlib:1.0.1"))
+        include(dependency("org.incendo.serverlib:ServerLib:2.1.0"))
     }
     relocate('net.kyori.text', 'com.plotsquared.formatting.text')
     relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
@@ -110,7 +110,7 @@ shadowJar {
     relocate('com.sk89q.squirrelid', 'com.plotsquared.squirrelid')
     relocate('org.khelekore.prtree', 'com.plotsquared.prtree')
     relocate('com.intellectualsites.paster', 'com.plotsquared.core.paster')
-    relocate('de.notmyfault', 'com.plotsquared.bukkit')
+    relocate('org.incendo.serverlib', 'com.plotsquared.bukkit')
     archiveFileName = "${project.name}-${parent.version}.jar"
     destinationDirectory = file "../target"
 }
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index 86ec1a9b3..a42a6fa55 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -183,9 +183,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>de.notmyfault</groupId>
-      <artifactId>serverlib</artifactId>
-      <version>1.0.1</version>
+      <groupId>org.incendo.serverlib</groupId>
+      <artifactId>ServerLib</artifactId>
+      <version>2.1.0</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 0ace2605e..a1e944c40 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -118,7 +118,6 @@ import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.extension.platform.Actor;
-import de.notmyfault.serverlib.ServerLib;
 import io.papermc.lib.PaperLib;
 import lombok.Getter;
 import lombok.NonNull;
@@ -140,6 +139,7 @@ import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.incendo.serverlib.ServerLib;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -408,6 +408,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain<
 
         // Check if we are in a safe environment
         ServerLib.checkUnsafeForks();
+        ServerLib.checkJavaLTS();
     }
 
     private void unload() {