MiniDay/hamster-core
1
0
Fork 0
Code Issues Pull Requests Actions Releases 8 Activity

refactor: 更新 bukkit api 至 1.19.2

Browse Source
This commit is contained in:
叁只仓鼠
2022-10-29 02:43:41 +08:00
parent f7278c435e
commit d1ba4d4519
19 changed files with 123 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java
View File

@@ -20,6 +20,9 @@ public final class CoreBukkitAPI extends CoreAPI {
FileConfiguration config = plugin.getConfig(); FileConfiguration config = plugin.getConfig();
ConfigurationSection datasourceConfig = config.getConfigurationSection("datasource"); ConfigurationSection datasourceConfig = config.getConfigurationSection("datasource");
if (datasourceConfig == null) {
throw new IllegalArgumentException("配置文件中未找到 datasource 节点！");
}
HikariConfig hikariConfig = new HikariConfig(); HikariConfig hikariConfig = new HikariConfig();
hikariConfig.setDriverClassName(datasourceConfig.getString("driver")); hikariConfig.setDriverClassName(datasourceConfig.getString("driver"));
hikariConfig.setJdbcUrl(datasourceConfig.getString("url")); hikariConfig.setJdbcUrl(datasourceConfig.getString("url"));

20
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java
View File

@@ -99,14 +99,21 @@ public class ParentCommand extends ChildCommand {
return map; return map;
} }
public void hook(@NotNull PluginCommand command) { public void hook(PluginCommand command) {
if (command == null) {
return;
}
command.setExecutor(this); command.setExecutor(this);
command.setTabCompleter(this); command.setTabCompleter(this);
plugin.getLogger().info("已注册指令 " + getUsage() + "."); plugin.getLogger().info("已注册指令 " + getUsage() + ".");
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (!hasPermission(sender)) {
CoreMessage.COMMAND_NOT_HAS_PERMISSION.show(sender);
return true;
}
if (args.length == 0) { if (args.length == 0) {
sender.sendMessage("§e==================== [" + name + "使用帮助] ===================="); sender.sendMessage("§e==================== [" + name + "使用帮助] ====================");
Map<String, String> helpMap = getCommandHelp(sender); Map<String, String> helpMap = getCommandHelp(sender);
@@ -122,16 +129,21 @@ public class ParentCommand extends ChildCommand {
return true; return true;
} }
for (ChildCommand childCommand : childCommands) { for (ChildCommand childCommand : childCommands) {
if (childCommand.getName().equalsIgnoreCase(args[0])) { if (!childCommand.getName().equalsIgnoreCase(args[0])) {
continue;
}
if (childCommand instanceof ParentCommand || childCommand.hasPermission(sender)) {
return childCommand.onCommand(sender, command, label, Arrays.copyOfRange(args, 1, args.length)); return childCommand.onCommand(sender, command, label, Arrays.copyOfRange(args, 1, args.length));
} }
CoreMessage.COMMAND_NOT_HAS_PERMISSION.show(sender);
return true;
} }
CoreMessage.COMMAND_NOT_FOUND.show(sender); CoreMessage.COMMAND_NOT_FOUND.show(sender);
return true; return true;
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
if (args.length == 0) { if (args.length == 0) {
return childCommands.stream() return childCommands.stream()
.map(ChildCommand::getName) .map(ChildCommand::getName)

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/GCCommand.java
View File

@@ -35,14 +35,14 @@ public class GCCommand extends ChildCommand {
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
System.gc(); System.gc();
sender.sendMessage("§a已发送 GC 信号."); sender.sendMessage("§a已发送 GC 信号.");
return true; return true;
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return Collections.emptyList(); return Collections.emptyList();
} }
} }

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/InfoModeCommand.java
View File

@@ -40,7 +40,7 @@ public class InfoModeCommand extends ChildCommand {
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
CoreMessage.COMMAND_MUST_USED_BY_PLAYER.show(sender); CoreMessage.COMMAND_MUST_USED_BY_PLAYER.show(sender);
return true; return true;
@@ -75,7 +75,7 @@ public class InfoModeCommand extends ChildCommand {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return null; return null;
} }
} }

10
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/YamlCommand.java
View File

