diff --git a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/AirGameCorePlugin.java b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java similarity index 87% rename from core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/AirGameCorePlugin.java rename to core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java index 288b9c5..f836851 100644 --- a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/AirGameCorePlugin.java +++ b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java @@ -1,6 +1,7 @@ package cn.hamster3.mc.plugin.core.velocity; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; +import cn.hamster3.mc.plugin.core.velocity.api.CoreVelocityAPI; import com.google.inject.Inject; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; @@ -10,7 +11,6 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; import com.zaxxer.hikari.HikariDataSource; import lombok.Getter; -import cn.hamster3.mc.plugin.core.velocity.api.CoreVelocityAPI; import org.slf4j.Logger; import java.io.File; @@ -20,15 +20,15 @@ import java.nio.file.StandardCopyOption; import java.util.Objects; @Plugin( - id = "airgame-core", - name = "AirGameCore", + id = "hamster-core", + name = "HamsterCore", version = BuildConstants.VERSION, description = BuildConstants.DESCRIPTION, authors = {"MiniDay"} ) -public class AirGameCorePlugin { +public class HamsterCorePlugin { @Getter - private static AirGameCorePlugin instance; + private static HamsterCorePlugin instance; @Getter private final java.util.logging.Logger logger; @Getter @@ -39,8 +39,8 @@ public class AirGameCorePlugin { private final File dataFolder; @Inject - public AirGameCorePlugin(Logger slf4jLogger, ProxyServer proxyServer, @DataDirectory Path dataPath) { - logger = java.util.logging.Logger.getLogger("airgame-core"); + public HamsterCorePlugin(Logger slf4jLogger, ProxyServer proxyServer, @DataDirectory Path dataPath) { + logger = java.util.logging.Logger.getLogger("hamster-core"); this.slf4jLogger = slf4jLogger; this.proxyServer = proxyServer; dataFolder = dataPath.toFile(); @@ -53,7 +53,7 @@ public class AirGameCorePlugin { File configFile = new File(dataFolder, "config.yml"); if (!configFile.exists()) { Files.copy( - Objects.requireNonNull(AirGameCorePlugin.class.getResourceAsStream("/config.yml")), + Objects.requireNonNull(HamsterCorePlugin.class.getResourceAsStream("/config.yml")), configFile.toPath(), StandardCopyOption.REPLACE_EXISTING ); @@ -64,7 +64,7 @@ public class AirGameCorePlugin { slf4jLogger.error("初始化 CoreAPI 出错", e); } long time = System.currentTimeMillis() - start; - slf4jLogger.info("AirGameCore 初始化完成,总计耗时 " + time + " ms"); + slf4jLogger.info("HamsterCore 初始化完成,总计耗时 " + time + " ms"); } @Subscribe @@ -91,7 +91,6 @@ public class AirGameCorePlugin { CoreAPI.getInstance().getScheduledService().shutdownNow(); slf4jLogger.info("已关闭 ScheduledExecutorService 线程池"); long time = System.currentTimeMillis() - start; - slf4jLogger.info("AirGameCore 关闭完成,总计耗时 " + time + " ms"); + slf4jLogger.info("HamsterCore 关闭完成,总计耗时 " + time + " ms"); } - -} +} \ No newline at end of file diff --git a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/api/CoreVelocityAPI.java b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/api/CoreVelocityAPI.java index 132cad4..6c50e0d 100644 --- a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/api/CoreVelocityAPI.java +++ b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/api/CoreVelocityAPI.java @@ -6,7 +6,7 @@ import cn.hamster3.mc.plugin.core.common.config.YamlConfig; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import cn.hamster3.mc.plugin.core.common.impl.ComponentTypeAdapter; import cn.hamster3.mc.plugin.core.common.impl.MessageTypeAdapter; -import cn.hamster3.mc.plugin.core.velocity.AirGameCorePlugin; +import cn.hamster3.mc.plugin.core.velocity.HamsterCorePlugin; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import cn.hamster3.mc.plugin.core.velocity.impl.AudienceProviderImpl; @@ -58,7 +58,7 @@ public final class CoreVelocityAPI extends CoreAPI { @Override public @NotNull Logger getLogger() { - return AirGameCorePlugin.getInstance().getLogger(); + return HamsterCorePlugin.getInstance().getLogger(); } @Override diff --git a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/impl/AudienceProviderImpl.java b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/impl/AudienceProviderImpl.java index 6295894..1428b77 100644 --- a/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/impl/AudienceProviderImpl.java +++ b/core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/impl/AudienceProviderImpl.java @@ -1,6 +1,6 @@ package cn.hamster3.mc.plugin.core.velocity.impl; -import cn.hamster3.mc.plugin.core.velocity.AirGameCorePlugin; +import cn.hamster3.mc.plugin.core.velocity.HamsterCorePlugin; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.key.Key; @@ -23,17 +23,17 @@ public class AudienceProviderImpl implements AudienceProvider { @Override public @NotNull Audience console() { - return AirGameCorePlugin.getInstance().getProxyServer().getConsoleCommandSource(); + return HamsterCorePlugin.getInstance().getProxyServer().getConsoleCommandSource(); } @Override public @NotNull Audience players() { - return Audience.audience(AirGameCorePlugin.getInstance().getProxyServer().getAllPlayers()); + return Audience.audience(HamsterCorePlugin.getInstance().getProxyServer().getAllPlayers()); } @Override public @NotNull Audience player(@NotNull UUID playerId) { - Player player = AirGameCorePlugin.getInstance().getProxyServer().getPlayer(playerId).orElse(null); + Player player = HamsterCorePlugin.getInstance().getProxyServer().getPlayer(playerId).orElse(null); if (player == null) { return Audience.empty(); } diff --git a/core-velocity/src/main/resources/config.yml b/core-velocity/src/main/resources/config.yml index ff2e445..f05abda 100644 --- a/core-velocity/src/main/resources/config.yml +++ b/core-velocity/src/main/resources/config.yml @@ -2,11 +2,11 @@ # 完整格式如下: # redis://用户名:密码@主机名:端口/数据库索引?参数名=参数值&参数名=参数值 # 若没有设置 redis 用户名,但设置了密码,则可以使用以下格式: -# redis://密码@localhost:6379/0?clientName=AirGameCore +# redis://:密码@localhost:6379?clientName=HamsterCore # 若没有设置 redis 用户名,也没有设置密码,则可以使用以下格式: -# redis://localhost:6379/0?clientName=AirGameCore +# redis://localhost:6379?clientName=HamsterCore # 若不设置数据库,则默认使用 0 -redis-url: "redis://localhost:6379/0?clientName=AirGameCore&timeout=5s" +redis-url: "redis://localhost:6379/0?clientName=HamsterCore&timeout=5s" datasource: # 数据库链接驱动地址 @@ -19,7 +19,7 @@ datasource: url: "jdbc:mysql://localhost:3306/Test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true" # 如果你不需要做多端跨服,那么请使用 sqlite 作本地数据库 # driver: "org.sqlite.JDBC" - # url: "jdbc:sqlite:./plugins/AirGameCore/database.db" + # url: "jdbc:sqlite:./plugins/HamsterCore/database.db" # 用户名 username: "root" # 密码