Fixes packet issues.

toxicity188 · Mar 22, 2024 · a7132bf · a7132bf
1 parent 90c8556
commit a7132bf
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 17 deletions.
diff --git a/api/src/main/java/kr/toxicity/hud/api/BetterHud.java b/api/src/main/java/kr/toxicity/hud/api/BetterHud.java
@@ -35,6 +35,7 @@ public void onLoad() {
     public abstract @NotNull HudScheduler getScheduler();
     public abstract @NotNull BedrockAdapter getBedrockAdapter();
     public abstract boolean isFolia();
+    public abstract boolean isMergeBossBar();
     public abstract void loadAssets(@NotNull String prefix, @NotNull File dir);
     public abstract int getWidth(char target);
     public abstract @NotNull HudPlayer getHudPlayer(@NotNull Player player);

diff --git a/dist/src/main/kotlin/kr/toxicity/hud/BetterHudImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/BetterHudImpl.kt
@@ -208,6 +208,7 @@ class BetterHudImpl: BetterHud() {
 
     override fun getScheduler(): HudScheduler = scheduler
     override fun isFolia(): Boolean = isFolia
+    override fun isMergeBossBar(): Boolean = ConfigManager.mergeBossBar
     override fun getPlaceholderManager(): PlaceholderManager = PlaceholderManagerImpl
     override fun getListenerManager(): ListenerManager = ListenerManagerImpl
     override fun getPopupManager(): PopupManager = PopupManagerImpl

diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/ConfigManager.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/ConfigManager.kt
@@ -29,6 +29,9 @@ object ConfigManager: BetterHudManager {
     var separateResourcePackNameSpace = false
         private set
 
+    var mergeBossBar = true
+        private set
+
     override fun start() {
 
     }
@@ -65,6 +68,7 @@ object ConfigManager: BetterHudManager {
             yaml.getString("build-folder-location")?.let {
                 buildFolderLocation = it
             }
+            mergeBossBar = yaml.getBoolean("merge-boss-bar", true)
         }.onFailure { e ->
             warn("Unable to load config.yml")
             warn("Reason: ${e.message}")

diff --git a/dist/src/main/resources/config.yml b/dist/src/main/resources/config.yml
@@ -6,6 +6,7 @@ tick-speed: 1
 
 default-font-name: "font.ttf"
 
+merge-boss-bar: true
 disable-to-bedrock-player: true
 build-folder-location: "BetterHud/build"
 separate-resource-pack-namespace: false

diff --git a/nms/v1_17_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_17_R1/NMSImpl.kt b/nms/v1_17_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_17_R1/NMSImpl.kt
@@ -1,6 +1,7 @@
 package kr.toxicity.hud.nms.v1_17_R1
 
 import com.mojang.authlib.GameProfile
+import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
@@ -321,8 +322,8 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
-                val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
+                val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }
                 writeBossBar(buf, ctx, msg, promise)
@@ -331,6 +332,11 @@ class NMSImpl: NMS {
             }
         }
     }
+    private class HudByteBuf(val source: ByteBuf): FriendlyByteBuf(source) {
+        override fun unwrap(): ByteBuf {
+            return source
+        }
+    }
 
     private class HudBossBar(uuid: UUID, component: Component, color: BarColor): BossEvent(uuid, fromAdventure(component), getColor(color), BossBarOverlay.PROGRESS) {
         override fun getProgress(): Float {

diff --git a/nms/v1_18_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R1/NMSImpl.kt b/nms/v1_18_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R1/NMSImpl.kt
@@ -1,6 +1,7 @@
 package kr.toxicity.hud.nms.v1_18_R1
 
 import com.mojang.authlib.GameProfile
+import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
@@ -322,8 +323,8 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
-                val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
+                val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }
                 writeBossBar(buf, ctx, msg, promise)
@@ -332,6 +333,11 @@ class NMSImpl: NMS {
             }
         }
     }
+    private class HudByteBuf(val source: ByteBuf): FriendlyByteBuf(source) {
+        override fun unwrap(): ByteBuf {
+            return source
+        }
+    }
 
     private class HudBossBar(uuid: UUID, component: Component, color: BarColor): BossEvent(uuid, fromAdventure(component), getColor(color), BossBarOverlay.PROGRESS) {
         override fun getProgress(): Float {

diff --git a/nms/v1_18_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R2/NMSImpl.kt b/nms/v1_18_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R2/NMSImpl.kt
@@ -1,6 +1,7 @@
 package kr.toxicity.hud.nms.v1_18_R2
 
 import com.mojang.authlib.GameProfile
+import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
@@ -325,8 +326,8 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
-                val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
+                val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }
                 writeBossBar(buf, ctx, msg, promise)
@@ -335,6 +336,11 @@ class NMSImpl: NMS {
             }
         }
     }
