Skip to content

Commit d115963

Browse files
committed
[2.1.3] 1.21
1 parent 8a4aef5 commit d115963

File tree

16 files changed

+191
-527
lines changed

16 files changed

+191
-527
lines changed

build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
55
java
6-
id("io.izzel.taboolib") version "2.0.11"
6+
id("io.izzel.taboolib") version "2.0.12"
77
id("org.jetbrains.kotlin.jvm") version "1.8.22"
88
}
99

@@ -14,12 +14,12 @@ subprojects {
1414

1515
taboolib {
1616
env {
17-
install(UNIVERSAL, DATABASE, KETHER, METRICS, NMS_UTIL, UI)
17+
install(UNIVERSAL, DATABASE, KETHER, METRICS, NMS_UTIL)
1818
install(EXPANSION_REDIS, EXPANSION_JAVASCRIPT, EXPANSION_PLAYER_DATABASE)
1919
install(BUKKIT_ALL, BUNGEE, VELOCITY)
2020
}
2121
version {
22-
taboolib = "6.1.2-beta9"
22+
taboolib = "6.1.2-beta10"
2323
coroutines = null
2424
}
2525
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=me.arasple.mc.trchat
2-
version=2.1.2
2+
version=2.1.3
33
kotlin.incremental=true
44
kotlin.incremental.java=true
55
kotlin.incremental.useClasspathSnapshot=true

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

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ package me.arasple.mc.trchat.api.nms
22

33
import org.bukkit.entity.Player
44
import org.bukkit.inventory.ItemStack
5+
import taboolib.common.util.unsafeLazy
56
import taboolib.module.chat.ComponentText
67
import taboolib.module.nms.LocaleKey
8+
import taboolib.module.nms.MinecraftVersion
79
import taboolib.module.nms.nmsProxy
810
import java.util.*
911

@@ -25,18 +27,15 @@ abstract class NMS {
2527

2628
abstract fun optimizeNBT(itemStack: ItemStack, nbtWhitelist: Array<String> = whitelistTags): ItemStack
2729

28-
abstract fun addCustomChatCompletions(player: Player, entries: List<String>)
29-
30-
abstract fun removeCustomChatCompletions(player: Player, entries: List<String>)
31-
32-
abstract fun setCustomChatCompletions(player: Player, entries: List<String>)
33-
3430
abstract fun getLocaleKey(itemStack: ItemStack): LocaleKey
3531

3632
companion object {
3733

3834
@JvmStatic
39-
val instance = nmsProxy<NMS>()
35+
val instance by unsafeLazy {
36+
if (MinecraftVersion.majorLegacy < 12005) nmsProxy<NMS>()
37+
else nmsProxy<NMS>("me.arasple.mc.trchat.api.nms.NMSImpl12100")
38+
}
4039

4140
val whitelistTags = arrayOf(
4241
// 附魔

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

-28
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package me.arasple.mc.trchat.api.nms
22

33
import me.arasple.mc.trchat.util.ServerUtil
44
import me.arasple.mc.trchat.util.reportOnce
5-
import net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket
65
import net.minecraft.server.v1_12_R1.ChatMessageType
76
import net.minecraft.server.v1_12_R1.PacketPlayOutChat
87
import org.bukkit.entity.Player
@@ -131,33 +130,6 @@ class NMSImpl : NMS() {
131130
return itemStack
132131
}
133132

134-
override fun addCustomChatCompletions(player: Player, entries: List<String>) {
135-
if (majorLegacy < 11901) return
136-
try {
137-
player.addCustomChatCompletions(entries)
138-
} catch (_: NoClassDefFoundError) {
139-
}
140-
}
141-
142-
override fun removeCustomChatCompletions(player: Player, entries: List<String>) {
143-
if (majorLegacy < 11901) return
144-
try {
145-
player.removeCustomChatCompletions(entries)
146-
} catch (_: NoClassDefFoundError) {
147-
}
148-
}
149-
150-
override fun setCustomChatCompletions(player: Player, entries: List<String>) {
151-
if (majorLegacy < 11901) return
152-
try {
153-
player.sendPacket(ClientboundCustomChatCompletionsPacket::class.java.invokeConstructor(
154-
ClientboundCustomChatCompletionsPacket.Action.SET,
155-
entries
156-
))
157-
} catch (_: NoClassDefFoundError) {
158-
}
159-
}
160-
161133
override fun getLocaleKey(itemStack: ItemStack): LocaleKey {
162134
val nmsItemStack = nmsProxy<NMSItem>().getNMSCopy(itemStack) as net.minecraft.server.v1_16_R3.ItemStack
163135
val nmsItem = nmsItemStack.item
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package me.arasple.mc.trchat.api.nms
2+
3+
import org.bukkit.entity.Player
4+
import org.bukkit.inventory.ItemStack
5+
import taboolib.common.platform.function.adaptPlayer
6+
import taboolib.module.chat.ComponentText
7+
import taboolib.module.nms.LocaleKey
8+
import java.util.*
9+
10+
class NMSImpl12100 : NMS() {
11+
12+
override fun craftChatMessageFromComponent(component: ComponentText): Any {
13+
TODO("Not yet implemented")
14+
}
15+
16+
override fun rawMessageFromCraftChatMessage(component: Any): String {
17+
TODO("Not yet implemented")
18+
}
19+
20+
override fun sendMessage(receiver: Player, component: ComponentText, sender: UUID?, usePacket: Boolean) {
21+
component.sendTo(adaptPlayer(receiver))
22+
}
23+
24+
override fun hoverItem(component: ComponentText, itemStack: ItemStack): ComponentText {
25+
TODO("Not yet implemented")
26+
}
27+
28+
override fun optimizeNBT(itemStack: ItemStack, nbtWhitelist: Array<String>): ItemStack {
29+
TODO("Not yet implemented")
30+
}
31+
32+
override fun getLocaleKey(itemStack: ItemStack): LocaleKey {
33+
TODO("Not yet implemented")
34+
}
35+
}

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/standard/EnderChestShow.kt

-126
This file was deleted.

0 commit comments

Comments
 (0)