Skip to content

optimize & fix #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/receptacle/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
repositories {
repositories {
maven("https://repo.aeoliancloud.com/repository/releases") { isAllowInsecureProtocol = true }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class NMSImpl : NMS() {
sendPacket(
player,
ClientboundSetCursorItemPacket::class.java.unsafeInstance(),
"contents" to toNMSCopy(ItemStack(Material.AIR))
"contents" to toNMSCopy(null)
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=me.arasple.mc.trmenu
version=3.5.3
version=3.5.4
11 changes: 8 additions & 3 deletions plugin/src/main/kotlin/trplugins/menu/TrMenu.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package trplugins.menu
import org.bukkit.Bukkit
import taboolib.common.platform.Plugin
import taboolib.common.platform.function.console
import taboolib.common.platform.function.pluginVersion
import taboolib.module.configuration.Config
import taboolib.module.configuration.Configuration
import taboolib.module.lang.Language
import taboolib.module.lang.sendLang
import taboolib.platform.BukkitPlugin
import taboolib.platform.util.bukkitPlugin
import trplugins.menu.api.action.ActionHandle
import trplugins.menu.api.action.impl.send.Tell
import trplugins.menu.api.receptacle.provider.PlatformProvider
Expand All @@ -17,6 +18,8 @@ import trplugins.menu.module.conf.prop.RunningPerformance
import trplugins.menu.module.display.MenuSession
import trplugins.menu.module.display.session
import trplugins.menu.module.internal.data.Metadata
import trplugins.menu.module.internal.database.GlobalDataDao
import trplugins.menu.module.internal.database.MetaDataDao
import trplugins.menu.module.internal.hook.HookPlugin
import trplugins.menu.module.internal.inputer.Inputer.Companion.cancelWords
import trplugins.menu.module.internal.listener.ListenerItemInteract.interactCooldown
Expand All @@ -35,7 +38,7 @@ object TrMenu : Plugin() {
lateinit var SETTINGS: Configuration
private set

val plugin by lazy { BukkitPlugin.getInstance() }
val plugin by lazy { bukkitPlugin }

var performance = RunningPerformance.NORMAL
private set
Expand All @@ -54,7 +57,9 @@ object TrMenu : Plugin() {
onSettingsReload()
Loader.loadMenus()
Metadata.database
console().sendLang("Plugin-Enabled", plugin.description.version)
MetaDataDao.door
GlobalDataDao.door
console().sendLang("Plugin-Enabled", pluginVersion)
console().sendLang("Plugin-Version")
HookPlugin.printInfo()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,10 @@ data class DataEntity(
@Length(-1)
val data: String
) {
constructor(player: Player, key: String, data: String) : this(player.uniqueId, key, data)

companion object {
fun constructor(player: Player, key: String, data: String): DataEntity {
return DataEntity(player.uniqueId, key, data)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ object Metadata {

fun saveData(player: Player, key: String) {
submitAsync {
MetaDataDao.door.update(DataEntity(player, key, getData(player)[key]?.toString() ?: ""))
MetaDataDao.door.update(DataEntity.constructor(player, key, getData(player)[key]?.toString() ?: ""))
}
}

Expand All @@ -97,7 +97,7 @@ object Metadata {
database.push(player)
} else {
dataMap.data.forEach { (key, value) ->
MetaDataDao.door.update(DataEntity(player, key, value?.toString() ?: ""))
MetaDataDao.door.update(DataEntity.constructor(player, key, value?.toString() ?: ""))
}
}
}
Expand Down