diff --git a/hamster-ball-bukkit/build.gradle b/hamster-ball-bukkit/build.gradle index 1f8feff..ca0616e 100644 --- a/hamster-ball-bukkit/build.gradle +++ b/hamster-ball-bukkit/build.gradle @@ -8,10 +8,6 @@ dependencies { //noinspection VulnerableLibrariesLocal compileOnly 'org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT' - // https://mvnrepository.com/artifact/io.netty/netty-all - //noinspection GradlePackageUpdate - shade 'io.netty:netty-all:4.1.86.Final' - compileOnly "cn.hamster3.mc.plugin.core:bukkit:${hamster_core_version}" compileOnly "me.clip:placeholderapi:2.11.2" transitive false } diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java index e7f1348..af4df59 100644 --- a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java +++ b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java @@ -32,7 +32,6 @@ public class HamsterBallPlugin extends JavaPlugin { logger.info("BallBukkitAPI 已启动."); } catch (Exception e) { e.printStackTrace(); - sync(Bukkit::shutdown); } } diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java index 38b9bbb..6a0db5f 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java @@ -57,6 +57,7 @@ public abstract class BallAPI { @NotNull private final EventLoopGroup executors; protected Channel channel; + private boolean enabled; private boolean connected; diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java index bfa247c..c812d5b 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java @@ -17,10 +17,6 @@ import java.util.logging.Level; @ChannelHandler.Sharable public class BallChannelHandler extends SimpleChannelInboundHandler { - public BallChannelHandler() { - super(true); - } - @Override protected void channelRead0(ChannelHandlerContext context, String message) { if ("pong".equals(message)) { diff --git a/hamster-ball-server/build.gradle b/hamster-ball-server/build.gradle index 8be31f3..c309f88 100644 --- a/hamster-ball-server/build.gradle +++ b/hamster-ball-server/build.gradle @@ -4,6 +4,7 @@ evaluationDependsOn(':hamster-ball-common') dependencies { apiShade project(":hamster-ball-common") transitive false + shade "cn.hamster3.mc.plugin.core:common:${hamster_core_version}" // // https://mvnrepository.com/artifact/org.slf4j/slf4j-api // implementation 'org.slf4j:slf4j-api:2.0.3' @@ -14,7 +15,6 @@ dependencies { implementationShade 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0' // https://mvnrepository.com/artifact/io.netty/netty-all - //noinspection GradlePackageUpdate implementationShade 'io.netty:netty-all:4.1.86.Final' // https://mvnrepository.com/artifact/org.yaml/snakeyaml implementationShade 'org.yaml:snakeyaml:2.0'