Skip to content

Commit

Permalink
Merge pull request #1 from Simonsator/development
Browse files Browse the repository at this point in the history
Fixed Building Project, [Untested] Added Party And Friends For BungeeCord Support
  • Loading branch information
JT122406 committed Feb 8, 2022
2 parents b9f2aa0 + 1bee70e commit a40e307
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 13 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.9.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down
45 changes: 39 additions & 6 deletions proxy-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,21 @@
<version>${parent.version}</version>

<repositories>
<repository>
<id>simonsators-repo</id>
<url>https://simonsator.de/repo/</url>
</repository>
<repository>
<id>andrei1058-repo</id>
<url>http://repo.andrei1058.com/releases</url>
<url>https://repo.andrei1058.com/releases</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>andrei1058-repo2</id>
Expand All @@ -36,6 +40,30 @@
</repositories>

<dependencies>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>Party-and-Friends-MySQL-Edition-Spigot-API</artifactId>
<version>1.5.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>be.maximvdw</groupId>
<artifactId>MVdWPlaceholderAPI</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>Spigot-Party-API-For-RedisBungee</artifactId>
<version>1.0.2-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>be.maximvdw</groupId>
<artifactId>MVdWPlaceholderAPI</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
Expand All @@ -45,7 +73,7 @@
<dependency>
<groupId>com.alessiodp.parties</groupId>
<artifactId>parties-api</artifactId>
<version>3.1.12</version>
<version>3.1.14</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -99,7 +127,7 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
<version>3.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -164,7 +192,12 @@
<scope>provided</scope>
</dependency>
</dependencies>

<pluginRepositories>
<pluginRepository>
<id>maven-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<build>
<resources>
<resource>
Expand Down Expand Up @@ -195,7 +228,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.3.0-SNAPSHOT</version>
<configuration>
<relocations>
<relocation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,16 @@
import com.andrei1058.bedwars.proxy.configuration.BedWarsConfig;
import com.andrei1058.bedwars.proxy.configuration.ConfigPath;
import com.andrei1058.bedwars.proxy.configuration.SoundsConfig;
import com.andrei1058.bedwars.proxy.database.*;
import com.andrei1058.bedwars.proxy.language.LangListeners;
import com.andrei1058.bedwars.proxy.language.LanguageManager;
import com.andrei1058.bedwars.proxy.levels.Level;
import com.andrei1058.bedwars.proxy.levels.internal.InternalLevel;
import com.andrei1058.bedwars.proxy.levels.internal.LevelListeners;
import com.andrei1058.bedwars.proxy.party.Internal;
import com.andrei1058.bedwars.proxy.party.Parties;
import com.andrei1058.bedwars.proxy.party.Party;
import com.andrei1058.bedwars.proxy.party.Partys;
import com.andrei1058.bedwars.proxy.party.*;
import com.andrei1058.bedwars.proxy.socketmanager.ServerSocketTask;
import com.andrei1058.bedwars.proxy.socketmanager.TimeOutTask;
import com.andrei1058.bedwars.proxy.support.papi.SupportPAPI;
import com.andrei1058.bedwars.proxy.database.*;
import com.andrei1058.spigot.updater.SpigotUpdater;
import com.andrei1058.spigot.versionsupport.BlockSupport;
import com.andrei1058.spigot.versionsupport.ItemStackSupport;
Expand Down Expand Up @@ -103,6 +100,9 @@ public void onEnable() {
} else if (Bukkit.getPluginManager().getPlugin("Partys") != null) {
getLogger().info("Hook into Parties (by Retr0) support!");
party = new Partys();
} else if (Bukkit.getPluginManager().getPlugin("Spigot-Party-API-PAF") != null) {
getLogger().info("Hook into Party and Friends Extended Edition for BungeeCord (by Simonsator) support!");
party = new PAFBungeeCordParty();
}
}
if (party == null) {
Expand Down Expand Up @@ -215,7 +215,7 @@ public ArenaUtil getArenaUtil() {
return ArenaManager.getInstance();
}

public static BedWars getAPI(){
public static BedWars getAPI() {
return BedWarsProxy.plugin;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package com.andrei1058.bedwars.proxy.party;

import de.simonsator.partyandfriends.spigot.api.pafplayers.PAFPlayer;
import de.simonsator.partyandfriends.spigot.api.pafplayers.PAFPlayerManager;
import de.simonsator.partyandfriends.spigot.api.party.PartyManager;
import de.simonsator.partyandfriends.spigot.api.party.PlayerParty;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

public class PAFBungeeCordParty implements Party {
@Override
public boolean hasParty(UUID p) {
return getPAFParty(p) == null;
}

private PlayerParty getPAFParty(UUID p) {
PAFPlayer pafPlayer = PAFPlayerManager.getInstance().getPlayer(p);
return PartyManager.getInstance().getParty(pafPlayer);
}


@Override
public int partySize(UUID p) {
return getMembers(p).size();
}

@Override
public boolean isOwner(UUID p) {
PAFPlayer pafPlayer = PAFPlayerManager.getInstance().getPlayer(p);
PlayerParty party = PartyManager.getInstance().getParty(pafPlayer);
if (party == null)
return false;
return party.isLeader(pafPlayer);
}

@Override
public List<UUID> getMembers(UUID owner) {
ArrayList<UUID> playerList = new ArrayList<>();
PlayerParty party = getPAFParty(owner);
if (party == null)
return playerList;
for (PAFPlayer players : party.getAllPlayers()) {
playerList.add(players.getUniqueId());
}
return playerList;
}

@Override
public void createParty(Player owner, Player... members) {

}

@Override
public void addMember(UUID owner, Player member) {

}

@Override
public void removeFromParty(UUID member) {

}

@Override
public void disband(UUID owner) {

}

@Override
public boolean isMember(UUID owner, UUID check) {
PlayerParty party = getPAFParty(owner);
if (party == null)
return false;
return party.isInParty(PAFPlayerManager.getInstance().getPlayer(check));
}

@Override
public void removePlayer(UUID owner, UUID target) {

}

@Override
public boolean isInternal() {
return false;
}

@Override
public UUID getOwner(UUID player) {
PlayerParty party = getPAFParty(player);
if (party == null)
return null;
return party.getLeader().getUniqueId();
}
}

0 comments on commit a40e307

Please sign in to comment.