From e2d6f9a09ce5d11e7138d120e6ab2d3c760fb86b Mon Sep 17 00:00:00 2001
From: Taahh <thepheonixblader@gmail.com>
Date: Sun, 23 Jan 2022 17:22:17 -0800
Subject: [PATCH 1/5] FS-424 (#11)

* Fixes NPE of https://gist.github.com/Wild1145/4dfd2c2fd3c38331d79c5672e700ec74
Added check to check if user is null or not
Added check to make sure the stripped strings are not null (tfm tag & guild tag)

* Forgot to use variables to substitute

Co-authored-by: spacerocket62 <spacerocket62@gmail.com>
---
 .../tfguilds/listener/JoinListener.java            | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java b/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java
index a01c041..bae6f31 100644
--- a/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java
+++ b/src/main/java/me/totalfreedom/tfguilds/listener/JoinListener.java
@@ -43,13 +43,19 @@ public class JoinListener implements Listener
 
         int maxLength = ConfigEntry.GLOBAL_TAG_MAX_LENGTH.getInteger();
         String tfmTag = TFGuilds.getPlugin().getTfmBridge().getTag(player);
-        if (user.displayTag() && tfmTag != null && guild.getTag() != null && maxLength > 0)
+        if (user != null && user.displayTag() && tfmTag != null && guild.getTag() != null && maxLength > 0)
         {
-            int length = GUtil.removeColorCodes(tfmTag).length() + GUtil.removeColorCodes(guild.getTag()).length();
-            if (length > maxLength)
+            String tfmTagStripped = GUtil.removeColorCodes(tfmTag);
+            String guildTagStripped = GUtil.removeColorCodes(guild.getTag());
+            if (tfmTagStripped != null && guildTagStripped != null)
             {
-                TFGuilds.getPlugin().getTfmBridge().clearTag(player);
+                int length = tfmTagStripped.length() + guildTagStripped.length();
+                if (length > maxLength)
+                {
+                    TFGuilds.getPlugin().getTfmBridge().clearTag(player);
+                }
             }
+
         }
     }
 }

From 0ba0e1aeaa4d471b4949c38e7e92df339353e68d Mon Sep 17 00:00:00 2001
From: Paldiu <pawereus@gmail.com>
Date: Fri, 28 Jan 2022 17:37:58 -0600
Subject: [PATCH 2/5] Update 2022.01

Update to the guilds plugin includes:
 - Fixed reflections methods for TFM Bridge to reflect new naming conventions
 - Added in an entry checker for the configuration file to ensure that the file contains the necessary key value pairs
 - Minor code QoL improvements
 - Convert to Paper
---
 .idea/TFGuilds.iml                            | 111 +++++-------------
 .idea/compiler.xml                            |   2 +-
 .idea/jarRepositories.xml                     |   5 +
 .idea/misc.xml                                |   2 +-
 nb-configuration.xml                          |   2 +-
 pom.xml                                       |  16 +--
 .../me/totalfreedom/tfguilds/TFGuilds.java    |   5 +-
 .../me/totalfreedom/tfguilds/TFMBridge.java   |  10 +-
 .../totalfreedom/tfguilds/config/Config.java  |  59 +++++++++-
 .../tfguilds/config/ConfigEntry.java          |   4 +
 src/main/resources/config.yml                 |   2 +-
 src/main/resources/plugin.yml                 |   2 +-
 12 files changed, 116 insertions(+), 104 deletions(-)

diff --git a/.idea/TFGuilds.iml b/.idea/TFGuilds.iml
index 163e931..e5665da 100644
--- a/.idea/TFGuilds.iml
+++ b/.idea/TFGuilds.iml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="CheckStyle-IDEA-Module">
-    <option name="configuration">
-      <map />
-    </option>
-  </component>
   <component name="FacetManager">
     <facet type="minecraft" name="Minecraft">
       <configuration>
         <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
