Skip to content

Commit 08c47f5

Browse files
ItsFlickerItsFlicker
committed
[2.3.0] 1.21.5 & Fix
1 parent e835297 commit 08c47f5

File tree

11 files changed

+81
-11
lines changed

11 files changed

+81
-11
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ subprojects {
3737
install(Bukkit, BungeeCord, Velocity)
3838
}
3939
version {
40-
taboolib = "6.2.3-8cc2f66"
40+
taboolib = "6.2.3-b217935"
4141
coroutines = null
4242
// isSkipKotlin = true
4343
// isSkipKotlinRelocate = true
@@ -61,7 +61,7 @@ subprojects {
6161
compileOnly(kotlin("stdlib"))
6262
compileOnly("com.google.code.gson:gson:2.8.5")
6363
compileOnly("com.google.guava:guava:21.0")
64-
compileOnly("net.kyori:adventure-api:4.17.0")
64+
compileOnly("net.kyori:adventure-api:4.21.0")
6565
}
6666

6767
// 编译配置

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=me.arasple.mc.trchat
2-
version=2.2.3
2+
version=2.3.0
33
kotlin.incremental=true
44
kotlin.incremental.java=true
55
kotlin.incremental.useClasspathSnapshot=true

‎plugin/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ taboolib {
2020
}
2121
}
2222
relocate("com.eatthepath.uuid.", "${rootProject.group}.library.uuid.")
23+
// relocate("net.md_5.bungee", "net.md_5.bungee121")
2324
// relocate("com.electronwill.nightconfig", "com.electronwill.nightconfig_3_6_7")
2425
}
2526

2627
dependencies {
2728
taboo("com.eatthepath:fast-uuid:0.2.0")
29+
// taboo("net.md-5:bungeecord-chat:1.21-R0.3") { isTransitive = false }
2830
}
2931

3032
tasks {

‎project/module-adventure/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
compileOnly(project(":project:common"))
33
compileOnly(project(":project:module-nms"))
4-
compileOnly("net.kyori:adventure-platform-bukkit:4.3.4")
4+
compileOnly("net.kyori:adventure-platform-bukkit:4.4.0")
55
compileOnly(fileTree(rootDir.resolve("libs")))
66
}
77