+    private class HudByteBuf(val source: ByteBuf): FriendlyByteBuf(source) {
+        override fun unwrap(): ByteBuf {
+            return source
+        }
+    }
 
     private class HudBossBar(uuid: UUID, component: Component, color: BarColor): BossEvent(uuid, fromAdventure(component), getColor(color), BossBarOverlay.PROGRESS) {
         override fun getProgress(): Float {

diff --git a/nms/v1_19_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R1/NMSImpl.kt b/nms/v1_19_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R1/NMSImpl.kt
@@ -1,6 +1,7 @@
 package kr.toxicity.hud.nms.v1_19_R1
 
 import com.mojang.authlib.GameProfile
+import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
@@ -325,8 +326,8 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
-                val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
+                val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }
                 writeBossBar(buf, ctx, msg, promise)
@@ -335,6 +336,11 @@ class NMSImpl: NMS {
             }
         }
     }
+    private class HudByteBuf(val source: ByteBuf): FriendlyByteBuf(source) {
+        override fun unwrap(): ByteBuf {
+            return source
+        }
+    }
 
     private class HudBossBar(uuid: UUID, component: Component, color: BarColor): BossEvent(uuid, fromAdventure(component), getColor(color), BossBarOverlay.PROGRESS) {
         override fun getProgress(): Float {

diff --git a/nms/v1_19_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R2/NMSImpl.kt b/nms/v1_19_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R2/NMSImpl.kt
@@ -1,6 +1,7 @@
 package kr.toxicity.hud.nms.v1_19_R2
 
 import com.mojang.authlib.GameProfile
+import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
@@ -325,8 +326,8 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
-                val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
+                val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }
                 writeBossBar(buf, ctx, msg, promise)
@@ -335,6 +336,11 @@ class NMSImpl: NMS {
             }
         }
     }
+    private class HudByteBuf(val source: ByteBuf): FriendlyByteBuf(source) {
+        override fun unwrap(): ByteBuf {
+            return source
+        }
+    }
 
     private class HudBossBar(uuid: UUID, component: Component, color: BarColor): BossEvent(uuid, fromAdventure(component), getColor(color), BossBarOverlay.PROGRESS) {
         override fun getProgress(): Float {

diff --git a/nms/v1_19_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R3/NMSImpl.kt b/nms/v1_19_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R3/NMSImpl.kt
@@ -1,6 +1,7 @@
 package kr.toxicity.hud.nms.v1_19_R3
 
 import com.mojang.authlib.GameProfile
+import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
@@ -324,8 +325,8 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
-                val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
+                val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }
                 writeBossBar(buf, ctx, msg, promise)
@@ -334,6 +335,11 @@ class NMSImpl: NMS {
             }
         }
     }
+    private class HudByteBuf(val source: ByteBuf): FriendlyByteBuf(source) {
+        override fun unwrap(): ByteBuf {
+            return source
+        }
+    }
 
     private class HudBossBar(uuid: UUID, component: Component, color: BarColor): BossEvent(uuid, fromAdventure(component), getColor(color), BossBarOverlay.PROGRESS) {
         override fun getProgress(): Float {

diff --git a/nms/v1_20_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R1/NMSImpl.kt b/nms/v1_20_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R1/NMSImpl.kt
@@ -1,6 +1,7 @@
 package kr.toxicity.hud.nms.v1_20_R1
 
 import com.mojang.authlib.GameProfile
+import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
@@ -324,8 +325,8 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
-                val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
+                val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }
                 writeBossBar(buf, ctx, msg, promise)
@@ -334,7 +335,11 @@ class NMSImpl: NMS {
             }
         }
     }
-
+    private class HudByteBuf(val source: ByteBuf): FriendlyByteBuf(source) {
+        override fun unwrap(): ByteBuf {
+            return source
+        }
+    }
     private class HudBossBar(uuid: UUID, component: Component, color: BarColor): BossEvent(uuid, fromAdventure(component), getColor(color), BossBarOverlay.PROGRESS) {
         override fun getProgress(): Float {
             return 0F

diff --git a/nms/v1_20_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R2/NMSImpl.kt b/nms/v1_20_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R2/NMSImpl.kt
@@ -326,7 +326,7 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
                 val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }

diff --git a/nms/v1_20_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R3/NMSImpl.kt b/nms/v1_20_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R3/NMSImpl.kt
@@ -326,7 +326,7 @@ class NMSImpl: NMS {
         }
 
         override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
-            if (msg is ClientboundBossEventPacket) {
+            if (BetterHud.getInstance().isMergeBossBar && msg is ClientboundBossEventPacket) {
                 val buf = FriendlyByteBuf(Unpooled.buffer(1 shl 4)).apply {
                     msg.write(this)
                 }