+          <platformType>PAPER</platformType>
         </autoDetectTypes>
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -24,81 +19,33 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.AtlasMediaGroup:TotalFreedomMod:development-0be2aa718f-1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.plugins:maven-checkstyle-plugin:3.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-core:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings-builder:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-repository-metadata:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model-builder:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-aether-provider:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-impl:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-spi:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-api:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.aether:aether-util:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-inject-plexus:1.4.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-inject-bean:1.4.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.sisu:sisu-guice:noaop:2.1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-classworlds:2.2.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.reporting:maven-reporting-api:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.reporting:maven-reporting-impl:2.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.shared:maven-shared-utils:0.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:2.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-core:1.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-digester:commons-digester:1.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-sink-api:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-logging-api:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-decoration-model:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-site-renderer:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-module-xhtml:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-module-fml:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-i18n:1.0-beta-7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-chain:commons-chain:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: dom4j:dom4j:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: sslext:sslext:1.2-0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.doxia:doxia-integration-tools:1.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:3.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: classworlds:classworlds:1.1-alpha-2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-component-annotations:2.0.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-resources:1.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-utils:3.3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-interpolation:1.26" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-velocity:1.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.puppycrawl.tools:checkstyle:8.29" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: info.picocli:picocli:4.1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr4-runtime:4.8-1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.saxon:Saxon-HE:9.9.1-6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.errorprone:error_prone_annotations:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.8" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: it.unimi.dsi:fastutil:8.5.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.8.0-beta4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-api:4.9.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-key:4.9.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:examination-api:1.3.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:examination-string:1.3.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:22.0.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-gson:4.9.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-legacy:4.9.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:adventure-text-serializer-plain:4.9.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:9.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:9.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:9.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:9.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ec2a0b4..b9600f9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,7 +11,7 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="TFGuilds" target="16" />
+      <module name="TFGuilds" target="17" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index b008060..e89a848 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,6 +11,11 @@
       <option name="name" value="jitpack.io" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="papermc" />
+      <option name="name" value="papermc" />
+      <option name="url" value="https://papermc.io/repo/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="sonatype" />
       <option name="name" value="sonatype" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d2b0ede..c01a206 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -16,5 +16,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/nb-configuration.xml b/nb-configuration.xml
index 5616f15..a5e2dc0 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -13,7 +13,7 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_11</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_17</netbeans.hint.jdkPlatform>
         <org-netbeans-modules-javascript2-requirejs.enabled>true</org-netbeans-modules-javascript2-requirejs.enabled>
     </properties>
 </project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 4658cc1..5a8e966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.AtlasMediaGroup</groupId>
     <artifactId>TFGuilds</artifactId>
-    <version>2021.06-RC3</version>
+    <version>2022.01</version>
     <packaging>jar</packaging>
 
     <name>TFGuilds</name>
@@ -25,8 +25,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -60,16 +60,16 @@
             <url>https://jitpack.io</url>
         </repository>
         <repository>
-            <id>spigotmc-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java b/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
index 8ae4e12..2436829 100644
--- a/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
+++ b/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
@@ -14,6 +14,7 @@ import me.totalfreedom.tfguilds.listener.ChatListener;
 import me.totalfreedom.tfguilds.listener.JoinListener;
 import me.totalfreedom.tfguilds.sql.SQLDatabase;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 
 public class TFGuilds extends JavaPlugin
 {
@@ -54,13 +55,13 @@ public class TFGuilds extends JavaPlugin
         {
             getSQL().getConnection().close();
         }
-        catch (SQLException throwables)
+        catch (SQLException ignored)
         {
         }
         config.save();
     }
 
-    public Config getConfig()
+    public @NotNull Config getConfig()
     {
         return config;
     }
diff --git a/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java b/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java
index 775d1b2..1a148f8 100644
--- a/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java
+++ b/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java
@@ -41,7 +41,7 @@ public class TFMBridge
             Bukkit.getLogger().warning("TotalFreedomMod not detected, checking operator status instead.");
             return player.isOp();
         }
