From 76edc1d146f264d0fef0f5ce8a2967b891a0bc20 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Wed, 27 Mar 2024 11:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=96=B0=E7=9A=84gr?= =?UTF-8?q?oupID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +- .../lunadeer}/liteworldedit/Commands.java | 14 +- .../lunadeer}/liteworldedit/Events.java | 4 +- .../liteworldedit/JobGenerator/Drain.java | 8 +- .../liteworldedit/JobGenerator/Empty.java | 8 +- .../liteworldedit/JobGenerator/Fill.java | 8 +- .../liteworldedit/JobGenerator/OverLay.java | 8 +- .../lunadeer}/liteworldedit/Jobs/Absorb.java | 4 +- .../lunadeer}/liteworldedit/Jobs/Job.java | 6 +- .../liteworldedit/Jobs/JobErrCode.java | 2 +- .../lunadeer}/liteworldedit/Jobs/Place.java | 4 +- .../lunadeer}/liteworldedit/Jobs/Remove.java | 6 +- .../liteworldedit/LiteWorldEdit.java | 11 +- .../lunadeer}/liteworldedit/LoggerX.java | 2 +- .../liteworldedit/Managers/Cache.java | 4 +- .../liteworldedit/Managers/ConfigManager.java | 16 +- .../liteworldedit/Managers/JobQueue.java | 4 +- .../liteworldedit/Managers/Point.java | 2 +- .../cn/lunadeer/liteworldedit/Metrics.java | 862 ++++++++++++++++++ .../lunadeer}/liteworldedit/Notification.java | 10 +- .../liteworldedit/SchedulerUtil.java | 2 +- .../lunadeer}/liteworldedit/Task.java | 6 +- .../lunadeer}/liteworldedit/XPlayer.java | 10 +- src/main/resources/config.yml | 2 + src/main/resources/plugin.yml | 4 +- 25 files changed, 946 insertions(+), 67 deletions(-) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Commands.java (97%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Events.java (95%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/JobGenerator/Drain.java (78%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/JobGenerator/Empty.java (78%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/JobGenerator/Fill.java (79%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/JobGenerator/OverLay.java (83%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Jobs/Absorb.java (94%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Jobs/Job.java (96%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Jobs/JobErrCode.java (95%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Jobs/Place.java (98%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Jobs/Remove.java (93%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/LiteWorldEdit.java (86%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/LoggerX.java (97%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Managers/Cache.java (86%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Managers/ConfigManager.java (82%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Managers/JobQueue.java (96%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Managers/Point.java (86%) create mode 100644 src/main/java/cn/lunadeer/liteworldedit/Metrics.java rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Notification.java (90%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/SchedulerUtil.java (96%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/Task.java (92%) rename src/main/java/{site/deercloud => cn/lunadeer}/liteworldedit/XPlayer.java (86%) diff --git a/pom.xml b/pom.xml index 77073f6..7736737 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - site.deercloud + cn.lunadeer LiteWorldEdit - 2.4.1.0 + 2.4.1.3 jar LiteWorldEdit @@ -16,7 +16,7 @@ 1.8 UTF-8 - https://blog.deercloud.site + https://ssl.lunadeer.cn:14448/project-2/ diff --git a/src/main/java/site/deercloud/liteworldedit/Commands.java b/src/main/java/cn/lunadeer/liteworldedit/Commands.java similarity index 97% rename from src/main/java/site/deercloud/liteworldedit/Commands.java rename to src/main/java/cn/lunadeer/liteworldedit/Commands.java index b3d88e6..cbaad5c 100644 --- a/src/main/java/site/deercloud/liteworldedit/Commands.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Commands.java @@ -1,5 +1,11 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; +import cn.lunadeer.liteworldedit.JobGenerator.Drain; +import cn.lunadeer.liteworldedit.JobGenerator.Empty; +import cn.lunadeer.liteworldedit.JobGenerator.Fill; +import cn.lunadeer.liteworldedit.JobGenerator.OverLay; +import cn.lunadeer.liteworldedit.Jobs.Job; +import cn.lunadeer.liteworldedit.Managers.Point; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.command.Command; @@ -8,12 +14,6 @@ import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; -import site.deercloud.liteworldedit.JobGenerator.Drain; -import site.deercloud.liteworldedit.JobGenerator.Empty; -import site.deercloud.liteworldedit.JobGenerator.Fill; -import site.deercloud.liteworldedit.JobGenerator.OverLay; -import site.deercloud.liteworldedit.Jobs.Job; -import site.deercloud.liteworldedit.Managers.Point; import java.util.*; diff --git a/src/main/java/site/deercloud/liteworldedit/Events.java b/src/main/java/cn/lunadeer/liteworldedit/Events.java similarity index 95% rename from src/main/java/site/deercloud/liteworldedit/Events.java rename to src/main/java/cn/lunadeer/liteworldedit/Events.java index 9320a84..9f58fd9 100644 --- a/src/main/java/site/deercloud/liteworldedit/Events.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Events.java @@ -1,5 +1,6 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; +import cn.lunadeer.liteworldedit.Managers.Point; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -11,7 +12,6 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.ItemStack; -import site.deercloud.liteworldedit.Managers.Point; public class Events implements Listener { @EventHandler diff --git a/src/main/java/site/deercloud/liteworldedit/JobGenerator/Drain.java b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Drain.java similarity index 78% rename from src/main/java/site/deercloud/liteworldedit/JobGenerator/Drain.java rename to src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Drain.java index 627512f..fc2b846 100644 --- a/src/main/java/site/deercloud/liteworldedit/JobGenerator/Drain.java +++ b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Drain.java @@ -1,11 +1,11 @@ -package site.deercloud.liteworldedit.JobGenerator; +package cn.lunadeer.liteworldedit.JobGenerator; +import cn.lunadeer.liteworldedit.Jobs.Absorb; +import cn.lunadeer.liteworldedit.LiteWorldEdit; +import cn.lunadeer.liteworldedit.Managers.Point; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.Jobs.Absorb; -import site.deercloud.liteworldedit.LiteWorldEdit; -import site.deercloud.liteworldedit.Managers.Point; public class Drain { public static void drain(Player player, World world, Point p1, Point p2) { diff --git a/src/main/java/site/deercloud/liteworldedit/JobGenerator/Empty.java b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Empty.java similarity index 78% rename from src/main/java/site/deercloud/liteworldedit/JobGenerator/Empty.java rename to src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Empty.java index a892602..61da76c 100644 --- a/src/main/java/site/deercloud/liteworldedit/JobGenerator/Empty.java +++ b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Empty.java @@ -1,11 +1,11 @@ -package site.deercloud.liteworldedit.JobGenerator; +package cn.lunadeer.liteworldedit.JobGenerator; +import cn.lunadeer.liteworldedit.Jobs.Remove; +import cn.lunadeer.liteworldedit.LiteWorldEdit; +import cn.lunadeer.liteworldedit.Managers.Point; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.Jobs.Remove; -import site.deercloud.liteworldedit.LiteWorldEdit; -import site.deercloud.liteworldedit.Managers.Point; public class Empty { public static void empty(Player player, World world, Point p1, Point p2) { diff --git a/src/main/java/site/deercloud/liteworldedit/JobGenerator/Fill.java b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Fill.java similarity index 79% rename from src/main/java/site/deercloud/liteworldedit/JobGenerator/Fill.java rename to src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Fill.java index 18bb51f..4cfe8dc 100644 --- a/src/main/java/site/deercloud/liteworldedit/JobGenerator/Fill.java +++ b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/Fill.java @@ -1,12 +1,12 @@ -package site.deercloud.liteworldedit.JobGenerator; +package cn.lunadeer.liteworldedit.JobGenerator; +import cn.lunadeer.liteworldedit.Jobs.Place; +import cn.lunadeer.liteworldedit.LiteWorldEdit; +import cn.lunadeer.liteworldedit.Managers.Point; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.Jobs.Place; -import site.deercloud.liteworldedit.LiteWorldEdit; -import site.deercloud.liteworldedit.Managers.Point; public class Fill { diff --git a/src/main/java/site/deercloud/liteworldedit/JobGenerator/OverLay.java b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/OverLay.java similarity index 83% rename from src/main/java/site/deercloud/liteworldedit/JobGenerator/OverLay.java rename to src/main/java/cn/lunadeer/liteworldedit/JobGenerator/OverLay.java index acd66f6..ee5b6dc 100644 --- a/src/main/java/site/deercloud/liteworldedit/JobGenerator/OverLay.java +++ b/src/main/java/cn/lunadeer/liteworldedit/JobGenerator/OverLay.java @@ -1,13 +1,13 @@ -package site.deercloud.liteworldedit.JobGenerator; +package cn.lunadeer.liteworldedit.JobGenerator; +import cn.lunadeer.liteworldedit.Jobs.Place; +import cn.lunadeer.liteworldedit.LiteWorldEdit; +import cn.lunadeer.liteworldedit.Managers.Point; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.Jobs.Place; -import site.deercloud.liteworldedit.LiteWorldEdit; -import site.deercloud.liteworldedit.Managers.Point; public class OverLay { diff --git a/src/main/java/site/deercloud/liteworldedit/Jobs/Absorb.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java similarity index 94% rename from src/main/java/site/deercloud/liteworldedit/Jobs/Absorb.java rename to src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java index 70ce43a..e6abfc9 100644 --- a/src/main/java/site/deercloud/liteworldedit/Jobs/Absorb.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java @@ -1,5 +1,6 @@ -package site.deercloud.liteworldedit.Jobs; +package cn.lunadeer.liteworldedit.Jobs; +import cn.lunadeer.liteworldedit.LoggerX; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -8,7 +9,6 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import site.deercloud.liteworldedit.LoggerX; import java.util.HashMap; diff --git a/src/main/java/site/deercloud/liteworldedit/Jobs/Job.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Job.java similarity index 96% rename from src/main/java/site/deercloud/liteworldedit/Jobs/Job.java rename to src/main/java/cn/lunadeer/liteworldedit/Jobs/Job.java index 9b79bb8..9e278b3 100644 --- a/src/main/java/site/deercloud/liteworldedit/Jobs/Job.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Job.java @@ -1,5 +1,7 @@ -package site.deercloud.liteworldedit.Jobs; +package cn.lunadeer.liteworldedit.Jobs; +import cn.lunadeer.liteworldedit.LoggerX; +import cn.lunadeer.liteworldedit.Notification; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -9,8 +11,6 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; -import site.deercloud.liteworldedit.LoggerX; -import site.deercloud.liteworldedit.Notification; import java.util.HashMap; diff --git a/src/main/java/site/deercloud/liteworldedit/Jobs/JobErrCode.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/JobErrCode.java similarity index 95% rename from src/main/java/site/deercloud/liteworldedit/Jobs/JobErrCode.java rename to src/main/java/cn/lunadeer/liteworldedit/Jobs/JobErrCode.java index 2a9c85b..672485f 100644 --- a/src/main/java/site/deercloud/liteworldedit/Jobs/JobErrCode.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/JobErrCode.java @@ -1,4 +1,4 @@ -package site.deercloud.liteworldedit.Jobs; +package cn.lunadeer.liteworldedit.Jobs; public enum JobErrCode { OK(0, ""), // 无错误 diff --git a/src/main/java/site/deercloud/liteworldedit/Jobs/Place.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java similarity index 98% rename from src/main/java/site/deercloud/liteworldedit/Jobs/Place.java rename to src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java index a5a1b95..25e582b 100644 --- a/src/main/java/site/deercloud/liteworldedit/Jobs/Place.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java @@ -1,5 +1,6 @@ -package site.deercloud.liteworldedit.Jobs; +package cn.lunadeer.liteworldedit.Jobs; +import cn.lunadeer.liteworldedit.LoggerX; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -12,7 +13,6 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BlockStateMeta; -import site.deercloud.liteworldedit.LoggerX; import java.util.HashMap; diff --git a/src/main/java/site/deercloud/liteworldedit/Jobs/Remove.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java similarity index 93% rename from src/main/java/site/deercloud/liteworldedit/Jobs/Remove.java rename to src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java index 6b7cc2f..933774a 100644 --- a/src/main/java/site/deercloud/liteworldedit/Jobs/Remove.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java @@ -1,5 +1,7 @@ -package site.deercloud.liteworldedit.Jobs; +package cn.lunadeer.liteworldedit.Jobs; +import cn.lunadeer.liteworldedit.LiteWorldEdit; +import cn.lunadeer.liteworldedit.LoggerX; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -8,8 +10,6 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.inventory.ItemStack; -import site.deercloud.liteworldedit.LiteWorldEdit; -import site.deercloud.liteworldedit.LoggerX; import java.util.HashMap; diff --git a/src/main/java/site/deercloud/liteworldedit/LiteWorldEdit.java b/src/main/java/cn/lunadeer/liteworldedit/LiteWorldEdit.java similarity index 86% rename from src/main/java/site/deercloud/liteworldedit/LiteWorldEdit.java rename to src/main/java/cn/lunadeer/liteworldedit/LiteWorldEdit.java index db23844..2ac0bd7 100644 --- a/src/main/java/site/deercloud/liteworldedit/LiteWorldEdit.java +++ b/src/main/java/cn/lunadeer/liteworldedit/LiteWorldEdit.java @@ -1,9 +1,9 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; +import cn.lunadeer.liteworldedit.Managers.Cache; +import cn.lunadeer.liteworldedit.Managers.ConfigManager; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; -import site.deercloud.liteworldedit.Managers.Cache; -import site.deercloud.liteworldedit.Managers.ConfigManager; import java.util.Objects; @@ -20,6 +20,10 @@ public final class LiteWorldEdit extends JavaPlugin { Objects.requireNonNull(Bukkit.getPluginCommand("LiteWorldEdit")).setExecutor(new Commands()); Objects.requireNonNull(Bukkit.getPluginCommand("LiteWorldEdit")).setTabCompleter(new Commands()); + if (config.enableBStats()) { + metrics = new Metrics(this, 21436); + } + LoggerX.info("LiteWorldEdit 已加载"); LoggerX.info("版本: " + getPluginMeta().getVersion()); LoggerX.info(""); @@ -50,4 +54,5 @@ public final class LiteWorldEdit extends JavaPlugin { public static LiteWorldEdit instance; public static ConfigManager config; private Cache _cache; + private Metrics metrics; } diff --git a/src/main/java/site/deercloud/liteworldedit/LoggerX.java b/src/main/java/cn/lunadeer/liteworldedit/LoggerX.java similarity index 97% rename from src/main/java/site/deercloud/liteworldedit/LoggerX.java rename to src/main/java/cn/lunadeer/liteworldedit/LoggerX.java index 81c3dd3..3eb9230 100644 --- a/src/main/java/site/deercloud/liteworldedit/LoggerX.java +++ b/src/main/java/cn/lunadeer/liteworldedit/LoggerX.java @@ -1,4 +1,4 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; import org.bukkit.entity.Player; diff --git a/src/main/java/site/deercloud/liteworldedit/Managers/Cache.java b/src/main/java/cn/lunadeer/liteworldedit/Managers/Cache.java similarity index 86% rename from src/main/java/site/deercloud/liteworldedit/Managers/Cache.java rename to src/main/java/cn/lunadeer/liteworldedit/Managers/Cache.java index 1940c71..a573d04 100644 --- a/src/main/java/site/deercloud/liteworldedit/Managers/Cache.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Managers/Cache.java @@ -1,7 +1,7 @@ -package site.deercloud.liteworldedit.Managers; +package cn.lunadeer.liteworldedit.Managers; +import cn.lunadeer.liteworldedit.XPlayer; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.XPlayer; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/site/deercloud/liteworldedit/Managers/ConfigManager.java b/src/main/java/cn/lunadeer/liteworldedit/Managers/ConfigManager.java similarity index 82% rename from src/main/java/site/deercloud/liteworldedit/Managers/ConfigManager.java rename to src/main/java/cn/lunadeer/liteworldedit/Managers/ConfigManager.java index d2419ea..b7b68a3 100644 --- a/src/main/java/site/deercloud/liteworldedit/Managers/ConfigManager.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Managers/ConfigManager.java @@ -1,7 +1,7 @@ -package site.deercloud.liteworldedit.Managers; +package cn.lunadeer.liteworldedit.Managers; +import cn.lunadeer.liteworldedit.LiteWorldEdit; import org.bukkit.configuration.file.FileConfiguration; -import site.deercloud.liteworldedit.LiteWorldEdit; public class ConfigManager { public ConfigManager() { @@ -18,6 +18,7 @@ public class ConfigManager { _z_max = _file.getInt("MaxZ", 64); _multiplier = _file.getInt("Multiplier", 1); _drop_items = _file.getBoolean("DropItems", false); + _b_stats = _file.getBoolean("bStats", true); _plugin.saveConfig(); } @@ -68,6 +69,16 @@ public class ConfigManager { _plugin.saveConfig(); } + public Boolean enableBStats() { + return _b_stats; + } + + public void setBStats(Boolean b_stats) { + _b_stats = b_stats; + _file.set("bStats", b_stats); + _plugin.saveConfig(); + } + private final LiteWorldEdit _plugin = LiteWorldEdit.instance; private FileConfiguration _file; @@ -81,4 +92,5 @@ public class ConfigManager { private Boolean _drop_items; private Integer _multiplier; + private Boolean _b_stats; } diff --git a/src/main/java/site/deercloud/liteworldedit/Managers/JobQueue.java b/src/main/java/cn/lunadeer/liteworldedit/Managers/JobQueue.java similarity index 96% rename from src/main/java/site/deercloud/liteworldedit/Managers/JobQueue.java rename to src/main/java/cn/lunadeer/liteworldedit/Managers/JobQueue.java index 7cd58d0..620249c 100644 --- a/src/main/java/site/deercloud/liteworldedit/Managers/JobQueue.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Managers/JobQueue.java @@ -1,11 +1,11 @@ -package site.deercloud.liteworldedit.Managers; +package cn.lunadeer.liteworldedit.Managers; +import cn.lunadeer.liteworldedit.Jobs.Job; import org.bukkit.Bukkit; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarStyle; import org.bukkit.boss.BossBar; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.Jobs.Job; import java.util.LinkedList; diff --git a/src/main/java/site/deercloud/liteworldedit/Managers/Point.java b/src/main/java/cn/lunadeer/liteworldedit/Managers/Point.java similarity index 86% rename from src/main/java/site/deercloud/liteworldedit/Managers/Point.java rename to src/main/java/cn/lunadeer/liteworldedit/Managers/Point.java index 41d66e2..73d08e0 100644 --- a/src/main/java/site/deercloud/liteworldedit/Managers/Point.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Managers/Point.java @@ -1,4 +1,4 @@ -package site.deercloud.liteworldedit.Managers; +package cn.lunadeer.liteworldedit.Managers; import org.bukkit.entity.Player; diff --git a/src/main/java/cn/lunadeer/liteworldedit/Metrics.java b/src/main/java/cn/lunadeer/liteworldedit/Metrics.java new file mode 100644 index 0000000..8c53988 --- /dev/null +++ b/src/main/java/cn/lunadeer/liteworldedit/Metrics.java @@ -0,0 +1,862 @@ +package cn.lunadeer.liteworldedit; + +import org.bukkit.Bukkit; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.java.JavaPlugin; + +import javax.net.ssl.HttpsURLConnection; +import java.io.*; +import java.lang.reflect.Method; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.stream.Collectors; +import java.util.zip.GZIPOutputStream; + +public class Metrics { + private final Plugin plugin; + + private final MetricsBase metricsBase; + + /** + * Creates a new Metrics instance. + * + * @param plugin Your plugin instance. + * @param serviceId The id of the service. It can be found at What is my plugin id? + */ + public Metrics(JavaPlugin plugin, int serviceId) { + this.plugin = plugin; + // Get the config file + File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); + File configFile = new File(bStatsFolder, "config.yml"); + YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile); + if (!config.isSet("serverUuid")) { + config.addDefault("enabled", true); + config.addDefault("serverUuid", UUID.randomUUID().toString()); + config.addDefault("logFailedRequests", false); + config.addDefault("logSentData", false); + config.addDefault("logResponseStatusText", false); + // Inform the server owners about bStats + config + .options() + .header( + "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n" + + "many people use their plugin and their total player count. It's recommended to keep bStats\n" + + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n" + + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n" + + "anonymous.") + .copyDefaults(true); + try { + config.save(configFile); + } catch (IOException ignored) { + } + } + // Load the data + boolean enabled = config.getBoolean("enabled", true); + String serverUUID = config.getString("serverUuid"); + boolean logErrors = config.getBoolean("logFailedRequests", false); + boolean logSentData = config.getBoolean("logSentData", false); + boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false); + metricsBase = + new MetricsBase( + "bukkit", + serverUUID, + serviceId, + enabled, + this::appendPlatformData, + this::appendServiceData, + submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask), + plugin::isEnabled, + (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error), + (message) -> this.plugin.getLogger().log(Level.INFO, message), + logErrors, + logSentData, + logResponseStatusText); + } + + /** + * Shuts down the underlying scheduler service. + */ + public void shutdown() { + metricsBase.shutdown(); + } + + /** + * Adds a custom chart. + * + * @param chart The chart to add. + */ + public void addCustomChart(CustomChart chart) { + metricsBase.addCustomChart(chart); + } + + private void appendPlatformData(JsonObjectBuilder builder) { + builder.appendField("playerAmount", getPlayerAmount()); + builder.appendField("onlineMode", Bukkit.getOnlineMode() ? 1 : 0); + builder.appendField("bukkitVersion", Bukkit.getVersion()); + builder.appendField("bukkitName", Bukkit.getName()); + builder.appendField("javaVersion", System.getProperty("java.version")); + builder.appendField("osName", System.getProperty("os.name")); + builder.appendField("osArch", System.getProperty("os.arch")); + builder.appendField("osVersion", System.getProperty("os.version")); + builder.appendField("coreCount", Runtime.getRuntime().availableProcessors()); + } + + private void appendServiceData(JsonObjectBuilder builder) { + builder.appendField("pluginVersion", plugin.getDescription().getVersion()); + } + + private int getPlayerAmount() { + try { + // Around MC 1.8 the return type was changed from an array to a collection, + // This fixes java.lang.NoSuchMethodError: + // org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection; + Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers"); + return onlinePlayersMethod.getReturnType().equals(Collection.class) + ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size() + : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length; + } catch (Exception e) { + // Just use the new method if the reflection failed + return Bukkit.getOnlinePlayers().size(); + } + } + + public static class MetricsBase { + + /** + * The version of the Metrics class. + */ + public static final String METRICS_VERSION = "3.0.2"; + + private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s"; + + private final ScheduledExecutorService scheduler; + + private final String platform; + + private final String serverUuid; + + private final int serviceId; + + private final Consumer appendPlatformDataConsumer; + + private final Consumer appendServiceDataConsumer; + + private final Consumer submitTaskConsumer; + + private final Supplier checkServiceEnabledSupplier; + + private final BiConsumer errorLogger; + + private final Consumer infoLogger; + + private final boolean logErrors; + + private final boolean logSentData; + + private final boolean logResponseStatusText; + + private final Set customCharts = new HashSet<>(); + + private final boolean enabled; + + /** + * Creates a new MetricsBase class instance. + * + * @param platform The platform of the service. + * @param serviceId The id of the service. + * @param serverUuid The server uuid. + * @param enabled Whether or not data sending is enabled. + * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and + * appends all platform-specific data. + * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and + * appends all service-specific data. + * @param submitTaskConsumer A consumer that takes a runnable with the submit task. This can be + * used to delegate the data collection to a another thread to prevent errors caused by + * concurrency. Can be {@code null}. + * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled. + * @param errorLogger A consumer that accepts log message and an error. + * @param infoLogger A consumer that accepts info log messages. + * @param logErrors Whether or not errors should be logged. + * @param logSentData Whether or not the sent data should be logged. + * @param logResponseStatusText Whether or not the response status text should be logged. + */ + public MetricsBase( + String platform, + String serverUuid, + int serviceId, + boolean enabled, + Consumer appendPlatformDataConsumer, + Consumer appendServiceDataConsumer, + Consumer submitTaskConsumer, + Supplier checkServiceEnabledSupplier, + BiConsumer errorLogger, + Consumer infoLogger, + boolean logErrors, + boolean logSentData, + boolean logResponseStatusText) { + ScheduledThreadPoolExecutor scheduler = + new ScheduledThreadPoolExecutor(1, task -> new Thread(task, "bStats-Metrics")); + // We want delayed tasks (non-periodic) that will execute in the future to be + // cancelled when the scheduler is shutdown. + // Otherwise, we risk preventing the server from shutting down even when + // MetricsBase#shutdown() is called + scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); + this.scheduler = scheduler; + this.platform = platform; + this.serverUuid = serverUuid; + this.serviceId = serviceId; + this.enabled = enabled; + this.appendPlatformDataConsumer = appendPlatformDataConsumer; + this.appendServiceDataConsumer = appendServiceDataConsumer; + this.submitTaskConsumer = submitTaskConsumer; + this.checkServiceEnabledSupplier = checkServiceEnabledSupplier; + this.errorLogger = errorLogger; + this.infoLogger = infoLogger; + this.logErrors = logErrors; + this.logSentData = logSentData; + this.logResponseStatusText = logResponseStatusText; + checkRelocation(); + if (enabled) { + // WARNING: Removing the option to opt-out will get your plugin banned from + // bStats + startSubmitting(); + } + } + + public void addCustomChart(CustomChart chart) { + this.customCharts.add(chart); + } + + public void shutdown() { + scheduler.shutdown(); + } + + private void startSubmitting() { + final Runnable submitTask = + () -> { + if (!enabled || !checkServiceEnabledSupplier.get()) { + // Submitting data or service is disabled + scheduler.shutdown(); + return; + } + if (submitTaskConsumer != null) { + submitTaskConsumer.accept(this::submitData); + } else { + this.submitData(); + } + }; + // Many servers tend to restart at a fixed time at xx:00 which causes an uneven + // distribution of requests on the + // bStats backend. To circumvent this problem, we introduce some randomness into + // the initial and second delay. + // WARNING: You must not modify and part of this Metrics class, including the + // submit delay or frequency! + // WARNING: Modifying this code will get your plugin banned on bStats. Just + // don't do it! + long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3)); + long secondDelay = (long) (1000 * 60 * (Math.random() * 30)); + scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS); + scheduler.scheduleAtFixedRate( + submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS); + } + + private void submitData() { + final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder(); + appendPlatformDataConsumer.accept(baseJsonBuilder); + final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder(); + appendServiceDataConsumer.accept(serviceJsonBuilder); + JsonObjectBuilder.JsonObject[] chartData = + customCharts.stream() + .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors)) + .filter(Objects::nonNull) + .toArray(JsonObjectBuilder.JsonObject[]::new); + serviceJsonBuilder.appendField("id", serviceId); + serviceJsonBuilder.appendField("customCharts", chartData); + baseJsonBuilder.appendField("service", serviceJsonBuilder.build()); + baseJsonBuilder.appendField("serverUUID", serverUuid); + baseJsonBuilder.appendField("metricsVersion", METRICS_VERSION); + JsonObjectBuilder.JsonObject data = baseJsonBuilder.build(); + scheduler.execute( + () -> { + try { + // Send the data + sendData(data); + } catch (Exception e) { + // Something went wrong! :( + if (logErrors) { + errorLogger.accept("Could not submit bStats metrics data", e); + } + } + }); + } + + private void sendData(JsonObjectBuilder.JsonObject data) throws Exception { + if (logSentData) { + infoLogger.accept("Sent bStats metrics data: " + data.toString()); + } + String url = String.format(REPORT_URL, platform); + HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection(); + // Compress the data to save bandwidth + byte[] compressedData = compress(data.toString()); + connection.setRequestMethod("POST"); + connection.addRequestProperty("Accept", "application/json"); + connection.addRequestProperty("Connection", "close"); + connection.addRequestProperty("Content-Encoding", "gzip"); + connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length)); + connection.setRequestProperty("Content-Type", "application/json"); + connection.setRequestProperty("User-Agent", "Metrics-Service/1"); + connection.setDoOutput(true); + try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) { + outputStream.write(compressedData); + } + StringBuilder builder = new StringBuilder(); + try (BufferedReader bufferedReader = + new BufferedReader(new InputStreamReader(connection.getInputStream()))) { + String line; + while ((line = bufferedReader.readLine()) != null) { + builder.append(line); + } + } + if (logResponseStatusText) { + infoLogger.accept("Sent data to bStats and received response: " + builder); + } + } + + /** + * Checks that the class was properly relocated. + */ + private void checkRelocation() { + // You can use the property to disable the check in your test environment + if (System.getProperty("bstats.relocatecheck") == null + || !System.getProperty("bstats.relocatecheck").equals("false")) { + // Maven's Relocate is clever and changes strings, too. So we have to use this + // little "trick" ... :D + final String defaultPackage = + new String(new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'}); + final String examplePackage = + new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'}); + // We want to make sure no one just copy & pastes the example and uses the wrong + // package names + if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage) + || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) { + throw new IllegalStateException("bStats Metrics class has not been relocated correctly!"); + } + } + } + + /** + * Gzips the given string. + * + * @param str The string to gzip. + * @return The gzipped string. + */ + private static byte[] compress(final String str) throws IOException { + if (str == null) { + return null; + } + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) { + gzip.write(str.getBytes(StandardCharsets.UTF_8)); + } + return outputStream.toByteArray(); + } + } + + public static class SimplePie extends CustomChart { + + private final Callable callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public SimplePie(String chartId, Callable callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObjectBuilder.JsonObject getChartData() throws Exception { + String value = callable.call(); + if (value == null || value.isEmpty()) { + // Null = skip the chart + return null; + } + return new JsonObjectBuilder().appendField("value", value).build(); + } + } + + public static class MultiLineChart extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public MultiLineChart(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObjectBuilder.JsonObject getChartData() throws Exception { + JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean allSkipped = true; + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue() == 0) { + // Skip this invalid + continue; + } + allSkipped = false; + valuesBuilder.appendField(entry.getKey(), entry.getValue()); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); + } + } + + public static class AdvancedPie extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public AdvancedPie(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObjectBuilder.JsonObject getChartData() throws Exception { + JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean allSkipped = true; + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue() == 0) { + // Skip this invalid + continue; + } + allSkipped = false; + valuesBuilder.appendField(entry.getKey(), entry.getValue()); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); + } + } + + public static class SimpleBarChart extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public SimpleBarChart(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObjectBuilder.JsonObject getChartData() throws Exception { + JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + for (Map.Entry entry : map.entrySet()) { + valuesBuilder.appendField(entry.getKey(), new int[]{entry.getValue()}); + } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); + } + } + + public static class AdvancedBarChart extends CustomChart { + + private final Callable> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public AdvancedBarChart(String chartId, Callable> callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObjectBuilder.JsonObject getChartData() throws Exception { + JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); + Map map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean allSkipped = true; + for (Map.Entry entry : map.entrySet()) { + if (entry.getValue().length == 0) { + // Skip this invalid + continue; + } + allSkipped = false; + valuesBuilder.appendField(entry.getKey(), entry.getValue()); + } + if (allSkipped) { + // Null = skip the chart + return null; + } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); + } + } + + public static class DrilldownPie extends CustomChart { + + private final Callable>> callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public DrilldownPie(String chartId, Callable>> callable) { + super(chartId); + this.callable = callable; + } + + @Override + public JsonObjectBuilder.JsonObject getChartData() throws Exception { + JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); + Map> map = callable.call(); + if (map == null || map.isEmpty()) { + // Null = skip the chart + return null; + } + boolean reallyAllSkipped = true; + for (Map.Entry> entryValues : map.entrySet()) { + JsonObjectBuilder valueBuilder = new JsonObjectBuilder(); + boolean allSkipped = true; + for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) { + valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue()); + allSkipped = false; + } + if (!allSkipped) { + reallyAllSkipped = false; + valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build()); + } + } + if (reallyAllSkipped) { + // Null = skip the chart + return null; + } + return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); + } + } + + public abstract static class CustomChart { + + private final String chartId; + + protected CustomChart(String chartId) { + if (chartId == null) { + throw new IllegalArgumentException("chartId must not be null"); + } + this.chartId = chartId; + } + + public JsonObjectBuilder.JsonObject getRequestJsonObject( + BiConsumer errorLogger, boolean logErrors) { + JsonObjectBuilder builder = new JsonObjectBuilder(); + builder.appendField("chartId", chartId); + try { + JsonObjectBuilder.JsonObject data = getChartData(); + if (data == null) { + // If the data is null we don't send the chart. + return null; + } + builder.appendField("data", data); + } catch (Throwable t) { + if (logErrors) { + errorLogger.accept("Failed to get data for custom chart with id " + chartId, t); + } + return null; + } + return builder.build(); + } + + protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception; + } + + public static class SingleLineChart extends CustomChart { + + private final Callable callable; + + /** + * Class constructor. + * + * @param chartId The id of the chart. + * @param callable The callable which is used to request the chart data. + */ + public SingleLineChart(String chartId, Callable callable) { + super(chartId); + this.callable = callable; + } + + @Override + protected JsonObjectBuilder.JsonObject getChartData() throws Exception { + int value = callable.call(); + if (value == 0) { + // Null = skip the chart + return null; + } + return new JsonObjectBuilder().appendField("value", value).build(); + } + } + + /** + * An extremely simple JSON builder. + * + *

While this class is neither feature-rich nor the most performant one, it's sufficient enough + * for its use-case. + */ + public static class JsonObjectBuilder { + + private StringBuilder builder = new StringBuilder(); + + private boolean hasAtLeastOneField = false; + + public JsonObjectBuilder() { + builder.append("{"); + } + + /** + * Appends a null field to the JSON. + * + * @param key The key of the field. + * @return A reference to this object. + */ + public JsonObjectBuilder appendNull(String key) { + appendFieldUnescaped(key, "null"); + return this; + } + + /** + * Appends a string field to the JSON. + * + * @param key The key of the field. + * @param value The value of the field. + * @return A reference to this object. + */ + public JsonObjectBuilder appendField(String key, String value) { + if (value == null) { + throw new IllegalArgumentException("JSON value must not be null"); + } + appendFieldUnescaped(key, "\"" + escape(value) + "\""); + return this; + } + + /** + * Appends an integer field to the JSON. + * + * @param key The key of the field. + * @param value The value of the field. + * @return A reference to this object. + */ + public JsonObjectBuilder appendField(String key, int value) { + appendFieldUnescaped(key, String.valueOf(value)); + return this; + } + + /** + * Appends an object to the JSON. + * + * @param key The key of the field. + * @param object The object. + * @return A reference to this object. + */ + public JsonObjectBuilder appendField(String key, JsonObject object) { + if (object == null) { + throw new IllegalArgumentException("JSON object must not be null"); + } + appendFieldUnescaped(key, object.toString()); + return this; + } + + /** + * Appends a string array to the JSON. + * + * @param key The key of the field. + * @param values The string array. + * @return A reference to this object. + */ + public JsonObjectBuilder appendField(String key, String[] values) { + if (values == null) { + throw new IllegalArgumentException("JSON values must not be null"); + } + String escapedValues = + Arrays.stream(values) + .map(value -> "\"" + escape(value) + "\"") + .collect(Collectors.joining(",")); + appendFieldUnescaped(key, "[" + escapedValues + "]"); + return this; + } + + /** + * Appends an integer array to the JSON. + * + * @param key The key of the field. + * @param values The integer array. + * @return A reference to this object. + */ + public JsonObjectBuilder appendField(String key, int[] values) { + if (values == null) { + throw new IllegalArgumentException("JSON values must not be null"); + } + String escapedValues = + Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(",")); + appendFieldUnescaped(key, "[" + escapedValues + "]"); + return this; + } + + /** + * Appends an object array to the JSON. + * + * @param key The key of the field. + * @param values The integer array. + * @return A reference to this object. + */ + public JsonObjectBuilder appendField(String key, JsonObject[] values) { + if (values == null) { + throw new IllegalArgumentException("JSON values must not be null"); + } + String escapedValues = + Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(",")); + appendFieldUnescaped(key, "[" + escapedValues + "]"); + return this; + } + + /** + * Appends a field to the object. + * + * @param key The key of the field. + * @param escapedValue The escaped value of the field. + */ + private void appendFieldUnescaped(String key, String escapedValue) { + if (builder == null) { + throw new IllegalStateException("JSON has already been built"); + } + if (key == null) { + throw new IllegalArgumentException("JSON key must not be null"); + } + if (hasAtLeastOneField) { + builder.append(","); + } + builder.append("\"").append(escape(key)).append("\":").append(escapedValue); + hasAtLeastOneField = true; + } + + /** + * Builds the JSON string and invalidates this builder. + * + * @return The built JSON string. + */ + public JsonObject build() { + if (builder == null) { + throw new IllegalStateException("JSON has already been built"); + } + JsonObject object = new JsonObject(builder.append("}").toString()); + builder = null; + return object; + } + + /** + * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt. + * + *

This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'. + * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n"). + * + * @param value The value to escape. + * @return The escaped value. + */ + private static String escape(String value) { + final StringBuilder builder = new StringBuilder(); + for (int i = 0; i < value.length(); i++) { + char c = value.charAt(i); + if (c == '"') { + builder.append("\\\""); + } else if (c == '\\') { + builder.append("\\\\"); + } else if (c <= '\u000F') { + builder.append("\\u000").append(Integer.toHexString(c)); + } else if (c <= '\u001F') { + builder.append("\\u00").append(Integer.toHexString(c)); + } else { + builder.append(c); + } + } + return builder.toString(); + } + + /** + * A super simple representation of a JSON object. + * + *

This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not + * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String, + * JsonObject)}. + */ + public static class JsonObject { + + private final String value; + + private JsonObject(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } + } + } +} diff --git a/src/main/java/site/deercloud/liteworldedit/Notification.java b/src/main/java/cn/lunadeer/liteworldedit/Notification.java similarity index 90% rename from src/main/java/site/deercloud/liteworldedit/Notification.java rename to src/main/java/cn/lunadeer/liteworldedit/Notification.java index cbdb722..af177b0 100644 --- a/src/main/java/site/deercloud/liteworldedit/Notification.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Notification.java @@ -1,4 +1,4 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.Style; @@ -7,8 +7,6 @@ import net.kyori.adventure.title.Title; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import static site.deercloud.liteworldedit.LoggerX.debug; - public class Notification { private static final Style i_style = Style.style(TextColor.color(139, 255, 123)); private static final Style w_style = Style.style(TextColor.color(255, 185, 69)); @@ -43,19 +41,19 @@ public class Notification { public static void info(Player player, Component msg) { player.sendMessage(Component.text(prefix, i_style).append(msg)); if (LiteWorldEdit.config.isDebug()) - debug("来自玩家[ " + player.getName() + " ] 的提示 | " + msg); + LoggerX.debug("来自玩家[ " + player.getName() + " ] 的提示 | " + msg); } public static void warn(Player player, Component msg) { player.sendMessage(Component.text(prefix, w_style).append(msg)); if (LiteWorldEdit.config.isDebug()) - debug("来自玩家[ " + player.getName() + " ] 的警告 | " + msg); + LoggerX.debug("来自玩家[ " + player.getName() + " ] 的警告 | " + msg); } public static void error(Player player, Component msg) { player.sendMessage(Component.text(prefix, e_style).append(msg)); if (LiteWorldEdit.config.isDebug()) - debug("来自玩家[ " + player.getName() + " ] 的报错 | " + msg); + LoggerX.debug("来自玩家[ " + player.getName() + " ] 的报错 | " + msg); } public static void info(CommandSender player, Component msg) { diff --git a/src/main/java/site/deercloud/liteworldedit/SchedulerUtil.java b/src/main/java/cn/lunadeer/liteworldedit/SchedulerUtil.java similarity index 96% rename from src/main/java/site/deercloud/liteworldedit/SchedulerUtil.java rename to src/main/java/cn/lunadeer/liteworldedit/SchedulerUtil.java index 0f9f493..6c7f49a 100644 --- a/src/main/java/site/deercloud/liteworldedit/SchedulerUtil.java +++ b/src/main/java/cn/lunadeer/liteworldedit/SchedulerUtil.java @@ -1,4 +1,4 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; diff --git a/src/main/java/site/deercloud/liteworldedit/Task.java b/src/main/java/cn/lunadeer/liteworldedit/Task.java similarity index 92% rename from src/main/java/site/deercloud/liteworldedit/Task.java rename to src/main/java/cn/lunadeer/liteworldedit/Task.java index cfe1433..9a46f12 100644 --- a/src/main/java/site/deercloud/liteworldedit/Task.java +++ b/src/main/java/cn/lunadeer/liteworldedit/Task.java @@ -1,8 +1,8 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; +import cn.lunadeer.liteworldedit.Jobs.Job; +import cn.lunadeer.liteworldedit.Jobs.JobErrCode; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.Jobs.Job; -import site.deercloud.liteworldedit.Jobs.JobErrCode; public class Task implements Runnable { /** diff --git a/src/main/java/site/deercloud/liteworldedit/XPlayer.java b/src/main/java/cn/lunadeer/liteworldedit/XPlayer.java similarity index 86% rename from src/main/java/site/deercloud/liteworldedit/XPlayer.java rename to src/main/java/cn/lunadeer/liteworldedit/XPlayer.java index fe945d1..54440ce 100644 --- a/src/main/java/site/deercloud/liteworldedit/XPlayer.java +++ b/src/main/java/cn/lunadeer/liteworldedit/XPlayer.java @@ -1,14 +1,14 @@ -package site.deercloud.liteworldedit; +package cn.lunadeer.liteworldedit; +import cn.lunadeer.liteworldedit.Jobs.Job; +import cn.lunadeer.liteworldedit.Managers.JobQueue; +import cn.lunadeer.liteworldedit.Managers.Point; import org.bukkit.entity.Player; -import site.deercloud.liteworldedit.Jobs.Job; -import site.deercloud.liteworldedit.Managers.JobQueue; -import site.deercloud.liteworldedit.Managers.Point; import java.util.HashMap; import java.util.Map; -import static site.deercloud.liteworldedit.SchedulerUtil.runAtFixedRateEntity; +import static cn.lunadeer.liteworldedit.SchedulerUtil.runAtFixedRateEntity; public class XPlayer { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 4fd863d..d6c5334 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -8,4 +8,6 @@ Multiplier: 1 DropItems: false +bStats: true + Debug: false \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 1a1e146..c3f52e1 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,12 +1,12 @@ name: LiteWorldEdit version: '${project.version}' -main: site.deercloud.liteworldedit.LiteWorldEdit +main: cn.lunadeer.liteworldedit.LiteWorldEdit api-version: 1.14 prefix: LWE load: STARTUP authors: [ Luming ] description: 生存用简易创世神。 -website: https://blog.deercloud.site +website: https://ssl.lunadeer.cn:14448/project-2/ folia-supported: true commands: LiteWorldEdit: