diff --git a/build.gradle b/build.gradle index 1fd2b19..927900b 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,8 @@ dependencies { library 'org.mariadb.jdbc:mariadb-java-client:2.7.4' library 'org.apache.httpcomponents:httpclient:4.5.13' compileOnly 'io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT' + implementation 'org.bstats:bstats-base:3.0.0' + implementation 'org.bstats:bstats-bukkit:3.0.0' } group = 'dev.plex' @@ -38,6 +40,7 @@ description = 'Plex' shadowJar { archiveClassifier.set("") + relocate 'org.bstats', 'dev.plex' } bukkit { diff --git a/src/main/java/dev/plex/Plex.java b/src/main/java/dev/plex/Plex.java index e900564..355ad88 100644 --- a/src/main/java/dev/plex/Plex.java +++ b/src/main/java/dev/plex/Plex.java @@ -25,6 +25,7 @@ import dev.plex.world.CustomWorld; import java.util.UUID; import lombok.Getter; import lombok.Setter; +import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -52,7 +53,7 @@ public class Plex extends JavaPlugin private AdminList adminList; - private String ranksOrPermissions; + private String system; public static Plex get() { @@ -83,7 +84,7 @@ public class Plex extends JavaPlugin { config.load(); messages.load(); - ranksOrPermissions = config.getString("commands.permissions"); + system = config.getString("commands.permissions"); try { @@ -96,6 +97,11 @@ public class Plex extends JavaPlugin e.printStackTrace(); } + // https://bstats.org/plugin/bukkit/Plex/14143 + Metrics metrics = new Metrics(this, 14143); + PlexLog.log("Enabled Metrics"); + + if (storageType == StorageType.MONGODB) { mongoPlayerData = new MongoPlayerData(); diff --git a/src/main/java/dev/plex/command/PlexCommand.java b/src/main/java/dev/plex/command/PlexCommand.java index 32b14f1..1b1c876 100644 --- a/src/main/java/dev/plex/command/PlexCommand.java +++ b/src/main/java/dev/plex/command/PlexCommand.java @@ -88,7 +88,7 @@ public abstract class PlexCommand extends Command PlexPlayer plexPlayer = PlayerCache.getPlexPlayerMap().get(player.getUniqueId()); - if (plugin.getRanksOrPermissions().equalsIgnoreCase("ranks")) + if (plugin.getSystem().equalsIgnoreCase("ranks")) { if (!plexPlayer.getRankFromString().isAtLeast(getLevel())) { @@ -96,7 +96,7 @@ public abstract class PlexCommand extends Command return true; } } - else if (plugin.getRanksOrPermissions().equalsIgnoreCase("permissions")) + else if (plugin.getSystem().equalsIgnoreCase("permissions")) { if (!player.hasPermission(perms.permission())) { @@ -180,14 +180,14 @@ public abstract class PlexCommand extends Command protected boolean checkRank(Player player, Rank rank, String permission) { PlexPlayer plexPlayer = getPlexPlayer(player); - if (plugin.getRanksOrPermissions().equalsIgnoreCase("ranks")) + if (plugin.getSystem().equalsIgnoreCase("ranks")) { if (!plexPlayer.getRank().equals(rank.toString())) { throw new CommandFailException(PlexUtils.tl("noPermissionRank", ChatColor.stripColor(rank.getLoginMSG()))); } } - else if (plugin.getRanksOrPermissions().equalsIgnoreCase("permissions")) + else if (plugin.getSystem().equalsIgnoreCase("permissions")) { if (!player.hasPermission(permission)) { diff --git a/src/main/java/dev/plex/handlers/CommandHandler.java b/src/main/java/dev/plex/handlers/CommandHandler.java index 5ae4fde..8e8341b 100644 --- a/src/main/java/dev/plex/handlers/CommandHandler.java +++ b/src/main/java/dev/plex/handlers/CommandHandler.java @@ -12,7 +12,7 @@ public class CommandHandler extends PlexBase public CommandHandler() { List commands = Lists.newArrayList(); - if (plugin.getRanksOrPermissions().equalsIgnoreCase("ranks")) + if (plugin.getSystem().equalsIgnoreCase("ranks")) { commands.add(new AdminCMD()); commands.add(new DeopAllCMD());