pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.pikamug.unite</groupId>
     <artifactId>Unite</artifactId>
-    <version>1.1.2</version>
+    <version>1.2.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,25 +17,29 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>bungeecord-repo</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
         <repository>
             <!-- Parties -->
             <id>alessiodp-repo</id>
             <url>https://repo.alessiodp.com/releases/</url>
         </repository>
         <repository>
-            <!-- DungeonsXL -->
+            <!-- BetterTeams, DungeonsXL -->
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
         <repository>
-            <!-- mcMMO Overhaul -->
-            <id>neetgames</id>
-            <url>https://nexus.neetgames.com/repository/maven-releases/</url>
+            <!-- Party and Friends -->
+            <id>simonsators-repo</id>
+            <url>https://simonsator.de/repo</url>
         </repository>
         <repository>
             <!-- SimpleClans -->
-            <id>codemc-repo</id>
-            <url>https://repo.codemc.org/repository/maven-public/</url>
+            <id>roinujnosde-repo</id>
+            <url>https://repo.roinujnosde.me/releases/</url>
         </repository>
     </repositories>
 
@@ -46,34 +50,70 @@
             <version>1.13.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.19-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>22.0.0</version>
+            <version>23.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.alessiodp.parties</groupId>
             <artifactId>parties-bukkit</artifactId>
-            <version>3.1.8</version>
+            <version>3.2.9</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.booksaw</groupId>
+            <artifactId>BetterTeams</artifactId>
+            <version>4.11.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.PikaMug</groupId>
             <artifactId>DungeonsXL-Dummy</artifactId>
-            <version>377c3a340e</version>
+            <version>65374cb9a8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.PikaMug</groupId>
+            <artifactId>mcMMO-for-Java-8</artifactId>
+            <version>dd16fc5496</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.simonsator</groupId>
+            <artifactId>DevelopmentPAFSpigot</artifactId>
+            <version>1.0.239</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.simonsator</groupId>
+            <artifactId>BungeecordPartyAndFriends</artifactId>
+            <version>1.0.89</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.simonsator</groupId>
+            <artifactId>Party-and-Friends-MySQL-Edition-Spigot-API</artifactId>
+            <version>1.5.4-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.gmail.nossr50.mcMMO</groupId>
-            <artifactId>mcMMO</artifactId>
-            <version>2.1.202</version>
+            <groupId>de.simonsator</groupId>
+            <artifactId>spigot-party-api-for-party-and-friends</artifactId>
+            <version>1.0.5-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
             <artifactId>SimpleClans</artifactId>
-            <version>2.16.0</version> <!-- https://github.com/RoinujNosde/SimpleClans/issues/291 -->
+            <version>2.18.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -84,6 +124,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
                 <configuration>
                     <source>8</source>
                     <target>8</target>

src/main/java/me/pikamug/unite/Unite.java

@@ -1,7 +1,10 @@
 package me.pikamug.unite;
 
 import me.pikamug.unite.api.objects.PartyProvider;
+import me.pikamug.unite.api.objects.plugins.PartyProvider_BetterTeams;
 import me.pikamug.unite.api.objects.plugins.PartyProvider_DungeonsXL;
+import me.pikamug.unite.api.objects.plugins.PartyProvider_PAF;
+import me.pikamug.unite.api.objects.plugins.PartyProvider_PAFGUI;
 import me.pikamug.unite.api.objects.plugins.PartyProvider_Parties;
 import me.pikamug.unite.api.objects.plugins.PartyProvider_SimpleClans;
 import me.pikamug.unite.api.objects.plugins.PartyProvider_mcMMO;
