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

feat: 兼容1.0.0

Browse Source
This commit is contained in:
叁只仓鼠
2023-10-25 21:08:12 +08:00
parent 13b0e32d5a
commit 6079f4d930
4 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java
View File

@@ -59,8 +59,8 @@ public class HamsterCorePlugin extends JavaPlugin {
logger.info("已注册 CallbackListener.");
Bukkit.getPluginManager().registerEvents(DebugListener.INSTANCE, this);
logger.info("已注册 DebugListener.");
ParentCoreCommand.INSTANCE.hook();
ParentLoreCommand.INSTANCE.hook();
ParentCoreCommand.INSTANCE.register();
ParentLoreCommand.INSTANCE.register();
long time = System.currentTimeMillis() - start;
Bukkit.getScheduler().runTaskLater(this, () -> {
PointAPI.reloadPlayerPointAPIHook();

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

@@ -11,9 +11,8 @@ public abstract class ChildCommand implements TabExecutor {
@NotNull
public abstract String getUsage();
public abstract boolean hasPermission(@NotNull CommandSender sender);
@NotNull
public abstract String getDescription();
public abstract boolean hasPermission(@NotNull CommandSender sender);
}

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

@@ -53,6 +53,25 @@ public abstract class ParentCommand extends ChildCommand {
return "";
}
public void register() {
JavaPlugin plugin = getPlugin();
PluginCommand command = plugin.getCommand(getName());
if (command == null) {
throw new IllegalArgumentException("在插件 " + plugin.getName() + " 中未找到指令 " + getName() + ".");
}
command.setExecutor(this);
command.setTabCompleter(this);
plugin.getLogger().info("已注册指令 " + getUsage() + ".");
}
/**
* 建议使用 {@link #register()}
*/
@Deprecated
public void hook() {
register();
}
/**
* 获取所有子命令
* <p>
@@ -108,17 +127,6 @@ public abstract class ParentCommand extends ChildCommand {
}
}
public void hook() {
JavaPlugin plugin = getPlugin();
PluginCommand command = plugin.getCommand(getName());
if (command == null) {
throw new IllegalArgumentException("在插件 " + plugin.getName() + " 中未找到指令 " + getName() + ".");
}
command.setExecutor(this);
command.setTabCompleter(this);
plugin.getLogger().info("已注册指令 " + getUsage() + ".");
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (!hasPermission(sender)) {

13
core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java
View File

@@ -1,5 +1,7 @@
package cn.hamster3.mc.plugin.core.common.util;
import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.sound.Sound;
@@ -16,6 +18,17 @@ import java.util.zip.ZipOutputStream;
@SuppressWarnings("unused")
public final class CoreUtils {
/**
* @deprecated 建议使用 {@link CoreAPI#getGson()}
*/
@Deprecated
public static Gson GSON = CoreAPI.getInstance().getGson();
/**
* @deprecated 建议使用 {@link CoreAPI#getHumanGson()}
*/
@Deprecated
public static Gson GSON_HUMAN = CoreAPI.getInstance().getHumanGson();
private CoreUtils() {
}