From 0ca763ebdb780c4c559741d361164aa4abaafe9f Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Thu, 1 Jun 2023 09:04:44 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hamster-ball-bukkit/build.gradle | 11 ++++++++--- hamster-ball-bungeecord/build.gradle | 4 ++-- hamster-ball-common/build.gradle | 3 ++- .../ball/common/connector/BallChannelInitializer.java | 3 --- .../cn/hamster3/mc/plugin/ball/common/utils/OS.java | 11 ++++++++--- hamster-ball-server/build.gradle | 2 +- .../server/connector/BallServerChannelHandler.java | 4 ---- .../connector/BallServerChannelInitializer.java | 3 --- .../server/connector/BallServerKeepAliveHandler.java | 4 ---- 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/hamster-ball-bukkit/build.gradle b/hamster-ball-bukkit/build.gradle index 870b88e..1f8feff 100644 --- a/hamster-ball-bukkit/build.gradle +++ b/hamster-ball-bukkit/build.gradle @@ -3,12 +3,17 @@ setArchivesBaseName("HamsterBall-Bukkit") evaluationDependsOn(':hamster-ball-common') dependencies { - apiShade(project(":hamster-ball-common")) { transitive = false } + apiShade project(":hamster-ball-common") transitive false - compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT' + //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 } + compileOnly "me.clip:placeholderapi:2.11.2" transitive false } processResources { diff --git a/hamster-ball-bungeecord/build.gradle b/hamster-ball-bungeecord/build.gradle index af0fd64..5269926 100644 --- a/hamster-ball-bungeecord/build.gradle +++ b/hamster-ball-bungeecord/build.gradle @@ -3,10 +3,10 @@ setArchivesBaseName("HamsterBall-BungeeCord") evaluationDependsOn(':hamster-ball-common') dependencies { - apiShade(project(":hamster-ball-common")) { transitive = false } + apiShade project(":hamster-ball-common") transitive false //noinspection VulnerableLibrariesLocal - compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT' + compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT' exclude group: 'io.netty' compileOnly "cn.hamster3.mc.plugin.core:bungeecord:${hamster_core_version}" } diff --git a/hamster-ball-common/build.gradle b/hamster-ball-common/build.gradle index b443905..f3db9f7 100644 --- a/hamster-ball-common/build.gradle +++ b/hamster-ball-common/build.gradle @@ -3,9 +3,10 @@ setArchivesBaseName("HamsterBall-Common") dependencies { // https://mvnrepository.com/artifact/com.google.code.gson/gson //noinspection GradlePackageUpdate + //noinspection VulnerableLibrariesLocal compileOnly 'com.google.code.gson:gson:2.8.0' // https://mvnrepository.com/artifact/io.netty/netty-all - compileOnly 'io.netty:netty-all:4.1.82.Final' + compileOnly 'io.netty:netty-all:4.1.86.Final' compileOnly "cn.hamster3.mc.plugin.core:common:${hamster_core_version}" diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java index 166a1a3..f516a90 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java @@ -13,9 +13,6 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; public class BallChannelInitializer extends ChannelInitializer { - public BallChannelInitializer() { - } - @Override protected void initChannel(@NotNull SocketChannel channel) { channel.pipeline() diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java index ef5b1de..341fa93 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java @@ -1,5 +1,6 @@ package cn.hamster3.mc.plugin.ball.common.utils; +import cn.hamster3.mc.plugin.core.common.thread.NamedThreadFactory; import io.netty.channel.Channel; import io.netty.channel.EventLoopGroup; import io.netty.channel.ServerChannel; @@ -14,12 +15,16 @@ import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import org.jetbrains.annotations.NotNull; +import java.util.concurrent.ThreadFactory; + public enum OS { WINDOWS, LINUX, MACOS, OTHER; + private static final ThreadFactory THREAD_FACTORY = new NamedThreadFactory("HamsterBall-IO"); + @NotNull public static OS getCurrentOS() { String s = System.getProperties().get("os.name").toString().toLowerCase(); @@ -50,11 +55,11 @@ public enum OS { public EventLoopGroup getEventLoopGroup(int nThread) { switch (this) { case LINUX: - return new EpollEventLoopGroup(nThread); + return new EpollEventLoopGroup(nThread, THREAD_FACTORY); case MACOS: - return new KQueueEventLoopGroup(nThread); + return new KQueueEventLoopGroup(nThread, THREAD_FACTORY); default: - return new NioEventLoopGroup(nThread); + return new NioEventLoopGroup(nThread, THREAD_FACTORY); } } diff --git a/hamster-ball-server/build.gradle b/hamster-ball-server/build.gradle index d0431b3..8be31f3 100644 --- a/hamster-ball-server/build.gradle +++ b/hamster-ball-server/build.gradle @@ -3,7 +3,7 @@ setArchivesBaseName("HamsterBall-Server") evaluationDependsOn(':hamster-ball-common') dependencies { - apiShade(project(":hamster-ball-common")) { transitive = false } + apiShade project(":hamster-ball-common") transitive false // // https://mvnrepository.com/artifact/org.slf4j/slf4j-api // implementation 'org.slf4j:slf4j-api:2.0.3' diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java index dd22fbd..8b6af1d 100644 --- a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java +++ b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java @@ -13,10 +13,6 @@ import org.slf4j.LoggerFactory; public class BallServerChannelHandler extends SimpleChannelInboundHandler { private static final Logger LOGGER = LoggerFactory.getLogger("BallServerChannelHandler"); - public BallServerChannelHandler() { - super(true); - } - @Override protected void channelRead0(ChannelHandlerContext context, String message) { if ("ping".equals(message)) { diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java index 9feff75..7df6490 100644 --- a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java +++ b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java @@ -24,9 +24,6 @@ public class BallServerChannelInitializer extends ChannelInitializer CHANNELS = new ArrayList<>(); private static final Logger LOGGER = LoggerFactory.getLogger("BallServerChannelInitializer"); - public BallServerChannelInitializer() { - } - public static void broadcastMessage(BallMessageInfo messageInfo) { String string = messageInfo.toString(); synchronized (CHANNELS) { diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java index db9fdce..8ce028b 100644 --- a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java +++ b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java @@ -11,10 +11,6 @@ import org.slf4j.LoggerFactory; public class BallServerKeepAliveHandler extends SimpleUserEventChannelHandler { private static final Logger LOGGER = LoggerFactory.getLogger("BallServerKeepAliveHandler"); - public BallServerKeepAliveHandler() { - super(true); - } - @Override protected void eventReceived(ChannelHandlerContext context, IdleStateEvent event) { context.close();