Merge https://github.com/IntellectualSites/PlotSquared into 1.16

Bukkit/build.gradle

@@ -12,8 +12,8 @@ repositories {
         url = "https://papermc.io/repo/repository/maven-public/"
     }
     maven { url = "https://ci.ender.zone/plugin/repository/everything/" }
+    maven { url = "https://mvn.intellectualsites.com/content/repositories/releases" }
     maven { url = "https://mvn.intellectualsites.com/content/repositories/snapshots" }
-    maven { url = "https://repo.wea-ondara.net/repository/public/" }
     maven { url = "http://repo.mvdw-software.be/content/groups/public/" }
     mavenLocal()
 }
@@ -27,7 +27,6 @@ dependencies {
     implementation("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT")
     compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.2.0-SNAPSHOT") {
         exclude(module: "bukkit")
-
     }
     compile("io.papermc:paperlib:1.0.4")
     implementation("net.kyori:text-adapter-bukkit:3.0.3")
@@ -39,10 +38,9 @@ dependencies {
     implementation("net.ess3:EssentialsX:2.18.0") {
         exclude(group: "io.papermc", module: "paperlib")
     }
-    implementation("net.alpenblock:BungeePerms:4.0-dev-106")
     compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false }
     compile('com.sk89q:squirrelid:1.0.0-SNAPSHOT'){ transitive = false }
-    compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1-SNAPSHOT'){ transitive = false }
+    compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1'){ transitive = false }
 }
 
 sourceCompatibility = 1.8

Bukkit/pom.xml

@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.plotsquared</groupId>
       <artifactId>PlotSquared-Core</artifactId>
-      <version>5.13.6</version>
+      <version>5.13.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>be.maximvdw</groupId>
       <artifactId>MVdWPlaceholderAPI</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -188,12 +188,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>net.alpenblock</groupId>
-      <artifactId>BungeePerms</artifactId>
-      <version>4.0-dev-106</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java

@@ -58,7 +58,6 @@ import com.plotsquared.bukkit.util.BukkitTaskManager;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.SetGenCB;
 import com.plotsquared.bukkit.util.UpdateUtility;
-import com.plotsquared.bukkit.uuid.BungeePermsUUIDService;
 import com.plotsquared.bukkit.uuid.EssentialsUUIDService;
 import com.plotsquared.bukkit.uuid.LuckPermsUUIDService;
 import com.plotsquared.bukkit.uuid.OfflinePlayerUUIDService;
@@ -291,16 +290,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain<
             luckPermsUUIDService = null;
         }
 