@@ -55,8 +58,11 @@ public static Unite getInstance() {
 
     public void hookProviders() {
         hookProvider("Parties", PartyProvider_Parties.class, ServicePriority.Highest, "com.alessiodp.parties.api.interfaces.PartiesAPI");
+        hookProvider("BetterTeams", PartyProvider_BetterTeams.class, ServicePriority.Normal, "com.booksaw.betterTeams.Main");
         hookProvider("DungeonsXL", PartyProvider_DungeonsXL.class, ServicePriority.Normal, "de.erethon.dungeonsxl.DungeonsXL");
         hookProvider("mcMMO", PartyProvider_mcMMO.class, ServicePriority.High, "com.gmail.nossr50.party.PartyManager");
+        hookProvider("PartyAndFriends", PartyProvider_PAF.class, ServicePriority.Normal, "de.simonsator.partyandfriends.main.PAFPlugin");
+        hookProvider("PartyAndFriendsGUI",  PartyProvider_PAFGUI.class, ServicePriority.High, "de.simonsator.partyandfriendsgui.PAFGUIPlugin");
         hookProvider("SimpleClans", PartyProvider_SimpleClans.class, ServicePriority.Normal, "net.sacredlabyrinth.phaed.simpleclans.SimpleClans");
     }
 
@@ -84,7 +90,7 @@ private static boolean packagesExists(String...packages) {
                 Class.forName(pkg);
             }
             return true;
-        } catch (Exception e) {
+        } catch (NoClassDefFoundError | ClassNotFoundException e) {
             return false;
         }
     }

src/main/java/me/pikamug/unite/api/events/betterteams/PartyCreateEvent_BetterTeams.java

@@ -0,0 +1,36 @@
+package me.pikamug.unite.api.events.betterteams;
+
+import com.booksaw.betterTeams.customEvents.CreateTeamEvent;
+import me.pikamug.unite.api.events.PartyCreateEvent;
+import me.pikamug.unite.api.objects.PartyProvider;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class PartyCreateEvent_BetterTeams extends PartyCreateEvent {
+    private final PartyProvider partyProvider;
+    private final CreateTeamEvent event;
+
+    public PartyCreateEvent_BetterTeams(PartyProvider partyProvider, Event event, boolean async) {
+        super(async);
+        this.partyProvider = partyProvider;
+        this.event = (CreateTeamEvent) event;
+    }
+
+    @Override
+    public Event getPluginEvent() {
+        return event;
+    }
+
+    @Override
+    public @NotNull PartyProvider getPartyProvider() {
+        return partyProvider;
+    }
+
+    @Override
+    public UUID getCreator() {
+        return Objects.requireNonNull(event.getPlayer()).getUniqueId();
+    }
+}

src/main/java/me/pikamug/unite/api/events/betterteams/PartyDeleteEvent_BetterTeams.java

@@ -0,0 +1,36 @@
+package me.pikamug.unite.api.events.betterteams;
+
+import com.booksaw.betterTeams.customEvents.DisbandTeamEvent;
+import me.pikamug.unite.api.events.PartyDeleteEvent;
+import me.pikamug.unite.api.objects.PartyProvider;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class PartyDeleteEvent_BetterTeams extends PartyDeleteEvent {
+    private final PartyProvider partyProvider;
+    private final DisbandTeamEvent event;
+
+    public PartyDeleteEvent_BetterTeams(PartyProvider partyProvider, Event event, boolean async) {
+        super(async);
+        this.partyProvider = partyProvider;
+        this.event = (DisbandTeamEvent) event;
+    }
+
+    @Override
+    public Event getPluginEvent() {
+        return event;
+    }
+
+    @Override
+    public @NotNull PartyProvider getPartyProvider() {
+        return partyProvider;
+    }
+
+    @Override
+    public UUID getDisbander() {
+        return Objects.requireNonNull(event.getPlayer()).getUniqueId();
+    }
+}

src/main/java/me/pikamug/unite/api/events/betterteams/PartyJoinEvent_BetterTeams.java

@@ -0,0 +1,35 @@
+package me.pikamug.unite.api.events.betterteams;
+
+import com.booksaw.betterTeams.customEvents.PlayerJoinTeamEvent;
+import me.pikamug.unite.api.events.PartyJoinEvent;
+import me.pikamug.unite.api.objects.PartyProvider;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public class PartyJoinEvent_BetterTeams extends PartyJoinEvent {
+    private final PartyProvider partyProvider;
+    private final PlayerJoinTeamEvent event;
+
+    public PartyJoinEvent_BetterTeams(PartyProvider partyProvider, Event event, boolean async) {
+        super(async);
+        this.partyProvider = partyProvider;
+        this.event = (PlayerJoinTeamEvent) event;
+    }
+
+    @Override
+    public Event getPluginEvent() {
+        return event;
+    }
+
+    @Override
+    public @NotNull PartyProvider getPartyProvider() {
+        return partyProvider;
+    }
+
+    @Override
+    public UUID getPlayer() {
+        return event.getPlayer().getUniqueId();
+    }
+}

src/main/java/me/pikamug/unite/api/events/betterteams/PartyLeaveEvent_BetterTeams.java

@@ -0,0 +1,35 @@
+package me.pikamug.unite.api.events.betterteams;
+
+import com.booksaw.betterTeams.customEvents.PlayerLeaveTeamEvent;
+import me.pikamug.unite.api.events.PartyLeaveEvent;
+import me.pikamug.unite.api.objects.PartyProvider;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public class PartyLeaveEvent_BetterTeams extends PartyLeaveEvent {
+    private final PartyProvider partyProvider;
+    private final PlayerLeaveTeamEvent event;
+
+    public PartyLeaveEvent_BetterTeams(PartyProvider partyProvider, Event event, boolean async) {
+        super(async);
+        this.partyProvider = partyProvider;
+        this.event = (PlayerLeaveTeamEvent) event;
+    }
+
+    @Override
+    public Event getPluginEvent() {
+        return event;
+    }
+
+    @Override
+    public @NotNull PartyProvider getPartyProvider() {
+        return partyProvider;
+    }
+
+    @Override
+    public UUID getPlayer() {
+        return event.getPlayer().getUniqueId();
+    }
+}

src/main/java/me/pikamug/unite/api/events/dungeonsxl/PartyCreateEvent_DungeonsXL.java

@@ -20,7 +20,7 @@ public PartyCreateEvent_DungeonsXL(PartyProvider partyProvider, Event event, boo
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }
 

src/main/java/me/pikamug/unite/api/events/dungeonsxl/PartyDeleteEvent_DungeonsXL.java

@@ -20,7 +20,7 @@ public PartyDeleteEvent_DungeonsXL(PartyProvider partyProvider, Event event, boo
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }
 

src/main/java/me/pikamug/unite/api/events/dungeonsxl/PartyJoinEvent_DungeonsXL.java

@@ -19,7 +19,7 @@ public PartyJoinEvent_DungeonsXL(PartyProvider partyProvider, Event event, boole
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }
 

src/main/java/me/pikamug/unite/api/events/dungeonsxl/PartyLeaveEvent_DungeonsXL.java

@@ -19,7 +19,7 @@ public PartyLeaveEvent_DungeonsXL(PartyProvider partyProvider, Event event, bool
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }
 

src/main/java/me/pikamug/unite/api/events/mcmmo/PartyCreateEvent_mcMMO.java

@@ -19,7 +19,7 @@ public PartyCreateEvent_mcMMO(PartyProvider partyProvider, Event event, boolean
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }
 

src/main/java/me/pikamug/unite/api/events/mcmmo/PartyDeleteEvent_mcMMO.java

@@ -19,7 +19,7 @@ public PartyDeleteEvent_mcMMO(PartyProvider partyProvider, Event event, boolean
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }
 

src/main/java/me/pikamug/unite/api/events/mcmmo/PartyJoinEvent_mcMMO.java

@@ -19,7 +19,7 @@ public PartyJoinEvent_mcMMO(PartyProvider partyProvider, Event event, boolean as
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }
 

src/main/java/me/pikamug/unite/api/events/mcmmo/PartyLeaveEvent_mcMMO.java

@@ -19,7 +19,7 @@ public PartyLeaveEvent_mcMMO(PartyProvider partyProvider, Event event, boolean a
     }
 
     @Override
-    public @NotNull Event getPluginEvent() {
+    public Event getPluginEvent() {
         return event;
     }