Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-11-27 00:45:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/PartyAndFriends-For-Bungeecord-Extended-Support' into 'master'

Browse Source 
Added Party and Friends for Bungee/Velocity Support

See merge request Simonsator/mmocore!1
This commit is contained in:
Simon Brungs 2022-08-29 13:51:30 +00:00
commit a65f32d94b
5 changed files with 75 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -1,8 +1,8 @@
/bin/
/.m2/
/target/
/.settings/
/.idea/
bin/
.m2/
target/
.settings/
.idea/
.classpath
.project
MMOCore.eml

15
MMOCore-API/pom.xml
View File

@ -204,7 +204,6 @@
</dependency>
<!-- Party plugins -->
<dependency>
<groupId>de.simonsator</groupId>
<artifactId>DevelopmentPAFSpigot</artifactId>
@ -212,6 +211,20 @@
<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.4-RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alessiodp</groupId>
<artifactId>Parties</artifactId>

6
MMOCore-API/src/main/java/net/Indyuce/mmocore/party/PartyModuleType.java
View File

@ -1,10 +1,7 @@
package net.Indyuce.mmocore.party;
import net.Indyuce.mmocore.party.compat.DungeonsXLPartyModule;
import net.Indyuce.mmocore.party.compat.McMMOPartyModule;
import net.Indyuce.mmocore.party.compat.PAFPartyModule;
import net.Indyuce.mmocore.party.compat.*;
import net.Indyuce.mmocore.party.provided.MMOCorePartyModule;
import net.Indyuce.mmocore.party.compat.PartiesPartyModule;
import org.bukkit.Bukkit;
import javax.inject.Provider;
@ -16,6 +13,7 @@ public enum PartyModuleType {
MMOCORE("MMOCore", MMOCorePartyModule::new),
PARTIES("Parties", PartiesPartyModule::new),
PARTY_AND_FRIENDS("PartyAndFriends", PAFPartyModule::new),
PARTY_AND_FRIENDS_BUNGEECORD_VELOCITY("Spigot-Party-API-PAF", PAFProxyPartyModule::new),
;
private final String pluginName;

52
MMOCore-API/src/main/java/net/Indyuce/mmocore/party/compat/PAFProxyPartyModule.java Normal file
View File

@ -0,0 +1,52 @@
package net.Indyuce.mmocore.party.compat;
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 net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.party.AbstractParty;
import net.Indyuce.mmocore.party.PartyModule;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
public class PAFProxyPartyModule implements PartyModule {
@Nullable
@Override
public AbstractParty getParty(PlayerData playerData) {
PlayerParty party = PartyManager.getInstance().getParty(PAFPlayerManager.getInstance().getPlayer(playerData.getUniqueId()));
return party == null ? null : new CustomParty(party);
}
class CustomParty implements AbstractParty {
private final PlayerParty party;
public CustomParty(PlayerParty party) {
this.party = party;
}
@Override
public boolean hasMember(Player player) {
return party.isInParty(PAFPlayerManager.getInstance().getPlayer(player.getUniqueId()));
}
@Override
public List<PlayerData> getOnlineMembers() {
List<PlayerData> list = new ArrayList<>();
for (PAFPlayer online : party.getAllPlayers())
list.add(PlayerData.get(online.getUniqueId()));
return list;
}
@Override
public int countMembers() {
return party.getAllPlayers().size();
}
}
}

4
MMOCore-Dist/src/main/resources/config.yml
View File

@ -1,4 +1,3 @@
# DO NOT TOUCH
config-version: 9
@ -57,7 +56,8 @@ protect-custom-mine: false
# - mmocore
# - dungeonsxl
# - parties
# - party_and_friends
# - party_and_friends (Use this one if you are using Party and Friends Extended for Spigot)
# - party_and_friends_bungeecord_velocity (Use this one if you are using Party and Friends For Bungeecord, Party and Friends For Velocity or Party and Friends Extended Edition for Bungeecord/Velocity. This one requires https://www.spigotmc.org/resources/spigot-party-api-for-party-and-friends.39751/ to be installed)
# - mcmmo
party-plugin: mmocore