-        final BungeePermsUUIDService bungeePermsUUIDService;
-        if (Settings.UUID.SERVICE_BUNGEE_PERMS &&
-            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;
         if (Settings.UUID.SERVICE_ESSENTIALSX && Bukkit.getPluginManager().getPlugin("Essentials") != null) {
             essentialsUUIDService = new EssentialsUUIDService();
@@ -335,10 +324,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain<
                 impromptuPipeline.registerService(luckPermsUUIDService);
                 backgroundPipeline.registerService(luckPermsUUIDService);
             }
-            if (bungeePermsUUIDService != null) {
-                impromptuPipeline.registerService(bungeePermsUUIDService);
-                backgroundPipeline.registerService(bungeePermsUUIDService);
-            }
             if (essentialsUUIDService != null) {
                 impromptuPipeline.registerService(essentialsUUIDService);
                 backgroundPipeline.registerService(essentialsUUIDService);
@@ -1164,14 +1149,21 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain<
         return new BukkitPlotGenerator(world, generator);
     }
 
-    @Override public List<Map.Entry<Map.Entry<String, String>, Boolean>> getPluginIds() {
+    @Override public String getPluginList() {
-        List<Map.Entry<Map.Entry<String, String>, Boolean>> names = new ArrayList<>();
+        StringBuilder msg = new StringBuilder();
-        for (final Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+        Plugin[] plugins = Bukkit.getServer().getPluginManager().getPlugins();
-            Map.Entry<String, String> id = new AbstractMap.SimpleEntry<>(plugin.getName(),
+        msg.append("Plugins (").append(plugins.length).append("): \n");
-                plugin.getDescription().getVersion());
+        for (Plugin p : plugins) {
-            names.add(new AbstractMap.SimpleEntry<>(id, plugin.isEnabled()));
+            msg.append(" - ").append(p.getName()).append(":").append("\n")
+                .append("  • Version: ").append(p.getDescription().getVersion()).append("\n")
+                .append("  • Enabled: ").append(p.isEnabled()).append("\n")
+                .append("  • Main: ").append(p.getDescription().getMain()).append("\n")
+                .append("  • Authors: ").append(p.getDescription().getAuthors()).append("\n")
+                .append("  • Load Before: ").append(p.getDescription().getLoadBefore()).append("\n")
+                .append("  • Dependencies: ").append(p.getDescription().getDepend()).append("\n")
+                .append("  • Soft Dependencies: ").append(p.getDescription().getSoftDepend()).append("\n");
         }
-        return names;
+        return msg.toString();
     }
 
     @Override public Actor getConsole() {

Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java

@@ -1,85 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            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;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/IPlotMain.java

@@ -282,7 +282,7 @@ public interface IPlotMain<P> extends ILogger {
      */
     @NotNull IndependentPlotGenerator getDefaultGenerator();
 
-    List<Map.Entry<Map.Entry<String, String>, Boolean>> getPluginIds();
+    String getPluginList();
 
     Actor getConsole();
 

Core/src/main/java/com/plotsquared/core/command/DebugPaste.java

@@ -91,28 +91,21 @@ public class DebugPaste extends SubCommand {
                     .append("\n");
                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';')
                     .append(!Settings.UUID.OFFLINE).append('\n');
-                b.append("Plugins:");
+                b.append(PlotSquared.get().IMP.getPluginList());
-                for (Map.Entry<Map.Entry<String, String>, Boolean> pluginInfo : PlotSquared
-                    .get().IMP.getPluginIds()) {
-                    Map.Entry<String, String> nameVersion = pluginInfo.getKey();
-                    String name = nameVersion.getKey();
-                    String version = nameVersion.getValue();
-                    boolean enabled = pluginInfo.getValue();
-                    b.append("\n  ").append(name).append(":\n    ").append("version: '")
-                        .append(version).append('\'').append("\n    enabled: ").append(enabled);
-                }
                 b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
                 Runtime runtime = Runtime.getRuntime();
                 RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
-                b.append("Uptime: ").append(
+                b.append("Uptime: ")
-                    TimeUnit.MINUTES.convert(rb.getUptime(), TimeUnit.MILLISECONDS) + " minutes")
+                    .append(TimeUnit.MINUTES.convert(rb.getUptime(), TimeUnit.MILLISECONDS))
+                    .append(" minutes")
                     .append('\n');
                 b.append("JVM Flags: ").append(rb.getInputArguments()).append('\n');
-                b.append("Free Memory: ").append(runtime.freeMemory() / 1024 / 1024 + " MB")
+                b.append("Free Memory: ").append(runtime.freeMemory() / 1024 / 1024).append(" MB")
                     .append('\n');
-                b.append("Max Memory: ").append(runtime.maxMemory() / 1024 / 1024 + " MB")
+                b.append("Max Memory: ").append(runtime.maxMemory() / 1024 / 1024).append(" MB")
+                    .append('\n');
+                b.append("Total Memory: ").append(runtime.totalMemory() / 1024 / 1024).append(" MB")
                     .append('\n');
-                b.append("Total Memory: ").append(runtime.totalMemory() / 1024 / 1024 + " MB").append('\n');
                 b.append("Available Processors: ").append(runtime.availableProcessors()).append('\n');
                 b.append("Java Name: ").append(rb.getVmName()).append('\n');
                 b.append("Java Version: '").append(System.getProperty("java.version"))

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -268,8 +268,6 @@ public class Settings extends Config {
         public static boolean SERVICE_BUKKIT = true;
         @Comment("Whether the EssentialsX service is enabled")
         public static boolean SERVICE_ESSENTIALSX = true;
-        @Comment("Whether the BungeePerms service is enabled")
-        public static boolean SERVICE_BUNGEE_PERMS = true;
     }
 
 

build.gradle

@@ -34,7 +34,7 @@ ext {
     git = Grgit.open(dir: new File(rootDir.toString() + "/.git"))
 }
 
-def ver = "5.13.6"
+def ver = "5.13.7"
 def versuffix = ""
 ext {
     if (project.hasProperty("versionsuffix")) {