diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..0993a0f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,18 @@ +steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + + - name: Build with Gradle + run: ./gradlew build + + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: Package + path: build/libs \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b1dff0d --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Kotlin ### +.kotlin + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/discord.xml b/.idea/discord.xml new file mode 100644 index 0000000..30bab2a --- /dev/null +++ b/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..9d62f93 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..d4b7acc --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..5b1ac2a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..931b96c --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..1bba050 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,29 @@ +val kotlinVersion: String by project +val mcVersion: String by project + +plugins { + kotlin("jvm") version "2.0.20" + id("com.gradleup.shadow") version "8.3.3" +} + +group = "org.elliotnash.coordsoffline" +version = "2.0.0" + +repositories { + mavenCentral() + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") +} + +dependencies { + testImplementation(kotlin("test")) + implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") + + compileOnly("org.spigotmc:spigot-api:$mcVersion+") +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(21) +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..16fe563 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +kotlinVersion=2.0.20 +mcVersion=1.21.1 +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..866dec2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 09 18:37:41 PDT 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# 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=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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 + +@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=. +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%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..a0efb04 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,4 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} +rootProject.name = "CoordsOffline" diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/CoordsOfflinePlugin.kt b/src/main/kotlin/org/elliotnash/coordsoffline/CoordsOfflinePlugin.kt new file mode 100644 index 0000000..59fe197 --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/CoordsOfflinePlugin.kt @@ -0,0 +1,14 @@ +package org.elliotnash.coordsoffline + +import org.bukkit.plugin.java.JavaPlugin +import org.elliotnash.coordsoffline.command.Coords +import org.elliotnash.coordsoffline.command.OfflineTP + +class CoordsOfflinePlugin : JavaPlugin() { + override fun onEnable() { + val offlinePlayerLoader = getOfflinePlayerLoader() + + getCommand("coords")?.setExecutor(Coords(offlinePlayerLoader)) + getCommand("otp")?.setExecutor(OfflineTP(offlinePlayerLoader)) + } +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/OfflinePlayerLoader.kt b/src/main/kotlin/org/elliotnash/coordsoffline/OfflinePlayerLoader.kt new file mode 100644 index 0000000..d044960 --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/OfflinePlayerLoader.kt @@ -0,0 +1,40 @@ +package org.elliotnash.coordsoffline + +import org.bukkit.Bukkit +import org.bukkit.OfflinePlayer +import org.bukkit.entity.Player +import org.elliotnash.coordsoffline.nms.v1_17_R1 +import org.elliotnash.coordsoffline.nms.v1_19_R1 +import org.elliotnash.coordsoffline.nms.v1_20_R2 + +interface OfflinePlayerLoader { + fun loadOfflinePlayer(offlinePlayer: OfflinePlayer): Player? + fun loadPlayer(player: OfflinePlayer): Player? { + return player.player ?: loadOfflinePlayer(player) + } +} + +fun getOfflinePlayerLoader(): OfflinePlayerLoader { + val version = getMCVersion() + + return when { + // <1.17.0 is untested + version < MCVersion(1, 17, 0) -> { + Bukkit.getLogger().warning("Untested MC Versions '$version', using v1_17_R1 adapter!") + v1_17_R1() + } + // 1.17.0 - 1.18.2 -> v1_17_R1 + version <= MCVersion(1, 18, 2) -> v1_17_R1() + // 1.19.0 - 1.19.2 -> v1_19_R1 + version <= MCVersion(1, 19, 2) -> v1_19_R1() + // 1.19.3 - 1.20.1 -> v1_17_R1 + version <= MCVersion(1, 20, 1) -> v1_17_R1() + // 1.20.2 - 1.21.1 -> v1_20_R2 + version <= MCVersion(1, 21, 1) -> v1_20_R2() + // >1.21.1 is untested + else -> { + Bukkit.getLogger().warning("Untested MC Versions '$version', using v1_20_R2 adapter!") + v1_20_R2() + } + } +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/Util.kt b/src/main/kotlin/org/elliotnash/coordsoffline/Util.kt new file mode 100644 index 0000000..b4f4d9c --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/Util.kt @@ -0,0 +1,103 @@ +package org.elliotnash.coordsoffline + +import org.bukkit.Bukkit + +//fun getNMSVersion(): NMSVersion { +// Bukkit.getLogger().info("GETTING VERSION") +// Bukkit.getLogger().info(Bukkit.getServer()::class.java.getPackage().name) +// val version = Bukkit.getServer()::class.java.getPackage().name.split("\\.")[3] +// return NMSVersion.fromString(version) +//} +// +//class InvalidNMSVersion(message: String) : Exception(message) +// +//class NMSVersion( +// val major: Int, +// val minor: Int, +// val revision: Int +//) : Comparable { +// companion object { +// private val nmsVersionRegex = Regex("""v(\d*)_(\d*)_R(\d*)""") +// fun fromString(version: String): NMSVersion { +// val match = nmsVersionRegex.matchEntire(version) +// if (match == null) { +// throw InvalidNMSVersion("Invalid NMS version: $version!") +// } +// return NMSVersion(match.groupValues[0].toInt(), match.groupValues[1].toInt(), match.groupValues[2].toInt()) +// } +// } +// +// override fun compareTo(other: NMSVersion): Int { +// if (major > other.major) return 1 +// if (major < other.major) return -1 +// if (minor > other.minor) return 1 +// if (minor < other.minor) return -1 +// if (revision > other.revision) return 1 +// if (revision < other.revision) return -1 +// return 0 +// } +// override fun equals(other: Any?): Boolean { +// if (other is NMSVersion) { +// return major == other.major && minor == other.minor && revision == other.revision +// } +// return false +// } +// override fun hashCode(): Int { +// return major * 32194 + minor * 12137 + revision * 23109 +// } +// override fun toString(): String { +// return "v${major}_${minor}_R${revision}" +// } +//} + +fun getMCVersion(): MCVersion { + val version = Bukkit.getBukkitVersion().split("-")[0] + return MCVersion.fromString(version) +} + +class InvalidMCVersion(message: String) : Exception(message) + +class MCVersion( + val major: Int, + val minor: Int, + val patch: Int +) : Comparable { + companion object { + fun fromString(version: String): MCVersion { + val el = version.split(".") + try { + if (el.size == 2) { + return MCVersion(el[0].toInt(), el[1].toInt(), 0) + } + if (el.size == 3) { + return MCVersion(el[0].toInt(), el[1].toInt(), el[2].toInt()) + } + } catch (_: NumberFormatException) { + throw InvalidMCVersion("Invalid MC version: $version!") + } + throw InvalidMCVersion("Invalid MC version: $version!") + } + } + + override fun compareTo(other: MCVersion): Int { + if (major > other.major) return 1 + if (major < other.major) return -1 + if (minor > other.minor) return 1 + if (minor < other.minor) return -1 + if (patch > other.patch) return 1 + if (patch < other.patch) return -1 + return 0 + } + override fun equals(other: Any?): Boolean { + if (other is MCVersion) { + return major == other.major && minor == other.minor && patch == other.patch + } + return false + } + override fun hashCode(): Int { + return major * 43981 + minor * 19284 + patch * 93029 + } + override fun toString(): String { + return "${major}.${minor}.${patch}" + } +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/command/Coords.kt b/src/main/kotlin/org/elliotnash/coordsoffline/command/Coords.kt new file mode 100644 index 0000000..40644e2 --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/command/Coords.kt @@ -0,0 +1,90 @@ +package org.elliotnash.coordsoffline.command + +import net.md_5.bungee.api.chat.ClickEvent +import net.md_5.bungee.api.chat.ComponentBuilder +import net.md_5.bungee.api.chat.HoverEvent +import net.md_5.bungee.api.chat.TextComponent +import org.bukkit.Bukkit +import org.bukkit.ChatColor +import org.bukkit.Location +import org.bukkit.command.Command +import org.bukkit.command.CommandSender +import org.bukkit.command.TabExecutor +import org.bukkit.entity.Player +import org.bukkit.util.StringUtil +import org.elliotnash.coordsoffline.OfflinePlayerLoader +import java.util.* + +class Coords(private val offlinePlayerLoader: OfflinePlayerLoader) : TabExecutor { + override fun onTabComplete( + sender: CommandSender, + command: Command, + alias: String, + args: Array + ): List { + if (sender is Player) { + if (args.size < 2) { + val playerNames: MutableList = LinkedList() + for (player in Bukkit.getOfflinePlayers()) { + if (player.name != null) { + playerNames.add(player.name!!) + } + } + return StringUtil.copyPartialMatches>( + args[0], + playerNames, + ArrayList() + ) + } + } + return emptyList() + } + + override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { + if (args.size == 1) { + // gets uuid and offline player of target, including bedrock players + + val offlinePlayer = Bukkit.getOfflinePlayer(args[0]) + if (!offlinePlayer.hasPlayedBefore()) { + sender.sendMessage(ChatColor.RED.toString() + "This player has not played before!") + return true + } + + // Loads player if offline and get coords + val player = offlinePlayerLoader.loadPlayer(offlinePlayer) + if (player != null) { + val onlineLocation = player.getLocation() + + //sends coords to sender + sender.spigot().sendMessage(createComponent(args[0], onlineLocation)) + return true + } else { + sender.sendMessage("Target is null") + } + } + return false + } + + companion object { + fun createComponent(name: String?, location: Location): TextComponent { + //Creates main text components + val mainComponent = + TextComponent(name + " is in world " + location.getWorld()!!.name + " with location ") + mainComponent.color = ChatColor.AQUA.asBungee() + + val locationComponent = + TextComponent(location.x.toString() + ", " + location.y + ", " + location.z) + // Add a click event to the component. + locationComponent.clickEvent = ClickEvent(ClickEvent.Action.RUN_COMMAND, "/otp $name") + locationComponent.hoverEvent = HoverEvent( + HoverEvent.Action.SHOW_TEXT, ComponentBuilder("Click to teleport!").color( + ChatColor.GOLD.asBungee() + ).create() + ) + locationComponent.color = ChatColor.LIGHT_PURPLE.asBungee() + //adds location component to main + mainComponent.addExtra(locationComponent) + return mainComponent + } + } +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/command/OfflineTP.kt b/src/main/kotlin/org/elliotnash/coordsoffline/command/OfflineTP.kt new file mode 100644 index 0000000..5f1ebea --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/command/OfflineTP.kt @@ -0,0 +1,171 @@ +package org.elliotnash.coordsoffline.command + +import org.bukkit.Bukkit +import org.bukkit.Location +import org.bukkit.command.Command +import org.bukkit.command.CommandSender +import org.bukkit.command.TabExecutor +import org.bukkit.entity.Player +import org.elliotnash.coordsoffline.OfflinePlayerLoader +import java.util.* +import kotlin.math.min + +interface TpArg + +data class TpCoordArg( + val coords: Array +) : TpArg { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + other as TpCoordArg + return coords.contentEquals(other.coords) + } + override fun hashCode(): Int { + return coords.contentHashCode() + } +} + +data class TpPlayerArg( + val name: String +) : TpArg + +class OfflineTP(private val offlinePlayerLoader: OfflinePlayerLoader) : TabExecutor { + private fun parseCoord(coord: String): Double? { + return try { + if (coord == "~") { + null + } else { + coord.toDouble() + } + } catch (_: NumberFormatException) { + null + } + } + + private fun parseArgs(args: Array): List? { + val out: MutableList = ArrayList(2) + var i = 0 + while (i < args.size) { + if (out.size >= 2) { + return null + } + var coord = parseCoord(args[i]) + if (coord == null) { + if (!out.isEmpty()) { + if (out[0] is TpCoordArg) { + return null + } + } + out.add(TpPlayerArg(args[i])) + } else { + val coords = arrayOf(coord, null, null) + var c = 1 + val end = min((i + 2).toDouble(), args.size.toDouble()).toInt() + while (i < end) { + coord = parseCoord(args[i]) + if (coord == null) { + return null + } + coords[c++] = coord + ++i + } + out.add(TpCoordArg(coords)) + } + ++i + } + return out + } + + override fun onTabComplete( + sender: CommandSender, + command: Command, + alias: String, + args: Array + ): List { + if (sender is Player) { + val parg = parseArgs(args) + if (parg != null) { + if (parg.isEmpty()) { + return Bukkit.getOfflinePlayers().map{ it.name }.filterNotNull() + } else { + val last = parg[parg.size - 1] + if (last is TpPlayerArg) { + return Bukkit.getOfflinePlayers().map{ it.name }.filterNotNull().filter{ it.startsWith(last.name ?: "")} + } + } + } + } + return emptyList() + } + + override fun onCommand(sender: CommandSender, command: Command, alias: String, args: Array): Boolean { + val pargs = parseArgs(args) + if (pargs == null) { + return false + } + var source: Player? = null + var target: Location? = null + if (pargs.size == 1) { + if (sender !is Player) { + return false + } + source = sender + val targetArg = pargs[0] + if (targetArg is TpPlayerArg) { + val targetPlayer = offlinePlayerLoader.loadPlayer(Bukkit.getOfflinePlayer(targetArg.name)) + if (targetPlayer == null) { + return false + } + target = targetPlayer.getLocation() + } else if (targetArg is TpCoordArg) { + for (c in targetArg.coords) { + if (c == null) { + return false + } + } + target = Location( + source.world, + (targetArg.coords[0] ?: source.location.x), + (targetArg.coords[1] ?: source.location.y), + (targetArg.coords[2] ?: source.location.z), + source.getLocation().yaw, + source.getLocation().pitch + ) + } + } else { + source = offlinePlayerLoader.loadPlayer(Bukkit.getOfflinePlayer((pargs[0] as TpPlayerArg).name)) + if (source == null) { + return false + } + val targetArg = pargs[1] + if (targetArg is TpPlayerArg) { + val targetPlayer = offlinePlayerLoader.loadPlayer(Bukkit.getOfflinePlayer(targetArg.name)) + if (targetPlayer == null) { + return false + } + target = targetPlayer.location + } else if (targetArg is TpCoordArg) { + for (c in targetArg.coords) { + if (c == null) { + return false + } + } + target = Location( + source.world, + (targetArg.coords[0] ?: source.location.x), + (targetArg.coords[1] ?: source.location.y), + (targetArg.coords[2] ?: source.location.z), + source.getLocation().yaw, + source.getLocation().pitch + ) + } + } + if (target == null) { + return false + } + + source.teleport(target) + return true + } +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_17_R1.kt b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_17_R1.kt new file mode 100644 index 0000000..d21e1c5 --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_17_R1.kt @@ -0,0 +1,27 @@ +package org.elliotnash.coordsoffline.nms + +import org.bukkit.OfflinePlayer +import org.bukkit.entity.Player +import org.elliotnash.coordsoffline.OfflinePlayerLoader + +class v1_17_R1 : OfflinePlayerLoader, v1_17_R1_v1_21_R1_Base() { + // ServerPlayer(minecraftServer: MinecraftServer, worldServer: ServerLevel, gameProfile: GameProfile) + private val serverPlayerConstructor = serverPlayerClass.getConstructor(minecraftServerClass, serverLevelClass, gameProfileClass) + + override fun loadOfflinePlayer(offlinePlayer: OfflinePlayer): Player? { + // new GameProfile(offlinePlayer.uniqueId, offlinePlayer.name) + val gameProfile = gameProfileConstructor.newInstance(offlinePlayer.uniqueId, offlinePlayer.name) + // new ServerPlayer(server, level, gameProfile) + val serverPlayer = serverPlayerConstructor.newInstance( + minecraftServerInstance, + // minecraftServerInstance.getLevel(Level.OVERWORLD) + minecraftServerGetLevelMethod.invoke(minecraftServerInstance, levelOVERWORLDField.get(null)), + gameProfile + ) + + // serverPlayer.getBukkitEntity() + val player = serverPlayerGetBukkitEntity.invoke(serverPlayer) as Player? + player?.loadData() + return player + } +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_17_R1_v1_21_R1_Base.kt b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_17_R1_v1_21_R1_Base.kt new file mode 100644 index 0000000..d7b2fef --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_17_R1_v1_21_R1_Base.kt @@ -0,0 +1,31 @@ +package org.elliotnash.coordsoffline.nms + +import java.util.UUID + +abstract class v1_17_R1_v1_21_R1_Base { + // ResourceKey class + val resourceKeyClass = Class.forName("net.minecraft.resources.ResourceKey") + + // MinecraftServer.getServer() method + val minecraftServerClass = Class.forName("net.minecraft.server.MinecraftServer") + val minecraftServerGetServerMethod = minecraftServerClass.getMethod("getServer") + val minecraftServerGetLevelMethod = minecraftServerClass.getMethod("getLevel", resourceKeyClass) + + // GameProfile(id: UUID, name: String) constructor + val gameProfileClass = Class.forName("com.mojang.authlib.GameProfile") + val gameProfileConstructor = gameProfileClass.getConstructor(UUID::class.java, String::class.java) + + // Level class + val levelClass = Class.forName("net.minecraft.world.level.Level") + val levelOVERWORLDField = levelClass.getField("OVERWORLD") + + // ServerLevel class + val serverLevelClass = Class.forName("net.minecraft.server.level.ServerLevel") + + // ServerPlayer class + val serverPlayerClass = Class.forName("net.minecraft.server.level.ServerPlayer") + val serverPlayerGetBukkitEntity = serverPlayerClass.getMethod("getBukkitEntity") + + // Get nms MinecraftServer instance + val minecraftServerInstance = minecraftServerGetServerMethod.invoke(null) +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_19_R1.kt b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_19_R1.kt new file mode 100644 index 0000000..fd7484e --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_19_R1.kt @@ -0,0 +1,31 @@ +package org.elliotnash.coordsoffline.nms + +import org.bukkit.OfflinePlayer +import org.bukkit.entity.Player +import org.elliotnash.coordsoffline.OfflinePlayerLoader + +class v1_19_R1 : OfflinePlayerLoader, v1_17_R1_v1_21_R1_Base() { + // ProfilePublicKey + private val profilePublicKeyClass = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey") + + // ServerPlayer(minecraftServer: MinecraftServer, worldServer: ServerLevel, gameProfile: GameProfile, profilePublicKey: ProfilePublicKey) + private val serverPlayerConstructor = serverPlayerClass.getConstructor(minecraftServerClass, serverLevelClass, gameProfileClass, profilePublicKeyClass) + + override fun loadOfflinePlayer(offlinePlayer: OfflinePlayer): Player? { + // new GameProfile(offlinePlayer.uniqueId, offlinePlayer.name) + val gameProfile = gameProfileConstructor.newInstance(offlinePlayer.uniqueId, offlinePlayer.name) + // new ServerPlayer(server, level, gameProfile, null) + val serverPlayer = serverPlayerConstructor.newInstance( + minecraftServerInstance, + // minecraftServerInstance.getLevel(Level.OVERWORLD) + minecraftServerGetLevelMethod.invoke(minecraftServerInstance, levelOVERWORLDField.get(null)), + gameProfile, + null + ) + + // serverPlayer.getBukkitEntity() + val player = serverPlayerGetBukkitEntity.invoke(serverPlayer) as Player? + player?.loadData() + return player + } +} diff --git a/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_20_R2.kt b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_20_R2.kt new file mode 100644 index 0000000..8bb55f5 --- /dev/null +++ b/src/main/kotlin/org/elliotnash/coordsoffline/nms/v1_20_R2.kt @@ -0,0 +1,62 @@ +package org.elliotnash.coordsoffline.nms + +import org.bukkit.OfflinePlayer +import org.bukkit.entity.Player +import org.elliotnash.coordsoffline.OfflinePlayerLoader +import java.util.UUID + +class v1_20_R2 : OfflinePlayerLoader { + // ResourceKey class + val resourceKeyClass = Class.forName("net.minecraft.resources.ResourceKey") + + // MinecraftServer.getServer() method + val minecraftServerClass = Class.forName("net.minecraft.server.MinecraftServer") + val minecraftServerGetServerMethod = minecraftServerClass.getMethod("getServer") + val minecraftServerGetLevelMethod = minecraftServerClass.getMethod("getLevel", resourceKeyClass) + + // GameProfile(id: UUID, name: String) constructor + val gameProfileClass = Class.forName("com.mojang.authlib.GameProfile") + val gameProfileConstructor = gameProfileClass.getConstructor(UUID::class.java, String::class.java) + + // Level class + val levelClass = Class.forName("net.minecraft.world.level.Level") + val levelOVERWORLDField = levelClass.getField("OVERWORLD") + + // ServerLevel class + val serverLevelClass = Class.forName("net.minecraft.server.level.ServerLevel") + + // ServerPlayer class + val serverPlayerClass = Class.forName("net.minecraft.server.level.ServerPlayer") + val serverPlayerGetBukkitEntity = serverPlayerClass.getMethod("getBukkitEntity") + + // Get nms MinecraftServer instance + val minecraftServerInstance = minecraftServerGetServerMethod.invoke(null) + + // ClientInformation.createDefault() method + private val clientInformationClass = Class.forName("net.minecraft.server.level.ClientInformation") + private val clientInformationCreateDefaultMethod = clientInformationClass.getMethod("createDefault") + + // ServerPlayer(minecraftServer: MinecraftServer, worldServer: ServerLevel, gameProfile: GameProfile, clientInformation: ClientInformation) + private val serverPlayerConstructor = serverPlayerClass.getConstructor(minecraftServerClass, serverLevelClass, gameProfileClass, clientInformationClass) + + override fun loadOfflinePlayer(offlinePlayer: OfflinePlayer): Player? { + // new GameProfile(offlinePlayer.uniqueId, offlinePlayer.name) + val gameProfile = gameProfileConstructor.newInstance(offlinePlayer.uniqueId, offlinePlayer.name) + // new ServerPlayer(server, level, gameProfile, clientInformation) + val serverPlayer = serverPlayerConstructor.newInstance( + minecraftServerInstance, + // minecraftServerInstance.getLevel(Level.OVERWORLD) + minecraftServerGetLevelMethod.invoke(minecraftServerInstance, levelOVERWORLDField.get(null)), + gameProfile, + clientInformationCreateDefaultMethod.invoke(null) + ) + + // String test = "HI"; + val test = 3 + + // serverPlayer.getBukkitEntity() + val player = serverPlayerGetBukkitEntity.invoke(serverPlayer) as Player? + player?.loadData() + return player + } +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..c9e0c27 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,22 @@ +name: CoordsOffline +version: 2.0.0 +main: org.elliotnash.coordsoffline.CoordsOfflinePlugin +api-version: 1.21 +author: Elliot +description: A plugin to view the coordinates of a player who's offline or online. +commands: + coords: + usage: /coords player + description: Find the coords of a player + permission: coordsoffline.use + otp: + usage: /otp [source] target + description: Teleports a player (including offline players) + permission: coordsoffline.teleport +permissions: + coordsoffline.use: + description: Allows use of the /coords command + default: op + coordsoffline.teleport: + description: Allows use of the /otp command + default: op \ No newline at end of file