‎project/module-compat/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
repositories {
2+
maven("https://maven.devs.beer/")
23
maven("https://nexus.scarsz.me/content/groups/public/")
34
maven("https://repo.oraxen.com/releases")
45
// maven("https://repo.nexomc.com/releases")
@@ -11,7 +12,7 @@ dependencies {
1112
compileOnly("com.discordsrv:discordsrv:1.26.0") { isTransitive = false }
1213
compileOnly("com.willfp:eco:6.35.1") { isTransitive = false }
1314

14-
compileOnly("com.github.LoneDev6:api-itemsadder:3.6.3-beta-14") { isTransitive = false }
15+
compileOnly("dev.lone:api-itemsadder:4.0.10") { isTransitive = false }
1516
// compileOnly("com.nexomc:nexo:0.7.0")
1617

1718
compileOnly("xyz.xenondevs.nova:nova-api:0.12.13") { isTransitive = false }

‎project/module-compat/src/main/kotlin/me/arasple/mc/trchat/module/internal/hook/impl/HookItemsAdder.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package me.arasple.mc.trchat.module.internal.hook.impl
33
import dev.lone.itemsadder.api.FontImages.FontImageWrapper
44
import me.arasple.mc.trchat.module.internal.hook.HookAbstract
55
import org.bukkit.entity.Player
6-
import taboolib.module.nms.MinecraftVersion.versionId
76

87
/**
98
* @author ItsFlicker
@@ -16,7 +15,7 @@ class HookItemsAdder : HookAbstract() {
1615
return message
1716
}
1817
return try {
19-
if (player == null || versionId >= 12005) {
18+
if (player == null) {
2019
FontImageWrapper.replaceFontImages(message)
2120
} else {
2221
FontImageWrapper.replaceFontImages(player, message)

‎project/module-nms/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
compileOnly(project(":project:common"))
3-
// compileOnly("ink.ptms.core:v12101:12101:mapped")
3+
// compileOnly("ink.ptms.core:v12105:12105:mapped")
44
// compileOnly("ink.ptms.core:v12005:12005:mapped")
55
compileOnly("ink.ptms.core:v12004:12004:mapped")
66
compileOnly("ink.ptms.core:v12002:12002:mapped")

‎project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMSImpl.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.arasple.mc.trchat.api.nms
22

33
import me.arasple.mc.trchat.util.ServerUtil
4+
import me.arasple.mc.trchat.util.nilUUID
45
import me.arasple.mc.trchat.util.reportOnce
56
import net.minecraft.server.v1_12_R1.ChatMessageType
67
import net.minecraft.server.v1_12_R1.PacketPlayOutChat
@@ -71,7 +72,7 @@ class NMSImpl : NMS() {
7172
receiver.sendPacket(PacketPlayOutChat::class.java.invokeConstructor(
7273
craftChatMessageFromComponent(component),
7374
ChatMessageType.CHAT,
74-
sender
75+
sender ?: nilUUID
7576
))
7677
} else if (versionId >= 11200) {
7778
receiver.sendPacket(PacketPlayOutChat::class.java.invokeConstructor(

‎project/runtime-bukkit/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
compileOnly(project(":project:module-compat"))
99
compileOnly(project(":project:module-nms"))
1010
compileOnly("ink.ptms.core:v12005:12005:universal")
11-
compileOnly("net.md-5:bungeecord-api:1.21-R0.2")
11+
compileOnly("net.md-5:bungeecord-api:1.21-R0.3")
1212
compileOnly(fileTree(rootDir.resolve("libs")))
1313

1414
compileOnly("me.clip:placeholderapi:2.11.5") { isTransitive = false }

‎project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/logger/SLF4JLoggerSuppressor.kt‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package me.arasple.mc.trchat.module.internal.logger
2+
3+
import org.slf4j.LoggerFactory
4+
import taboolib.common.LifeCycle
5+
import taboolib.common.platform.Awake
6+
import taboolib.common.platform.Platform
7+
import taboolib.common.platform.PlatformSide
8+
import taboolib.common.platform.function.submit
9+
import java.io.PrintStream
10+
11+
/**
12+
* https://github.com/8aka-Team/Invero/blob/main/src/main/kotlin/cc/trixey/invero/common/logger/SLF4JLoggerSuppressor.kt
13+
* SLF4J日志抑制器
14+
* 用于屏蔽SLF4J的初始化警告日志
15+
*/
16+
@PlatformSide(Platform.BUKKIT)
17+
object SLF4JLoggerSuppressor {
18+
19+
@Awake(LifeCycle.ENABLE)
20+
fun setupLoggerSuppressor() {
21+
// 保存原始的System.err输出流
22+
val originalErr = System.err
23+
24+
submit {
25+
// 恢复原始的错误输出流
26+
System.setErr(originalErr)
27+
}
28+
29+
try {
30+
// 设置一个临时的错误输出流，过滤掉SLF4J相关的初始化警告
31+
System.setErr(object : PrintStream(originalErr) {
32+
override fun println(message: String?) {
33+
if (!isSLF4JInitMessage(message)) {
34+
super.println(message)
35+
}
36+
}
37+
38+
override fun print(message: String?) {
39+
if (!isSLF4JInitMessage(message)) {
40+
super.print(message)
41+
}
42+
}
43+
})
44+
45+
// 触发SLF4J的初始化
46+
LoggerFactory.getLogger(SLF4JLoggerSuppressor::class.java)
47+
48+
} catch (_: Exception) {
49+
}
50+
}
51+
52+
/**
53+
* 判断是否为SLF4J的初始化消息
54+
*/
55+
private fun isSLF4JInitMessage(message: String?): Boolean {
56+
if (message == null) return false
57+
return message.contains("SLF4J:") && (
58+
message.contains("No SLF4J providers were found") ||
59+
message.contains("Defaulting to no-operation (NOP) logger") ||
60+
message.contains("See https://www.slf4j.org/codes.html") ||
61+
message.contains("StaticLoggerBinder") ||
62+
message.contains("slf4j-api") ||
63+
message.contains("slf4j-simple") ||
64+
message.contains("SLF4J initialization")
65+
)
66+
}
67+
}

0 commit comments

Comments
 (0)