mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-22 13:16:45 +01:00
Merge pull request #2852 from aurorasmiles/features/v5/uuid
Add BungeePerms UUID service
This commit is contained in:
commit
fdf82d0d1e
@ -13,6 +13,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
maven { url = "https://ci.ender.zone/plugin/repository/everything/" }
|
maven { url = "https://ci.ender.zone/plugin/repository/everything/" }
|
||||||
maven { url = "https://mvn.intellectualsites.com/content/repositories/snapshots" }
|
maven { url = "https://mvn.intellectualsites.com/content/repositories/snapshots" }
|
||||||
|
maven { url = "https://repo.wea-ondara.net/repository/public/" }
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -33,6 +34,7 @@ dependencies {
|
|||||||
implementation("me.clip:placeholderapi:2.10.6")
|
implementation("me.clip:placeholderapi:2.10.6")
|
||||||
implementation("net.luckperms:api:5.1")
|
implementation("net.luckperms:api:5.1")
|
||||||
implementation("net.ess3:EssentialsX:2.17.2")
|
implementation("net.ess3:EssentialsX:2.17.2")
|
||||||
|
implementation("net.alpenblock:BungeePerms:4.0-dev-106")
|
||||||
compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false }
|
compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false }
|
||||||
compile 'com.github.pavog:SquirrelID:0.6.1'
|
compile 'com.github.pavog:SquirrelID:0.6.1'
|
||||||
}
|
}
|
||||||
|
@ -152,6 +152,12 @@
|
|||||||
<version>2.16.1</version>
|
<version>2.16.1</version>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.alpenblock</groupId>
|
||||||
|
<artifactId>BungeePerms</artifactId>
|
||||||
|
<version>4.0-dev-106</version>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
|
@ -51,6 +51,7 @@ import com.plotsquared.bukkit.util.BukkitTaskManager;
|
|||||||
import com.plotsquared.bukkit.util.BukkitUtil;
|
import com.plotsquared.bukkit.util.BukkitUtil;
|
||||||
import com.plotsquared.bukkit.util.SetGenCB;
|
import com.plotsquared.bukkit.util.SetGenCB;
|
||||||
import com.plotsquared.bukkit.util.UpdateUtility;
|
import com.plotsquared.bukkit.util.UpdateUtility;
|
||||||
|
import com.plotsquared.bukkit.uuid.BungeePermsUUIDService;
|
||||||
import com.plotsquared.bukkit.uuid.EssentialsUUIDService;
|
import com.plotsquared.bukkit.uuid.EssentialsUUIDService;
|
||||||
import com.plotsquared.bukkit.uuid.LuckPermsUUIDService;
|
import com.plotsquared.bukkit.uuid.LuckPermsUUIDService;
|
||||||
import com.plotsquared.bukkit.uuid.OfflinePlayerUUIDService;
|
import com.plotsquared.bukkit.uuid.OfflinePlayerUUIDService;
|
||||||
@ -273,6 +274,14 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
|
|||||||
luckPermsUUIDService = null;
|
luckPermsUUIDService = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final BungeePermsUUIDService bungeePermsUUIDService;
|
||||||
|
if (Bukkit.getPluginManager().getPlugin("BungeePerms") != null) {
|
||||||
|
bungeePermsUUIDService = new BungeePermsUUIDService();
|
||||||
|
PlotSquared.log(Captions.PREFIX + "(UUID) Using BungeePerms as a complementary UUID service");
|
||||||
|
} else {
|
||||||
|
bungeePermsUUIDService = null;
|
||||||
|
}
|
||||||
|
|
||||||
final EssentialsUUIDService essentialsUUIDService;
|
final EssentialsUUIDService essentialsUUIDService;
|
||||||
if (Bukkit.getPluginManager().getPlugin("Essentials") != null) {
|
if (Bukkit.getPluginManager().getPlugin("Essentials") != null) {
|
||||||
essentialsUUIDService = new EssentialsUUIDService();
|
essentialsUUIDService = new EssentialsUUIDService();
|
||||||
@ -305,6 +314,10 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
|
|||||||
impromptuPipeline.registerService(luckPermsUUIDService);
|
impromptuPipeline.registerService(luckPermsUUIDService);
|
||||||
backgroundPipeline.registerService(luckPermsUUIDService);
|
backgroundPipeline.registerService(luckPermsUUIDService);
|
||||||
}
|
}
|
||||||
|
if (bungeePermsUUIDService != null) {
|
||||||
|
impromptuPipeline.registerService(bungeePermsUUIDService);
|
||||||
|
backgroundPipeline.registerService(bungeePermsUUIDService);
|
||||||
|
}
|
||||||
if (essentialsUUIDService != null) {
|
if (essentialsUUIDService != null) {
|
||||||
impromptuPipeline.registerService(essentialsUUIDService);
|
impromptuPipeline.registerService(essentialsUUIDService);
|
||||||
backgroundPipeline.registerService(essentialsUUIDService);
|
backgroundPipeline.registerService(essentialsUUIDService);
|
||||||
|
@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
* _____ _ _ _____ _
|
||||||
|
* | __ \| | | | / ____| | |
|
||||||
|
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
|
||||||
|
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
|
||||||
|
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
|
||||||
|
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
|
||||||
|
* | |
|
||||||
|
* |_|
|
||||||
|
* PlotSquared plot management system for Minecraft
|
||||||
|
* Copyright (C) 2020 IntellectualSites
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package com.plotsquared.bukkit.uuid;
|
||||||
|
|
||||||
|
import com.plotsquared.core.uuid.UUIDMapping;
|
||||||
|
import com.plotsquared.core.uuid.UUIDService;
|
||||||
|
import net.luckperms.api.model.user.UserManager;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.plugin.RegisteredServiceProvider;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
import net.alpenblock.bungeeperms.BungeePerms;
|
||||||
|
import net.alpenblock.bungeeperms.io.UUIDPlayerDB;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* UUID service that uses the BungeePerms API
|
||||||
|
*/
|
||||||
|
public class BungeePermsUUIDService implements UUIDService {
|
||||||
|
|
||||||
|
private final BungeePerms bp;
|
||||||
|
|
||||||
|
public BungeePermsUUIDService() {
|
||||||
|
final RegisteredServiceProvider<BungeePerms> provider = Bukkit.getServicesManager().getRegistration(BungeePerms.class);
|
||||||
|
if (provider != null) {
|
||||||
|
this.bp = provider.getProvider();
|
||||||
|
} else {
|
||||||
|
throw new IllegalStateException("BungeePerms is not available");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override @NotNull public List<UUIDMapping> getNames(@NotNull final List<UUID> uuids) {
|
||||||
|
final List<UUIDMapping> mappings = new ArrayList<>(uuids.size());
|
||||||
|
final UUIDPlayerDB uuiddb = BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB();
|
||||||
|
for (final UUID uuid : uuids) {
|
||||||
|
try {
|
||||||
|
final String username = uuiddb.getPlayerName(uuid);
|
||||||
|
if (username != null) {
|
||||||
|
mappings.add(new UUIDMapping(uuid, username));
|
||||||
|
}
|
||||||
|
} catch (final Exception ignored) {}
|
||||||
|
}
|
||||||
|
return mappings;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override @NotNull public List<UUIDMapping> getUUIDs(@NotNull final List<String> usernames) {
|
||||||
|
final List<UUIDMapping> mappings = new ArrayList<>(usernames.size());
|
||||||
|
final UUIDPlayerDB uuiddb = BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB();
|
||||||
|
for (final String username : usernames) {
|
||||||
|
try {
|
||||||
|
final UUID uuid = uuiddb.getUUID(username);
|
||||||
|
if (username != null) {
|
||||||
|
mappings.add(new UUIDMapping(uuid, username));
|
||||||
|
}
|
||||||
|
} catch (final Exception ignored) {}
|
||||||
|
}
|
||||||
|
return mappings;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user