1
mirror of https://github.com/CarmJos/UltraDepository.git synced 2026-06-05 00:58:22 +08:00

Compare commits

...

1 Commits

Author SHA1 Message Date
carm e95ca412f8 [v1.1.3] 版本更新
- [U] 当物品不足时发送提示
- [A] 使用bStats进行数据统计
2021-12-31 02:23:50 +08:00
5 changed files with 50 additions and 5 deletions
+22 -1
View File
@@ -14,7 +14,7 @@
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<artifactId>ultradepository</artifactId> <artifactId>ultradepository</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.1.2</version> <version>1.1.3</version>
<name>UltraDepository</name> <name>UltraDepository</name>
<description>超级仓库插件,支持设定不同物品的存储仓库。</description> <description>超级仓库插件,支持设定不同物品的存储仓库。</description>
@@ -91,6 +91,13 @@
<dependencies> <dependencies>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>cc.carm.lib</groupId> <groupId>cc.carm.lib</groupId>
<artifactId>easysql-beecp</artifactId> <artifactId>easysql-beecp</artifactId>
@@ -207,6 +214,20 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>cc.carm.plugin.ultradepository.lib.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>cc.carm.lib.easysql</pattern>
<shadedPattern>cc.carm.plugin.ultradepository.lib.easysql</shadedPattern>
</relocation>
<relocation>
<pattern>cn.beecp</pattern>
<shadedPattern>cc.carm.plugin.ultradepository.lib.beecp</shadedPattern>
</relocation>
</relocations>
<filters> <filters>
<filter> <filter>
<artifact>*:*</artifact> <artifact>*:*</artifact>
@@ -15,6 +15,8 @@ import cc.carm.plugin.ultradepository.storage.MySQLStorage;
import cc.carm.plugin.ultradepository.util.ColorParser; import cc.carm.plugin.ultradepository.util.ColorParser;
import cc.carm.plugin.ultradepository.util.MessageUtil; import cc.carm.plugin.ultradepository.util.MessageUtil;
import cc.carm.plugin.ultradepository.util.SchedulerUtils; import cc.carm.plugin.ultradepository.util.SchedulerUtils;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.SingleLineChart;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
@@ -27,6 +29,7 @@ import org.jetbrains.annotations.Nullable;
public class Main extends JavaPlugin { public class Main extends JavaPlugin {
private static Main instance; private static Main instance;
private static Metrics metrics;
private static SchedulerUtils scheduler; private static SchedulerUtils scheduler;
private static DataStorage storage; private static DataStorage storage;
@@ -94,6 +97,15 @@ public class Main extends JavaPlugin {
log("检测到未安装PlaceholderAPI,跳过变量注册。"); log("检测到未安装PlaceholderAPI,跳过变量注册。");
} }
if (PluginConfig.METRICS.get()) {
log("启用统计数据...");
metrics = new Metrics(this, 13776);
metrics.addCustomChart(new SingleLineChart(
"active_depositories",
() -> getDepositoryManager().getDepositories().size())
);
}
initialized = true; initialized = true;
log("加载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。"); log("加载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
@@ -11,9 +11,14 @@ import org.bukkit.Material;
public class PluginConfig { public class PluginConfig {
public static final ConfigValue<Boolean> DEBUG = new ConfigValue<>( public static final ConfigValue<Boolean> DEBUG = new ConfigValue<>(
"debug", Boolean.class "debug", Boolean.class, false
); );
public static final ConfigValue<Boolean> METRICS = new ConfigValue<>(
"metrics", Boolean.class, true
);
public static final ConfigValue<String> STORAGE_METHOD = new ConfigValue<>( public static final ConfigValue<String> STORAGE_METHOD = new ConfigValue<>(
"storage.method", String.class "storage.method", String.class
); );
@@ -59,7 +59,11 @@ public class DepositoryGUI extends GUI {
return new GUIItem(factory.toItemStack()) { return new GUIItem(factory.toItemStack()) {
@Override @Override
public void onClick(ClickType type) { 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) { if (type == ClickType.LEFT) {
player.closeInventory(); player.closeInventory();
if (itemData.getAmount() >= 1) { if (itemData.getAmount() >= 1) {
@@ -71,7 +75,6 @@ public class DepositoryGUI extends GUI {
} else { } else {
PluginMessages.NO_ENOUGH_ITEM.send(player); PluginMessages.NO_ENOUGH_ITEM.send(player);
} }
} else if (type == ClickType.RIGHT) { } else if (type == ClickType.RIGHT) {
player.closeInventory(); player.closeInventory();
if (hasEmptySlot(player)) { if (hasEmptySlot(player)) {
@@ -84,7 +87,6 @@ public class DepositoryGUI extends GUI {
} else { } else {
PluginMessages.NO_SPACE.send(player); PluginMessages.NO_SPACE.send(player);
} }
} }
} }
}; };
+5
View File
@@ -6,6 +6,11 @@ version: ${project.version}
debug: false debug: false
# 统计数据设定
# 改选项用于帮助开发者统计插件版本与使用情况,且绝不会影响性能与使用体验。
# 当然,您也可以选择在这里关闭,或在plugins/bStats下的配置文件中关闭。
metrics: true
# 存储相关配置 # 存储相关配置
# 注意:存储配置不会通过重载指令生效,如有修改请重新启动服务器。 # 注意:存储配置不会通过重载指令生效,如有修改请重新启动服务器。
storage: storage: