diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c37caf --- /dev/null +++ b/.gitignore @@ -0,0 +1,118 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c986429 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2024 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..c67f8fa --- /dev/null +++ b/README.md @@ -0,0 +1,66 @@ +# Server Transfer Commands + +This mod adds commands to transfer yourself or another player to a different server using the new transfer packet added in 24w03a. The commands and config are loosely based on BungeeCord, so they should be familar if you've used it or a similar proxy before. + +This mod does not expose an API for transferring players or setting/getting cookies; it just sends the packet. This is something that may be added in the near future, though. + +## Commands + +Currently, the following commands are implemented: + +- `/server `: Go to a configured server that isn't restricted or you have permission to access. +- `/send `: Sends one or more players to a configured server. Restrictions are not considered. +- `/send-ip []`: Sends one or more players to the specified hostname and port. If no port is specified, it defaults to 25565. + +Commands that would query the servers like `/glist` and `/find` have not been added yet but are in progress. + +## Permissions + +Permissions can be set with groups in the config file or with any mod that supports the [Fabric Permissions API](https://github.com/lucko/fabric-permissions-api). If you would like to disable a command entirely, you can add it to the `disabled_commands` list in the config. + +- `server-transfer-commands.command.server` +- `server-transfer-commands.command.send` +- `server-transfer-commands.command.send-ip` +- `server-transfer-commands.server.`: Permission to use `/server` to go to a server that has `restricted` enabled. `/send` and `/send-ip` do not consider this. + +## Config + +The commented default config is as follows: + +```yaml +# The list of servers that can be accessed with /server or /send. +# If "restricted" is true, the "server-transfer-commands.server." permission is required to access it with /server. +servers: + lobby: + address: localhost:25565 + restricted: false + survival: + address: localhost:25564 + restricted: false + +# A server that should show "You are already connected to this server!" when you attempt to transfer to it. +this_server: lobby + +# Commands that should not be registered. +disabled_commands: + - disabledcommandhere + +# Permission groups for assigning to players or permission levels. +permissions: + default: + - server-transfer-commands.command.server + admin: + - server-transfer-commands.command.send + - server-transfer-commands.command.send-ip + +# Permission groups assigned to specific players. +groups: + 4win: + - admin + +# Permission groups assigned to Minecraft permission levels, normally from 1 to 4. +# Level 3 is what allows use of multiplayer management commands such as /kick. +level_groups: + 3: + - admin +``` \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..361dfdf --- /dev/null +++ b/build.gradle @@ -0,0 +1,67 @@ +plugins { + id 'fabric-loom' version '1.5-SNAPSHOT' + id("io.freefair.lombok") version "8.4" +} + +version = project.mod_version +group = 'us.mcnex' + +repositories { + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings loom.officialMojangMappings() + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + modImplementation(fabricApi.module("fabric-api-base", project.fabric_version)) + modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version)) + + include modImplementation("me.lucko:fabric-permissions-api:${project.permissions_api_version}") + include implementation("org.yaml:snakeyaml:${project.snakeyaml_version}") +} + +processResources { + inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version + } +} + +def targetJavaVersion = 17 +tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release.set(targetJavaVersion) + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + archivesBaseName = project.archives_base_name + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..da85ab9 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Mod Properties + mod_version = 0.1.0 + archives_base_name = server-transfer-commands + +# Fabric Properties + minecraft_version=24w03b + loader_version=0.15.6 + +# Dependencies + fabric_version=0.95.1+1.20.5 + permissions_api_version=0.2-SNAPSHOT + snakeyaml_version=2.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 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..1af9e09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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=$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 + 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, 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" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@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. +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% 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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/us/mcnex/servertransfercommands/ServerTransferCommands.java b/src/main/java/us/mcnex/servertransfercommands/ServerTransferCommands.java new file mode 100644 index 0000000..bcf4624 --- /dev/null +++ b/src/main/java/us/mcnex/servertransfercommands/ServerTransferCommands.java @@ -0,0 +1,28 @@ +package us.mcnex.servertransfercommands; + +import lombok.Getter; +import me.lucko.fabric.api.permissions.v0.PermissionCheckEvent; +import net.fabricmc.api.DedicatedServerModInitializer; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.fabricmc.fabric.api.util.TriState; +import us.mcnex.servertransfercommands.commands.TransferCommands; +import us.mcnex.servertransfercommands.config.Config; + +public class ServerTransferCommands implements DedicatedServerModInitializer { + @Getter + private static Config config; + + @Override + public void onInitializeServer() { + config = new Config("server-transfer-commands.yml"); + + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> TransferCommands.register(dispatcher)); + + PermissionCheckEvent.EVENT.register((source, permission) -> { + if (config.hasPermission(source, permission)) { + return TriState.TRUE; + } + return TriState.DEFAULT; + }); + } +} diff --git a/src/main/java/us/mcnex/servertransfercommands/commands/TransferCommands.java b/src/main/java/us/mcnex/servertransfercommands/commands/TransferCommands.java new file mode 100644 index 0000000..f163b6d --- /dev/null +++ b/src/main/java/us/mcnex/servertransfercommands/commands/TransferCommands.java @@ -0,0 +1,113 @@ +package us.mcnex.servertransfercommands.commands; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.IntegerArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import me.lucko.fabric.api.permissions.v0.Permissions; +import net.minecraft.ChatFormatting; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.arguments.EntityArgument; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.ClientboundTransferPacket; +import net.minecraft.server.level.ServerPlayer; +import us.mcnex.servertransfercommands.ServerTransferCommands; +import us.mcnex.servertransfercommands.config.Config; + +import java.util.Collection; + +import static net.minecraft.commands.Commands.argument; +import static net.minecraft.commands.Commands.literal; + +public class TransferCommands { + private static final SimpleCommandExceptionType ERROR_MUST_BE_PLAYER = new SimpleCommandExceptionType(Component.literal("You must be a player to run this command!")); + private static final SimpleCommandExceptionType ERROR_ALREADY_CONNECTED = new SimpleCommandExceptionType(Component.literal("You are already connected to this server!")); + private static final SimpleCommandExceptionType ERROR_TARGET_ALREADY_CONNECTED = new SimpleCommandExceptionType(Component.literal("The target is already connected to this server!")); + + public static void register(CommandDispatcher dispatcher) { + Config config = ServerTransferCommands.getConfig(); + + if (!config.getDisabledCommands().contains("server")) { + var serverCommand = literal("server").requires(Permissions.require("server-transfer-commands.command.server")); + for (var server : config.getServers().values()) { + var subcommand = literal(server.name()); + if (server.restricted()) { + subcommand.requires(Permissions.require("server-transfer-commands.server." + server.name())); + } + subcommand.executes(ctx -> { + if (config.getThisServer() == server) { + throw ERROR_ALREADY_CONNECTED.create(); + } else { + if (!ctx.getSource().isPlayer()) + throw ERROR_MUST_BE_PLAYER.create(); + transfer(ctx.getSource().getPlayerOrException(), server.hostName(), server.port()); + return 1; + } + }); + serverCommand.then(subcommand); + } + dispatcher.register(serverCommand); + } + + if (!config.getDisabledCommands().contains("send")) { + var sendCommand = literal("send").requires(Permissions.require("server-transfer-commands.command.send")); + var argument = argument("players", EntityArgument.players()); + for (var server : config.getServers().values()) { + var subcommand = literal(server.name()); + subcommand.executes(ctx -> { + if (config.getThisServer() == server) { + throw ERROR_TARGET_ALREADY_CONNECTED.create(); + } else { + var players = EntityArgument.getPlayers(ctx, "players"); + send(ctx.getSource(), players, server.hostName(), server.port()); + return 1; + } + }); + argument.then(subcommand); + } + sendCommand.then(argument); + dispatcher.register(sendCommand); + } + + if (!config.getDisabledCommands().contains("send-ip")) { + dispatcher.register(literal("send-ip") + .requires(Permissions.require("server-transfer-commands.command.send-ip")) + .then(argument("players", EntityArgument.players()) + .then(argument("hostname", StringArgumentType.string()) + .executes(ctx -> { + send(ctx, false); + return 1; + }) + .then(argument("port", IntegerArgumentType.integer(1, 65535)) + .executes(ctx -> { + send(ctx, true); + return 1; + }))))); + } + } + + private static void send(CommandContext ctx, boolean specifiesPort) throws CommandSyntaxException { + var players = EntityArgument.getPlayers(ctx, "players"); + String hostName = StringArgumentType.getString(ctx, "hostname"); + int port = specifiesPort ? IntegerArgumentType.getInteger(ctx, "port") : 25565; + send(ctx.getSource(), players, hostName, port); + } + + private static void send(CommandSourceStack source, Collection players, String hostName, int port) { + int playerCount = players.size(); + transfer(players, hostName, port); + source.sendSystemMessage(Component.literal("Attempting to send " + playerCount + " player" + (playerCount > 1 ? "s" : "") + " to " + hostName + ":" + port).withStyle(ChatFormatting.DARK_GREEN)); + } + + private static void transfer(ServerPlayer player, String hostName, int port) { + var transferPacket = new ClientboundTransferPacket(hostName, port); + player.connection.send(transferPacket); + } + + private static void transfer(Collection players, String hostName, int port) { + for (ServerPlayer player : players) + transfer(player, hostName, port); + } +} \ No newline at end of file diff --git a/src/main/java/us/mcnex/servertransfercommands/config/Config.java b/src/main/java/us/mcnex/servertransfercommands/config/Config.java new file mode 100644 index 0000000..db85ce7 --- /dev/null +++ b/src/main/java/us/mcnex/servertransfercommands/config/Config.java @@ -0,0 +1,106 @@ +package us.mcnex.servertransfercommands.config; + +import com.mojang.logging.LogUtils; +import lombok.Getter; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.SharedSuggestionProvider; +import org.slf4j.Logger; +import org.yaml.snakeyaml.Yaml; + +import java.io.FileReader; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.*; + +@Getter +public class Config { + private static final Logger LOGGER = LogUtils.getLogger(); + + private final ServerDefinition thisServer; + private final Map> permissions; + private final List disabledCommands; + private final Map servers; + private final Map> groups; + private final Map> levelGroups; + + @SuppressWarnings("unchecked") + public Config(String configName) { + Map map; + try { + Path configPath = FabricLoader.getInstance().getConfigDir().resolve(configName); + if (!Files.exists(configPath)) { + FabricLoader.getInstance().getModContainer("server-transfer-commands").ifPresent(modContainer -> { + Path path = modContainer.findPath("config.yml").orElseThrow(); + try { + Files.copy(path, configPath); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); + } + + Yaml yaml = new Yaml(); + map = yaml.load(new FileReader(configPath.toFile())); + + permissions = (Map>) map.getOrDefault("permissions", Collections.emptyMap()); + disabledCommands = (List) map.getOrDefault("disabled_commands", Collections.emptySet()); + groups = (Map>) map.getOrDefault("groups", Collections.emptyMap()); + levelGroups = (Map>) map.getOrDefault("level_groups", Collections.emptyMap()); + servers = new HashMap<>(); + + if (map.containsKey("servers")) { + for (var server : ((Map>) map.get("servers")).entrySet()) { + URI address; + try { + address = new URI("tcp://" + server.getValue().getOrDefault("address", "localhost:25565")); + } catch (URISyntaxException e) { + LOGGER.warn("Invalid address for server " + server.getKey() + ", skipping"); + continue; + } + String hostName = address.getHost(); + int port = address.getPort() != -1 ? address.getPort() : 25565; + + boolean restricted = (boolean) server.getValue().getOrDefault("restricted", false); + servers.put(server.getKey(), new ServerDefinition(server.getKey(), hostName, port, restricted)); + } + } + + thisServer = servers.get((String) map.get("this_server")); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public List getGroups(String player) { + var playerGroups = groups.getOrDefault(player, new ArrayList<>()); + if (!playerGroups.contains("default")) + playerGroups.add(0, "default"); + return playerGroups; + } + + public Boolean hasPermission(String player, String permission) { + for (String group : getGroups(player)) { + if (permissions.get(group).contains(permission)) + return true; + } + return false; + } + + public Boolean hasPermission(SharedSuggestionProvider source, String permission) { + for (var levelGroupEntry : levelGroups.entrySet()) { + if (source.hasPermission(levelGroupEntry.getKey())) { + for (String group : levelGroupEntry.getValue()) { + if (permissions.get(group).contains(permission)) + return true; + } + } + } + if (source instanceof CommandSourceStack commandSourceStack && commandSourceStack.isPlayer()) + return hasPermission(Objects.requireNonNull(commandSourceStack.getPlayer()).getName().getString(), permission); + return false; + } +} diff --git a/src/main/java/us/mcnex/servertransfercommands/config/ServerDefinition.java b/src/main/java/us/mcnex/servertransfercommands/config/ServerDefinition.java new file mode 100644 index 0000000..a4249e8 --- /dev/null +++ b/src/main/java/us/mcnex/servertransfercommands/config/ServerDefinition.java @@ -0,0 +1,8 @@ +package us.mcnex.servertransfercommands.config; + +public record ServerDefinition ( + String name, + String hostName, + int port, + boolean restricted +) {} \ No newline at end of file diff --git a/src/main/resources/assets/server-transfer-commands/icon.png b/src/main/resources/assets/server-transfer-commands/icon.png new file mode 100644 index 0000000..888509c Binary files /dev/null and b/src/main/resources/assets/server-transfer-commands/icon.png differ diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..22fca36 --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,35 @@ +# The list of servers that can be accessed with /server or /send. +# If "restricted" is true, the "server-transfer-commands.server." permission is required to access it with /server. +servers: + lobby: + address: localhost:25565 + restricted: false + survival: + address: localhost:25564 + restricted: false + +# A server that should show "You are already connected to this server!" when you attempt to transfer to it. +this_server: lobby + +# Commands that should not be registered. +disabled_commands: + - disabledcommandhere + +# Permission groups for assigning to players or permission levels. +permissions: + default: + - server-transfer-commands.command.server + admin: + - server-transfer-commands.command.send + - server-transfer-commands.command.send-ip + +# Permission groups assigned to specific players. +groups: + 4win: + - admin + +# Permission groups assigned to Minecraft permission levels, normally from 1 to 4. +# Level 3 is what allows use of multiplayer management commands such as /kick. +level_groups: + 3: + - admin \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..b97645c --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,25 @@ +{ + "schemaVersion": 1, + "id": "server-transfer-commands", + "name": "Server Transfer Commands", + "version": "${version}", + "environment": "server", + "license": "MIT", + "icon": "assets/server-transfer-commands/icon.png", + "description": "Adds proxy-style commands like /server and /send using the new transfer packet.", + "authors": ["4win"], + "contact": { + "sources": "https://github.com/4wincode/server-transfer-commands", + "issues": "https://github.com/4wincode/server-transfer-commands/issues" + }, + "entrypoints": { + "server": [ + "us.mcnex.servertransfercommands.ServerTransferCommands" + ] + }, + "depends": { + "fabricloader": ">=${loader_version}", + "fabric-api-base": "*", + "fabric-command-api-v2": "*" + } +}