From 2966344abd1fb983d981c9afca671f5c64578947 Mon Sep 17 00:00:00 2001
From: Stijn Bannink <SW.Bannink@student.han.nl>
Date: Thu, 12 Oct 2023 20:20:03 +0200
Subject: [PATCH] Fixed building (moved IOByte deps to SBD repo)

---
 .gitignore                                    |  7 ++--
 .run/Build.run.xml                            | 32 +++++++++++++++++++
 dependency-reduced-pom.xml                    | 23 +++++++------
 pom.xml                                       |  7 +++-
 .../api/config/objects/JsonConfiguration.java |  4 ---
 5 files changed, 56 insertions(+), 17 deletions(-)
 create mode 100644 .run/Build.run.xml

diff --git a/.gitignore b/.gitignore
index 46270ec..673d375 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-# Project exclude paths
-/target/
-/.idea/
\ No newline at end of file
+.idea
+*.iml
+target/
+.flattened-pom.xml
\ No newline at end of file
diff --git a/.run/Build.run.xml b/.run/Build.run.xml
new file mode 100644
index 0000000..a3fa402
--- /dev/null
+++ b/.run/Build.run.xml
@@ -0,0 +1,32 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build" type="MavenRunConfiguration" factoryName="Maven">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="cmdOptions" />
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="clean" />
+              <option value="package" />
+            </list>
+          </option>
+          <option name="pomFileName" />
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="projectsCmdOptionValues">
+            <list />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 1ac13ad..6eab13e 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -16,14 +16,14 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.11.0</version>
         <configuration>
           <release>11</release>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
+        <version>3.5.1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -82,48 +82,53 @@
       <id>sk89q-repo</id>
       <url>https://maven.enginehub.org/repo/</url>
     </repository>
+    <repository>
+      <id>sbdevelopment-repo-releases</id>
+      <name>SBDevelopment Repository</name>
+      <url>https://repo.sbdevelopment.tech/releases</url>
+    </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.14.4-R0.1-SNAPSHOT</version>
+      <version>1.20.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>me.clip</groupId>
       <artifactId>placeholderapi</artifactId>
-      <version>2.10.9</version>
+      <version>2.11.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>net.kyori</groupId>
       <artifactId>adventure-text-serializer-bungeecord</artifactId>
-      <version>4.0.1</version>
+      <version>4.3.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>net.kyori</groupId>
       <artifactId>adventure-platform-viaversion</artifactId>
-      <version>4.0.1</version>
+      <version>4.3.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>net.kyori</groupId>
       <artifactId>adventure-platform-facet</artifactId>
-      <version>4.0.1</version>
+      <version>4.3.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.bergerkiller.bukkit</groupId>
       <artifactId>TrainCarts</artifactId>
-      <version>1.16.5-v1</version>
+      <version>1.20.1-v2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.bergerkiller.bukkit</groupId>
       <artifactId>BKCommonLib</artifactId>
-      <version>1.16.5-v1</version>
+      <version>1.20.1-v3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 1fabb68..bd0330a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -35,13 +35,18 @@
             <id>sk89q-repo</id>
             <url>https://maven.enginehub.org/repo/</url>
         </repository>
+        <repository>
+            <id>sbdevelopment-repo-releases</id>
+            <name>SBDevelopment Repository</name>
+            <url>https://repo.sbdevelopment.tech/releases</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
+            <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/nl/iobyte/themepark/api/config/objects/JsonConfiguration.java b/src/main/java/nl/iobyte/themepark/api/config/objects/JsonConfiguration.java
index a2a9dd5..14c56ef 100755
--- a/src/main/java/nl/iobyte/themepark/api/config/objects/JsonConfiguration.java
+++ b/src/main/java/nl/iobyte/themepark/api/config/objects/JsonConfiguration.java
@@ -2,7 +2,6 @@ package nl.iobyte.themepark.api.config.objects;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
@@ -28,8 +27,6 @@ public class JsonConfiguration extends FileConfiguration {
 
     @Override
     public void loadFromString(@NotNull String contents) throws InvalidConfigurationException {
-        Validate.notNull(contents, "Contents cannot be null");
-
         Map input;
         try {
             input = this.gson.fromJson(contents, Map.class);
@@ -65,7 +62,6 @@ public class JsonConfiguration extends FileConfiguration {
 
     @NotNull
     public static YamlConfiguration loadConfiguration(@NotNull File file) {
-        Validate.notNull(file, "File cannot be null");
         YamlConfiguration config = new YamlConfiguration();
 
         try {