From de2dff0376e77d0adc831727b871e2e5cd97fc25 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sat, 15 Aug 2020 20:06:27 -0500
Subject: [PATCH] Update for TFM staff refactor

---
 pom.xml                                         | 17 +++++++++++------
 .../com/lenis0012/bukkit/marriage2/TFM.java     |  9 ++++-----
 .../marriage2/commands/CommandChatSpy.java      |  2 +-
 .../marriage2/commands/CommandPriest.java       |  2 +-
 .../marriage2/commands/CommandReload.java       |  2 +-
 .../marriage2/commands/CommandUpdate.java       |  2 +-
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ac8af7..cc14775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,11 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+
+        <repository>
+            <id>telesphoreo-repo</id>
+            <url>https://telesphoreo.me/repo/maven</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -82,15 +87,15 @@
         <!-- PlotSquared v5 -->
         <dependency>
             <groupId>com.plotsquared</groupId>
-            <artifactId>PlotSquared</artifactId>
-            <version>5.1</version>
+            <artifactId>PlotSquared-Core</artifactId>
+            <version>5.13.1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TFPatches</groupId>
+            <groupId>me.totalfreedom</groupId>
             <artifactId>TotalFreedomMod</artifactId>
-            <version>4328a13eaf</version>
+            <version>2020.9</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -161,8 +166,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <showWarnings>true</showWarnings>
                     <showDeprecation>false</showDeprecation> <!-- TODO: Change back to true when setItemInHand fixed -->
                 </configuration>
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/TFM.java b/src/main/java/com/lenis0012/bukkit/marriage2/TFM.java
index 617df1b..4d8f9b7 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/TFM.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/TFM.java
@@ -5,8 +5,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-public class TFM {
-
+public class TFM
+{
     private TotalFreedomMod totalFreedomMod = null;
 
     public TotalFreedomMod getTFM()
@@ -26,9 +26,8 @@ public class TFM {
         return null;
     }
 
-    public boolean isAdmin(Player player)
+    public boolean isStaff(Player player)
     {
-        return getTFM().al.isAdmin(player);
+        return getTFM().sl.isStaff(player);
     }
-
 }
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandChatSpy.java b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandChatSpy.java
index 44ef635..12af865 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandChatSpy.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandChatSpy.java
@@ -16,7 +16,7 @@ public class CommandChatSpy extends Command {
 
     @Override
     public void execute() {
-        if (!marriage.getTFM().isAdmin(player))
+        if (!marriage.getTFM().isStaff(player))
         {
             sender.sendMessage(ChatColor.RED + "You are not permitted to use this command.");
             return;
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandPriest.java b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandPriest.java
index 711f4d1..576f59b 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandPriest.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandPriest.java
@@ -27,7 +27,7 @@ public class CommandPriest extends Command {
 
     @Override
     public void execute() {
-        if (!marriage.getTFM().isAdmin(player))
+        if (!marriage.getTFM().isStaff(player))
         {
             sender.sendMessage(ChatColor.RED + "You are not permitted to use this command.");
             return;
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandReload.java b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandReload.java
index 402a37d..889475a 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandReload.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandReload.java
@@ -22,7 +22,7 @@ public class CommandReload extends Command {
 
     @Override
     public void execute() {
-        if (!marriage.getTFM().isAdmin(player))
+        if (!marriage.getTFM().isStaff(player))
         {
             sender.sendMessage(ChatColor.RED + "You are not permitted to use this command.");
             return;
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandUpdate.java b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandUpdate.java
index e903276..e87f750 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandUpdate.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandUpdate.java
@@ -18,7 +18,7 @@ public class CommandUpdate extends Command {
 
     @Override
     public void execute() {
-        if (!marriage.getTFM().isAdmin(player))
+        if (!marriage.getTFM().isStaff(player))
         {
             sender.sendMessage(ChatColor.RED + "You are not permitted to use this command.");
             return;