-        Object al = ReflectionsHelper.getField(getTfm(), "al");
+        Object al = ReflectionsHelper.getField(getTfm(), "adminList");
         Method isAdmin = ReflectionsHelper.getMethod(al, "isAdmin", Player.class);
         try
         {
@@ -61,7 +61,7 @@ public class TFMBridge
             Bukkit.getLogger().warning("TotalFreedomMod not detected, checking operator status instead.");
             return sender.isOp();
         }
-        Object al = ReflectionsHelper.getField(getTfm(), "al");
+        Object al = ReflectionsHelper.getField(getTfm(), "adminList");
         Method isAdmin = ReflectionsHelper.getMethod(al, "isAdmin", CommandSender.class);
         try
         {
@@ -81,7 +81,7 @@ public class TFMBridge
             Bukkit.getLogger().warning("TotalFreedomMod not detected, vanish will return false.");
             return false;
         }
-        Object al = ReflectionsHelper.getField(getTfm(), "al");
+        Object al = ReflectionsHelper.getField(getTfm(), "adminList");
         Method isVanished = ReflectionsHelper.getMethod(al, "isVanished", String.class);
         try
         {
@@ -101,7 +101,7 @@ public class TFMBridge
             return null;
         }
 
-        Object pl = ReflectionsHelper.getField(getTfm(), "pl");
+        Object pl = ReflectionsHelper.getField(getTfm(), "playerList");
         Method getPlayer = ReflectionsHelper.getMethod(pl, "getPlayer", Player.class);
         try
         {
@@ -125,7 +125,7 @@ public class TFMBridge
             return;
         }
 //        getTfm().pl.getPlayer(player).setTag(null);
-        Object pl = ReflectionsHelper.getField(getTfm(), "pl");
+        Object pl = ReflectionsHelper.getField(getTfm(), "playerList");
         Method getPlayer = ReflectionsHelper.getMethod(pl, "getPlayer", Player.class);
         try
         {
diff --git a/src/main/java/me/totalfreedom/tfguilds/config/Config.java b/src/main/java/me/totalfreedom/tfguilds/config/Config.java
index 636179e..79194c1 100644
--- a/src/main/java/me/totalfreedom/tfguilds/config/Config.java
+++ b/src/main/java/me/totalfreedom/tfguilds/config/Config.java
@@ -1,20 +1,27 @@
 package me.totalfreedom.tfguilds.config;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
 import me.totalfreedom.tfguilds.TFGuilds;
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 public class Config extends YamlConfiguration
 {
 
-    private final TFGuilds plugin;
     private final File file;
 
     public Config(String fileName)
     {
-        this.plugin = TFGuilds.getPlugin();
+        TFGuilds plugin = TFGuilds.getPlugin();
         this.file = new File(plugin.getDataFolder(), fileName);
 
         if (!file.exists())
@@ -22,6 +29,8 @@ public class Config extends YamlConfiguration
             plugin.saveResource(fileName, false);
         }
 
+        checkForFields();
+
         load();
     }
 
@@ -48,4 +57,50 @@ public class Config extends YamlConfiguration
             ex.printStackTrace();
         }
     }
+
+    public void checkForFields()
+    {
+        if (!file.exists())
+        {
+            return;
+        }
+
+        Arrays.stream(ConfigEntry.values()).forEach(entry -> {
+            if (entry.getString().isBlank() || entry.getString().isEmpty() || entry.getString() == null)
+            {
+                try
+                {
+                    String[] split = entry.getName().split("\\.");
+                    String key = split[0];
+                    String subKey = split[1];
+                    String value = "REPLACE_ME";
+                    FileWriter writer = new FileWriter(file, true);
+                    InputStream is = TFGuilds.getPlugin().getResource("config.yml");
+                    if (is == null) {
+                        Bukkit.getServer().getLogger().severe("Unable to read from resource! Things may not work correctly!");
+                        return;
+                    }
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+                    while (reader.ready()) {
+                        if (!reader.readLine().trim().startsWith(subKey)) {
+                            continue;
+                        }
+                        value = reader.readLine().trim().split(":")[1].trim();
+                        break;
+                    }
+                    writer.write("\n"
+                            + key
+                            + ": "
+                            + "\n"
+                            + subKey.indent(2)
+                            + ": "
+                            + value);
+                }
+                catch (IOException ignored)
+                {
+                    Bukkit.getServer().getLogger().severe("The FileWriter could not add the necessary configuration options to the yaml file! Things may not work correctly!");
+                }
+            }
+        });
+    }
 }
