Fixed Points Hook

TrPlugins · Feb 14, 2021 · 8d888ab · 8d888ab
1 parent d6e7692
commit 8d888ab
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 28 deletions.
diff --git a/src/main/kotlin/me/arasple/mc/trmenu/TrMenu.kt b/src/main/kotlin/me/arasple/mc/trmenu/TrMenu.kt
@@ -1,6 +1,5 @@
 package me.arasple.mc.trmenu
 
-import io.izzel.taboolib.kotlin.kether.action.ActionRandom
 import io.izzel.taboolib.loader.Plugin
 import io.izzel.taboolib.module.config.TConfig
 import io.izzel.taboolib.module.inject.TInject

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/ActionCommand.kt b/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/ActionCommand.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trmenu.api.action.impl
 import io.izzel.taboolib.util.Features
 import me.arasple.mc.trmenu.api.action.base.AbstractAction
 import me.arasple.mc.trmenu.api.action.base.ActionOption
+import me.arasple.mc.trmenu.util.Tasks
 import org.bukkit.entity.Player
 
 /**
@@ -12,8 +13,10 @@ import org.bukkit.entity.Player
 class ActionCommand(content: String, option: ActionOption) : AbstractAction(content, option) {
 
     override fun onExecute(player: Player, placeholderPlayer: Player) {
-        parseContentSplited(placeholderPlayer, ";").forEach {
-            Features.dispatchCommand(player, it)
+        Tasks.task(false) {
+            parseContentSplited(placeholderPlayer, ";").forEach {
+                Features.dispatchCommand(player, it)
+            }
         }
     }
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/ActionCommandConsole.kt b/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/ActionCommandConsole.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trmenu.api.action.impl
 import io.izzel.taboolib.util.Features
 import me.arasple.mc.trmenu.api.action.base.AbstractAction
 import me.arasple.mc.trmenu.api.action.base.ActionOption
+import me.arasple.mc.trmenu.util.Tasks
 import org.bukkit.Bukkit
 import org.bukkit.entity.Player
 
@@ -13,8 +14,10 @@ import org.bukkit.entity.Player
 class ActionCommandConsole(content: String, option: ActionOption) : AbstractAction(content, option) {
 
     override fun onExecute(player: Player, placeholderPlayer: Player) {
-        parseContentSplited(placeholderPlayer, ";").forEach {
-            Features.dispatchCommand(Bukkit.getConsoleSender(), it)
+        Tasks.task(false) {
+            parseContentSplited(placeholderPlayer, ";").forEach {
+                Features.dispatchCommand(Bukkit.getConsoleSender(), it)
+            }
         }
     }
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/ActionCommandOp.kt b/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/ActionCommandOp.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trmenu.api.action.impl
 import io.izzel.taboolib.util.Features
 import me.arasple.mc.trmenu.api.action.base.AbstractAction
 import me.arasple.mc.trmenu.api.action.base.ActionOption
+import me.arasple.mc.trmenu.util.Tasks
 import org.bukkit.entity.Player
 
 /**
@@ -12,8 +13,10 @@ import org.bukkit.entity.Player
 class ActionCommandOp(content: String, option: ActionOption) : AbstractAction(content, option) {
 
     override fun onExecute(player: Player, placeholderPlayer: Player) {
-        parseContentSplited(placeholderPlayer, ";").forEach {
-            Features.dispatchCommand(player, it, true)
+        Tasks.task(false) {
+            parseContentSplited(placeholderPlayer, ";").forEach {
+                Features.dispatchCommand(player, it, true)
+            }
         }
     }
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionMoneyAdd.kt b/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionMoneyAdd.kt
@@ -14,7 +14,7 @@ class ActionMoneyAdd(content: String, option: ActionOption) : AbstractAction(con
     override fun onExecute(player: Player, placeholderPlayer: Player) {
         val amount = parseContent(placeholderPlayer).toDoubleOrNull() ?: -1.0
         if (amount > 0) {
-            HookPlugin.getVault().takeMoney(player, amount)
+            HookPlugin.getVault().addMoney(player, amount)
         }
     }
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionPointsAdd.kt b/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionPointsAdd.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trmenu.api.action.impl.hook
 import me.arasple.mc.trmenu.api.action.base.AbstractAction
 import me.arasple.mc.trmenu.api.action.base.ActionOption
 import me.arasple.mc.trmenu.module.internal.hook.HookPlugin
+import me.arasple.mc.trmenu.util.Tasks
 import org.bukkit.entity.Player
 
 /**
@@ -12,9 +13,11 @@ import org.bukkit.entity.Player
 class ActionPointsAdd(content: String, option: ActionOption) : AbstractAction(content, option) {
 
     override fun onExecute(player: Player, placeholderPlayer: Player) {
-        val amount = parseContent(placeholderPlayer).toIntOrNull() ?: -1
-        if (amount > 0) {
-            HookPlugin.getPlayerPoints().takePoints(player, amount)
+        Tasks.task(false) {
+            val amount = parseContent(placeholderPlayer).toIntOrNull() ?: -1
+            if (amount > 0) {
+                HookPlugin.getPlayerPoints().addPoints(player, amount)
+            }
         }
     }
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionPointsSet.kt b/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionPointsSet.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trmenu.api.action.impl.hook
 import me.arasple.mc.trmenu.api.action.base.AbstractAction
 import me.arasple.mc.trmenu.api.action.base.ActionOption
 import me.arasple.mc.trmenu.module.internal.hook.HookPlugin
+import me.arasple.mc.trmenu.util.Tasks
 import org.bukkit.entity.Player
 
 /**
@@ -12,9 +13,11 @@ import org.bukkit.entity.Player
 class ActionPointsSet(content: String, option: ActionOption) : AbstractAction(content, option) {
 
     override fun onExecute(player: Player, placeholderPlayer: Player) {
-        val amount = parseContent(placeholderPlayer).toIntOrNull() ?: -1
-        if (amount > 0) {
-            HookPlugin.getPlayerPoints().setPoints(player, amount)
+        Tasks.task(false) {
+            val amount = parseContent(placeholderPlayer).toIntOrNull() ?: -1
+            if (amount > 0) {
+                HookPlugin.getPlayerPoints().setPoints(player, amount)
+            }
         }
     }
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionPointsTake.kt b/src/main/kotlin/me/arasple/mc/trmenu/api/action/impl/hook/ActionPointsTake.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trmenu.api.action.impl.hook
 import me.arasple.mc.trmenu.api.action.base.AbstractAction
 import me.arasple.mc.trmenu.api.action.base.ActionOption
 import me.arasple.mc.trmenu.module.internal.hook.HookPlugin
+import me.arasple.mc.trmenu.util.Tasks
 import org.bukkit.entity.Player
 
 /**
@@ -12,9 +13,11 @@ import org.bukkit.entity.Player
 class ActionPointsTake(content: String, option: ActionOption) : AbstractAction(content, option) {
 
     override fun onExecute(player: Player, placeholderPlayer: Player) {
-        val amount = parseContent(placeholderPlayer).toIntOrNull() ?: -1
-        if (amount > 0) {
-            HookPlugin.getPlayerPoints().takePoints(player, amount)
+        Tasks.task(false) {
+            val amount = parseContent(placeholderPlayer).toIntOrNull() ?: -1
+            if (amount > 0) {
+                HookPlugin.getPlayerPoints().takePoints(player, amount)
+            }
         }
     }
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/module/internal/data/Metadata.kt b/src/main/kotlin/me/arasple/mc/trmenu/module/internal/data/Metadata.kt
@@ -23,9 +23,9 @@ import org.bukkit.metadata.FixedMetadataValue
  */
 object Metadata {
 
-    private val meta = mutableMapOf<String, DataMap>()
-    private val data = mutableMapOf<String, DataMap>()
-    val globalData = TConfig.create(TrMenu.plugin, "data/globalData.yml")
+    internal val meta = mutableMapOf<String, DataMap>()
+    internal val data = mutableMapOf<String, DataMap>()
+    internal val globalData = TConfig.create(TrMenu.plugin, "data/globalData.yml")
 
     @TSchedule(delay = 100, period = 20 * 30, async = true)
     @TFunction.Cancel
@@ -61,7 +61,7 @@ object Metadata {
     }
 
     fun lookBukkitMeta(player: Player, key: String, value: String = ""): Boolean {
-       return player.hasMetadata(key).also {
+        return player.hasMetadata(key).also {
             if (it) player.removeMetadata(key, TrMenu.plugin)
         }
     }

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/module/internal/listener/ListenerJoin.kt b/src/main/kotlin/me/arasple/mc/trmenu/module/internal/listener/ListenerJoin.kt
@@ -2,8 +2,8 @@ package me.arasple.mc.trmenu.module.internal.listener
 
 import io.izzel.taboolib.module.inject.TListener
 import me.arasple.mc.trmenu.module.internal.data.Metadata
-import me.arasple.mc.trmenu.util.bukkit.Heads
 import me.arasple.mc.trmenu.util.Tasks
+import me.arasple.mc.trmenu.util.bukkit.Heads
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerJoinEvent

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/module/internal/service/Shortcuts.kt b/src/main/kotlin/me/arasple/mc/trmenu/module/internal/service/Shortcuts.kt
@@ -5,6 +5,7 @@ import io.izzel.taboolib.module.inject.TListener
 import me.arasple.mc.trmenu.TrMenu
 import me.arasple.mc.trmenu.api.action.pack.Reactions
 import me.arasple.mc.trmenu.module.display.MenuSession
+import me.arasple.mc.trmenu.module.internal.data.Metadata
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
@@ -100,10 +101,9 @@ object Shortcuts {
             if (Version.isAfter(Version.v1_9) && e.hand == EquipmentSlot.OFF_HAND) return
 
             val clicked = e.rightClicked
-            if (clicked !is Player) return
-
-
-            e.isCancelled = rightClickPlayer(e.player, clicked)
+            if (clicked is Player && Metadata.data.containsKey(clicked.name)) {
+                e.isCancelled = rightClickPlayer(e.player, clicked)
+            }
         }
 
         @EventHandler(ignoreCancelled = true)

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/util/Regexs.kt b/src/main/kotlin/me/arasple/mc/trmenu/util/Regexs.kt
@@ -7,7 +7,7 @@ package me.arasple.mc.trmenu.util
 object Regexs {
 
     val PLACEHOLDER_API = "[%{](.+?)[%}]".toRegex()
-    val ICON_KEY = "`(\\w+)`".toRegex()
+    val ICON_KEY = "`(.+?)`".toRegex()
     val SENTENCE = "`(.+?)`".toRegex()
     val STRING = "\\{(\\w+)}".toRegex()
 

diff --git a/src/main/kotlin/me/arasple/mc/trmenu/util/bukkit/Heads.kt b/src/main/kotlin/me/arasple/mc/trmenu/util/bukkit/Heads.kt
@@ -27,7 +27,7 @@ object Heads {
 
     private val DEFAULT_HEAD = Materials.PLAYER_HEAD.parseItem()!!
     private val CACHED_PLAYER_TEXTURE = mutableMapOf<String, String?>()
-    private val CACHED_SKULLS = mutableMapOf<String, ItemStack>()
+     val CACHED_SKULLS = mutableMapOf<String, ItemStack>()
 
     fun cacheSize(): Pair<Int, Int> {
         return CACHED_SKULLS.size to CACHED_PLAYER_TEXTURE.size