Skip to content

Commit

Permalink
Support PAF Extended for Bungeecord. Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
PikaMug committed May 16, 2023
1 parent 254a90e commit a973e7b
Show file tree
Hide file tree
Showing 30 changed files with 391 additions and 30 deletions.
16 changes: 14 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>me.pikamug.unite</groupId>
<artifactId>Unite</artifactId>
<version>1.1.6</version>
<version>1.1.7</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>DevelopmentPAFSpigot</artifactId>
<version>1.0.67</version>
<version>1.0.239</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -97,6 +97,18 @@
<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>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>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/me/pikamug/unite/Unite.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import me.pikamug.unite.api.objects.PartyProvider;
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;
Expand Down Expand Up @@ -59,6 +60,7 @@ public void hookProviders() {
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");
}

Expand Down Expand Up @@ -86,7 +88,7 @@ private static boolean packagesExists(String...packages) {
Class.forName(pkg);
}
return true;
} catch (Exception e) {
} catch (NoClassDefFoundError | ClassNotFoundException e) {
return false;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public PartyCreateEvent_DungeonsXL(PartyProvider partyProvider, Event event, boo
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public PartyDeleteEvent_DungeonsXL(PartyProvider partyProvider, Event event, boo
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyJoinEvent_DungeonsXL(PartyProvider partyProvider, Event event, boole
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyLeaveEvent_DungeonsXL(PartyProvider partyProvider, Event event, bool
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyCreateEvent_mcMMO(PartyProvider partyProvider, Event event, boolean
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyDeleteEvent_mcMMO(PartyProvider partyProvider, Event event, boolean
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyJoinEvent_mcMMO(PartyProvider partyProvider, Event event, boolean as
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyLeaveEvent_mcMMO(PartyProvider partyProvider, Event event, boolean a
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyCreateEvent_PAF(PartyProvider partyProvider, PartyCreatedEvent event
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return (Event)((Object)event);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyDeleteEvent_PAF(PartyProvider partyProvider, LeftPartyEvent event, b
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return (Event)((Object)event);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public PartyJoinEvent_PAF(PartyProvider partyProvider, PartyJoinEvent event, boo
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return (Event)((Object)event);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyLeaveEvent_PAF(PartyProvider partyProvider, LeftPartyEvent event, bo
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return (Event)((Object)event);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package me.pikamug.unite.api.events.pafgui;

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.UUID;

public class PartyCreateEvent_PAFGUI extends PartyCreateEvent {
private final PartyProvider partyProvider;
private final UUID partyPlayer;

public PartyCreateEvent_PAFGUI(PartyProvider partyProvider, UUID partyPlayer, boolean async) {
super(async);
this.partyProvider = partyProvider;
this.partyPlayer = partyPlayer;
}

@Override
public Event getPluginEvent() {
return null;
}

@Override
public @NotNull PartyProvider getPartyProvider() {
return partyProvider;
}

@Override
public UUID getCreator() {
return partyPlayer;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package me.pikamug.unite.api.events.pafgui;

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.UUID;

public class PartyDeleteEvent_PAFGUI extends PartyDeleteEvent {
private final PartyProvider partyProvider;
private final UUID partyPlayer;

public PartyDeleteEvent_PAFGUI(PartyProvider partyProvider, UUID partyPlayer, boolean async) {
super(async);
this.partyProvider = partyProvider;
this.partyPlayer = partyPlayer;
}

@Override
public Event getPluginEvent() {
return null;
}

@Override
public @NotNull PartyProvider getPartyProvider() {
return partyProvider;
}

@Override
public UUID getDisbander() {
return partyPlayer;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package me.pikamug.unite.api.events.pafgui;

import me.pikamug.unite.api.objects.PartyProvider;
import org.bukkit.event.Event;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public class PartyJoinEvent_PAFGUI extends me.pikamug.unite.api.events.PartyJoinEvent {
private final PartyProvider partyProvider;
private final UUID partyPlayer;

public PartyJoinEvent_PAFGUI(PartyProvider partyProvider, UUID partyPlayer, boolean async) {
super(async);
this.partyProvider = partyProvider;
this.partyPlayer = partyPlayer;
}

@Override
public Event getPluginEvent() {
return null;
}

@Override
public @NotNull PartyProvider getPartyProvider() {
return partyProvider;
}

@Override
public UUID getPlayer() {
return partyPlayer;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package me.pikamug.unite.api.events.pafgui;

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_PAFGUI extends PartyLeaveEvent {
private final PartyProvider partyProvider;
private final UUID partyPlayer;

public PartyLeaveEvent_PAFGUI(PartyProvider partyProvider, UUID partyPlayer, boolean async) {
super(async);
this.partyProvider = partyProvider;
this.partyPlayer = partyPlayer;
}

@Override
public Event getPluginEvent() {
return null;
}

@Override
public @NotNull PartyProvider getPartyProvider() {
return partyProvider;
}

@Override
public UUID getPlayer() {
return partyPlayer;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public PartyCreateEvent_Parties(PartyProvider partyProvider, Event event, boolea
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public PartyDeleteEvent_Parties(PartyProvider partyProvider, Event event, boolea
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyJoinEvent_Parties(PartyProvider partyProvider, Event event, boolean
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyLeaveEvent_Parties(PartyProvider partyProvider, Event event, boolean
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public PartyCreateEvent_SimpleClans(PartyProvider partyProvider, Event event, bo
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public PartyDeleteEvent_SimpleClans(PartyProvider partyProvider, Event event, bo
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyJoinEvent_SimpleClans(PartyProvider partyProvider, Event event, bool
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PartyLeaveEvent_SimpleClans(PartyProvider partyProvider, Event event, boo
}

@Override
public @NotNull Event getPluginEvent() {
public Event getPluginEvent() {
return event;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
import me.pikamug.unite.api.objects.PartyProvider;
import org.bukkit.event.Event;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public interface PartyEvent {

@NotNull
@Nullable
Event getPluginEvent();

@NotNull
Expand Down
Loading

0 comments on commit a973e7b

Please sign in to comment.