diff --git a/src/main/java/me/totalfreedom/tfguilds/config/ConfigEntry.java b/src/main/java/me/totalfreedom/tfguilds/config/ConfigEntry.java
index 2889c02..9777e02 100644
--- a/src/main/java/me/totalfreedom/tfguilds/config/ConfigEntry.java
+++ b/src/main/java/me/totalfreedom/tfguilds/config/ConfigEntry.java
@@ -45,4 +45,8 @@ public enum ConfigEntry
     {
         return config.getString(path);
     }
+
+    public String getName() {
+        return path;
+    }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index cae444f..6e0a911 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -4,7 +4,7 @@
 
 settings:
   # Types: mysql, sqlite
-  connection: sqlite
+  connection: mysql
 
 server:
   # Log guild chat to console?
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 6174e6a..81f0a04 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: TFGuilds
 version: ${project.version}
 main: me.totalfreedom.tfguilds.TFGuilds
-api-version: 1.16
+api-version: 1.17
 authors: [ Fleek, super, speed ]
 description: A guilds plugin for the TotalFreedom server.
 softdepend:

From bfb89fb414df2eec7a12ef98a8e6b1b4ef0ffcc1 Mon Sep 17 00:00:00 2001
From: Paldiu <pawereus@gmail.com>
Date: Sat, 26 Feb 2022 14:30:42 -0600
Subject: [PATCH 3/5] Fixed config verification

---
 .../totalfreedom/tfguilds/config/Config.java  | 56 +++++--------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/src/main/java/me/totalfreedom/tfguilds/config/Config.java b/src/main/java/me/totalfreedom/tfguilds/config/Config.java
index 79194c1..01dbe2e 100644
--- a/src/main/java/me/totalfreedom/tfguilds/config/Config.java
+++ b/src/main/java/me/totalfreedom/tfguilds/config/Config.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
 import me.totalfreedom.tfguilds.TFGuilds;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
@@ -18,10 +19,13 @@ public class Config extends YamlConfiguration
 {
 
     private final File file;
+    private final TFGuilds plugin;
+    private final String fileName;
 
     public Config(String fileName)
     {
-        TFGuilds plugin = TFGuilds.getPlugin();
+        this.fileName = fileName;
+        plugin = TFGuilds.getPlugin();
         this.file = new File(plugin.getDataFolder(), fileName);
 
         if (!file.exists())
@@ -29,7 +33,7 @@ public class Config extends YamlConfiguration
             plugin.saveResource(fileName, false);
         }
 
-        checkForFields();
+        verifyConfiguration();
 
         load();
     }
@@ -58,48 +62,14 @@ public class Config extends YamlConfiguration
         }
     }
 
-    public void checkForFields()
-    {
-        if (!file.exists())
-        {
-            return;
-        }
+    public void verifyConfiguration() {
+        InputStreamReader stream = new InputStreamReader(plugin.getResource(fileName));
+        YamlConfiguration reader = YamlConfiguration.loadConfiguration(stream);
+        YamlConfiguration writer = YamlConfiguration.loadConfiguration(file);
 
-        Arrays.stream(ConfigEntry.values()).forEach(entry -> {
-            if (entry.getString().isBlank() || entry.getString().isEmpty() || entry.getString() == null)
-            {
-                try
-                {
-                    String[] split = entry.getName().split("\\.");
-                    String key = split[0];
-                    String subKey = split[1];
-                    String value = "REPLACE_ME";
-                    FileWriter writer = new FileWriter(file, true);
-                    InputStream is = TFGuilds.getPlugin().getResource("config.yml");
-                    if (is == null) {
-                        Bukkit.getServer().getLogger().severe("Unable to read from resource! Things may not work correctly!");
-                        return;
-                    }
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-                    while (reader.ready()) {
-                        if (!reader.readLine().trim().startsWith(subKey)) {
-                            continue;
-                        }
-                        value = reader.readLine().trim().split(":")[1].trim();
-                        break;
-                    }
-                    writer.write("\n"
-                            + key
-                            + ": "
-                            + "\n"
-                            + subKey.indent(2)
-                            + ": "
-                            + value);
-                }
-                catch (IOException ignored)
-                {
-                    Bukkit.getServer().getLogger().severe("The FileWriter could not add the necessary configuration options to the yaml file! Things may not work correctly!");
-                }
+        reader.getKeys(true).forEach(key -> {
+            if (!writer.contains(key)) {
+                writer.set(key, reader.get(key));
             }
         });
     }

From 4d624b4f3b0412822ae5324b1680e9c67de70617 Mon Sep 17 00:00:00 2001
From: Paldiu <pawereus@gmail.com>
Date: Sat, 26 Feb 2022 14:32:20 -0600
Subject: [PATCH 4/5] Return to previous naming conventions

---
 .../me/totalfreedom/tfguilds/TFMBridge.java   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java b/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java
index 1a148f8..688bd0b 100644
--- a/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java
+++ b/src/main/java/me/totalfreedom/tfguilds/TFMBridge.java
@@ -41,11 +41,11 @@ public class TFMBridge
             Bukkit.getLogger().warning("TotalFreedomMod not detected, checking operator status instead.");
             return player.isOp();
         }
-        Object al = ReflectionsHelper.getField(getTfm(), "adminList");
-        Method isAdmin = ReflectionsHelper.getMethod(al, "isAdmin", Player.class);
+        Object adminList = ReflectionsHelper.getField(getTfm(), "adminList");
+        Method isAdmin = ReflectionsHelper.getMethod(adminList, "isAdmin", Player.class);
         try
         {
-            return (boolean)isAdmin.invoke(al, player) /*getTfm().al.isAdmin(player)*/;
+            return (boolean)isAdmin.invoke(adminList, player) /*getTfm().adminList.isAdmin(player)*/;
         }
         catch (IllegalAccessException | InvocationTargetException e)
         {
@@ -61,11 +61,11 @@ public class TFMBridge
             Bukkit.getLogger().warning("TotalFreedomMod not detected, checking operator status instead.");
             return sender.isOp();
         }
-        Object al = ReflectionsHelper.getField(getTfm(), "adminList");
-        Method isAdmin = ReflectionsHelper.getMethod(al, "isAdmin", CommandSender.class);
+        Object adminList = ReflectionsHelper.getField(getTfm(), "adminList");
+        Method isAdmin = ReflectionsHelper.getMethod(adminList, "isAdmin", CommandSender.class);
         try
         {
-            return (boolean)isAdmin.invoke(al, sender) /*getTfm().al.isAdmin(player)*/;
+            return (boolean)isAdmin.invoke(adminList, sender) /*getTfm().adminList.isAdmin(player)*/;
         }
         catch (IllegalAccessException | InvocationTargetException e)
         {
@@ -81,11 +81,11 @@ public class TFMBridge
             Bukkit.getLogger().warning("TotalFreedomMod not detected, vanish will return false.");
             return false;
         }
-        Object al = ReflectionsHelper.getField(getTfm(), "adminList");
-        Method isVanished = ReflectionsHelper.getMethod(al, "isVanished", String.class);
+        Object adminList = ReflectionsHelper.getField(getTfm(), "adminList");
+        Method isVanished = ReflectionsHelper.getMethod(adminList, "isVanished", String.class);
         try
         {
-            return (boolean)isVanished.invoke(al, player.getName()) /*getTfm().al.isVanished(player.getName)*/;
+            return (boolean)isVanished.invoke(adminList, player.getName()) /*getTfm().adminList.isVanished(player.getName)*/;
         }
         catch (IllegalAccessException | InvocationTargetException e)
         {
@@ -101,11 +101,11 @@ public class TFMBridge
             return null;
         }
 
-        Object pl = ReflectionsHelper.getField(getTfm(), "playerList");
-        Method getPlayer = ReflectionsHelper.getMethod(pl, "getPlayer", Player.class);
+        Object playerList = ReflectionsHelper.getField(getTfm(), "playerList");
+        Method getPlayer = ReflectionsHelper.getMethod(playerList, "getPlayer", Player.class);
         try
         {
-            Object fPlayer = getPlayer.invoke(pl, player);
+            Object fPlayer = getPlayer.invoke(playerList, player);
             Method getTag = ReflectionsHelper.getMethod(fPlayer, "getTag");
 
             return (String)getTag.invoke(fPlayer);
@@ -115,7 +115,7 @@ public class TFMBridge
             e.printStackTrace();
         }
 
-        return "" /*ChatColor.stripColor(getTfm().pl.getPlayer(player).getTag())*/;
+        return "" /*ChatColor.stripColor(getTfm().playerList.getPlayer(player).getTag())*/;
     }
 
     public void clearTag(Player player)
@@ -124,12 +124,12 @@ public class TFMBridge
         {
             return;
         }
-//        getTfm().pl.getPlayer(player).setTag(null);
-        Object pl = ReflectionsHelper.getField(getTfm(), "playerList");
-        Method getPlayer = ReflectionsHelper.getMethod(pl, "getPlayer", Player.class);
+//        getTfm().playerList.getPlayer(player).setTag(null);
+        Object playerList = ReflectionsHelper.getField(getTfm(), "playerList");
+        Method getPlayer = ReflectionsHelper.getMethod(playerList, "getPlayer", Player.class);
         try
         {
-            Object fPlayer = getPlayer.invoke(pl, player);
+            Object fPlayer = getPlayer.invoke(playerList, player);
             Method setTag = ReflectionsHelper.getMethod(fPlayer, "setTag", String.class);
 
             setTag.invoke(fPlayer, (Object)null);

From 9221442fc58f0c62c23be3d5c63d50f092517f3b Mon Sep 17 00:00:00 2001
From: Paldiu <pawereus@gmail.com>
Date: Tue, 1 Mar 2022 15:41:10 -0600
Subject: [PATCH 5/5] Should automatically add kvps when needed

---
 .../me/totalfreedom/tfguilds/TFGuilds.java    | 20 +++++++++++++-
 .../totalfreedom/tfguilds/config/Config.java  | 26 ++++++++++++++-----
 .../tfguilds/sql/SQLDatabase.java             | 25 ++++++++----------
 3 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java b/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
index 2436829..75d9cf4 100644
--- a/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
+++ b/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
@@ -6,6 +6,11 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import me.totalfreedom.tfguilds.command.*;
 import me.totalfreedom.tfguilds.config.Config;
 import me.totalfreedom.tfguilds.guild.Guild;
@@ -34,7 +39,7 @@ public class TFGuilds extends JavaPlugin
     public void onEnable()
     {
         plugin = this;
-        config = new Config("config.yml");
+        config = new Config(this,"config.yml");
         sqlDatabase = new SQLDatabase(this);
         User.loadAll();
         Guild.loadAll();
@@ -88,6 +93,19 @@ public class TFGuilds extends JavaPlugin
         return commands;
     }
 
+    private void forcedSQLPostLoad() {
+        ExecutorService ex = Executors.newCachedThreadPool();
+        Future<SQLDatabase> future = ex.submit(() -> new SQLDatabase(getPlugin()));
+        try
+        {
+            sqlDatabase = future.get();
+        }
+        catch (InterruptedException | ExecutionException e)
+        {
+            e.printStackTrace();
+        }
+    }
+
     private void loadSubCommands()
     {
         subCommands.put("create", new CreateSubCommand());
diff --git a/src/main/java/me/totalfreedom/tfguilds/config/Config.java b/src/main/java/me/totalfreedom/tfguilds/config/Config.java
index 01dbe2e..cb65dcf 100644
--- a/src/main/java/me/totalfreedom/tfguilds/config/Config.java
+++ b/src/main/java/me/totalfreedom/tfguilds/config/Config.java
@@ -22,10 +22,11 @@ public class Config extends YamlConfiguration
     private final TFGuilds plugin;
     private final String fileName;
 
-    public Config(String fileName)
+    public Config(TFGuilds plugin, String fileName)
     {
+
         this.fileName = fileName;
-        plugin = TFGuilds.getPlugin();
+        this.plugin = plugin;
         this.file = new File(plugin.getDataFolder(), fileName);
 
         if (!file.exists())
@@ -67,10 +68,23 @@ public class Config extends YamlConfiguration
         YamlConfiguration reader = YamlConfiguration.loadConfiguration(stream);
         YamlConfiguration writer = YamlConfiguration.loadConfiguration(file);
 
-        reader.getKeys(true).forEach(key -> {
-            if (!writer.contains(key)) {
-                writer.set(key, reader.get(key));
+        AtomicBoolean shouldSave = new AtomicBoolean(false);
+
+        try {
+            reader.getKeys(true).forEach(key -> {
+                if (!writer.contains(key)) writer.set(key, reader.get(key));
+                if (!shouldSave.get()) shouldSave.set(true);
+            });
+            if (shouldSave.get()) {
+                writer.save(file);
             }
-        });
+        } catch (IOException ex) {
+            TFGuilds.getPlugin()
+                    .getLogger()
+                    .severe("Error attempting to verify configuration: \n"
+                            + ex.getMessage()
+                            + "\nCaused by: "
+                            + ex.getCause());
+        }
     }
 }
diff --git a/src/main/java/me/totalfreedom/tfguilds/sql/SQLDatabase.java b/src/main/java/me/totalfreedom/tfguilds/sql/SQLDatabase.java
index 5209c46..1b3bbc4 100644
--- a/src/main/java/me/totalfreedom/tfguilds/sql/SQLDatabase.java
+++ b/src/main/java/me/totalfreedom/tfguilds/sql/SQLDatabase.java
@@ -22,21 +22,18 @@ public class SQLDatabase
         }
         try
         {
-            switch (ConfigEntry.CONNECTION_TYPE.getString().toLowerCase())
+            if ("mysql".equals(ConfigEntry.CONNECTION_TYPE.getString().toLowerCase()))
             {
-                case "sqlite":
-                    connection = DriverManager.getConnection("jdbc:sqlite:" + createDBFile(plugin).getAbsolutePath().replace("%20", " "));
-                    break;
-                case "mysql":
-                    connection = DriverManager.getConnection(String.format("jdbc:mysql://%s:%d/%s",
-                            ConfigEntry.MYSQL_HOST.getString(),
-                            ConfigEntry.MYSQL_PORT.getInteger(),
-                            ConfigEntry.MYSQL_DATABASE.getString()),
-                            ConfigEntry.MYSQL_USERNAME.getString(),
-                            password);
-                    break;
-                default:
-                    connection = DriverManager.getConnection("jdbc:sqlite:" + createDBFile(plugin).getAbsolutePath().replace("%20", " "));
+                connection = DriverManager.getConnection(String.format("jdbc:mysql://%s:%d/%s",
+                                ConfigEntry.MYSQL_HOST.getString(),
+                                ConfigEntry.MYSQL_PORT.getInteger(),
+                                ConfigEntry.MYSQL_DATABASE.getString()),
+                        ConfigEntry.MYSQL_USERNAME.getString(),
+                        password);
+            }
+            else
+            {
+                connection = DriverManager.getConnection("jdbc:sqlite:" + createDBFile(plugin).getAbsolutePath().replace("%20", " "));
             }
 
             createTables();