From 3a3f402812ecf070f1bbced3eead0b0598be28e0 Mon Sep 17 00:00:00 2001
From: speedxx <43330808+speedxx@users.noreply.github.com>
Date: Mon, 13 Jul 2020 22:39:30 -0400
Subject: [PATCH] spigot

spigot
---
 TFGuilds.iml                                  | 12 +++++------
 pom.xml                                       | 20 ++++++-------------
 .../me/totalfreedom/tfguilds/TFGuilds.java    | 11 +++++++---
 src/main/resources/plugin.yml                 |  2 +-
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/TFGuilds.iml b/TFGuilds.iml
index 8955aea..391e646 100644
--- a/TFGuilds.iml
+++ b/TFGuilds.iml
@@ -21,22 +21,20 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.16.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.16.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" name="Maven: com.github.TFPatches:TotalFreedomMod:development-f9e8a4c8ba-1" level="project" />
+    <orderEntry type="library" name="Maven: net.md-5:bungeecord-chat:1.16-R0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: com.github.TFPatches:TotalFreedomMod:development-cdb385dd20-1" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.TFPatches:TF-LibsDisguises:0cfa32159a" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.comphenix.protocol:ProtocolLib:4.5.0" level="project" />
     <orderEntry type="library" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
     <orderEntry type="library" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.spigotmc:spigot:1.16.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: net.md-5:bungeecord-chat:1.16-R0.1" level="project" />
     <orderEntry type="library" name="Maven: me.rayzr522:jsonmessage:1.0.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3d12df7..c61db63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>TFGuilds</groupId>
+    <groupId>me.totalfreedom</groupId>
     <artifactId>TFGuilds</artifactId>
-    <version>0.2</version>
+    <version>0.2.1</version>
     <packaging>jar</packaging>
 
     <name>TFGuilds</name>
@@ -44,14 +44,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <outputDirectory>C:\Users\Jax\Desktop\STUFF\116test\plugins</outputDirectory>
-                </configuration>
-            </plugin>
         </plugins>
         <resources>
             <resource>
@@ -67,8 +59,8 @@
             <url>https://jitpack.io</url>
         </repository>
         <repository>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
+            <id>spigotmc-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
             <id>sonatype</id>
@@ -78,8 +70,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
             <version>1.16.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
diff --git a/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java b/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
index f5c6ceb..1f4c20c 100644
--- a/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
+++ b/src/main/java/me/totalfreedom/tfguilds/TFGuilds.java
@@ -29,9 +29,7 @@ public final class TFGuilds extends JavaPlugin
         config = new Config("config.yml");
         guilds = new Config("guilds.yml");
         bridge = new TFMBridge();
-        this.getCommand("guild").setExecutor(new GuildCommand());
-        this.getCommand("guildchat").setExecutor(new GuildChatCommand());
-        this.getCommand("tfguilds").setExecutor(new TFGuildsCommand());
+        loadCommands();
         loadListeners();
         GLog.info("Enabled " + this.getDescription().getFullName());
     }
@@ -45,6 +43,13 @@ public final class TFGuilds extends JavaPlugin
         GLog.info("Disabled " + this.getDescription().getFullName());
     }
 
+    private void loadCommands()
+    {
+        this.getCommand("guild").setExecutor(new GuildCommand());
+        this.getCommand("guildchat").setExecutor(new GuildChatCommand());
+        this.getCommand("tfguilds").setExecutor(new TFGuildsCommand());
+    }
+
     private void loadListeners()
     {
         PluginManager manager = this.getServer().getPluginManager();
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 786b26d..d9c76af 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.13
+api-version: 1.16
 softdepend: [TotalFreedomMod]
 authors: [speed, super]
 description: A guilds plugin for the TotalFreedom server.