@@ -39,7 +39,7 @@ public class YamlCommand extends ChildCommand {
@Override @Override
public boolean hasPermission(@NotNull CommandSender sender) { public boolean hasPermission(@NotNull CommandSender sender) {
return true; return sender.hasPermission("hamster.core.admin");
} }
@Override @Override
@@ -47,9 +47,9 @@ public class YamlCommand extends ChildCommand {
return "将当前信息保存至 yaml 中"; return "将当前信息保存至 yaml 中";
} }
@SuppressWarnings("deprecation") @SuppressWarnings({"deprecation", "ConstantConditions"})
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
YamlConfiguration config = new YamlConfiguration(); YamlConfiguration config = new YamlConfiguration();
config.set("mc-version", BukkitUtils.getMCVersion()); config.set("mc-version", BukkitUtils.getMCVersion());
config.set("nms-version", BukkitUtils.getNMSVersion()); config.set("nms-version", BukkitUtils.getNMSVersion());
@@ -70,10 +70,10 @@ public class YamlCommand extends ChildCommand {
lore.add("§e测试 lore 1"); lore.add("§e测试 lore 1");
lore.add("§e测试 lore 2"); lore.add("§e测试 lore 2");
lore.add("§e测试 lore 3"); lore.add("§e测试 lore 3");
meta.addEnchant(Enchantment.DAMAGE_ALL, 1, true);
meta.setDisplayName("§a测试物品"); meta.setDisplayName("§a测试物品");
meta.setLore(lore); meta.setLore(lore);
meta.addItemFlags(ItemFlag.values()); meta.addItemFlags(ItemFlag.values());
meta.addEnchant(Enchantment.DAMAGE_ALL, 1, true);
stack.setItemMeta(meta); stack.setItemMeta(meta);
config.set("test-item", stack); config.set("test-item", stack);
File dataFolder = new File(HamsterCorePlugin.getInstance().getDataFolder(), "yaml"); File dataFolder = new File(HamsterCorePlugin.getInstance().getDataFolder(), "yaml");
@@ -91,7 +91,7 @@ public class YamlCommand extends ChildCommand {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return Collections.emptyList(); return Collections.emptyList();
} }
} }

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreAddCommand.java
View File

@@ -41,7 +41,7 @@ public class LoreAddCommand extends ChildCommand {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (args.length < 1) { if (args.length < 1) {
CoreMessage.COMMAND_LORE_EMPTY_INPUT.show(sender); CoreMessage.COMMAND_LORE_EMPTY_INPUT.show(sender);
return true; return true;
@@ -71,7 +71,7 @@ public class LoreAddCommand extends ChildCommand {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return null; return null;
} }
} }

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreClearCommand.java
View File

@@ -41,7 +41,7 @@ public class LoreClearCommand extends ChildCommand {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
CoreMessage.COMMAND_MUST_USED_BY_PLAYER.show(sender); CoreMessage.COMMAND_MUST_USED_BY_PLAYER.show(sender);
return true; return true;
@@ -67,7 +67,7 @@ public class LoreClearCommand extends ChildCommand {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return null; return null;
} }
} }

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreNameCommand.java
View File

@@ -40,7 +40,7 @@ public class LoreNameCommand extends ChildCommand {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (args.length < 1) { if (args.length < 1) {
CoreMessage.COMMAND_LORE_EMPTY_INPUT.show(sender); CoreMessage.COMMAND_LORE_EMPTY_INPUT.show(sender);
return true; return true;
@@ -65,7 +65,7 @@ public class LoreNameCommand extends ChildCommand {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return null; return null;
} }
} }

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreRemoveCommand.java
View File

@@ -41,7 +41,7 @@ public class LoreRemoveCommand extends ChildCommand {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (args.length < 1) { if (args.length < 1) {
CoreMessage.COMMAND_LORE_REMOVE_NOT_INPUT_NUMBER.show(sender); CoreMessage.COMMAND_LORE_REMOVE_NOT_INPUT_NUMBER.show(sender);
return true; return true;
@@ -80,7 +80,7 @@ public class LoreRemoveCommand extends ChildCommand {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return null; return null;
} }
} }

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/LoreSetCommand.java
View File

@@ -42,7 +42,7 @@ public class LoreSetCommand extends ChildCommand {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (args.length < 1) { if (args.length < 1) {
CoreMessage.COMMAND_LORE_SET_NOT_INPUT_NUMBER.show(sender); CoreMessage.COMMAND_LORE_SET_NOT_INPUT_NUMBER.show(sender);
return true; return true;
@@ -86,7 +86,7 @@ public class LoreSetCommand extends ChildCommand {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
return null; return null;
} }
} }

