From e95ca412f8fd31ef90e869ebf36630856648278b Mon Sep 17 00:00:00 2001 From: CarmJos Date: Fri, 31 Dec 2021 02:23:50 +0800 Subject: [PATCH] =?UTF-8?q?[v1.1.3]=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20-=20[U]=20=E5=BD=93=E7=89=A9=E5=93=81=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E6=97=B6=E5=8F=91=E9=80=81=E6=8F=90=E7=A4=BA=20-=20[A]=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8bStats=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 23 ++++++++++++++++++- .../cc/carm/plugin/ultradepository/Main.java | 12 ++++++++++ .../configuration/PluginConfig.java | 7 +++++- .../ultradepository/ui/DepositoryGUI.java | 8 ++++--- src/main/resources/config.yml | 5 ++++ 5 files changed, 50 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 450b348..ef3aa2d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ cc.carm.plugin ultradepository jar - 1.1.2 + 1.1.3 UltraDepository 超级仓库插件，支持设定不同物品的存储仓库。 @@ -91,6 +91,13 @@ + + org.bstats + bstats-bukkit + 2.2.1 + compile + + cc.carm.lib easysql-beecp @@ -207,6 +214,20 @@ + + + org.bstats + cc.carm.plugin.ultradepository.lib.bstats + + + cc.carm.lib.easysql + cc.carm.plugin.ultradepository.lib.easysql + + + cn.beecp + cc.carm.plugin.ultradepository.lib.beecp + + *:* diff --git a/src/main/java/cc/carm/plugin/ultradepository/Main.java b/src/main/java/cc/carm/plugin/ultradepository/Main.java index b0e34b9..64b3874 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/Main.java +++ b/src/main/java/cc/carm/plugin/ultradepository/Main.java @@ -15,6 +15,8 @@ import cc.carm.plugin.ultradepository.storage.MySQLStorage; import cc.carm.plugin.ultradepository.util.ColorParser; import cc.carm.plugin.ultradepository.util.MessageUtil; import cc.carm.plugin.ultradepository.util.SchedulerUtils; +import org.bstats.bukkit.Metrics; +import org.bstats.charts.SingleLineChart; import org.bukkit.Bukkit; import org.bukkit.command.CommandExecutor; import org.bukkit.command.PluginCommand; @@ -27,6 +29,7 @@ import org.jetbrains.annotations.Nullable; public class Main extends JavaPlugin { private static Main instance; + private static Metrics metrics; private static SchedulerUtils scheduler; private static DataStorage storage; @@ -94,6 +97,15 @@ public class Main extends JavaPlugin { log("检测到未安装PlaceholderAPI，跳过变量注册。"); } + if (PluginConfig.METRICS.get()) { + log("启用统计数据..."); + metrics = new Metrics(this, 13776); + metrics.addCustomChart(new SingleLineChart( + "active_depositories", + () -> getDepositoryManager().getDepositories().size()) + ); + } + initialized = true; log("加载完成 ，共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。"); diff --git a/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java b/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java index 5dc28f0..83fbb55 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java +++ b/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java @@ -11,9 +11,14 @@ import org.bukkit.Material; public class PluginConfig { public static final ConfigValue DEBUG = new ConfigValue<>( - "debug", Boolean.class + "debug", Boolean.class, false ); + public static final ConfigValue METRICS = new ConfigValue<>( + "metrics", Boolean.class, true + ); + + public static final ConfigValue STORAGE_METHOD = new ConfigValue<>( "storage.method", String.class ); diff --git a/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java b/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java index cdb4eaf..ef126aa 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java +++ b/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java @@ -59,7 +59,11 @@ public class DepositoryGUI extends GUI { return new GUIItem(factory.toItemStack()) { @Override public void onClick(ClickType type) { - if (itemData.getAmount() < 1) return; + if (itemData.getAmount() < 1) { + PluginMessages.NO_ENOUGH_ITEM.send(player); + return; + } + if (type == ClickType.LEFT) { player.closeInventory(); if (itemData.getAmount() >= 1) { @@ -71,7 +75,6 @@ public class DepositoryGUI extends GUI { } else { PluginMessages.NO_ENOUGH_ITEM.send(player); } - } else if (type == ClickType.RIGHT) { player.closeInventory(); if (hasEmptySlot(player)) { @@ -84,7 +87,6 @@ public class DepositoryGUI extends GUI { } else { PluginMessages.NO_SPACE.send(player); } - } } }; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 61ac374..4c7ead3 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -6,6 +6,11 @@ version: ${project.version} debug: false +# 统计数据设定 +# 改选项用于帮助开发者统计插件版本与使用情况，且绝不会影响性能与使用体验。 +# 当然，您也可以选择在这里关闭，或在plugins/bStats下的配置文件中关闭。 +metrics: true + # 存储相关配置 # 注意：存储配置不会通过重载指令生效，如有修改请重新启动服务器。 storage: