[1.2.3] Update

ItsFlicker · ItsFlicker · commit 60d63d6fa501 · 2022-12-20T19:07:50.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=io.github.itsflicker.itstools
-version=1.2.2
+version=1.2.3
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/command/CommandOperation.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/command/CommandOperation.kt
@@ -78,7 +78,7 @@ object CommandOperation {
             sender.sendMessage("§cClick an entity in the next 10 seconds.")
         }
         dynamic("args", optional = true) {
-            suggestion<Player>(uncheck = true) { _, _ ->
+            suggestUncheck {
                 listOf("-d", "-s", "-t", "-p", "--f")
             }
             execute<Player> { sender, _, argument ->
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/command/CommandTools.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/command/CommandTools.kt
@@ -6,10 +6,7 @@ import io.github.itsflicker.itstools.module.feature.DebugItem
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 import taboolib.common.platform.ProxyCommandSender
-import taboolib.common.platform.command.CommandBody
-import taboolib.common.platform.command.CommandHeader
-import taboolib.common.platform.command.mainCommand
-import taboolib.common.platform.command.subCommand
+import taboolib.common.platform.command.*
 import taboolib.common.platform.function.getProxyPlayer
 import taboolib.common5.Demand
 import taboolib.expansion.createHelper
@@ -42,6 +39,20 @@ object CommandTools {
     @CommandBody(["rp"], optional = true)
     val resourcepack = CommandResourcePack
 
+    @CommandBody(permission = "itstools.command.forcechat", optional = true)
+    val forcechat = subCommand {
+        dynamic("player") {
+            suggestPlayers(allSymbol = true)
+            dynamic("message") {
+                execute<CommandSender> { _, context, argument ->
+                    context.playerFor(-1) {
+                        it.chat(argument)
+                    }
+                }
+            }
+        }
+    }
+
     @CommandBody(permission = "itstools.command.getdebugitem", optional = true)
     val getdebugitem = subCommand {
         execute<Player> { sender, _, _ ->
@@ -52,7 +63,7 @@ object CommandTools {
     @CommandBody(permission = "itstools.command.simplekether", optional = true)
     val simplekether = subCommand {
         dynamic("args") {
-            suggestion<ProxyCommandSender>(uncheck = true) { _, _ ->
+            suggestUncheck {
                 listOf("-source", "-namespace", "-sender")
             }
             execute<ProxyCommandSender> { sender, _, argument ->
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/command/impl/CommandResourcePack.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/command/impl/CommandResourcePack.kt
@@ -1,25 +1,17 @@
 package io.github.itsflicker.itstools.module.command.impl
 
-import dev.lone.itemsadder.api.ItemsAdder
 import io.github.itsflicker.itstools.conf
 import io.github.itsflicker.itstools.module.resourcepack.COSUploader
 import io.github.itsflicker.itstools.module.resourcepack.OSSUploader
 import io.github.itsflicker.itstools.module.resourcepack.ResourcePack
 import io.github.itsflicker.itstools.util.isItemsAdderHooked
-import io.github.itsflicker.itstools.util.isOraxenHooked
-import io.github.itsflicker.itstools.util.nms
-import io.th0rgal.oraxen.OraxenPlugin
-import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 import taboolib.common.io.newFile
 import taboolib.common.platform.ProxyCommandSender
-import taboolib.common.platform.command.CommandBody
-import taboolib.common.platform.command.subCommand
-import taboolib.common.platform.command.suggest
-import taboolib.common.platform.command.suggestPlayers
+import taboolib.common.platform.command.*
 import taboolib.common.platform.function.getDataFolder
-import taboolib.common.platform.function.warning
+import taboolib.common.platform.function.submitAsync
 
 /**
  * CommandResourcePack
@@ -37,22 +29,24 @@ object CommandResourcePack {
                 conf.resource_packs.filterValues { it.condition.eval(sender) }.keys.toList()
             }
             execute<Player> { sender, _, argument ->
-                send(sender, argument)
+                ResourcePack.send(sender, argument)
             }
         }
     }
 
     @CommandBody(permission = "itstools.command.resourcepack.send")
     val send = subCommand {
         dynamic("player") {
-            suggestPlayers()
+            suggestPlayers(allSymbol = true)
             dynamic("id") {
                 suggest {
                     conf.resource_packs.keys.toList()
                 }
                 execute<ProxyCommandSender> { _, context, argument ->
-                    val player = Bukkit.getPlayer(context.argument(-1))!!
-                    send(player, argument)
+                    context.playerFor(-1) {
+                        val player = it.cast<Player>()
+                        ResourcePack.send(player, argument)
+                    }
                 }
             }
         }
@@ -84,43 +78,22 @@ object CommandResourcePack {
                             getDataFolder().resolve("packs").resolve(argument)
                         }
                     }
-                    val succeed = when (context.argument(-1)) {
-                        "cos" -> COSUploader.upload(file)
-                        "oss" -> OSSUploader.upload(file)
-                        else -> error("out of case")
-                    }
-                    if (succeed) {
-                        sender.sendMessage("§a上传成功!")
-                    } else {
-                        sender.sendMessage("§c上传失败!")
+                    submitAsync {
+                        val succeed = when (context.argument(-1)) {
+                            "cos" -> COSUploader.upload(file)
+                            "oss" -> OSSUploader.upload(file)
+                            else -> error("out of case")
+                        }
+                        if (succeed) {
+                            sender.sendMessage("§a上传成功!")
+                        } else {
+                            sender.sendMessage("§c上传失败!")
+                        }
                     }
                 }
             }
         }
 
     }
 
-    private fun send(player: Player, id: String) {
-        val resourcePack = conf.resource_packs[id] ?: return
-        ResourcePack.selected.remove(player.uniqueId)?.removed?.eval(player)
-        when {
-            resourcePack.url.equals("itemsadder", ignoreCase = true) -> {
-                if (isItemsAdderHooked) {
-                    ItemsAdder.applyResourcepack(player)
-                } else {
-                    warning("ItemsAdder not loaded.")
-                }
-            }
-            resourcePack.url.equals("oraxen", ignoreCase = true) -> {
-                if (isOraxenHooked) {
-                    OraxenPlugin.get().uploadManager.sender.sendPack(player)
-                } else {
-                    warning("Oraxen not loaded.")
-                }
-            }
-            else -> nms.sendResourcePack(player, resourcePack.url, resourcePack.hash)
-        }
-        ResourcePack.selected[player.uniqueId] = resourcePack
-    }
-
 }
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/command/impl/CommandSendMap.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/command/impl/CommandSendMap.kt
@@ -1,12 +1,12 @@
 package io.github.itsflicker.itstools.module.command.impl
 
-import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import taboolib.common.platform.command.playerFor
 import taboolib.common.platform.command.subCommand
 import taboolib.common.platform.command.suggestPlayers
 import taboolib.module.nms.sendMap
 import java.io.File
-import java.net.URL
 
 /**
  * @author wlys
@@ -17,25 +17,30 @@ object CommandSendMap {
     val command = subCommand {
         literal("file") {
             dynamic("player") {
-                suggestPlayers()
+                suggestPlayers(allSymbol = true)
                 dynamic("file") {
                     execute<CommandSender> { _, context, argument ->
-                        val player = Bukkit.getPlayer(context.argument(-1)) ?: return@execute
-                        player.sendMap(File(argument))
+                        context.playerFor(-1) {
+                            val player = it.cast<Player>()
+                            player.sendMap(File(argument))
+                        }
                     }
                 }
             }
         }
         literal("url") {
             dynamic("player") {
-                suggestPlayers()
+                suggestPlayers(allSymbol = true)
                 dynamic("url") {
                     execute<CommandSender> { _, context, argument ->
-                        val player = Bukkit.getPlayer(context.argument(-1)) ?: return@execute
-                        player.sendMap(URL(argument))
+                        context.playerFor(-1) {
+                            val player = it.cast<Player>()
+                            player.sendMap(File(argument))
+                        }
                     }
                 }
             }
         }
     }
+
 }
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/command/impl/CommandSendToast.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/command/impl/CommandSendToast.kt
@@ -1,8 +1,9 @@
 package io.github.itsflicker.itstools.module.command.impl
 
-import org.bukkit.Bukkit
 import org.bukkit.Material
+import org.bukkit.entity.Player
 import taboolib.common.platform.ProxyCommandSender
+import taboolib.common.platform.command.playerFor
 import taboolib.common.platform.command.subCommand
 import taboolib.common.platform.command.suggest
 import taboolib.common.platform.command.suggestPlayers
@@ -21,7 +22,7 @@ object CommandSendToast {
 
     val command = subCommand {
         dynamic("player") {
-            suggestPlayers()
+            suggestPlayers(allSymbol = true)
             dynamic("frame") {
                 suggest {
                     ToastFrame.values().map { it.toString() }
@@ -32,12 +33,14 @@ object CommandSendToast {
                     }
                     dynamic("message") {
                         execute<ProxyCommandSender> { _, context, argument ->
-                            val player = Bukkit.getPlayer(context.argument(-3))
-                            player?.sendToast(
-                                Material.valueOf(context.argument(-1)),
-                                argument.colored(),
-                                ToastFrame.valueOf(context.argument(-2))
-                            )
+                            context.playerFor(-3) {
+                                val player = it.cast<Player>()
+                                player.sendToast(
+                                    Material.valueOf(context.argument(-1)),
+                                    argument.colored(),
+                                    ToastFrame.valueOf(context.argument(-2))
+                                )
+                            }
                         }
                     }
                 }
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/feature/CreeperConfetti.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/feature/CreeperConfetti.kt
@@ -0,0 +1,49 @@
+package io.github.itsflicker.itstools.module.feature
+
+import io.github.itsflicker.itstools.util.spawnRandomFirework
+import org.bukkit.entity.AreaEffectCloud
+import org.bukkit.entity.Creeper
+import org.bukkit.entity.EntityType
+import org.bukkit.event.entity.EntityExplodeEvent
+import taboolib.common.platform.event.EventPriority
+import taboolib.common.platform.event.SubscribeEvent
+import taboolib.module.configuration.ConfigNode
+import taboolib.platform.util.kill
+
+@Suppress("unused")
+object CreeperConfetti {
+
+    @ConfigNode("features.creeper_confetti.enabled")
+    var enabled = false
+        private set
+
+    @ConfigNode("features.creeper_confetti.max_effects")
+    var maxEffects = 3
+        private set
+
+    @SubscribeEvent(EventPriority.HIGHEST, ignoreCancelled = true)
+    fun onExplode(e: EntityExplodeEvent) {
+        if (!enabled) return
+        val creeper = e.entity as? Creeper ?: return
+        e.isCancelled = true
+        spawnRandomFirework(creeper.eyeLocation, 0, if (creeper.isPowered) 6 else 3, maxEffects, creeper)
+        spawnLingeringCloud(creeper)
+        creeper.kill()
+    }
+
+    private fun spawnLingeringCloud(creeper: Creeper) {
+        val effects = creeper.activePotionEffects
+        if (effects.isNotEmpty()) {
+            val cloud = creeper.world.spawnEntity(creeper.location, EntityType.AREA_EFFECT_CLOUD) as AreaEffectCloud
+            cloud.radius = 2.5F
+            cloud.radiusOnUse = -0.5F
+            cloud.waitTime = 10
+            cloud.duration /= 2
+            cloud.radiusPerTick = -cloud.radius / cloud.duration
+            effects.forEach {
+                cloud.addCustomEffect(it, true)
+            }
+        }
+    }
+
+}
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/listeners/Listeners.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/listeners/Listeners.kt
@@ -5,6 +5,7 @@ import io.github.itsflicker.itstools.module.feature.DebugItem
 import io.github.itsflicker.itstools.module.feature.IPInfo
 import io.github.itsflicker.itstools.module.resourcepack.ResourcePack
 import io.github.itsflicker.itstools.module.script.Reaction
+import org.bukkit.World
 import org.bukkit.entity.Phantom
 import org.bukkit.entity.Player
 import org.bukkit.event.entity.CreatureSpawnEvent
@@ -24,15 +25,23 @@ import taboolib.platform.util.isMainhand
 @Suppress("unused")
 object Listeners {
 
-    fun quit(player: Player) {
+    private fun quit(player: Player) {
         ResourcePack.selected.remove(player.uniqueId)?.removed?.eval(player)
         DebugItem.cooldown.reset(player.name)
         IPInfo.caches.remove(player.uniqueId)
     }
 
+    private fun applyWorld(player: Player, world: World) {
+        val rp = conf.resource_packs.values.firstOrNull { world.name in it.worlds } ?: return
+        val previous = ResourcePack.selected[player.uniqueId]
+        if (previous != null && rp.id == previous.id) return
+        ResourcePack.send(player, rp.id)
+    }
+
     @SubscribeEvent
     fun onJoin(e: PlayerJoinEvent) {
         IPInfo.cacheFromCloud(e.player)
+        applyWorld(e.player, e.player.world)
     }
 
     @SubscribeEvent
@@ -136,4 +145,9 @@ object Listeners {
         }
     }
 
+    @SubscribeEvent
+    fun onWorldChanged(e: PlayerChangedWorldEvent) {
+        applyWorld(e.player, e.player.world)
+    }
+
 }
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/module/resourcepack/ResourcePack.kt b/src/main/kotlin/io/github/itsflicker/itstools/module/resourcepack/ResourcePack.kt
diff --git a/src/main/kotlin/io/github/itsflicker/itstools/util/Util.kt b/src/main/kotlin/io/github/itsflicker/itstools/util/Util.kt
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`group=io.github.itsflicker.itstools`
`2`		`-version=1.2.2`
	`2`	`+version=1.2.3`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ object CommandOperation {`
`78`	`78`	`sender.sendMessage("§cClick an entity in the next 10 seconds.")`
`79`	`79`	`}`
`80`	`80`	`dynamic("args", optional = true) {`
`81`		`- suggestion<Player>(uncheck = true) { _, _ ->`
	`81`	`+ suggestUncheck {`
`82`	`82`	`listOf("-d", "-s", "-t", "-p", "--f")`
`83`	`83`	`}`
`84`	`84`	`execute<Player> { sender, _, argument ->`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`package io.github.itsflicker.itstools.module.command.impl`
`2`	`2`
`3`		`-import org.bukkit.Bukkit`
`4`	`3`	`import org.bukkit.command.CommandSender`
	`4`	`+import org.bukkit.entity.Player`
	`5`	`+import taboolib.common.platform.command.playerFor`
`5`	`6`	`import taboolib.common.platform.command.subCommand`
`6`	`7`	`import taboolib.common.platform.command.suggestPlayers`
`7`	`8`	`import taboolib.module.nms.sendMap`
`8`	`9`	`import java.io.File`
`9`		`-import java.net.URL`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* @author wlys`
`@@ -17,25 +17,30 @@ object CommandSendMap {`
`17`	`17`	`val command = subCommand {`
`18`	`18`	`literal("file") {`
`19`	`19`	`dynamic("player") {`
`20`		`- suggestPlayers()`
	`20`	`+ suggestPlayers(allSymbol = true)`
`21`	`21`	`dynamic("file") {`
`22`	`22`	`execute<CommandSender> { _, context, argument ->`
`23`		`- val player = Bukkit.getPlayer(context.argument(-1)) ?: return@execute`
`24`		`- player.sendMap(File(argument))`
	`23`	`+ context.playerFor(-1) {`
	`24`	`+ val player = it.cast<Player>()`
	`25`	`+ player.sendMap(File(argument))`
	`26`	`+ }`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`	`literal("url") {`
`30`	`32`	`dynamic("player") {`
`31`		`- suggestPlayers()`
	`33`	`+ suggestPlayers(allSymbol = true)`
`32`	`34`	`dynamic("url") {`
`33`	`35`	`execute<CommandSender> { _, context, argument ->`
`34`		`- val player = Bukkit.getPlayer(context.argument(-1)) ?: return@execute`
`35`		`- player.sendMap(URL(argument))`
	`36`	`+ context.playerFor(-1) {`
	`37`	`+ val player = it.cast<Player>()`
	`38`	`+ player.sendMap(File(argument))`
	`39`	`+ }`
`36`	`40`	`}`
`37`	`41`	`}`
`38`	`42`	`}`
`39`	`43`	`}`
`40`	`44`	`}`
	`45`	`+`
`41`	`46`	`}`