3
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java
View File

@@ -5,6 +5,7 @@ import cn.hamster3.mc.plugin.core.bukkit.command.ParentCommand;
import cn.hamster3.mc.plugin.core.common.util.CommonUtils; import cn.hamster3.mc.plugin.core.common.util.CommonUtils;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
public final class ParentLoreCommand extends ParentCommand { public final class ParentLoreCommand extends ParentCommand {
public static final ParentLoreCommand INSTANCE = new ParentLoreCommand(); public static final ParentLoreCommand INSTANCE = new ParentLoreCommand();
@@ -19,7 +20,7 @@ public final class ParentLoreCommand extends ParentCommand {
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
CommonUtils.replaceColorCode(args); CommonUtils.replaceColorCode(args);
return super.onCommand(sender, command, label, args); return super.onCommand(sender, command, label, args);
} }

6
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java
View File

@@ -1,10 +1,10 @@
package cn.hamster3.mc.plugin.core.bukkit.constant; package cn.hamster3.mc.plugin.core.bukkit.constant;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public enum CoreMessage { public enum CoreMessage {
COMMAND_NOT_FOUND, COMMAND_NOT_FOUND,
COMMAND_NOT_HAS_PERMISSION,
COMMAND_MUST_USED_BY_PLAYER, COMMAND_MUST_USED_BY_PLAYER,
COMMAND_DEBUG_INFO_MODE_ON, COMMAND_DEBUG_INFO_MODE_ON,
@@ -29,8 +29,4 @@ public enum CoreMessage {
public void show(CommandSender sender) { public void show(CommandSender sender) {
sender.sendMessage(name()); sender.sendMessage(name());
} }
public void show(Player player) {
player.sendMessage(name());
}
} }

3
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/DebugListener.java
View File

@@ -44,6 +44,9 @@ public class DebugListener implements Listener {
} }
event.setCancelled(true); event.setCancelled(true);
Block block = event.getClickedBlock(); Block block = event.getClickedBlock();
if (block == null) {
return;
}
player.sendMessage("§e=============================="); player.sendMessage("§e==============================");
player.sendMessage(String.format("§a方块位置: %s %d %d %d", player.sendMessage(String.format("§a方块位置: %s %d %d %d",
block.getWorld().getName(), block.getWorld().getName(),

7
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java
View File

@@ -9,8 +9,11 @@ import java.util.*;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class ButtonGroup { public class ButtonGroup {
@NotNull
private final String name; private final String name;
@NotNull
private final PageConfig config; private final PageConfig config;
@NotNull
private final HashMap<Character, String> buttonNameMap; private final HashMap<Character, String> buttonNameMap;
/** /**
@@ -19,7 +22,7 @@ public class ButtonGroup {
* @param pageConfig Page 设定 * @param pageConfig Page 设定
* @param config 按钮组设定 * @param config 按钮组设定
*/ */
public ButtonGroup(PageConfig pageConfig, ConfigurationSection config) { public ButtonGroup(@NotNull PageConfig pageConfig, @NotNull ConfigurationSection config) {
this.config = pageConfig; this.config = pageConfig;
name = config.getName(); name = config.getName();
buttonNameMap = new HashMap<>(); buttonNameMap = new HashMap<>();
@@ -148,6 +151,7 @@ public class ButtonGroup {
* *
* @return 按钮组名称 * @return 按钮组名称
*/ */
@NotNull
public String getName() { public String getName() {
return name; return name;
} }
@@ -157,6 +161,7 @@ public class ButtonGroup {
* *
* @return 把图形字符映射到按钮名称的表 * @return 把图形字符映射到按钮名称的表
*/ */
@NotNull
public HashMap<Character, String> getButtonNameMap() { public HashMap<Character, String> getButtonNameMap() {
return buttonNameMap; return buttonNameMap;
} }

30
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageConfig.java
View File

@@ -60,16 +60,20 @@ public class PageConfig implements InventoryHolder {
buttons = new HashMap<>(); buttons = new HashMap<>();
ConfigurationSection buttonsConfig = config.getConfigurationSection("buttons"); ConfigurationSection buttonsConfig = config.getConfigurationSection("buttons");
for (String key : buttonsConfig.getKeys(false)) { if (buttonsConfig != null) {
buttons.put(key, buttonsConfig.getItemStack(key)); for (String key : buttonsConfig.getKeys(false)) {
buttons.put(key, buttonsConfig.getItemStack(key));
}
} }
buttonGroups = new ArrayList<>(); buttonGroups = new ArrayList<>();
ConfigurationSection buttonGroupsConfig = config.getConfigurationSection("groups"); ConfigurationSection buttonGroupsConfig = config.getConfigurationSection("groups");
for (String key : buttonGroupsConfig.getKeys(false)) { if (buttonGroupsConfig != null) {
buttonGroups.add( for (String key : buttonGroupsConfig.getKeys(false)) {
new ButtonGroup(this, buttonGroupsConfig.getConfigurationSection(key)) //noinspection ConstantConditions
); ButtonGroup buttonGroup = new ButtonGroup(this, buttonGroupsConfig.getConfigurationSection(key));
buttonGroups.add(buttonGroup);
}
} }
ButtonGroup group = getButtonGroup("default"); ButtonGroup group = getButtonGroup("default");
@@ -84,12 +88,14 @@ public class PageConfig implements InventoryHolder {
buttonSounds = new HashMap<>(); buttonSounds = new HashMap<>();
ConfigurationSection buttonSoundConfig = config.getConfigurationSection("sounds"); ConfigurationSection buttonSoundConfig = config.getConfigurationSection("sounds");
for (String key : buttonSoundConfig.getKeys(false)) { if (buttonSoundConfig != null) {
try { for (String key : buttonSoundConfig.getKeys(false)) {
buttonSounds.put(key, Sound.valueOf(buttonSoundConfig.getString(key))); try {
} catch (IllegalArgumentException e) { buttonSounds.put(key, Sound.valueOf(buttonSoundConfig.getString(key)));
HamsterCorePlugin.getInstance().getLogger().warning("初始化 PageConfig 时遇到了一个异常:"); } catch (Exception e) {
e.printStackTrace(); HamsterCorePlugin.getInstance().getLogger().warning("初始化 PageConfig 时遇到了一个异常:");
e.printStackTrace();
}
} }
} }
} }

17
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java
View File

@@ -7,6 +7,7 @@ import org.bukkit.plugin.Plugin;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.util.HashMap; import java.util.HashMap;
@@ -23,11 +24,14 @@ public class PageManager {
throw new IllegalArgumentException(clazz.getName() + " 未被 @PluginPage 注解修饰！"); throw new IllegalArgumentException(clazz.getName() + " 未被 @PluginPage 注解修饰！");
} }
PluginPage annotation = clazz.getAnnotation(PluginPage.class); PluginPage annotation = clazz.getAnnotation(PluginPage.class);
String value = annotation.value(); String pluginName = annotation.value();
Plugin plugin = Bukkit.getPluginManager().getPlugin(value); Plugin plugin = Bukkit.getPluginManager().getPlugin(pluginName);
if (plugin == null) {
throw new IllegalArgumentException("未找到插件 " + pluginName + " !");
}
File pageFolder = new File(plugin.getDataFolder(), "pages"); File pageFolder = new File(plugin.getDataFolder(), "pages");
if (pageFolder.mkdirs()) { if (pageFolder.mkdirs()) {
HamsterCorePlugin.getInstance().getLogger().info("为 " + value + " 创建页面配置文件夹..."); HamsterCorePlugin.getInstance().getLogger().info("为 " + pluginName + " 创建页面配置文件夹...");
} }
String pageFileName = clazz.getSimpleName() + ".yml"; String pageFileName = clazz.getSimpleName() + ".yml";
File pageFile = new File(pageFolder, pageFileName); File pageFile = new File(pageFolder, pageFileName);
@@ -37,8 +41,13 @@ public class PageManager {
PAGE_CONFIG.put(clazz.getName(), pageConfig); PAGE_CONFIG.put(clazz.getName(), pageConfig);
return pageConfig; return pageConfig;
} }
InputStream resource = plugin.getResource("/" + pageFileName);
if (resource == null) {
throw new IllegalArgumentException("在插件 " + pluginName + " 的文件内部未找到 " + pageFileName + " !");
}
try { try {
Files.copy(plugin.getResource("/" + pageFileName), pageFile.toPath(), StandardCopyOption.REPLACE_EXISTING); Files.copy(resource, pageFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
resource.close();
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }

9
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitUtils.java
View File

@@ -82,6 +82,7 @@ public final class BukkitUtils {
try { try {
stack = new ItemStack(Material.valueOf("PLAYER_HEAD")); stack = new ItemStack(Material.valueOf("PLAYER_HEAD"));
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
//noinspection deprecation
stack = new ItemStack(Material.valueOf("SKULL_ITEM"), 1, (short) 3); stack = new ItemStack(Material.valueOf("SKULL_ITEM"), 1, (short) 3);
} }
SkullMeta meta = (SkullMeta) stack.getItemMeta(); SkullMeta meta = (SkullMeta) stack.getItemMeta();
@@ -110,8 +111,10 @@ public final class BukkitUtils {
stack = new ItemStack(Material.valueOf("SKULL_ITEM"), 1, (short) 3); stack = new ItemStack(Material.valueOf("SKULL_ITEM"), 1, (short) 3);
} }
SkullMeta meta = (SkullMeta) stack.getItemMeta(); SkullMeta meta = (SkullMeta) stack.getItemMeta();
meta.setOwner(name); if (meta != null) {
stack.setItemMeta(meta); meta.setOwner(name);
stack.setItemMeta(meta);
}
return stack; return stack;
} }
@@ -161,7 +164,7 @@ public final class BukkitUtils {
} }
if (stack.hasItemMeta()) { if (stack.hasItemMeta()) {
ItemMeta meta = stack.getItemMeta(); ItemMeta meta = stack.getItemMeta();
if (meta.hasDisplayName()) { if (meta != null && meta.hasDisplayName()) {
return meta.getDisplayName(); return meta.getDisplayName();
} }
} }

4
hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java
View File

@@ -27,10 +27,10 @@ public abstract class CoreAPI {
} }
public void reportError(@NotNull String apiKey, @NotNull String projectID, @NotNull Throwable exception) { public void reportError(@NotNull String apiKey, @NotNull String projectID, @NotNull Throwable exception) {
// todo
} }
public void reportFile(@NotNull String apiKey, @NotNull String projectID, @NotNull String filename, byte @NotNull [] bytes) { public void reportFile(@NotNull String apiKey, @NotNull String projectID, @NotNull String filename, byte @NotNull [] bytes) {
// todo
} }
} }

45
hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/CountdownThread.java
View File

@@ -8,14 +8,14 @@ import java.util.concurrent.TimeUnit;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public abstract class CountdownThread implements Runnable { public abstract class CountdownThread implements Runnable {
private final long interval; private final long interval;
private final long ticks; private final long totalTicks;
protected int tick; private int nowTicks;
private ScheduledFuture<?> future; private ScheduledFuture<?> future;
public CountdownThread(long interval, long ticks) { public CountdownThread(long interval, long totalTicks) {
this.interval = interval; this.interval = interval;
this.ticks = ticks; this.totalTicks = totalTicks;
tick = 0; nowTicks = 0;
} }
public void start() { public void start() {
@@ -28,7 +28,7 @@ public abstract class CountdownThread implements Runnable {
@Override @Override
public void run() { public void run() {
if (tick == ticks) { if (nowTicks == totalTicks) {
try { try {
onFinish(); onFinish();
} catch (Exception e) { } catch (Exception e) {
@@ -38,11 +38,11 @@ public abstract class CountdownThread implements Runnable {
return; return;
} }
try { try {
onTick(tick); onTick(nowTicks);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
tick++; nowTicks++;
} }
/** /**
@@ -50,12 +50,35 @@ public abstract class CountdownThread implements Runnable {
* *
* @param tick 时间刻度，以 0 开始，到 interval-1 结束 * @param tick 时间刻度，以 0 开始，到 interval-1 结束
*/ */
protected void onTick(int tick) { protected abstract void onTick(int tick);
}
protected abstract void onFinish();
public void cancel() { public void cancel() {
future.cancel(false); future.cancel(false);
} }
protected abstract void onFinish(); public long getInterval() {
return interval;
}
public long getTotalTicks() {
return totalTicks;
}
public int getNowTicks() {
return nowTicks;
}
public void setNowTicks(int nowTicks) {
this.nowTicks = nowTicks;
}
public ScheduledFuture<?> getFuture() {
return future;
}
public void setFuture(ScheduledFuture<?> future) {
this.future = future;
}
} }