Skip to content

Commit

Permalink
[2.1.3] 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsFlicker committed Jun 30, 2024
1 parent 8a4aef5 commit d115963
Show file tree
Hide file tree
Showing 16 changed files with 191 additions and 527 deletions.
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
java
id("io.izzel.taboolib") version "2.0.11"
id("io.izzel.taboolib") version "2.0.12"
id("org.jetbrains.kotlin.jvm") version "1.8.22"
}

Expand All @@ -14,12 +14,12 @@ subprojects {

taboolib {
env {
install(UNIVERSAL, DATABASE, KETHER, METRICS, NMS_UTIL, UI)
install(UNIVERSAL, DATABASE, KETHER, METRICS, NMS_UTIL)
install(EXPANSION_REDIS, EXPANSION_JAVASCRIPT, EXPANSION_PLAYER_DATABASE)
install(BUKKIT_ALL, BUNGEE, VELOCITY)
}
version {
taboolib = "6.1.2-beta9"
taboolib = "6.1.2-beta10"
coroutines = null
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=me.arasple.mc.trchat
version=2.1.2
version=2.1.3
kotlin.incremental=true
kotlin.incremental.java=true
kotlin.incremental.useClasspathSnapshot=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ package me.arasple.mc.trchat.api.nms

import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import taboolib.common.util.unsafeLazy
import taboolib.module.chat.ComponentText
import taboolib.module.nms.LocaleKey
import taboolib.module.nms.MinecraftVersion
import taboolib.module.nms.nmsProxy
import java.util.*

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

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

abstract fun addCustomChatCompletions(player: Player, entries: List<String>)

abstract fun removeCustomChatCompletions(player: Player, entries: List<String>)

abstract fun setCustomChatCompletions(player: Player, entries: List<String>)

abstract fun getLocaleKey(itemStack: ItemStack): LocaleKey

companion object {

@JvmStatic
val instance = nmsProxy<NMS>()
val instance by unsafeLazy {
if (MinecraftVersion.majorLegacy < 12005) nmsProxy<NMS>()
else nmsProxy<NMS>("me.arasple.mc.trchat.api.nms.NMSImpl12100")
}

val whitelistTags = arrayOf(
// 附魔
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package me.arasple.mc.trchat.api.nms

import me.arasple.mc.trchat.util.ServerUtil
import me.arasple.mc.trchat.util.reportOnce
import net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket
import net.minecraft.server.v1_12_R1.ChatMessageType
import net.minecraft.server.v1_12_R1.PacketPlayOutChat
import org.bukkit.entity.Player
Expand Down Expand Up @@ -131,33 +130,6 @@ class NMSImpl : NMS() {
return itemStack
}

override fun addCustomChatCompletions(player: Player, entries: List<String>) {
if (majorLegacy < 11901) return
try {
player.addCustomChatCompletions(entries)
} catch (_: NoClassDefFoundError) {
}
}

override fun removeCustomChatCompletions(player: Player, entries: List<String>) {
if (majorLegacy < 11901) return
try {
player.removeCustomChatCompletions(entries)
} catch (_: NoClassDefFoundError) {
}
}

override fun setCustomChatCompletions(player: Player, entries: List<String>) {
if (majorLegacy < 11901) return
try {
player.sendPacket(ClientboundCustomChatCompletionsPacket::class.java.invokeConstructor(
ClientboundCustomChatCompletionsPacket.Action.SET,
entries
))
} catch (_: NoClassDefFoundError) {
}
}

override fun getLocaleKey(itemStack: ItemStack): LocaleKey {
val nmsItemStack = nmsProxy<NMSItem>().getNMSCopy(itemStack) as net.minecraft.server.v1_16_R3.ItemStack
val nmsItem = nmsItemStack.item
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package me.arasple.mc.trchat.api.nms

import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import taboolib.common.platform.function.adaptPlayer
import taboolib.module.chat.ComponentText
import taboolib.module.nms.LocaleKey
import java.util.*

class NMSImpl12100 : NMS() {

override fun craftChatMessageFromComponent(component: ComponentText): Any {
TODO("Not yet implemented")
}

override fun rawMessageFromCraftChatMessage(component: Any): String {
TODO("Not yet implemented")
}

override fun sendMessage(receiver: Player, component: ComponentText, sender: UUID?, usePacket: Boolean) {
component.sendTo(adaptPlayer(receiver))
}

override fun hoverItem(component: ComponentText, itemStack: ItemStack): ComponentText {
TODO("Not yet implemented")
}

override fun optimizeNBT(itemStack: ItemStack, nbtWhitelist: Array<String>): ItemStack {
TODO("Not yet implemented")
}

override fun getLocaleKey(itemStack: ItemStack): LocaleKey {
TODO("Not yet implemented")
}
}

This file was deleted.

Loading

0 comments on commit d115963

Please sign in to comment.