From 9646c92985c342d0daab77f5408a1e970c9e9346 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sat, 12 Jul 2025 05:45:03 +0200 Subject: [PATCH 01/14] feat: initial implementation of absorbing animals --- .../winlogon/powertools/AbsorbAnimal.scala | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala diff --git a/src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala b/src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala new file mode 100644 index 0000000..4dd487e --- /dev/null +++ b/src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala @@ -0,0 +1,75 @@ +package org.winlogon.powertools +import org.bukkit.entity.Player +import org.bukkit.entity.Tameable +import org.bukkit.NamespacedKey +import org.bukkit.Material +import org.bukkit.persistence.PersistentDataType +import org.bukkit.inventory.meta.ItemMeta +import org.bukkit.inventory.ItemStack +import net.kyori.adventure.text.Component + +import scala.jdk.CollectionConverters._ + +class AbsorbAnimal(private val plugin: PowerToolsPlugin) { + private def executeAbsorb(player: Player): Unit = { + import org.bukkit.entity.Tameable + import org.bukkit.NamespacedKey + import org.bukkit.persistence.PersistentDataType + + val targetEntity = player.getTargetEntity(5) // 5 block range + if (targetEntity == null) { + sendError(player, "You must be looking at a pet within 5 blocks.") + return + } + + targetEntity match { + case tameable: Tameable if tameable.isTamed && tameable.getOwner != null && tameable.getOwner.getUniqueId == player.getUniqueId => + absorbPet(player, tameable) + case _ => + sendError(player, "You must be looking at a tamed pet that you own.") + } + } + + private def absorbPet(player: Player, pet: Tameable): Unit = { + // create placeholder item - will be spawn egg later + val item = ItemStack(Material.STICK) + val meta = item.getItemMeta() + + val entityType = pet.getType + val displayName = fmt(s"Absorbed ${entityType.name().toLowerCase.replace('_', ' ')}") + meta.displayName(displayName) + + val lore = List( + fmt("Right click to spawn"), + fmt(s"Pet ID: ${pet.getUniqueId}") + ).asJava + meta.lore(lore) + + // store nbt data + val pdc = meta.getPersistentDataContainer() + val entityTypeKey = NamespacedKey(plugin, "absorbed_entity_type") + pdc.set(entityTypeKey, PersistentDataType.STRING, entityType.name()) + + val nbtKey = NamespacedKey(plugin, "absorbed_nbt") + // TODO: (de)serialize NBT data as PDC + pdc.set(nbtKey, PersistentDataType.STRING, "idk") + + item.setItemMeta(meta) + + // remove pet from world + pet.remove() + + // give item to player + player.getInventory.addItem(item) + player.sendMessage(fmt(s"Successfully absorbed your pet!")) + } + + def fmt(s: String): Component = { + Component.text("") + } + + def sendError(p: Player, s: String): Unit = { + + } +} + From dd16006bfa712fde282806bb9d1b88671ffa35e0 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sat, 12 Jul 2025 05:47:56 +0200 Subject: [PATCH 02/14] chore: add command to absorb animal? (will be removed prob) --- .../scala/org/winlogon/powertools/PowerToolsPlugin.scala | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala b/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala index 8c557f7..45e3b02 100644 --- a/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala +++ b/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala @@ -119,6 +119,14 @@ class PowerToolsPlugin extends JavaPlugin { }) .register() + CommandAPICommand("absorb") + .withPermission("powertools.absorb") + .executesPlayer((player: Player, _: CommandArguments) => { + // TODO: absorb player and check if they have required item in inv + successStatus + }) + .register() + // Smite Command CommandAPICommand("smite") .withPermission("powertools.smite") From 40feb63bd0650a00900cb67f74f6635ecaad5950 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sat, 26 Jul 2025 08:16:30 +0200 Subject: [PATCH 03/14] refactor: rename apply() and unify error messages - rename ChatFormatting.apply to translateLegacyCodes - normalize error message casing/punctuation via sentenceCase - change splitenchants command to split - add console sender to sudo chat audience - wrap target inventory in invsee for 1.21.6+ compatibility --- .../winlogon/powertools/ChatFormatting.scala | 6 +- .../powertools/PowerToolsPlugin.scala | 95 +++++++++++++------ 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/src/main/scala/org/winlogon/powertools/ChatFormatting.scala b/src/main/scala/org/winlogon/powertools/ChatFormatting.scala index 017490f..286de9f 100644 --- a/src/main/scala/org/winlogon/powertools/ChatFormatting.scala +++ b/src/main/scala/org/winlogon/powertools/ChatFormatting.scala @@ -10,13 +10,9 @@ import net.kyori.adventure.text.minimessage.tag.standard.StandardTags object ChatFormatting { private val miniMessage = MiniMessage.miniMessage() private val colorConverter = RetroHue(miniMessage) - private val tagsResolver: TagResolver = TagResolver - .builder() - .resolver(StandardTags.defaults()) - .build() /** Convert a legacy formatted string into a MiniMessage Component */ - def apply(msg: String): Component = { + def translateLegacyCodes(msg: String): Component = { colorConverter.convertToComponent(msg, '&') } } diff --git a/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala b/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala index 45e3b02..b76e78e 100644 --- a/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala +++ b/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala @@ -30,6 +30,8 @@ import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer import scala.jdk.CollectionConverters.* import scala.util.{Try, Success, Failure} import scala.util.boundary +import scala.util.chaining.scalaUtilChainingOps +import org.bukkit.event.inventory.InventoryType case class UnenchantConfig(basePrice: Double) case class UnsafeEnchantConfig(enabled: Boolean) @@ -112,7 +114,7 @@ class PowerToolsPlugin extends JavaPlugin { if (!targetName.equalsIgnoreCase(player.getName)) { executeInvsee(player, targetName) } else { - sendError(player, "You cannot invsee yourself.") + sendError(player, "you cannot invsee yourself") } successStatus @@ -169,10 +171,9 @@ class PowerToolsPlugin extends JavaPlugin { ) .register() - // Unenchant Command - CommandAPICommand("splitenchants") + CommandAPICommand("split") .withPermission("powertools.splitenchants") - .withAliases("split", "unenchant") + .withAliases("unenchant") .executesPlayer((player: Player, _: CommandArguments) => { executeSplitUnenchant(player) successStatus @@ -223,7 +224,7 @@ class PowerToolsPlugin extends JavaPlugin { } private def executeUnsafeEnchant(player: Player, args: CommandArguments): Unit = { if (!config.unsafeEnchants.enabled) { - sendError(player, "Unsafe enchantments are disabled in config.") + sendError(player, "unsafe enchantments are disabled in config") return } val enchantment = args.get("enchantment").asInstanceOf[Enchantment] @@ -231,7 +232,7 @@ class PowerToolsPlugin extends JavaPlugin { Option(player.getInventory.getItemInMainHand) .filter(item => item.getType != Material.AIR) - .fold(sendError(player, "You must be holding an item to enchant.")) { item => + .fold(sendError(player, "you must be holding an item to enchant")) { item => item.addUnsafeEnchantment(enchantment, level) player.updateInventory() @@ -264,21 +265,21 @@ class PowerToolsPlugin extends JavaPlugin { itemHand .filter(_.getType == Material.ENCHANTED_BOOK) .foreach { _ => - sendError(player, "The item can't be an enchanted book.") + sendError(player, "the item can't be an enchanted book") return } itemHand .filterNot(item => item == null || item.getType == Material.AIR) - .fold(sendError(player, "You must be holding an item.")) { itemInHand => + .fold(sendError(player, "you must be holding an item")) { itemInHand => val enchantments = itemInHand.getEnchantments if (enchantments.isEmpty) { - sendError(player, "This item has no enchantments to split.") + sendError(player, "this item has no enchantments to split") return } val cost = (config.unenchant.basePrice * enchantments.size).toInt if (player.getTotalExperience < cost) { - sendError(player, s"You need at least $cost XP to split these enchantments.") + sendError(player, s"you need at least $cost XP to split these enchantments") return } player.giveExp(-cost) @@ -319,7 +320,7 @@ class PowerToolsPlugin extends JavaPlugin { private def executeSudoCommand(sender: CommandSender, target: Player, command: String): Unit = { if (target == null || !target.isOnline) { - sender.sendMessage(fmt("<#F93822>Error&7: Player not found or offline.")) + sendError(sender, "player not found or offline") return } // Use the scheduler to perform the command asynchronously. @@ -328,11 +329,15 @@ class PowerToolsPlugin extends JavaPlugin { private def executeSudoChat(sender: CommandSender, target: Player, message: String): Unit = { if (target == null || !target.isOnline) { - sendError(sender, "Player not found or offline.") + sendError(sender, "player not found or offline") return } val players = Bukkit.getOnlinePlayers() + + val consoleSenderAudience = Audience.audience(Bukkit.getConsoleSender()) val viewers = new java.util.HashSet[Audience](players) + viewers.add(consoleSenderAudience) + val userMsg = fmt(message) // `AsyncChatEvent`s called by plugins must be synchronous @@ -356,26 +361,41 @@ class PowerToolsPlugin extends JavaPlugin { case Some(h) => inv.setHelmet(hand) inv.setItemInMainHand(h) - player.sendMessage(fmt("&7Swapping items...")) + player.sendRichMessage("Swapping items...") case None => inv.setHelmet(hand) inv.setItemInMainHand(null) } player.updateInventory() - player.sendMessage(fmt("&7Your held item is now &3on your head!")) + player.sendRichMessage("Your held item is now on your head!") } private def executeInvsee(player: Player, targetName: String): Unit = { Option(Bukkit.getPlayer(targetName)) .filter(_.isOnline) - .fold(sendError(player, "Player not found or offline."))(target => player.openInventory(target.getInventory)) + .fold(sendError(player, "player not found or offline"))(target => { + var inventorySize = 45 + val targetInventory = target.getInventory + + if (targetInventory.getSize() > inventorySize) { + inventorySize = targetInventory.getSize() + } + + // FIXME: you originally could open a player's inventory normally but for some + // reason, between 1.21.5 and 1.21.6 you can't do it anymore. + val wrapperInventory = Bukkit.createInventory(null, inventorySize) + wrapperInventory.setContents(targetInventory.getContents) + player.openInventory(wrapperInventory) + + // TODO: since you can't open a player inventory as before, the changes need + // to be written back to the target's inventory + }) } private def executeSmite(sender: CommandSender, targetName: String): Unit = { Option(Bukkit.getPlayer(targetName)) - .filter(_.isOnline) // if the player is online and is not null - // or else if he is, sendError, or else - .fold(sendError(sender, "Player not found or offline.")) { target => + .filter(_.isOnline) + .fold(sendError(sender, "player not found or offline")) { target => val result = Try { target.getWorld.strikeLightning(target.getLocation) } @@ -383,9 +403,9 @@ class PowerToolsPlugin extends JavaPlugin { result match { case Success(_) => sender.sendMessage(fmt(s"&7You have smitten &3${target.getName}!")) - target.sendMessage(fmt("&7You have been smitten by &3a mighty force!")) + target.sendMessage(fmt("&7You have been smitten by &3a mighty force&7!")) case Failure(_) => - sendError(sender, "Failed to smite player.") + sendError(sender, "failed to smite player") } } } @@ -422,6 +442,8 @@ class PowerToolsPlugin extends JavaPlugin { } } + // TODO: I'm not totally sure I remember what this is here for, is it for aliasing a + // server IP? If yes then it should have another name. private def registerTransferCommandsIfEnabled(transferConfigEnabled: Boolean): Unit = { if (!transferConfigEnabled) { return @@ -437,13 +459,14 @@ class PowerToolsPlugin extends JavaPlugin { }))) .executesPlayer((player: Player, args: CommandArguments) => { val serverName = args.get("server").asInstanceOf[String] - config.transferConfig.servers.find(_.get("name") == serverName) match { - case None => - sendError(player, "Server not found.") - case Some(server) => + + config.transferConfig.servers + .find(_.get("name") == serverName) + .fold(sendError(player, "server not found"))( server => { val allowPlayers = server.getOrDefault("allowPlayers", "false").toBoolean + if (!(allowPlayers && player.hasPermission("powertools.transfer.all"))) { - sendError(player, "You don't have permission to transfer to this server.") + sendError(player, "you don't have permission to transfer to this server") return } @@ -453,19 +476,31 @@ class PowerToolsPlugin extends JavaPlugin { player.transfer(host, port) } catch { case _: NumberFormatException => - sendError(player, "Invalid port for server. Please contact a server admin") + sendError(player, "invalid port for server! Please contact a server admin") case ex: Exception => - sendError(player, s"Transfer failed: ${ex.getMessage}") + sendError(player, s"transfer failed: ${ex.getMessage}") } - } + }) }) .register() } /** Format a string converting legacy colors to MiniMessage */ - private def fmt(s: String): Component = ChatFormatting.apply(s) + private def fmt(s: String): Component = ChatFormatting.translateLegacyCodes(s) /** Send an error message to the player */ private def sendError(target: Player | CommandSender, err: String): Unit = - target.sendMessage(fmt(s"<#F93822>Error&7: $err")) + target.sendMessage(fmt(s"<#F93822>Error&7: ${sentenceCase(err)}")) + + private def sentenceCase(input: String): String = { + input + .trim + .pipe { s => + if (s.isEmpty) s + else s.head.toUpper + s.tail + } + .pipe { s => + if (s.endsWith(".")) s else s + "." + } + } } From 88dbba6549191317a34ae190e25757f789046a94 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sat, 26 Jul 2025 13:14:24 +0200 Subject: [PATCH 04/14] feat: port PowerTools to Kotlin --- .gitattributes | 12 + .gitignore | 6 + build.gradle.kts | 134 +++++ build.sbt | 36 -- gradle.properties | 1 + gradle/libs.versions.toml | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 +++++++++ gradlew.bat | 94 ++++ project/Dependencies.scala | 5 - project/build.properties | 1 - project/plugins.sbt | 1 - settings.gradle.kts | 1 + .../org/winlogon/powertools/AbsorbAnimal.kt | 64 +++ .../org/winlogon/powertools/ChatFormatting.kt | 28 + .../winlogon/powertools/PowerToolsLoader.kt} | 7 +- .../winlogon/powertools/PowerToolsPlugin.kt | 344 ++++++++++++ .../winlogon/powertools/AbsorbAnimal.scala | 75 --- .../winlogon/powertools/ChatFormatting.scala | 18 - .../powertools/PowerToolsPlugin.scala | 506 ------------------ 21 files changed, 947 insertions(+), 646 deletions(-) create mode 100644 .gitattributes create mode 100644 build.gradle.kts delete mode 100644 build.sbt create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 project/Dependencies.scala delete mode 100644 project/build.properties delete mode 100644 project/plugins.sbt create mode 100644 settings.gradle.kts create mode 100644 src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt create mode 100644 src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt rename src/main/{scala/org/winlogon/powertools/PowerToolsLoader.scala => kotlin/org/winlogon/powertools/PowerToolsLoader.kt} (89%) create mode 100644 src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt delete mode 100644 src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala delete mode 100644 src/main/scala/org/winlogon/powertools/ChatFormatting.scala delete mode 100644 src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f91f646 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/.gitignore b/.gitignore index cb309b4..72c40c0 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,9 @@ replay_pid* .bloop/ project/metals.sbt + +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..645609d --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,134 @@ +import java.text.SimpleDateFormat +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile +import java.util.* + +plugins { + id("com.gradleup.shadow") version "8.3.6" + kotlin("jvm") version "2.1.10" +} + +group = "org.winlogon.powertools" + +fun getTime(): String { + val sdf = SimpleDateFormat("yyMMdd-HHmm") + sdf.timeZone = TimeZone.getTimeZone("UTC") + return sdf.format(Date()).toString() +} + +val shortVersion: String? = if (project.hasProperty("ver")) { + val ver = project.property("ver").toString() + if (ver.startsWith("v")) { + ver.substring(1).uppercase() + } else { + ver.uppercase() + } +} else { + null +} + +val version: String = when { + shortVersion.isNullOrEmpty() -> "${getTime()}-SNAPSHOT" + shortVersion.contains("-RC-") -> shortVersion.substringBefore("-RC-") + "-SNAPSHOT" + else -> shortVersion +} + +val pluginName = rootProject.name +val pluginVersion = version +val pluginPackage = project.group.toString() +val projectName = rootProject.name + +repositories { + maven { + name = "papermc" + url = uri("https://repo.papermc.io/repository/maven-public/") + content { + includeModule("io.papermc.paper", "paper-api") + includeModule("net.md-5", "bungeecord-chat") + } + } + maven { + name = "minecraft" + url = uri("https://libraries.minecraft.net") + content { + includeModule("com.mojang", "brigadier") + } + } + maven { + name = "winlogon" + url = uri("https://maven.winlogon.org/releases/") + } + maven { + url = uri("https://repo.codemc.org/repository/maven-public/") + } + mavenCentral() +} + +val lampVersion = "4.0.0-rc.12" + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") + compileOnly("org.winlogon:retrohue:0.1.1") + implementation("io.github.revxrsal:lamp.common:$lampVersion") + implementation("io.github.revxrsal:lamp.bukkit:$lampVersion") + implementation("io.github.revxrsal:lamp.brigadier:$lampVersion") + + testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.4") + testImplementation("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.4") +} + +tasks.test { + useJUnitPlatform() +} + +tasks.processResources { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + filesMatching("**/paper-plugin.yml") { + expand( + "NAME" to pluginName, + "VERSION" to pluginVersion, + "PACKAGE" to pluginPackage + ) + } +} + +tasks.shadowJar { + archiveClassifier.set("") + minimize() +} + +tasks.jar { + enabled = false +} + +tasks.assemble { + dependsOn(tasks.shadowJar) +} + +tasks.withType { + options.compilerArgs.add("-parameters") +} + +tasks.withType { + compilerOptions { + javaParameters = true + } +} + +tasks.register("printProjectName") { + doLast { + println(projectName) + } +} + +var shadowJarTask = tasks.shadowJar.get() +tasks.register("release") { + dependsOn(tasks.build) + doLast { + if (!version.endsWith("-SNAPSHOT")) { + shadowJarTask.archiveFile.get().asFile.renameTo( + file("${layout.buildDirectory.get()}/libs/${rootProject.name}.jar") + ) + } + } +} diff --git a/build.sbt b/build.sbt deleted file mode 100644 index 334986e..0000000 --- a/build.sbt +++ /dev/null @@ -1,36 +0,0 @@ -import Dependencies._ - -lazy val mainScalaClass = "org.winlogon.powertools.PowerToolsPlugin" -lazy val scalaVer = "3.3.6" - -ThisBuild / scalaVersion := scalaVer -ThisBuild / version := "0.4.0-SNAPSHOT" -ThisBuild / organization := "org.winlogon" -ThisBuild / organizationName := "winlogon" -Compile / mainClass := Some(mainScalaClass) - -lazy val root = (project in file(".")) - .settings( - name := "powertools", - assembly / assemblyOption := (assembly / assemblyOption).value.withIncludeScala(false) - ) - -// Merge strategy for avoiding conflicts in dependencies -assembly / assemblyMergeStrategy := { - case PathList("META-INF", xs @ _*) => MergeStrategy.discard - case _ => MergeStrategy.first -} - -assembly / mainClass := Some(mainScalaClass) - -libraryDependencies ++= Seq( - "io.papermc.paper" % "paper-api" % "1.21.6-R0.1-SNAPSHOT" % Provided, - "dev.jorel" % "commandapi-bukkit-core" % "10.0.1" % Provided, - "org.winlogon" % "retrohue" % "0.1.1" % Provided -) - -resolvers ++= Seq( - "papermc-repo" at "https://repo.papermc.io/repository/maven-public/", - "codemc" at "https://repo.codemc.org/repository/maven-public/", - "winlogon-code" at "https://maven.winlogon.org/releases", -) diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..009b8e0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.configuration-cache=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..4ac3234 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,2 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/project/Dependencies.scala b/project/Dependencies.scala deleted file mode 100644 index fc623e8..0000000 --- a/project/Dependencies.scala +++ /dev/null @@ -1,5 +0,0 @@ -import sbt._ - -object Dependencies { - lazy val munit = "org.scalameta" %% "munit" % "0.7.29" -} diff --git a/project/build.properties b/project/build.properties deleted file mode 100644 index 73df629..0000000 --- a/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.10.7 diff --git a/project/plugins.sbt b/project/plugins.sbt deleted file mode 100644 index c46ce74..0000000 --- a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0") diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..33a04b9 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "PowerTools" diff --git a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt new file mode 100644 index 0000000..1d231b8 --- /dev/null +++ b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt @@ -0,0 +1,64 @@ +package org.winlogon.powertools + +import net.kyori.adventure.text.Component +import org.bukkit.Material +import org.bukkit.NamespacedKey +import org.bukkit.entity.Player +import org.bukkit.entity.Tameable +import org.bukkit.inventory.ItemStack +import org.bukkit.inventory.meta.ItemMeta +import org.bukkit.persistence.PersistentDataType + +class AbsorbAnimal(private val plugin: PowerToolsPlugin) { + + fun executeAbsorb(player: Player) { + val targetEntity = player.getTargetEntity(5) // 5 block range + if (targetEntity == null) { + sendError(player, "You must be looking at a pet within 5 blocks.") + return + } + + if (targetEntity is Tameable && targetEntity.isTamed && + targetEntity.owner?.uniqueId == player.uniqueId) { + absorbPet(player, targetEntity) + } else { + sendError(player, "You must be looking at a tamed pet that you own.") + } + } + + private fun absorbPet(player: Player, pet: Tameable) { + val item = ItemStack(Material.STICK) + val meta = item.itemMeta + + val entityType = pet.type + val displayName = fmt("Absorbed ${entityType.name.lowercase().replace('_', ' ')}") + meta.displayName(displayName) + + val lore = listOf( + fmt("Right click to spawn"), + fmt("Pet ID: ${pet.uniqueId}") + ) + meta.lore(lore) + + val pdc = meta.persistentDataContainer + val entityTypeKey = NamespacedKey(plugin, "absorbed_entity_type") + pdc.set(entityTypeKey, PersistentDataType.STRING, entityType.name) + + val nbtKey = NamespacedKey(plugin, "absorbed_nbt") + pdc.set(nbtKey, PersistentDataType.STRING, "idk") + + item.itemMeta = meta + + pet.remove() + player.inventory.addItem(item) + player.sendMessage(fmt("Successfully absorbed your pet!")) + } + + private fun fmt(s: String): Component { + return plugin.fmt(s) + } + + private fun sendError(p: Player, s: String) { + plugin.sendError(p, s) + } +} diff --git a/src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt b/src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt new file mode 100644 index 0000000..a7769b5 --- /dev/null +++ b/src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt @@ -0,0 +1,28 @@ +package org.winlogon.powertools + +import net.kyori.adventure.text.Component +import net.kyori.adventure.text.minimessage.MiniMessage +import org.winlogon.retrohue.RetroHue +import org.bukkit.command.CommandSender + +object ChatFormatting { + private val miniMessage = MiniMessage.miniMessage() + private val colorConverter = RetroHue(miniMessage) + + fun translateLegacyCodes(msg: String): Component { + return colorConverter.convertToComponent(msg, '&') + } + + fun sendError(target: CommandSender, err: String) { + target.sendMessage(translateLegacyCodes("<#F93822>Error&7: ${sentenceCase(err)}")) + } + + private fun sentenceCase(input: String): String { + return input.trim().let { + if (it.isEmpty()) it + else it[0].uppercaseChar() + it.substring(1) + }.let { + if (it.endsWith(".")) it else "$it." + } + } +} diff --git a/src/main/scala/org/winlogon/powertools/PowerToolsLoader.scala b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt similarity index 89% rename from src/main/scala/org/winlogon/powertools/PowerToolsLoader.scala rename to src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt index 2e03432..d1e1e83 100644 --- a/src/main/scala/org/winlogon/powertools/PowerToolsLoader.scala +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt @@ -1,15 +1,14 @@ package org.winlogon.powertools -import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver import io.papermc.paper.plugin.loader.PluginClasspathBuilder import io.papermc.paper.plugin.loader.PluginLoader - +import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.graph.Dependency import org.eclipse.aether.repository.RemoteRepository -class PowerToolsLoader extends PluginLoader { - override def classloader(classpathBuilder: PluginClasspathBuilder): Unit = { +class PowerToolsLoader : PluginLoader { + override fun classloader(classpathBuilder: PluginClasspathBuilder) { val resolver = MavenLibraryResolver() resolver.addRepository( diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt new file mode 100644 index 0000000..3d930fe --- /dev/null +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt @@ -0,0 +1,344 @@ +package org.winlogon.powertools + +import revxrsal.commands.Lamp +import revxrsal.commands.annotation.Command +import revxrsal.commands.annotation.Default +import revxrsal.commands.annotation.Dependency +import revxrsal.commands.annotation.Named +import revxrsal.commands.annotation.Optional +import revxrsal.commands.annotation.Subcommand +import revxrsal.commands.bukkit.BukkitLamp +import revxrsal.commands.bukkit.actor.BukkitCommandActor +import revxrsal.commands.bukkit.annotation.CommandPermission + +import net.kyori.adventure.audience.Audience +import net.kyori.adventure.text.Component +import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer + +import org.bukkit.Bukkit +import org.bukkit.Material +import org.bukkit.attribute.Attribute +import org.bukkit.command.CommandSender +import org.bukkit.command.ConsoleCommandSender +import org.bukkit.command.TabCompleter +import org.bukkit.enchantments.Enchantment +import org.bukkit.entity.Player +import org.bukkit.inventory.ItemStack +import org.bukkit.inventory.meta.EnchantmentStorageMeta +import org.bukkit.plugin.java.JavaPlugin +import kotlin.math.roundToInt +import io.papermc.paper.datacomponent.DataComponentTypes + +class PowerToolsPlugin : JavaPlugin() { + @Dependency + private lateinit var config: Configuration + private lateinit var absorbAnimal: AbsorbAnimal + private lateinit var lamp: Lamp + private val romanNumeralRegex = """^(?=.)M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$""".toRegex() + + override fun onEnable() { + config = loadConfig() + absorbAnimal = AbsorbAnimal(this) + lamp = BukkitLamp.builder(this).build() + lamp.register(this) + } + + private fun loadConfig(): Configuration { + saveDefaultConfig() + reloadConfig() + val yamlConfig = getConfig() + + val healCfg = HealConfig( + removeEffects = yamlConfig.getBoolean("heal.remove-effects", true), + showWhoHealed = yamlConfig.getBoolean("heal.show-who-healed", false) + ) + val unenchantCfg = UnenchantConfig(yamlConfig.getDouble("unenchant.base-price", 5.0)) + val unsafeCfg = UnsafeEnchantConfig(yamlConfig.getBoolean("unsafe-enchants.enabled", true)) + val transferCfg = TransferConfig( + enabled = yamlConfig.getBoolean("transfer.enabled", true), + servers = yamlConfig.getMapList("transfer.servers").map { configMap -> + val map = HashMap() + configMap.forEach { (k, v) -> map[k.toString()] = v.toString() } + map + } + ) + + return Configuration(healCfg, unenchantCfg, unsafeCfg, transferCfg) + } + + @Command("broadcast", "bc") + fun broadcast( + actor: BukkitCommandActor, + @Named("message") message: String + ) { + val formattedMessage = "[Broadcast] " + val messageComponent = Placeholder.component("message", Component.text(message)) + + Bukkit.getOnlinePlayers().forEach { it.sendRichMessage(formattedMessage, messageComponent) } + if (actor.sender() is ConsoleCommandSender) { + actor.sender().sendRichMessage(formattedMessage, messageComponent) + } + } + + @Command("hat") + fun hat(actor: BukkitCommandActor) { + val player = actor.sender() as Player + + val inv = player.inventory + val hand = inv.itemInMainHand + val helmet = inv.helmet + + if (helmet != null) { + inv.helmet = hand + inv.setItemInMainHand(helmet) + player.sendRichMessage("Swapping items...") + } else { + inv.helmet = hand + inv.setItemInMainHand(null) + } + + player.updateInventory() + player.sendRichMessage("Your held item is now on your head!") + } + + @Command("invsee") + fun invsee( + actor: BukkitCommandActor, + @Named("target") target: Player + ) { + if (target.name == actor.name()) { + ChatFormatting.sendError(actor.sender(), "you cannot invsee yourself") + return + } + + val player = actor.sender() as Player + + if (!target.isOnline) { + ChatFormatting.sendError(player, "player not found or offline") + return + } + + val targetInv = target.inventory + val inventorySize = maxOf(45, targetInv.size) + + val wrapper = Bukkit.createInventory(null, inventorySize) + wrapper.contents = targetInv.contents + + player.openInventory(wrapper) + + // TODO: sync changes back into target’s inventory when closing widget + } + + @Command("absorb") + fun absorb(actor: BukkitCommandActor) { + // TODO: absorb player and check if they have required item in inv + } + + @Command("smite") + fun smite( + actor: BukkitCommandActor, + @Named("target") target: Player + ) { + target.takeIf { it.isOnline }?.let { tgt -> + try { + tgt.world.strikeLightning(target.location) + actor.sender().sendMessage(fmt("&7You have smitten &3${target.name}!")) + target.sendMessage(fmt("&7You have been smitten by &3a mighty force&7!")) + } catch (e: Exception) { + ChatFormatting.sendError(actor.sender(), "failed to smite player") + } + } ?: ChatFormatting.sendError(actor.sender(), "player not found or offline") + } + + @Subcommand("sudo") + @Command("sudo") + class SudoCommands(private val plugin: PowerToolsPlugin) { + @Subcommand("command", "cmd") + fun sudoCommand( + actor: BukkitCommandActor, + @Named("target") target: Player, + @Named("command") command: String + ) { + if (!target.isOnline) { + ChatFormatting.sendError(actor.sender(), "player not found or offline") + return + } + target.scheduler.execute(plugin, Runnable { target.chat("/${command.trim()}") }, null, 0L) + } + + @Subcommand("chat") + fun sudoChat( + actor: BukkitCommandActor, + @Named("target") target: Player, + @Named("message") message: String + ) { + if (!target.isOnline) { + ChatFormatting.sendError(actor.sender(), "player not found or offline") + return + } + + target.chat(message) + } + } + + @Command("split", "unenchant") + fun split(actor: BukkitCommandActor) { + val player = actor.sender() as Player + + val inventory = player.inventory + val itemHand = inventory.itemInMainHand + + if (itemHand.type == Material.ENCHANTED_BOOK) { + ChatFormatting.sendError(player, "the item can't be an enchanted book") + return + } + + if (itemHand.type == Material.AIR) { + ChatFormatting.sendError(player, "you must be holding an item") + return + } + + val enchantments = itemHand.enchantments + if (enchantments.isEmpty()) { + ChatFormatting.sendError(player, "this item has no enchantments to split") + return + } + + val cost = (config.unenchant.basePrice * enchantments.size).roundToInt() + if (player.totalExperience < cost) { + ChatFormatting.sendError(player, "you need at least $cost XP to split these enchantments") + return + } + player.giveExp(-cost) + + val meta = itemHand.itemMeta + enchantments.keys.forEach(meta::removeEnchant) + itemHand.itemMeta = meta + itemHand.resetData(DataComponentTypes.REPAIR_COST) + + enchantments.forEach { (ench, level) -> + val book = ItemStack(Material.ENCHANTED_BOOK) + val bookMeta = book.itemMeta as EnchantmentStorageMeta + bookMeta.addStoredEnchant(ench, level, true) + book.itemMeta = bookMeta + + if (inventory.firstEmpty() == -1) { + player.world.dropItemNaturally(player.location, book) + } else { + inventory.addItem(book) + } + } + + player.updateInventory() + player.sendMessage(fmt("&7Successfully split &3${enchantments.size} &7enchantment(s) for &2$cost XP.")) + } + + @Command("fly") + fun fly(actor: BukkitCommandActor) { + val player = actor.sender() as Player + val canFly = player.allowFlight + val toggledFly = !canFly + + val statusMessage = if (toggledFly) "enabled" else "disabled" + val color = if (toggledFly) "dark_aqua" else "red" + val playerName = "${player.name}" + + player.allowFlight = toggledFly + player.sendRichMessage("Fly <$color>$statusMessage for $playerName.") + } + + @Command("enchantunsafe", "ue", "uenchant") + fun enchantUnsafe( + actor: BukkitCommandActor, + @Named("enchantment") enchantment: Enchantment, + @Named("level") level: Int + ) { + val player = actor.sender() as Player + + if (!config.unsafeEnchants.enabled) { + ChatFormatting.sendError(player, "unsafe enchantments are disabled in config") + return + } + val item = player.inventory.itemInMainHand + if (item.type == Material.AIR) { + ChatFormatting.sendError(player, "you must be holding an item to enchant") + return + } + + item.addUnsafeEnchantment(enchantment, level) + player.updateInventory() + + val displayName = PlainTextComponentSerializer.plainText() + .serialize(enchantment.displayName(1)) + + val finalDisplayName = displayName.trim().split("\\s+".toRegex()).let { words -> + if (words.isNotEmpty() && romanNumeralRegex.matches(words.last())) { + words.dropLast(1).joinToString(" ") + } else { + displayName + } + } + + val prefix = "&8[&5UE&8]" + player.sendMessage(fmt("$prefix Applied $finalDisplayName at level $level.")) + } + + @Command("heal", "h") + fun heal( + actor: BukkitCommandActor, + @Optional @Named("player") target: Player? + ) { + val healTarget = target ?: (actor.sender() as? Player) + healTarget?.let { healPlayer(it, actor.sender()) } + } + + private fun healPlayer(player: Player, sender: CommandSender) { + player.getAttribute(Attribute.MAX_HEALTH)?.let { + player.health = it.value + } + player.foodLevel = 20 + player.saturation = 20f + + if (config.heal.removeEffects) { + player.activePotionEffects.forEach { effect -> player.removePotionEffect(effect.type) } + } + + val healedMessage = "You have been healed." + + if (player != sender) { + sender.sendRichMessage( + " has been healed.", + Placeholder.component("player", Component.text(player.name)) + ) + + val healMsg = if (config.heal.showWhoHealed) { + "You have been healed by ." + } else { + healedMessage + } + + player.sendRichMessage(healMsg, Placeholder.component("staff", Component.text(sender.name))) + } else { + sender.sendRichMessage(healedMessage) + } + } + + fun fmt(s: String): Component { + return ChatFormatting.translateLegacyCodes(s) + } + +} + +// Configuration classes +data class UnenchantConfig(val basePrice: Double) +data class UnsafeEnchantConfig(val enabled: Boolean) +data class HealConfig(val removeEffects: Boolean, val showWhoHealed: Boolean) +data class TransferConfig(val enabled: Boolean, val servers: List>) +data class Configuration( + val heal: HealConfig, + val unenchant: UnenchantConfig, + val unsafeEnchants: UnsafeEnchantConfig, + val transferConfig: TransferConfig +) diff --git a/src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala b/src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala deleted file mode 100644 index 4dd487e..0000000 --- a/src/main/scala/org/winlogon/powertools/AbsorbAnimal.scala +++ /dev/null @@ -1,75 +0,0 @@ -package org.winlogon.powertools -import org.bukkit.entity.Player -import org.bukkit.entity.Tameable -import org.bukkit.NamespacedKey -import org.bukkit.Material -import org.bukkit.persistence.PersistentDataType -import org.bukkit.inventory.meta.ItemMeta -import org.bukkit.inventory.ItemStack -import net.kyori.adventure.text.Component - -import scala.jdk.CollectionConverters._ - -class AbsorbAnimal(private val plugin: PowerToolsPlugin) { - private def executeAbsorb(player: Player): Unit = { - import org.bukkit.entity.Tameable - import org.bukkit.NamespacedKey - import org.bukkit.persistence.PersistentDataType - - val targetEntity = player.getTargetEntity(5) // 5 block range - if (targetEntity == null) { - sendError(player, "You must be looking at a pet within 5 blocks.") - return - } - - targetEntity match { - case tameable: Tameable if tameable.isTamed && tameable.getOwner != null && tameable.getOwner.getUniqueId == player.getUniqueId => - absorbPet(player, tameable) - case _ => - sendError(player, "You must be looking at a tamed pet that you own.") - } - } - - private def absorbPet(player: Player, pet: Tameable): Unit = { - // create placeholder item - will be spawn egg later - val item = ItemStack(Material.STICK) - val meta = item.getItemMeta() - - val entityType = pet.getType - val displayName = fmt(s"Absorbed ${entityType.name().toLowerCase.replace('_', ' ')}") - meta.displayName(displayName) - - val lore = List( - fmt("Right click to spawn"), - fmt(s"Pet ID: ${pet.getUniqueId}") - ).asJava - meta.lore(lore) - - // store nbt data - val pdc = meta.getPersistentDataContainer() - val entityTypeKey = NamespacedKey(plugin, "absorbed_entity_type") - pdc.set(entityTypeKey, PersistentDataType.STRING, entityType.name()) - - val nbtKey = NamespacedKey(plugin, "absorbed_nbt") - // TODO: (de)serialize NBT data as PDC - pdc.set(nbtKey, PersistentDataType.STRING, "idk") - - item.setItemMeta(meta) - - // remove pet from world - pet.remove() - - // give item to player - player.getInventory.addItem(item) - player.sendMessage(fmt(s"Successfully absorbed your pet!")) - } - - def fmt(s: String): Component = { - Component.text("") - } - - def sendError(p: Player, s: String): Unit = { - - } -} - diff --git a/src/main/scala/org/winlogon/powertools/ChatFormatting.scala b/src/main/scala/org/winlogon/powertools/ChatFormatting.scala deleted file mode 100644 index 286de9f..0000000 --- a/src/main/scala/org/winlogon/powertools/ChatFormatting.scala +++ /dev/null @@ -1,18 +0,0 @@ -package org.winlogon.powertools - -import org.winlogon.retrohue.RetroHue - -import net.kyori.adventure.text.Component -import net.kyori.adventure.text.minimessage.MiniMessage -import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver -import net.kyori.adventure.text.minimessage.tag.standard.StandardTags - -object ChatFormatting { - private val miniMessage = MiniMessage.miniMessage() - private val colorConverter = RetroHue(miniMessage) - - /** Convert a legacy formatted string into a MiniMessage Component */ - def translateLegacyCodes(msg: String): Component = { - colorConverter.convertToComponent(msg, '&') - } -} diff --git a/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala b/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala deleted file mode 100644 index b76e78e..0000000 --- a/src/main/scala/org/winlogon/powertools/PowerToolsPlugin.scala +++ /dev/null @@ -1,506 +0,0 @@ -package org.winlogon.powertools - -import dev.jorel.commandapi.CommandAPICommand -import dev.jorel.commandapi.arguments.{ - EnchantmentArgument, GreedyStringArgument, - IntegerArgument, PlayerArgument, StringArgument, - ArgumentSuggestions -} -import dev.jorel.commandapi.executors.{CommandArguments, CommandExecutor} - -import org.bukkit.attribute.Attribute -import org.bukkit.command.{CommandSender, ConsoleCommandSender} -import org.bukkit.enchantments.Enchantment -import org.bukkit.entity.Player -import org.bukkit.inventory.ItemStack -import org.bukkit.inventory.meta.EnchantmentStorageMeta -import org.bukkit.plugin.java.JavaPlugin -import org.bukkit.{Bukkit, Material} - -import io.papermc.paper.chat.ChatRenderer -import io.papermc.paper.datacomponent.DataComponentTypes -import io.papermc.paper.event.player.AsyncChatEvent - -import net.kyori.adventure.audience.Audience -import net.kyori.adventure.text.Component -import net.kyori.adventure.text.format.NamedTextColor -import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer - -import scala.jdk.CollectionConverters.* -import scala.util.{Try, Success, Failure} -import scala.util.boundary -import scala.util.chaining.scalaUtilChainingOps -import org.bukkit.event.inventory.InventoryType - -case class UnenchantConfig(basePrice: Double) -case class UnsafeEnchantConfig(enabled: Boolean) -case class HealConfig(removeEffects: Boolean, showWhoHealed: Boolean) -case class TransferConfig(enabled: Boolean, servers: List[java.util.HashMap[String, String]]) -case class Configuration( - heal: HealConfig, - unenchant: UnenchantConfig, - unsafeEnchants: UnsafeEnchantConfig, - transferConfig: TransferConfig -) - -class PowerToolsPlugin extends JavaPlugin { - private var config: Configuration = _ - - override def onEnable(): Unit = { - config = loadConfig() - registerCommands() - } - - private def loadConfig(): Configuration = { - saveDefaultConfig() - reloadConfig() - val yamlConfig = getConfig - - val healCfg = HealConfig( - removeEffects = yamlConfig.getBoolean("heal.remove-effects", true), - showWhoHealed = yamlConfig.getBoolean("heal.show-who-healed", false) - ) - val unenchantCfg = UnenchantConfig(yamlConfig.getDouble("unenchant.base-price", 5.0)) - val unsafeCfg = UnsafeEnchantConfig(yamlConfig.getBoolean("unsafe-enchants.enabled", true)) - val transferCfg = TransferConfig( - enabled = yamlConfig.getBoolean("transfer.enabled", true), - servers = yamlConfig.getMapList("transfer.servers").asScala.map { configMap => - val map = new java.util.HashMap[String, String]() - configMap.asScala.foreach { case (k, v) => - map.put(k.toString, v.toString) - } - map - }.toList - ) - - Configuration(healCfg, unenchantCfg, unsafeCfg, transferCfg) - } - - // TODO: add user-facing /transfer command which is configurable - private def registerCommands(): Unit = { - // Helper to always return 1 as status. - val successStatus: Int = 1 - - // Broadcast Command - CommandAPICommand("broadcast") - .withAliases("bc") - .withPermission("powertools.broadcast") - .withArguments(GreedyStringArgument("message")) - .executes((sender: CommandSender, args: CommandArguments) => { - val message = args.get("message").asInstanceOf[String] - executeBroadcast(sender, message) - successStatus - }) - .register() - - // Hat command - CommandAPICommand("hat") - .withPermission("powertools.hat") - .executesPlayer((player: Player, _: CommandArguments) => { - executeHat(player) - successStatus - }) - .register() - - // Invsee Command - CommandAPICommand("invsee") - .withPermission("powertools.invsee") - .withArguments(PlayerArgument("target")) - .executesPlayer((player: Player, args: CommandArguments) => { - val targetName = Option(args.get("target").asInstanceOf[Player]).map(_.getName) - .getOrElse("unknown") - - if (!targetName.equalsIgnoreCase(player.getName)) { - executeInvsee(player, targetName) - } else { - sendError(player, "you cannot invsee yourself") - } - - successStatus - }) - .register() - - CommandAPICommand("absorb") - .withPermission("powertools.absorb") - .executesPlayer((player: Player, _: CommandArguments) => { - // TODO: absorb player and check if they have required item in inv - successStatus - }) - .register() - - // Smite Command - CommandAPICommand("smite") - .withPermission("powertools.smite") - .withArguments(PlayerArgument("target")) - .executes((sender: CommandSender, args: CommandArguments) => { - val player = args.get("target").asInstanceOf[Player] - val targetName = Option(player).map(_.getName).getOrElse("unknown") - executeSmite(sender, targetName) - successStatus - }) - .register() - - // Sudo command - CommandAPICommand("sudo") - .withAliases("doas") - .withPermission("powertools.wheel") - .withArguments(StringArgument("target")) - .withSubcommand( - CommandAPICommand("command") - .withAliases("cmd") - .withArguments(PlayerArgument("target")) - .withArguments(GreedyStringArgument("command")) - .executes((sender: CommandSender, args: CommandArguments) => { - val target = args.get("target").asInstanceOf[Player] - val command = args.get("command").asInstanceOf[String] - executeSudoCommand(sender, target, command) - successStatus - }) - ) - .withSubcommand( - CommandAPICommand("chat") - .withArguments(PlayerArgument("target")) - .withArguments(GreedyStringArgument("message")) - .executes((sender: CommandSender, args: CommandArguments) => { - val target = args.get("target").asInstanceOf[Player] - val message = args.get("message").asInstanceOf[String] - executeSudoChat(sender, target, message) - successStatus - }) - ) - .register() - - CommandAPICommand("split") - .withPermission("powertools.splitenchants") - .withAliases("unenchant") - .executesPlayer((player: Player, _: CommandArguments) => { - executeSplitUnenchant(player) - successStatus - }) - .register() - - CommandAPICommand("fly") - .withPermission("powertools.fly") - .executesPlayer((player: Player, _: CommandArguments) => { - val canFly = player.getAllowFlight() - val toggledFly = !canFly - - val statusMessage = if (toggledFly) "enabled" else "disabled" - val color = if (toggledFly) "dark_aqua" else "red" - - val playerName = s"${player.getName()}" - player.setAllowFlight(toggledFly) - player.sendRichMessage(s"Fly <$color>$statusMessage for $playerName.") - successStatus - }) - .register() - - // Unsafe enchant command - CommandAPICommand("enchantunsafe") - .withPermission("powertools.unsafe-enchants") - .withAliases("ue", "uenchant") - .withArguments(EnchantmentArgument("enchantment"), IntegerArgument("level")) - .executesPlayer((player: Player, args: CommandArguments) => { - executeUnsafeEnchant(player, args) - successStatus - }) - .register() - - // Heal command - CommandAPICommand("heal") - .withPermission("heal.admin") - .withAliases("h") - .withArguments(PlayerArgument("player").setOptional(true)) - .executes((sender: CommandSender, args: CommandArguments) => { - val maybeTarget = Option(args.get("player").asInstanceOf[Player]) - .orElse(Option(sender).collect { case p: Player => p }) - maybeTarget.foreach(target => healPlayer(target, sender)) - successStatus - }) - .register() - - registerTransferCommandsIfEnabled(config.transferConfig.enabled) - } - private def executeUnsafeEnchant(player: Player, args: CommandArguments): Unit = { - if (!config.unsafeEnchants.enabled) { - sendError(player, "unsafe enchantments are disabled in config") - return - } - val enchantment = args.get("enchantment").asInstanceOf[Enchantment] - val level = args.get("level").asInstanceOf[Integer].intValue() - - Option(player.getInventory.getItemInMainHand) - .filter(item => item.getType != Material.AIR) - .fold(sendError(player, "you must be holding an item to enchant")) { item => - item.addUnsafeEnchantment(enchantment, level) - player.updateInventory() - - val displayName = PlainTextComponentSerializer.plainText() - .serialize(enchantment.displayName(1)) - - val romanNumeralRegex = """^(?=.)M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$""".r - - val finalDisplayName = { - val trimmed = displayName.trim - val words = trimmed.split("\\s+") - if (words.nonEmpty && romanNumeralRegex.pattern.matcher(words.last).matches()) { - words.dropRight(1).mkString(" ") - } else { - displayName - } - } - - val prefix = "&8[&5UE&8]" - player.sendMessage(fmt( - s"$prefix Applied $finalDisplayName at level $level." - )) - } - } - - private def executeSplitUnenchant(player: Player): Unit = { - val inventory = player.getInventory - val itemHand = Option(inventory.getItemInMainHand) - - itemHand - .filter(_.getType == Material.ENCHANTED_BOOK) - .foreach { _ => - sendError(player, "the item can't be an enchanted book") - return - } - - itemHand - .filterNot(item => item == null || item.getType == Material.AIR) - .fold(sendError(player, "you must be holding an item")) { itemInHand => - val enchantments = itemInHand.getEnchantments - if (enchantments.isEmpty) { - sendError(player, "this item has no enchantments to split") - return - } - val cost = (config.unenchant.basePrice * enchantments.size).toInt - if (player.getTotalExperience < cost) { - sendError(player, s"you need at least $cost XP to split these enchantments") - return - } - player.giveExp(-cost) - - // Remove all enchantments from the item meta. - val meta = itemInHand.getItemMeta - enchantments.keySet.asScala.foreach(meta.removeEnchant) - itemInHand.setItemMeta(meta) - itemInHand.resetData(DataComponentTypes.REPAIR_COST) - - // Create an enchanted book for each enchantment. - enchantments.asScala.foreach { case (ench, level) => - val book = new ItemStack(Material.ENCHANTED_BOOK) - val bookMeta = book.getItemMeta.asInstanceOf[EnchantmentStorageMeta] - bookMeta.addStoredEnchant(ench, level, true) - book.setItemMeta(bookMeta) - // If the inventory is full, drop it at the player's position - if (inventory.firstEmpty() == -1) - player.getWorld.dropItemNaturally(player.getLocation, book) - else - inventory.addItem(book) - } - player.updateInventory() - player.sendMessage(fmt(s"&7Successfully split &3${enchantments.size} &7enchantment(s) for &2$cost XP.")) - } - } - - private def executeBroadcast(sender: CommandSender, message: String): Unit = { - val formattedMessage = "[Broadcast] " - val messageComponent = Placeholder.component("message", Component.text(message, NamedTextColor.GRAY)) - - Bukkit.getOnlinePlayers.forEach(_.sendRichMessage(formattedMessage, messageComponent)) - // Send message to console if the command was sent from console for user feedback - if (sender.isInstanceOf[ConsoleCommandSender]) { - sender.sendRichMessage(formattedMessage, messageComponent) - } - } - - private def executeSudoCommand(sender: CommandSender, target: Player, command: String): Unit = { - if (target == null || !target.isOnline) { - sendError(sender, "player not found or offline") - return - } - // Use the scheduler to perform the command asynchronously. - target.getScheduler.execute(this, () => target.chat(s"/${command.trim()}"), null, 0L) - } - - private def executeSudoChat(sender: CommandSender, target: Player, message: String): Unit = { - if (target == null || !target.isOnline) { - sendError(sender, "player not found or offline") - return - } - val players = Bukkit.getOnlinePlayers() - - val consoleSenderAudience = Audience.audience(Bukkit.getConsoleSender()) - val viewers = new java.util.HashSet[Audience](players) - viewers.add(consoleSenderAudience) - - val userMsg = fmt(message) - - // `AsyncChatEvent`s called by plugins must be synchronous - val event = AsyncChatEvent(false, target, viewers, ChatRenderer.defaultRenderer(), userMsg, userMsg, null) - - // If the event is not cancelled, send the message - if (event.callEvent() && !event.isCancelled) { - val renderer = event.renderer() - val senderComponent = event.getPlayer.displayName() - // Create an audience from the players and craft a new rendered message - val renderedMessage = renderer.render(event.getPlayer, senderComponent, event.message(), Audience.audience(players)) - event.viewers().forEach(_.sendMessage(renderedMessage)) - } - } - - private def executeHat(player: Player): Unit = { - val inv = player.getInventory - val hand = inv.getItemInMainHand - val helmet = Option(inv.getHelmet) - helmet match { - case Some(h) => - inv.setHelmet(hand) - inv.setItemInMainHand(h) - player.sendRichMessage("Swapping items...") - case None => - inv.setHelmet(hand) - inv.setItemInMainHand(null) - } - player.updateInventory() - player.sendRichMessage("Your held item is now on your head!") - } - - private def executeInvsee(player: Player, targetName: String): Unit = { - Option(Bukkit.getPlayer(targetName)) - .filter(_.isOnline) - .fold(sendError(player, "player not found or offline"))(target => { - var inventorySize = 45 - val targetInventory = target.getInventory - - if (targetInventory.getSize() > inventorySize) { - inventorySize = targetInventory.getSize() - } - - // FIXME: you originally could open a player's inventory normally but for some - // reason, between 1.21.5 and 1.21.6 you can't do it anymore. - val wrapperInventory = Bukkit.createInventory(null, inventorySize) - wrapperInventory.setContents(targetInventory.getContents) - player.openInventory(wrapperInventory) - - // TODO: since you can't open a player inventory as before, the changes need - // to be written back to the target's inventory - }) - } - - private def executeSmite(sender: CommandSender, targetName: String): Unit = { - Option(Bukkit.getPlayer(targetName)) - .filter(_.isOnline) - .fold(sendError(sender, "player not found or offline")) { target => - val result = Try { - target.getWorld.strikeLightning(target.getLocation) - } - - result match { - case Success(_) => - sender.sendMessage(fmt(s"&7You have smitten &3${target.getName}!")) - target.sendMessage(fmt("&7You have been smitten by &3a mighty force&7!")) - case Failure(_) => - sendError(sender, "failed to smite player") - } - } - } - - private def healPlayer(player: Player, sender: CommandSender): Unit = { - Option(player.getAttribute(Attribute.MAX_HEALTH)) - .foreach(max => player.setHealth(max.getValue())) - player.setFoodLevel(20) - player.setSaturation(20f) - - if (config.heal.removeEffects) { - player.getActivePotionEffects.forEach(effect => player.removePotionEffect(effect.getType)) - } - - val healedMessage = "You have been healed." - - if (player != sender) { - sender.sendRichMessage( - " has been healed.", - Placeholder.component("player", Component.text(player.getName(), NamedTextColor.DARK_AQUA)) - ) - - val senderComponent = Component.text(sender.getName(), NamedTextColor.DARK_AQUA) - - val healMsg = if (config.heal.showWhoHealed) { - s"You have been healed by ." - } else { - healedMessage - } - - player.sendRichMessage(healMsg, Placeholder.component("staff", senderComponent)) - } else { - sender.sendRichMessage(healedMessage) - } - } - - // TODO: I'm not totally sure I remember what this is here for, is it for aliasing a - // server IP? If yes then it should have another name. - private def registerTransferCommandsIfEnabled(transferConfigEnabled: Boolean): Unit = { - if (!transferConfigEnabled) { - return - } - - CommandAPICommand("transfer") - .withPermission("powertools.transfer") - .withArguments(new StringArgument("server").replaceSuggestions(ArgumentSuggestions.strings(info => { - config.transferConfig.servers.filter { server => - val allowPlayers = server.getOrDefault("allowPlayers", "false").toBoolean - allowPlayers || info.sender().hasPermission("powertools.transfer.all") - }.map(_.get("name")).toArray - }))) - .executesPlayer((player: Player, args: CommandArguments) => { - val serverName = args.get("server").asInstanceOf[String] - - config.transferConfig.servers - .find(_.get("name") == serverName) - .fold(sendError(player, "server not found"))( server => { - val allowPlayers = server.getOrDefault("allowPlayers", "false").toBoolean - - if (!(allowPlayers && player.hasPermission("powertools.transfer.all"))) { - sendError(player, "you don't have permission to transfer to this server") - return - } - - try { - val host = server.get("host") - val port = server.get("port").toInt - player.transfer(host, port) - } catch { - case _: NumberFormatException => - sendError(player, "invalid port for server! Please contact a server admin") - case ex: Exception => - sendError(player, s"transfer failed: ${ex.getMessage}") - } - }) - }) - .register() - } - - /** Format a string converting legacy colors to MiniMessage */ - private def fmt(s: String): Component = ChatFormatting.translateLegacyCodes(s) - - /** Send an error message to the player */ - private def sendError(target: Player | CommandSender, err: String): Unit = - target.sendMessage(fmt(s"<#F93822>Error&7: ${sentenceCase(err)}")) - - private def sentenceCase(input: String): String = { - input - .trim - .pipe { s => - if (s.isEmpty) s - else s.head.toUpper + s.tail - } - .pipe { s => - if (s.endsWith(".")) s else s + "." - } - } -} From 81b4be0380fa32f24d1c57f2e97bc1b1896d0a9e Mon Sep 17 00:00:00 2001 From: winlogon Date: Sat, 26 Jul 2025 13:16:25 +0200 Subject: [PATCH 05/14] chore: make paper-plugin.yml use the placeholders --- .../org/winlogon/powertools/AbsorbAnimal.kt | 8 ++------ src/main/resources/paper-plugin.yml | 20 +++++-------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt index 1d231b8..aec18b1 100644 --- a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt +++ b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt @@ -14,7 +14,7 @@ class AbsorbAnimal(private val plugin: PowerToolsPlugin) { fun executeAbsorb(player: Player) { val targetEntity = player.getTargetEntity(5) // 5 block range if (targetEntity == null) { - sendError(player, "You must be looking at a pet within 5 blocks.") + ChatFormatting.sendError(player, "You must be looking at a pet within 5 blocks.") return } @@ -22,7 +22,7 @@ class AbsorbAnimal(private val plugin: PowerToolsPlugin) { targetEntity.owner?.uniqueId == player.uniqueId) { absorbPet(player, targetEntity) } else { - sendError(player, "You must be looking at a tamed pet that you own.") + ChatFormatting.sendError(player, "You must be looking at a tamed pet that you own.") } } @@ -57,8 +57,4 @@ class AbsorbAnimal(private val plugin: PowerToolsPlugin) { private fun fmt(s: String): Component { return plugin.fmt(s) } - - private fun sendError(p: Player, s: String) { - plugin.sendError(p, s) - } } diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index fe48f87..cc91ee3 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -1,17 +1,7 @@ -name: 'PowerTools' -version: '0.4.0-SNAPSHOT' -main: 'org.winlogon.powertools.PowerToolsPlugin' -loader: 'org.winlogon.powertools.PowerToolsLoader' +name: '${NAME}' +version: '${VERSION}' +main: '${PACKAGE}.PowerToolsPlugin' +loader: '${PACKAGE}.PowerToolsLoader' description: 'Fun utilities for everyone!' folia-supported: true -api-version: 1.21 -dependencies: - server: - CommandAPI: - load: BEFORE - required: true - join-classpath: true - ScalaLoader: - load: BEFORE - required: true - join-classpath: true +api-version: 1.21.6 From 75bf7005135dfbc860aba348b1d3ebcdd706a142 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sat, 26 Jul 2025 23:36:07 +0200 Subject: [PATCH 06/14] fix: change /ue to take in string + autocomplete --- .../winlogon/powertools/PowerToolsPlugin.kt | 26 +++++++++++++++---- .../suggestions/EnchantmentSuggestions.kt | 22 ++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 src/main/kotlin/org/winlogon/powertools/suggestions/EnchantmentSuggestions.kt diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt index 3d930fe..ce054b1 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt @@ -7,6 +7,8 @@ import revxrsal.commands.annotation.Dependency import revxrsal.commands.annotation.Named import revxrsal.commands.annotation.Optional import revxrsal.commands.annotation.Subcommand +import revxrsal.commands.annotation.SuggestWith + import revxrsal.commands.bukkit.BukkitLamp import revxrsal.commands.bukkit.actor.BukkitCommandActor import revxrsal.commands.bukkit.annotation.CommandPermission @@ -16,6 +18,7 @@ import net.kyori.adventure.text.Component import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer +import net.kyori.adventure.key.Key import org.bukkit.Bukkit import org.bukkit.Material @@ -28,11 +31,15 @@ import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack import org.bukkit.inventory.meta.EnchantmentStorageMeta import org.bukkit.plugin.java.JavaPlugin -import kotlin.math.roundToInt +import org.winlogon.powertools.suggestions.EnchantmentSuggestions import io.papermc.paper.datacomponent.DataComponentTypes +import io.papermc.paper.registry.RegistryAccess +import io.papermc.paper.registry.RegistryKey +import io.papermc.paper.registry.TypedKey + +import kotlin.math.roundToInt class PowerToolsPlugin : JavaPlugin() { - @Dependency private lateinit var config: Configuration private lateinit var absorbAnimal: AbsorbAnimal private lateinit var lamp: Lamp @@ -133,7 +140,7 @@ class PowerToolsPlugin : JavaPlugin() { @Command("absorb") fun absorb(actor: BukkitCommandActor) { - // TODO: absorb player and check if they have required item in inv + actor.sender().sendRichMessage("Not yet implemented") } @Command("smite") @@ -249,18 +256,27 @@ class PowerToolsPlugin : JavaPlugin() { player.sendRichMessage("Fly <$color>$statusMessage for $playerName.") } - @Command("enchantunsafe", "ue", "uenchant") + @Command("ue", "unsafe-ench", "uenchant") fun enchantUnsafe( actor: BukkitCommandActor, - @Named("enchantment") enchantment: Enchantment, + @SuggestWith(EnchantmentSuggestions::class) @Named("enchantment") enchant: String, @Named("level") level: Int ) { + // context + val registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT) + val typedKey = TypedKey.create(RegistryKey.ENCHANTMENT, Key.key("minecraft:$enchant")) + val enchantment = registry.get(typedKey) ?: run { + ChatFormatting.sendError(actor.sender(), "invalid enchantment, or not found") + return + } + val player = actor.sender() as Player if (!config.unsafeEnchants.enabled) { ChatFormatting.sendError(player, "unsafe enchantments are disabled in config") return } + val item = player.inventory.itemInMainHand if (item.type == Material.AIR) { ChatFormatting.sendError(player, "you must be holding an item to enchant") diff --git a/src/main/kotlin/org/winlogon/powertools/suggestions/EnchantmentSuggestions.kt b/src/main/kotlin/org/winlogon/powertools/suggestions/EnchantmentSuggestions.kt new file mode 100644 index 0000000..e5aea47 --- /dev/null +++ b/src/main/kotlin/org/winlogon/powertools/suggestions/EnchantmentSuggestions.kt @@ -0,0 +1,22 @@ +package org.winlogon.powertools.suggestions + +import revxrsal.commands.bukkit.actor.BukkitCommandActor +import revxrsal.commands.autocomplete.SuggestionProvider +import revxrsal.commands.node.ExecutionContext + +import org.bukkit.enchantments.Enchantment + +import io.papermc.paper.registry.RegistryAccess +import io.papermc.paper.registry.RegistryKey + +class EnchantmentSuggestions : SuggestionProvider { + override fun getSuggestions(context: ExecutionContext): List { + + val registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT) + return registry.stream() + .map { it.key.key } + .sorted() + .toList() + } +} + From 02fc92c2b74321ebf38b41487a3c8f04ea1becb1 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sun, 27 Jul 2025 06:20:37 +0200 Subject: [PATCH 07/14] chore: trim trailing whitespace --- .../org/winlogon/powertools/AbsorbAnimal.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt index aec18b1..e45b253 100644 --- a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt +++ b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt @@ -18,7 +18,7 @@ class AbsorbAnimal(private val plugin: PowerToolsPlugin) { return } - if (targetEntity is Tameable && targetEntity.isTamed && + if (targetEntity is Tameable && targetEntity.isTamed && targetEntity.owner?.uniqueId == player.uniqueId) { absorbPet(player, targetEntity) } else { @@ -29,32 +29,32 @@ class AbsorbAnimal(private val plugin: PowerToolsPlugin) { private fun absorbPet(player: Player, pet: Tameable) { val item = ItemStack(Material.STICK) val meta = item.itemMeta - + val entityType = pet.type val displayName = fmt("Absorbed ${entityType.name.lowercase().replace('_', ' ')}") meta.displayName(displayName) - + val lore = listOf( fmt("Right click to spawn"), fmt("Pet ID: ${pet.uniqueId}") ) meta.lore(lore) - + val pdc = meta.persistentDataContainer val entityTypeKey = NamespacedKey(plugin, "absorbed_entity_type") pdc.set(entityTypeKey, PersistentDataType.STRING, entityType.name) - + val nbtKey = NamespacedKey(plugin, "absorbed_nbt") pdc.set(nbtKey, PersistentDataType.STRING, "idk") - + item.itemMeta = meta - + pet.remove() player.inventory.addItem(item) player.sendMessage(fmt("Successfully absorbed your pet!")) } - + private fun fmt(s: String): Component { - return plugin.fmt(s) + return ChatFormatting.colorConverter.convertToComponent(s, '&') } } From 5b7134575412321489b5985b88175a7045ebab25 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sun, 27 Jul 2025 06:21:18 +0200 Subject: [PATCH 08/14] chore: make lamp runtime dep using paper loader --- .../winlogon/powertools/PowerToolsLoader.kt | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt index d1e1e83..8217e06 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt @@ -3,6 +3,7 @@ package org.winlogon.powertools import io.papermc.paper.plugin.loader.PluginClasspathBuilder import io.papermc.paper.plugin.loader.PluginLoader import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver + import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.graph.Dependency import org.eclipse.aether.repository.RemoteRepository @@ -11,28 +12,34 @@ class PowerToolsLoader : PluginLoader { override fun classloader(classpathBuilder: PluginClasspathBuilder) { val resolver = MavenLibraryResolver() - resolver.addRepository( - RemoteRepository.Builder( - "central", - "default", - MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR - ).build() + val resolvers = mapOf( + "central" to MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR, + "winlogon-code" to "https://maven.winlogon.org/releases" ) - resolver.addRepository( - RemoteRepository.Builder( - "winlogon-code", - "default", - "https://maven.winlogon.org/releases" - ).build() + resolvers.forEach { (name, url) -> + resolver.addRepository( + RemoteRepository.Builder(name, "default", url).build() + ) + } + + val lampVersion = "4.0.0-rc.12" + val dependencies = mapOf( + "org.winlogon:retrohue" to "0.1.1", + "org.winlogon:asynccraftr" to "0.1.1", + "io.github.revxrsal:lamp.common" to lampVersion, + "io.github.revxrsal:lamp.bukkit" to lampVersion, + "io.github.revxrsal:lamp.brigadier" to lampVersion ) - resolver.addDependency( - Dependency( - DefaultArtifact("org.winlogon:retrohue:0.1.1"), - null + dependencies.forEach { (artifactId, version) -> + resolver.addDependency( + Dependency( + DefaultArtifact("$artifactId:$version"), + null + ) ) - ) + } classpathBuilder.addLibrary(resolver) } From 3cc9ee753094f7c464ea0004fed98a61cc76f9c8 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sun, 27 Jul 2025 06:21:54 +0200 Subject: [PATCH 09/14] chore(fmt): ditch translateColor codes for fmtter --- .../kotlin/org/winlogon/powertools/ChatFormatting.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt b/src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt index a7769b5..12ca938 100644 --- a/src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt +++ b/src/main/kotlin/org/winlogon/powertools/ChatFormatting.kt @@ -7,14 +7,13 @@ import org.bukkit.command.CommandSender object ChatFormatting { private val miniMessage = MiniMessage.miniMessage() - private val colorConverter = RetroHue(miniMessage) - - fun translateLegacyCodes(msg: String): Component { - return colorConverter.convertToComponent(msg, '&') - } + val colorConverter = RetroHue(miniMessage) fun sendError(target: CommandSender, err: String) { - target.sendMessage(translateLegacyCodes("<#F93822>Error&7: ${sentenceCase(err)}")) + val formattedMessage = colorConverter.convertToComponent( + "<#F93822>Error&7: ${sentenceCase(err)}", '&' + ) + target.sendMessage(formattedMessage) } private fun sentenceCase(input: String): String { From dee540bdd04d8ad01c565f0132aabfbc9f42eaf7 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sun, 27 Jul 2025 06:22:40 +0200 Subject: [PATCH 10/14] feat: use MM placeholders and add edge case checks --- .../winlogon/powertools/PowerToolsPlugin.kt | 98 ++++++++++++------- 1 file changed, 60 insertions(+), 38 deletions(-) diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt index ce054b1..a4b4341 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt @@ -14,13 +14,15 @@ import revxrsal.commands.bukkit.actor.BukkitCommandActor import revxrsal.commands.bukkit.annotation.CommandPermission import net.kyori.adventure.audience.Audience +import net.kyori.adventure.key.Key import net.kyori.adventure.text.Component +import net.kyori.adventure.text.format.NamedTextColor import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer -import net.kyori.adventure.key.Key import org.bukkit.Bukkit +import org.bukkit.GameMode import org.bukkit.Material import org.bukkit.attribute.Attribute import org.bukkit.command.CommandSender @@ -32,6 +34,8 @@ import org.bukkit.inventory.ItemStack import org.bukkit.inventory.meta.EnchantmentStorageMeta import org.bukkit.plugin.java.JavaPlugin import org.winlogon.powertools.suggestions.EnchantmentSuggestions +import org.winlogon.asynccraftr.AsyncCraftr + import io.papermc.paper.datacomponent.DataComponentTypes import io.papermc.paper.registry.RegistryAccess import io.papermc.paper.registry.RegistryKey @@ -44,12 +48,17 @@ class PowerToolsPlugin : JavaPlugin() { private lateinit var absorbAnimal: AbsorbAnimal private lateinit var lamp: Lamp private val romanNumeralRegex = """^(?=.)M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$""".toRegex() - + override fun onEnable() { config = loadConfig() absorbAnimal = AbsorbAnimal(this) + + val sudoCommands = SudoCommands(this) lamp = BukkitLamp.builder(this).build() - lamp.register(this) + lamp.apply { + register(this@PowerToolsPlugin) + register(sudoCommands) + } } private fun loadConfig(): Configuration { @@ -77,12 +86,12 @@ class PowerToolsPlugin : JavaPlugin() { @Command("broadcast", "bc") fun broadcast( - actor: BukkitCommandActor, + actor: BukkitCommandActor, @Named("message") message: String ) { val formattedMessage = "[Broadcast] " val messageComponent = Placeholder.component("message", Component.text(message)) - + Bukkit.getOnlinePlayers().forEach { it.sendRichMessage(formattedMessage, messageComponent) } if (actor.sender() is ConsoleCommandSender) { actor.sender().sendRichMessage(formattedMessage, messageComponent) @@ -96,7 +105,7 @@ class PowerToolsPlugin : JavaPlugin() { val inv = player.inventory val hand = inv.itemInMainHand val helmet = inv.helmet - + if (helmet != null) { inv.helmet = hand inv.setItemInMainHand(helmet) @@ -105,14 +114,14 @@ class PowerToolsPlugin : JavaPlugin() { inv.helmet = hand inv.setItemInMainHand(null) } - + player.updateInventory() player.sendRichMessage("Your held item is now on your head!") } @Command("invsee") fun invsee( - actor: BukkitCommandActor, + actor: BukkitCommandActor, @Named("target") target: Player ) { if (target.name == actor.name()) { @@ -129,12 +138,12 @@ class PowerToolsPlugin : JavaPlugin() { val targetInv = target.inventory val inventorySize = maxOf(45, targetInv.size) - + val wrapper = Bukkit.createInventory(null, inventorySize) wrapper.contents = targetInv.contents - + player.openInventory(wrapper) - + // TODO: sync changes back into target’s inventory when closing widget } @@ -145,24 +154,24 @@ class PowerToolsPlugin : JavaPlugin() { @Command("smite") fun smite( - actor: BukkitCommandActor, + actor: BukkitCommandActor, @Named("target") target: Player ) { + val player = actor.sender() target.takeIf { it.isOnline }?.let { tgt -> try { tgt.world.strikeLightning(target.location) - actor.sender().sendMessage(fmt("&7You have smitten &3${target.name}!")) - target.sendMessage(fmt("&7You have been smitten by &3a mighty force&7!")) + player.sendRichMessage("You have smitten ${target.name}!") + target.sendRichMessage("You have been smitten by a mighty force!") } catch (e: Exception) { - ChatFormatting.sendError(actor.sender(), "failed to smite player") + ChatFormatting.sendError(player, "failed to smite player - ${e.message}") } - } ?: ChatFormatting.sendError(actor.sender(), "player not found or offline") + } ?: ChatFormatting.sendError(player, "player not found or offline") } - @Subcommand("sudo") @Command("sudo") class SudoCommands(private val plugin: PowerToolsPlugin) { - @Subcommand("command", "cmd") + @Subcommand("cmd") fun sudoCommand( actor: BukkitCommandActor, @Named("target") target: Player, @@ -172,10 +181,10 @@ class PowerToolsPlugin : JavaPlugin() { ChatFormatting.sendError(actor.sender(), "player not found or offline") return } - target.scheduler.execute(plugin, Runnable { target.chat("/${command.trim()}") }, null, 0L) + AsyncCraftr.runEntityTask(plugin, target, Runnable { target.chat("/${command.trim()}") }) } - @Subcommand("chat") + @Subcommand("echo") fun sudoChat( actor: BukkitCommandActor, @Named("target") target: Player, @@ -196,23 +205,23 @@ class PowerToolsPlugin : JavaPlugin() { val inventory = player.inventory val itemHand = inventory.itemInMainHand - + if (itemHand.type == Material.ENCHANTED_BOOK) { ChatFormatting.sendError(player, "the item can't be an enchanted book") return } - + if (itemHand.type == Material.AIR) { ChatFormatting.sendError(player, "you must be holding an item") return } - + val enchantments = itemHand.enchantments if (enchantments.isEmpty()) { ChatFormatting.sendError(player, "this item has no enchantments to split") return } - + val cost = (config.unenchant.basePrice * enchantments.size).roundToInt() if (player.totalExperience < cost) { ChatFormatting.sendError(player, "you need at least $cost XP to split these enchantments") @@ -230,16 +239,20 @@ class PowerToolsPlugin : JavaPlugin() { val bookMeta = book.itemMeta as EnchantmentStorageMeta bookMeta.addStoredEnchant(ench, level, true) book.itemMeta = bookMeta - + if (inventory.firstEmpty() == -1) { player.world.dropItemNaturally(player.location, book) } else { inventory.addItem(book) } } - + player.updateInventory() - player.sendMessage(fmt("&7Successfully split &3${enchantments.size} &7enchantment(s) for &2$cost XP.")) + player.sendRichMessage( + "Successfully split enchantment(s) for XP.", + Placeholder.component("enchantments", Component.text(enchantments.size.toString(), NamedTextColor.DARK_AQUA)), + Placeholder.component("cost", Component.text(cost.toString(), NamedTextColor.GREEN)) + ) } @Command("fly") @@ -249,9 +262,14 @@ class PowerToolsPlugin : JavaPlugin() { val toggledFly = !canFly val statusMessage = if (toggledFly) "enabled" else "disabled" - val color = if (toggledFly) "dark_aqua" else "red" - val playerName = "${player.name}" - + val color = if (toggledFly) "green" else "red" + val playerName = "${player.name}" + + if (player.gameMode == GameMode.CREATIVE) { + player.allowFlight = true + ChatFormatting.sendError(player, "flying is always disabled in creative mode. Keeping fly enabled") + return + } player.allowFlight = toggledFly player.sendRichMessage("Fly <$color>$statusMessage for $playerName.") } @@ -262,6 +280,8 @@ class PowerToolsPlugin : JavaPlugin() { @SuggestWith(EnchantmentSuggestions::class) @Named("enchantment") enchant: String, @Named("level") level: Int ) { + // this should be precomputed somewhere + val unsafeEnchantsPrefix = ChatFormatting.colorConverter.convertToComponent("&8[&5UE&8]") // context val registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT) val typedKey = TypedKey.create(RegistryKey.ENCHANTMENT, Key.key("minecraft:$enchant")) @@ -282,7 +302,7 @@ class PowerToolsPlugin : JavaPlugin() { ChatFormatting.sendError(player, "you must be holding an item to enchant") return } - + item.addUnsafeEnchantment(enchantment, level) player.updateInventory() @@ -297,8 +317,15 @@ class PowerToolsPlugin : JavaPlugin() { } } - val prefix = "&8[&5UE&8]" - player.sendMessage(fmt("$prefix Applied $finalDisplayName at level $level.")) + val finalDisplayNameComponent = Component.text(finalDisplayName, NamedTextColor.DARK_AQUA) + val levelComponent = Component.text(level.toString(), NamedTextColor.DARK_GREEN) + + player.sendRichMessage( + " Applied at level .", + Placeholder.component("prefix", unsafeEnchantsPrefix), + Placeholder.component("ench-display-name", finalDisplayNameComponent), + Placeholder.component("level", levelComponent) + ) } @Command("heal", "h") @@ -340,11 +367,6 @@ class PowerToolsPlugin : JavaPlugin() { sender.sendRichMessage(healedMessage) } } - - fun fmt(s: String): Component { - return ChatFormatting.translateLegacyCodes(s) - } - } // Configuration classes From 74ca5d663224b0ee4f42c08d398efa82333d9de1 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sun, 27 Jul 2025 15:37:24 +0200 Subject: [PATCH 11/14] build: bump kotlin to 2.2.0, add deps, shade jar - Upgrade Kotlin plugin and stdlib to 2.2.0 - Add AsyncCraftr 0.1.0 as a compileOnly dependency - Update Gradle Shadow config to include and relocate Kotlin and Lamp libraries for shading, merging service files - Refactor PowerToolsLoader to remove hardcoded Lamp versions and fix AsyncCraftr version - Update PowerToolsPlugin broadcast command to send gray-colored messages and always log to console sender --- build.gradle.kts | 16 +++++++++++++++- .../org/winlogon/powertools/PowerToolsLoader.kt | 6 +----- .../org/winlogon/powertools/PowerToolsPlugin.kt | 7 +++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 645609d..a04a82f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,9 +2,11 @@ import java.text.SimpleDateFormat import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile import java.util.* +val kotlinVersion = "2.2.0" + plugins { id("com.gradleup.shadow") version "8.3.6" - kotlin("jvm") version "2.1.10" + kotlin("jvm") version "2.2.0" } group = "org.winlogon.powertools" @@ -68,6 +70,9 @@ val lampVersion = "4.0.0-rc.12" dependencies { compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") compileOnly("org.winlogon:retrohue:0.1.1") + compileOnly("org.winlogon:asynccraftr:0.1.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + implementation("io.github.revxrsal:lamp.common:$lampVersion") implementation("io.github.revxrsal:lamp.bukkit:$lampVersion") implementation("io.github.revxrsal:lamp.brigadier:$lampVersion") @@ -95,6 +100,15 @@ tasks.processResources { tasks.shadowJar { archiveClassifier.set("") minimize() + dependencies { + include(dependency("org.jetbrains.kotlin:kotlin-stdlib")) + include(dependency("io.github.revxrsal:lamp.common:$lampVersion")) + include(dependency("io.github.revxrsal:lamp.bukkit:$lampVersion")) + include(dependency("io.github.revxrsal:lamp.brigadier:$lampVersion")) + } + relocate("io.github.revxrsal.lamp", "${project.group}.shaded.lamp") + relocate("kotlin", "${project.group}.shaded.kotlin") + mergeServiceFiles() } tasks.jar { diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt index 8217e06..1df0a69 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt @@ -23,13 +23,9 @@ class PowerToolsLoader : PluginLoader { ) } - val lampVersion = "4.0.0-rc.12" val dependencies = mapOf( "org.winlogon:retrohue" to "0.1.1", - "org.winlogon:asynccraftr" to "0.1.1", - "io.github.revxrsal:lamp.common" to lampVersion, - "io.github.revxrsal:lamp.bukkit" to lampVersion, - "io.github.revxrsal:lamp.brigadier" to lampVersion + "org.winlogon:asynccraftr" to "0.1.0", ) dependencies.forEach { (artifactId, version) -> diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt index a4b4341..ca4082b 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt @@ -90,12 +90,10 @@ class PowerToolsPlugin : JavaPlugin() { @Named("message") message: String ) { val formattedMessage = "[Broadcast] " - val messageComponent = Placeholder.component("message", Component.text(message)) + val messageComponent = Placeholder.component("message", Component.text(message, NamedTextColor.GRAY)) Bukkit.getOnlinePlayers().forEach { it.sendRichMessage(formattedMessage, messageComponent) } - if (actor.sender() is ConsoleCommandSender) { - actor.sender().sendRichMessage(formattedMessage, messageComponent) - } + Bukkit.getConsoleSender().sendRichMessage(formattedMessage, messageComponent) } @Command("hat") @@ -285,6 +283,7 @@ class PowerToolsPlugin : JavaPlugin() { // context val registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT) val typedKey = TypedKey.create(RegistryKey.ENCHANTMENT, Key.key("minecraft:$enchant")) + val enchantment = registry.get(typedKey) ?: run { ChatFormatting.sendError(actor.sender(), "invalid enchantment, or not found") return From 3049132db066b2070c9ef30716ad595d0945fb89 Mon Sep 17 00:00:00 2001 From: winlogon Date: Sun, 27 Jul 2025 17:43:00 +0200 Subject: [PATCH 12/14] feat: add pet absorption feature using NBT-API - add NBT-API dependency and repository - implement AbsorbAnimal class to convert pets into spawn eggs with NBT data - add ClickListener to handle pet absorption interaction within 5 seconds - create a new Gradle task to generate .mojang-mapped marker resource - update PowerToolsPlugin with absorb command registering event listener and timeout --- .../org/winlogon/powertools/AbsorbAnimal.kt | 119 ++++++++++++++---- .../winlogon/powertools/PowerToolsLoader.kt | 4 +- .../winlogon/powertools/PowerToolsPlugin.kt | 13 +- 3 files changed, 108 insertions(+), 28 deletions(-) diff --git a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt index e45b253..a154fbb 100644 --- a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt +++ b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt @@ -1,19 +1,55 @@ package org.winlogon.powertools +import de.tr7zw.changeme.nbtapi.NBT +import de.tr7zw.changeme.nbtapi.NBTEntity +import de.tr7zw.changeme.nbtapi.NBTItem +import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT +import de.tr7zw.changeme.nbtapi.iface.ReadableNBT +import de.tr7zw.changeme.nbtapi.iface.ReadWriteItemNBT + import net.kyori.adventure.text.Component +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer + +import org.bukkit.Bukkit import org.bukkit.Material import org.bukkit.NamespacedKey +import org.bukkit.entity.EntityType import org.bukkit.entity.Player import org.bukkit.entity.Tameable import org.bukkit.inventory.ItemStack import org.bukkit.inventory.meta.ItemMeta +import org.bukkit.inventory.meta.SpawnEggMeta +import org.bukkit.inventory.EquipmentSlot import org.bukkit.persistence.PersistentDataType +import org.bukkit.event.player.PlayerInteractAtEntityEvent +import org.bukkit.event.EventHandler +import org.bukkit.event.Listener +import org.bukkit.event.HandlerList +import org.bukkit.plugin.Plugin + +import java.util.function.Function -class AbsorbAnimal(private val plugin: PowerToolsPlugin) { +class AbsorbAnimal(private val plugin: Plugin) { + private companion object { + private val plainSerializer = PlainTextComponentSerializer.plainText() + private val EGG_MAP: Map = Material.values() + .asSequence() + .filter { it.name.endsWith("_SPAWN_EGG") } + .mapNotNull { mat -> + // remove the suffix to get the entity name + val entityName = mat.name.removeSuffix("_SPAWN_EGG") - fun executeAbsorb(player: Player) { - val targetEntity = player.getTargetEntity(5) // 5 block range - if (targetEntity == null) { + // try to match it to EntityType + runCatching { EntityType.valueOf(entityName) } + .getOrNull() + ?.let { entityType -> entityType to mat } + } + .toMap() + } + + fun absorbPetOf(player: Player) { + // 5 block range + val targetEntity = player.getTargetEntity(5) ?: run { ChatFormatting.sendError(player, "You must be looking at a pet within 5 blocks.") return } @@ -27,34 +63,65 @@ class AbsorbAnimal(private val plugin: PowerToolsPlugin) { } private fun absorbPet(player: Player, pet: Tameable) { - val item = ItemStack(Material.STICK) - val meta = item.itemMeta - + val compound: ReadWriteNBT = NBT.get(pet, Function { nbt -> + val copy = NBT.parseNBT(nbt.toString()) + listOf("UUID", "Pos", "Dimension", "id").forEach(copy::removeKey) + copy + }) ?: run { + ChatFormatting.sendError(player, "failed to read pet data") + return + } + + val spawnEggMaterial = getEggMaterialFor(pet) ?: run { + ChatFormatting.sendError(player, "invalid pet type") + return + } + + val baseEgg = ItemStack(spawnEggMaterial) + val finalEggStack: ItemStack = NBT.modify(baseEgg, Function { itemNbt -> + val entityTag = itemNbt.getOrCreateCompound("EntityTag") + entityTag.mergeCompound(compound) + baseEgg + }) + + val meta = finalEggStack.itemMeta ?: return val entityType = pet.type - val displayName = fmt("Absorbed ${entityType.name.lowercase().replace('_', ' ')}") - meta.displayName(displayName) - - val lore = listOf( + meta.displayName(fmt("Absorbed ${entityType.name.lowercase().replace('_',' ')}")) + meta.lore(listOf( fmt("Right click to spawn"), - fmt("Pet ID: ${pet.uniqueId}") - ) - meta.lore(lore) - - val pdc = meta.persistentDataContainer - val entityTypeKey = NamespacedKey(plugin, "absorbed_entity_type") - pdc.set(entityTypeKey, PersistentDataType.STRING, entityType.name) - - val nbtKey = NamespacedKey(plugin, "absorbed_nbt") - pdc.set(nbtKey, PersistentDataType.STRING, "idk") - - item.itemMeta = meta - + fmt("Pet name: ${plainSerializer.serialize(pet.name())}"), + fmt("Pet level: ${pet.health}"), + )) + meta.persistentDataContainer.apply { + set(NamespacedKey(plugin, "absorbed_entity_type"), PersistentDataType.STRING, entityType.name) + set(NamespacedKey(plugin, "absorbed_nbt"), PersistentDataType.STRING, compound.toString()) + } + finalEggStack.itemMeta = meta + pet.remove() - player.inventory.addItem(item) - player.sendMessage(fmt("Successfully absorbed your pet!")) + player.inventory.addItem(finalEggStack) + player.sendMessage(fmt("&7Successfully absorbed your pet!")) } private fun fmt(s: String): Component { return ChatFormatting.colorConverter.convertToComponent(s, '&') } + + private fun getEggMaterialFor(pet: Tameable): Material? { + return EGG_MAP[pet.type] + } } + +class ClickListener(private val plugin: Plugin, private val player: Player) : Listener { + @EventHandler + fun onClick(event: PlayerInteractAtEntityEvent) { + if (event.player == player && event.hand == EquipmentSlot.HAND) { + player.rayTraceEntities(5)?.hitEntity.let { + if (it == event.rightClicked) { + AbsorbAnimal(plugin).absorbPetOf(player) + HandlerList.unregisterAll(this@ClickListener) + } + } + } + } + } diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt index 1df0a69..286e67c 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsLoader.kt @@ -14,7 +14,8 @@ class PowerToolsLoader : PluginLoader { val resolvers = mapOf( "central" to MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR, - "winlogon-code" to "https://maven.winlogon.org/releases" + "winlogon-code" to "https://maven.winlogon.org/releases", + "codemc" to "https://repo.codemc.io/repository/maven-public/", ) resolvers.forEach { (name, url) -> @@ -26,6 +27,7 @@ class PowerToolsLoader : PluginLoader { val dependencies = mapOf( "org.winlogon:retrohue" to "0.1.1", "org.winlogon:asynccraftr" to "0.1.0", + "de.tr7zw:item-nbt-api" to "2.15.1", ) dependencies.forEach { (artifactId, version) -> diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt index ca4082b..1600e13 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt @@ -33,6 +33,7 @@ import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack import org.bukkit.inventory.meta.EnchantmentStorageMeta import org.bukkit.plugin.java.JavaPlugin +import org.bukkit.event.HandlerList import org.winlogon.powertools.suggestions.EnchantmentSuggestions import org.winlogon.asynccraftr.AsyncCraftr @@ -42,6 +43,7 @@ import io.papermc.paper.registry.RegistryKey import io.papermc.paper.registry.TypedKey import kotlin.math.roundToInt +import java.time.Duration class PowerToolsPlugin : JavaPlugin() { private lateinit var config: Configuration @@ -147,7 +149,16 @@ class PowerToolsPlugin : JavaPlugin() { @Command("absorb") fun absorb(actor: BukkitCommandActor) { - actor.sender().sendRichMessage("Not yet implemented") + val player = actor.sender() as Player + player.sendRichMessage("You have 5 seconds to right-click your pet to absorb it.") + + val listener = ClickListener(this, player) + server.pluginManager.registerEvents(listener, this) + + AsyncCraftr.runEntityTaskLater(this, player, Runnable { + HandlerList.unregisterAll(listener) + player.sendRichMessage("Absorb window expired.") + }, Duration.ofSeconds(5)) } @Command("smite") From 6e5788c2b585c2d132e8056047aafeb9bcb8f17f Mon Sep 17 00:00:00 2001 From: winlogon Date: Sun, 27 Jul 2025 17:43:17 +0200 Subject: [PATCH 13/14] build: add NBT-API to dependencies --- build.gradle.kts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index a04a82f..241dda3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,6 +71,7 @@ dependencies { compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") compileOnly("org.winlogon:retrohue:0.1.1") compileOnly("org.winlogon:asynccraftr:0.1.0") + compileOnly("de.tr7zw:item-nbt-api:2.15.1") implementation("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") implementation("io.github.revxrsal:lamp.common:$lampVersion") @@ -97,6 +98,19 @@ tasks.processResources { } } +tasks.register("createMojangMapped") { + from(layout.projectDirectory.file("empty-marker")) + into(layout.buildDirectory.dir("generated-resources/META-INF")) + rename { ".mojang-mapped" } +} + +tasks.processResources { + dependsOn("createMojangMapped") + from(layout.buildDirectory.dir("generated-resources/META-INF")) { + into("META-INF") + } +} + tasks.shadowJar { archiveClassifier.set("") minimize() From 420ec084266732e2cbad00c2a45d6de18015d03d Mon Sep 17 00:00:00 2001 From: winlogon Date: Mon, 28 Jul 2025 01:17:52 +0200 Subject: [PATCH 14/14] fix: handle NBT data properly --- .../org/winlogon/powertools/AbsorbAnimal.kt | 35 +++++++++++++++---- .../winlogon/powertools/PowerToolsPlugin.kt | 6 ++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt index a154fbb..ed14356 100644 --- a/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt +++ b/src/main/kotlin/org/winlogon/powertools/AbsorbAnimal.kt @@ -28,6 +28,7 @@ import org.bukkit.event.HandlerList import org.bukkit.plugin.Plugin import java.util.function.Function +import java.util.UUID class AbsorbAnimal(private val plugin: Plugin) { private companion object { @@ -63,21 +64,43 @@ class AbsorbAnimal(private val plugin: Plugin) { } private fun absorbPet(player: Player, pet: Tameable) { - val compound: ReadWriteNBT = NBT.get(pet, Function { nbt -> - val copy = NBT.parseNBT(nbt.toString()) - listOf("UUID", "Pos", "Dimension", "id").forEach(copy::removeKey) - copy + val nbtString = NBT.get(pet, Function { nbt -> + nbt.toString() }) ?: run { ChatFormatting.sendError(player, "failed to read pet data") return } - + + Bukkit.getLogger().info("${player.name}'s pet NBT data is: $nbtString") + val spawnEggMaterial = getEggMaterialFor(pet) ?: run { ChatFormatting.sendError(player, "invalid pet type") return } - + val baseEgg = ItemStack(spawnEggMaterial) + val compound = NBT.parseNBT(nbtString) + + // remove unnecessary keys + listOf("UUID", "Pos", "Dimension", "id").forEach(compound::removeKey) + + val ownerIntArray = compound.getIntArray("Owner") + if (ownerIntArray != null && ownerIntArray.size == 4) { + // convert int array to UUID + val msb = ownerIntArray[0].toLong() shl 32 or (ownerIntArray[1].toLong() and 0xFFFFFFFFL) + val lsb = ownerIntArray[2].toLong() shl 32 or (ownerIntArray[3].toLong() and 0xFFFFFFFFL) + val uuid = UUID(msb, lsb) + compound.removeKey("Owner") + compound.setString("OwnerUUID", uuid.toString()) + } + + val petName = pet.customName() + if (petName != null) { + val customName = plainSerializer.serialize(petName) + val jsonName = "{\"text\":\"${customName}\"}" + compound.setString("CustomName", jsonName) + } + val finalEggStack: ItemStack = NBT.modify(baseEgg, Function { itemNbt -> val entityTag = itemNbt.getOrCreateCompound("EntityTag") entityTag.mergeCompound(compound) diff --git a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt index 1600e13..80f2cd7 100644 --- a/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt +++ b/src/main/kotlin/org/winlogon/powertools/PowerToolsPlugin.kt @@ -44,6 +44,7 @@ import io.papermc.paper.registry.TypedKey import kotlin.math.roundToInt import java.time.Duration +import de.tr7zw.changeme.nbtapi.NBT class PowerToolsPlugin : JavaPlugin() { private lateinit var config: Configuration @@ -52,6 +53,11 @@ class PowerToolsPlugin : JavaPlugin() { private val romanNumeralRegex = """^(?=.)M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$""".toRegex() override fun onEnable() { + if (!NBT.preloadApi()) { + logger.warning("NBT API not found") + server.pluginManager.disablePlugin(this) + return + } config = loadConfig() absorbAnimal = AbsorbAnimal(this)