diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..9ce27de --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,36 @@ +name: Build + +on: push + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/loom-cache + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle- + + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 16 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - uses: actions/upload-artifact@v2 + with: + name: artifacts + path: build/libs + retention-days: 30 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..7df52b8 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,39 @@ +name: Release + +on: + release: + types: + - published + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/loom-cache + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle- + + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 16 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Upload GitHub release + uses: AButler/upload-release-assets@v2.0 + with: + files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar' + repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..550b373 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f7bf9fe --- /dev/null +++ b/build.gradle @@ -0,0 +1,54 @@ +plugins { + id 'fabric-loom' version '0.8-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +repositories { + maven { url = "https://maven.nucleoid.xyz/" } + maven { url = "https://maven.gegy.dev/" } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modImplementation 'xyz.nucleoid:plasmid:0.5-pre35+1.17.1' + modImplementation include('xyz.nucleoid:more-codecs:0.1.5') + + modRuntime ("supercoder79:databreaker:0.2.7") { + exclude module : "fabric-loader" + } +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" + it.options.release = 16 +} + +java { + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1ab9cf9 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties +minecraft_version=1.17.1 +yarn_mappings=1.17.1+build.1 +loader_version=0.11.6 + +# Dependencies +fabric_version=0.36.1+1.17 + +# Mod Properties +mod_version=1.0.0 +maven_group=xyz.nucleoid +archives_base_name=game-parties diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c 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..e5338d3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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 "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +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 b/settings.gradle new file mode 100644 index 0000000..767bc9b --- /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/xyz/nucleoid/parties/GameParties.java b/src/main/java/xyz/nucleoid/parties/GameParties.java new file mode 100644 index 0000000..40f7db3 --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/GameParties.java @@ -0,0 +1,15 @@ +package xyz.nucleoid.parties; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; + +public final class GameParties implements ModInitializer { + @Override + public void onInitialize() { + CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> { + PartyCommand.register(dispatcher); + }); + + PartyManager.register(); + } +} diff --git a/src/main/java/xyz/nucleoid/parties/Party.java b/src/main/java/xyz/nucleoid/parties/Party.java new file mode 100644 index 0000000..eeafd1d --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/Party.java @@ -0,0 +1,72 @@ +package xyz.nucleoid.parties; + +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; +import net.minecraft.server.MinecraftServer; +import xyz.nucleoid.plasmid.game.player.MutablePlayerSet; +import xyz.nucleoid.plasmid.util.PlayerRef; + +import java.util.List; +import java.util.Set; + +public final class Party { + private PlayerRef owner; + + private final List members = new ObjectArrayList<>(); + private final Set pendingMembers = new ObjectOpenHashSet<>(); + + private final MutablePlayerSet memberPlayers; + + Party(MinecraftServer server, PlayerRef owner) { + this.memberPlayers = new MutablePlayerSet(server); + this.setOwner(owner); + } + + void setOwner(PlayerRef owner) { + this.owner = owner; + if (this.memberPlayers.add(owner)) { + this.members.add(owner); + } + } + + boolean invite(PlayerRef player) { + if (this.memberPlayers.contains(player)) { + return false; + } + return this.pendingMembers.add(player); + } + + boolean remove(PlayerRef player) { + if (this.memberPlayers.remove(player)) { + this.members.remove(player); + return true; + } + return this.pendingMembers.remove(player); + } + + boolean acceptInvite(PlayerRef player) { + if (this.pendingMembers.remove(player)) { + if (this.memberPlayers.add(player)) { + this.members.add(player); + } + return true; + } + return false; + } + + public boolean contains(PlayerRef player) { + return this.memberPlayers.contains(player); + } + + public boolean isOwner(PlayerRef from) { + return from.equals(this.owner); + } + + public List getMembers() { + return this.members; + } + + public MutablePlayerSet getMemberPlayers() { + return this.memberPlayers; + } +} diff --git a/src/main/java/xyz/nucleoid/parties/PartyCommand.java b/src/main/java/xyz/nucleoid/parties/PartyCommand.java new file mode 100644 index 0000000..8fe33ff --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/PartyCommand.java @@ -0,0 +1,179 @@ +package xyz.nucleoid.parties; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.command.argument.GameProfileArgumentType; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.MutableText; +import net.minecraft.util.Formatting; +import xyz.nucleoid.plasmid.util.PlayerRef; + +import static net.minecraft.server.command.CommandManager.argument; +import static net.minecraft.server.command.CommandManager.literal; + +public final class PartyCommand { + // @formatter:off + public static void register(CommandDispatcher dispatcher) { + dispatcher.register( + literal("party") + .then(literal("invite") + .then(argument("player", EntityArgumentType.player()) + .executes(PartyCommand::invitePlayer) + )) + .then(literal("kick") + .then(argument("player", GameProfileArgumentType.gameProfile()) + .executes(PartyCommand::kickPlayer) + )) + .then(literal("transfer") + .then(argument("player", EntityArgumentType.player()) + .executes(PartyCommand::transferToPlayer) + )) + .then(literal("accept") + .then(argument("player", EntityArgumentType.player()) + .executes(PartyCommand::acceptInvite) + )) + .then(literal("leave").executes(PartyCommand::leave)) + .then(literal("disband").executes(PartyCommand::disband)) + ); + } + // @formatter:on + + private static int invitePlayer(CommandContext ctx) throws CommandSyntaxException { + var source = ctx.getSource(); + var owner = source.getPlayer(); + + var player = EntityArgumentType.getPlayer(ctx, "player"); + + var partyManager = PartyManager.get(source.getServer()); + var result = partyManager.invitePlayer(PlayerRef.of(owner), PlayerRef.of(player)); + if (result.isOk()) { + MutableText message = PartyTexts.invitedSender(player); + source.sendFeedback(message.formatted(Formatting.GOLD), false); + + var notification = PartyTexts.invitedReceiver(owner) + .formatted(Formatting.GOLD); + + player.sendMessage(notification, false); + } else { + var error = result.error(); + source.sendError(PartyTexts.displayError(error, player)); + } + + return Command.SINGLE_SUCCESS; + } + + private static int kickPlayer(CommandContext ctx) throws CommandSyntaxException { + var source = ctx.getSource(); + var server = source.getServer(); + var owner = source.getPlayer(); + + var profiles = GameProfileArgumentType.getProfileArgument(ctx, "player"); + + for (var profile : profiles) { + var partyManager = PartyManager.get(source.getServer()); + var result = partyManager.kickPlayer(PlayerRef.of(owner), PlayerRef.of(profile)); + if (result.isOk()) { + var party = result.party(); + + var message = PartyTexts.kickedSender(owner); + party.getMemberPlayers().sendMessage(message.formatted(Formatting.GOLD)); + + PlayerRef.of(profile).ifOnline(server, player -> { + player.sendMessage(PartyTexts.kickedReceiver().formatted(Formatting.RED), false); + }); + } else { + var error = result.error(); + source.sendError(PartyTexts.displayError(error, profile.getName())); + } + } + + return Command.SINGLE_SUCCESS; + } + + private static int transferToPlayer(CommandContext ctx) throws CommandSyntaxException { + var source = ctx.getSource(); + var oldOwner = source.getPlayer(); + var newOwner = EntityArgumentType.getPlayer(ctx, "player"); + + var partyManager = PartyManager.get(source.getServer()); + var result = partyManager.transferParty(PlayerRef.of(oldOwner), PlayerRef.of(newOwner)); + if (result.isOk()) { + source.sendFeedback( + PartyTexts.transferredSender(newOwner).formatted(Formatting.GOLD), + false + ); + + newOwner.sendMessage( + PartyTexts.transferredReceiver(oldOwner).formatted(Formatting.GOLD), + false + ); + } else { + var error = result.error(); + source.sendError(PartyTexts.displayError(error, newOwner)); + } + + return Command.SINGLE_SUCCESS; + } + + private static int acceptInvite(CommandContext ctx) throws CommandSyntaxException { + var source = ctx.getSource(); + var player = source.getPlayer(); + + var owner = EntityArgumentType.getPlayer(ctx, "player"); + + var partyManager = PartyManager.get(source.getServer()); + var result = partyManager.acceptInvite(PlayerRef.of(player), PlayerRef.of(owner)); + if (result.isOk()) { + var party = result.party(); + + var message = PartyTexts.joinSuccess(player); + party.getMemberPlayers().sendMessage(message.formatted(Formatting.GOLD)); + } else { + var error = result.error(); + source.sendError(PartyTexts.displayError(error, player)); + } + + return Command.SINGLE_SUCCESS; + } + + private static int leave(CommandContext ctx) throws CommandSyntaxException { + var source = ctx.getSource(); + var player = source.getPlayer(); + + var partyManager = PartyManager.get(source.getServer()); + var result = partyManager.leaveParty(PlayerRef.of(player)); + if (result.isOk()) { + var party = result.party(); + + var message = PartyTexts.leaveSuccess(player); + party.getMemberPlayers().sendMessage(message.formatted(Formatting.GOLD)); + } else { + var error = result.error(); + source.sendError(PartyTexts.displayError(error, player)); + } + + return Command.SINGLE_SUCCESS; + } + + private static int disband(CommandContext ctx) throws CommandSyntaxException { + var source = ctx.getSource(); + var owner = source.getPlayer(); + + var partyManager = PartyManager.get(source.getServer()); + var result = partyManager.disbandParty(PlayerRef.of(owner)); + if (result.isOk()) { + var party = result.party(); + + var message = PartyTexts.disbandSuccess(); + party.getMemberPlayers().sendMessage(message.formatted(Formatting.GOLD)); + } else { + var error = result.error(); + source.sendError(PartyTexts.displayError(error, owner)); + } + + return Command.SINGLE_SUCCESS; + } +} diff --git a/src/main/java/xyz/nucleoid/parties/PartyError.java b/src/main/java/xyz/nucleoid/parties/PartyError.java new file mode 100644 index 0000000..5e39b50 --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/PartyError.java @@ -0,0 +1,10 @@ +package xyz.nucleoid.parties; + +public enum PartyError { + DOES_NOT_EXIST, + ALREADY_INVITED, + ALREADY_IN_PARTY, + CANNOT_REMOVE_SELF, + NOT_IN_PARTY, + NOT_INVITED +} diff --git a/src/main/java/xyz/nucleoid/parties/PartyManager.java b/src/main/java/xyz/nucleoid/parties/PartyManager.java new file mode 100644 index 0000000..e6d3237 --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/PartyManager.java @@ -0,0 +1,201 @@ +package xyz.nucleoid.parties; + +import com.google.common.collect.Lists; +import it.unimi.dsi.fastutil.objects.Object2ObjectMap; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.plasmid.event.GameEvents; +import xyz.nucleoid.plasmid.util.PlayerRef; + +import java.util.Collection; +import java.util.Collections; + +public final class PartyManager { + private static PartyManager instance; + + private final MinecraftServer server; + private final Object2ObjectMap playerToParty = new Object2ObjectOpenHashMap<>(); + + private PartyManager(MinecraftServer server) { + this.server = server; + } + + public static void register() { + GameEvents.COLLECT_PLAYERS_FOR_JOIN.register((gameSpace, player, additional) -> { + var partyManager = PartyManager.get(player.server); + + var members = partyManager.getPartyMembers(player); + additional.addAll(members); + }); + } + + public static PartyManager get(MinecraftServer server) { + if (instance == null || instance.server != server) { + instance = new PartyManager(server); + } + return instance; + } + + public void onPlayerLogOut(ServerPlayerEntity player) { + var ref = PlayerRef.of(player); + + var party = this.playerToParty.remove(ref); + if (party == null) { + return; + } + + if (party.remove(ref)) { + if (party.isOwner(ref)) { + this.onPartyOwnerLogOut(player, party); + } + + party.getMemberPlayers().sendMessage(PartyTexts.leftGame(player)); + } + } + + private void onPartyOwnerLogOut(ServerPlayerEntity player, Party party) { + var members = party.getMembers(); + + if (!members.isEmpty()) { + var nextMember = members.get(0); + party.setOwner(nextMember); + + nextMember.ifOnline(this.server, nextPlayer -> { + nextPlayer.sendMessage(PartyTexts.transferredReceiver(player), false); + }); + } + } + + public PartyResult invitePlayer(PlayerRef owner, PlayerRef player) { + var party = this.getOrCreateOwnParty(owner); + if (party != null) { + if (party.invite(player)) { + return PartyResult.ok(party); + } else { + return PartyResult.err(PartyError.ALREADY_INVITED); + } + } + + return PartyResult.err(PartyError.DOES_NOT_EXIST); + } + + public PartyResult kickPlayer(PlayerRef owner, PlayerRef player) { + if (owner.equals(player)) { + return PartyResult.err(PartyError.CANNOT_REMOVE_SELF); + } + + var party = this.getOwnParty(owner); + if (party == null) { + return PartyResult.err(PartyError.DOES_NOT_EXIST); + } + + if (party.remove(player)) { + this.playerToParty.remove(player, party); + return PartyResult.ok(party); + } + + return PartyResult.err(PartyError.NOT_IN_PARTY); + } + + public PartyResult acceptInvite(PlayerRef player, PlayerRef owner) { + if (this.playerToParty.containsKey(player)) { + return PartyResult.err(PartyError.ALREADY_IN_PARTY); + } + + var party = this.getOwnParty(owner); + if (party == null) { + return PartyResult.err(PartyError.DOES_NOT_EXIST); + } + + if (party.acceptInvite(player)) { + this.playerToParty.put(player, party); + return PartyResult.ok(party); + } + + return PartyResult.err(PartyError.NOT_INVITED); + } + + public PartyResult leaveParty(PlayerRef player) { + var party = this.getParty(player); + if (party == null) { + return PartyResult.err(PartyError.DOES_NOT_EXIST); + } + + if (party.isOwner(player)) { + if (party.getMembers().size() > 1) { + return PartyResult.err(PartyError.CANNOT_REMOVE_SELF); + } + return this.disbandParty(player); + } + + if (party.remove(player)) { + this.playerToParty.remove(player, party); + return PartyResult.ok(party); + } else { + return PartyResult.err(PartyError.NOT_IN_PARTY); + } + } + + public PartyResult transferParty(PlayerRef from, PlayerRef to) { + var party = this.getOwnParty(from); + if (party == null) { + return PartyResult.err(PartyError.DOES_NOT_EXIST); + } + + if (!party.contains(to)) { + return PartyResult.err(PartyError.NOT_IN_PARTY); + } + + party.setOwner(to); + return PartyResult.ok(party); + } + + public PartyResult disbandParty(PlayerRef owner) { + var party = this.getOwnParty(owner); + if (party != null) { + this.disbandParty(party); + return PartyResult.ok(party); + } else { + return PartyResult.err(PartyError.DOES_NOT_EXIST); + } + } + + public void disbandParty(Party party) { + for (PlayerRef member : party.getMembers()) { + this.playerToParty.remove(member, party); + } + } + + @Nullable + public Party getParty(PlayerRef player) { + return this.playerToParty.get(player); + } + + @Nullable + public Party getOwnParty(PlayerRef owner) { + var party = this.playerToParty.get(owner); + if (party != null && party.isOwner(owner)) { + return party; + } + return null; + } + + private Party getOrCreateOwnParty(PlayerRef owner) { + var party = this.playerToParty.computeIfAbsent(owner, o -> new Party(this.server, o)); + if (party.isOwner(owner)) { + return party; + } + return null; + } + + public Collection getPartyMembers(ServerPlayerEntity player) { + var party = this.getOwnParty(PlayerRef.of(player)); + if (party != null) { + return Lists.newArrayList(party.getMemberPlayers()); + } else { + return Collections.singleton(player); + } + } +} diff --git a/src/main/java/xyz/nucleoid/parties/PartyResult.java b/src/main/java/xyz/nucleoid/parties/PartyResult.java new file mode 100644 index 0000000..1869998 --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/PartyResult.java @@ -0,0 +1,39 @@ +package xyz.nucleoid.parties; + +import org.jetbrains.annotations.Nullable; + +public final class PartyResult { + private final Party party; + private final PartyError error; + + private PartyResult(Party party, PartyError error) { + this.party = party; + this.error = error; + } + + public static PartyResult ok(Party party) { + return new PartyResult(party, null); + } + + public static PartyResult err(PartyError error) { + return new PartyResult(null, error); + } + + public boolean isOk() { + return this.error == null; + } + + public boolean isErr() { + return this.error != null; + } + + @Nullable + public Party party() { + return this.party; + } + + @Nullable + public PartyError error() { + return this.error; + } +} diff --git a/src/main/java/xyz/nucleoid/parties/PartyTexts.java b/src/main/java/xyz/nucleoid/parties/PartyTexts.java new file mode 100644 index 0000000..b54658d --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/PartyTexts.java @@ -0,0 +1,72 @@ +package xyz.nucleoid.parties; + +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.MutableText; +import net.minecraft.text.TranslatableText; +import xyz.nucleoid.plasmid.game.GameTexts; + +public final class PartyTexts { + public static MutableText displayError(PartyError error, ServerPlayerEntity player) { + return displayError(error, player.getGameProfile().getName()); + } + + public static MutableText displayError(PartyError error, String player) { + return switch (error) { + case DOES_NOT_EXIST -> new TranslatableText("text.game_parties.party.error.does_not_exist"); + case ALREADY_INVITED -> new TranslatableText("text.game_parties.party.error.already_invited", player); + case ALREADY_IN_PARTY -> new TranslatableText("text.game_parties.party.error.already_in_party"); + case CANNOT_REMOVE_SELF -> new TranslatableText("text.game_parties.party.error.cannot_remove_self"); + case NOT_IN_PARTY -> new TranslatableText("text.game_parties.party.error.not_in_party", player); + case NOT_INVITED -> new TranslatableText("text.game_parties.party.error.not_invited"); + }; + } + + public static MutableText joinSuccess(ServerPlayerEntity player) { + return new TranslatableText("text.game_parties.party.join.success", player.getDisplayName()); + } + + public static MutableText leaveSuccess(ServerPlayerEntity player) { + return new TranslatableText("text.game_parties.party.leave.success", player.getDisplayName()); + } + + public static MutableText disbandSuccess() { + return new TranslatableText("text.game_parties.party.disband.success"); + } + + public static MutableText transferredSender(ServerPlayerEntity transferredTo) { + return new TranslatableText("text.game_parties.party.transferred.sender", transferredTo.getDisplayName()); + } + + public static MutableText transferredReceiver(ServerPlayerEntity transferredFrom) { + return new TranslatableText("text.game_parties.party.transferred.receiver", transferredFrom.getDisplayName()); + } + + public static MutableText kickedSender(ServerPlayerEntity player) { + return new TranslatableText("text.game_parties.party.kicked.sender", player.getDisplayName()); + } + + public static MutableText kickedReceiver() { + return new TranslatableText("text.game_parties.party.kicked.receiver"); + } + + public static MutableText invitedSender(ServerPlayerEntity player) { + return new TranslatableText("text.game_parties.party.invited.sender", player.getDisplayName()); + } + + public static MutableText invitedReceiver(ServerPlayerEntity owner) { + return new TranslatableText("text.game_parties.party.invited.receiver", owner.getDisplayName()) + .append(PartyTexts.inviteNotificationLink(owner)); + } + + public static MutableText inviteNotificationLink(ServerPlayerEntity owner) { + return new TranslatableText("text.game_parties.party.invited.receiver.click") + .setStyle(GameTexts.commandLinkStyle( + "/party accept " + owner.getGameProfile().getName(), + new TranslatableText("text.game_parties.party.invited.receiver.hover", owner.getDisplayName()) + )); + } + + public static MutableText leftGame(ServerPlayerEntity player) { + return new TranslatableText("text.game_parties.party.left_game", player.getDisplayName()); + } +} diff --git a/src/main/java/xyz/nucleoid/parties/mixin/PlayerManagerMixin.java b/src/main/java/xyz/nucleoid/parties/mixin/PlayerManagerMixin.java new file mode 100644 index 0000000..c378bba --- /dev/null +++ b/src/main/java/xyz/nucleoid/parties/mixin/PlayerManagerMixin.java @@ -0,0 +1,24 @@ +package xyz.nucleoid.parties.mixin; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.PlayerManager; +import net.minecraft.server.network.ServerPlayerEntity; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import xyz.nucleoid.plasmid.party.PartyManager; + +@Mixin(PlayerManager.class) +public class PlayerManagerMixin { + @Shadow + @Final + private MinecraftServer server; + + @Inject(method = "remove", at = @At("RETURN")) + private void removePlayer(ServerPlayerEntity player, CallbackInfo ci) { + PartyManager.get(this.server).onPlayerLogOut(player); + } +} diff --git a/src/main/resources/data/game_parties/lang/en_us.json b/src/main/resources/data/game_parties/lang/en_us.json new file mode 100644 index 0000000..a9cdd5b --- /dev/null +++ b/src/main/resources/data/game_parties/lang/en_us.json @@ -0,0 +1,20 @@ +{ + "text.game_parties.party.disband.success": "Your party has been disbanded!", + "text.game_parties.party.error.already_in_party": "You are already in this party!", + "text.game_parties.party.error.already_invited": "%s is already invited to this party!", + "text.game_parties.party.error.cannot_remove_self": "Cannot remove yourself from the party!", + "text.game_parties.party.error.does_not_exist": "You do not control any party!", + "text.game_parties.party.error.not_in_party": "%s is not in this party!", + "text.game_parties.party.error.not_invited": "You are not invited to this party!", + "text.game_parties.party.invited.receiver": "You have been invited to join %s's party! ", + "text.game_parties.party.invited.receiver.click": "Click here to join", + "text.game_parties.party.invited.receiver.hover": "Join %s's party!", + "text.game_parties.party.invited.sender": "Invited %s to the party", + "text.game_parties.party.join.success": "%s has joined the party!", + "text.game_parties.party.kicked.receiver": "You have been kicked from the party", + "text.game_parties.party.kicked.sender": "%s has been kicked from the party", + "text.game_parties.party.leave.success": "%s has left the party!", + "text.game_parties.party.transferred.receiver": "%s's party has been transferred to you", + "text.game_parties.party.transferred.sender": "Your party has been transferred to %s", + "text.game_parties.party.left_game": "%s left the game and has been removed from the party!" +} diff --git a/src/main/resources/data/game_parties/lang/et_ee.json b/src/main/resources/data/game_parties/lang/et_ee.json new file mode 100644 index 0000000..7cc4476 --- /dev/null +++ b/src/main/resources/data/game_parties/lang/et_ee.json @@ -0,0 +1,19 @@ +{ + "text.game_parties.party.disband.success": "Sinu pidu on laiali saadetud!", + "text.game_parties.party.error.already_in_party": "Sa oled juba sellel peol!", + "text.game_parties.party.error.already_invited": "%s on juba sellele people kutsutud!", + "text.game_parties.party.error.cannot_remove_self": "Ennast ei saa peolt eemaldada!", + "text.game_parties.party.error.does_not_exist": "Sa ei juhi ühtegi pidu!", + "text.game_parties.party.error.not_in_party": "%s ei ole sellel peol!", + "text.game_parties.party.error.not_invited": "Sind ei ole sellele peole kutsutud!", + "text.game_parties.party.invited.receiver": "Sind on kutsutud mängija %s peole! ", + "text.game_parties.party.invited.receiver.click": "Klõpsa liitumiseks siia", + "text.game_parties.party.invited.receiver.hover": "Liitu mängija %s peoga!", + "text.game_parties.party.invited.sender": "%s on peole kutsutud", + "text.game_parties.party.join.success": "%s on peoga liitunud!", + "text.game_parties.party.kicked.receiver": "Sind on peolt välja visatud", + "text.game_parties.party.kicked.sender": "%s on peolt välja visatud", + "text.game_parties.party.leave.success": "%s on peolt lahkunud!", + "text.game_parties.party.transferred.receiver": "Mängija %s pidu on sulle üle kantud", + "text.game_parties.party.transferred.sender": "Sinu pidu on mängijale %s üle kantud" +} diff --git a/src/main/resources/data/game_parties/lang/fr_fr.json b/src/main/resources/data/game_parties/lang/fr_fr.json new file mode 100644 index 0000000..959c7f1 --- /dev/null +++ b/src/main/resources/data/game_parties/lang/fr_fr.json @@ -0,0 +1,17 @@ +{ + "text.game_parties.party.error.already_in_party": "Vous faites déjà parti(e) de ce groupe !", + "text.game_parties.party.error.already_invited": "%s a déjà été invité(e) dans votre groupe !", + "text.game_parties.party.error.cannot_remove_self": "Vous ne pouvez pas quitter votre propre groupe !", + "text.game_parties.party.error.does_not_exist": "Vous n'avez le contrôle d'aucun groupe !", + "text.game_parties.party.error.not_in_party": "%s ne fait pas parti(e) de ce groupe !", + "text.game_parties.party.error.not_invited": "Vous n'êtes pas invité(e) dans ce groupe !", + "text.game_parties.party.invited.receiver": "Vous avez été invité(e) à rejoindre le groupe de %s ! ", + "text.game_parties.party.invited.receiver.click": "Cliquez ici pour le rejoindre", + "text.game_parties.party.invited.receiver.hover": "Rejoindre le groupe de %s !", + "text.game_parties.party.invited.sender": "%s a été invité(e) dans le groupe", + "text.game_parties.party.kicked.receiver": "Vous avez été éjecté(e) du groupe.", + "text.game_parties.party.kicked.sender": "%s a été éjecté(e) du groupe", + "text.game_parties.party.leave.success": "%s a quitté le groupe!", + "text.game_parties.party.transferred.receiver": "Le groupe de %s vous a été transféré", + "text.game_parties.party.transferred.sender": "Votre groupe a été transféré à %s" +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..3bbe671 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,21 @@ +{ + "schemaVersion": 1, + "id": "game_parties", + "version": "${version}", + "name": "Game Parties", + "description": "Support for player parties to join and play games together", + "authors": ["Gegy"], + "license": "LGPLv3", + "environment": "*", + "entrypoints": { + "main": ["xyz.nucleoid.parties.GameParties"] + }, + "mixins": ["game_parties.mixins.json"], + "depends": { + "fabricloader": ">=0.9.1", + "fabric": "*", + "minecraft": "1.17.x", + "plasmid": "0.5.x", + "java": ">=16" + } +} diff --git a/src/main/resources/game_parties.mixins.json b/src/main/resources/game_parties.mixins.json new file mode 100644 index 0000000..6ca9a3e --- /dev/null +++ b/src/main/resources/game_parties.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "xyz.nucleoid.parties.mixin", + "compatibilityLevel": "JAVA_16", + "mixins": [ + "PlayerManagerMixin" + ], + "injectors": { + "defaultRequire": 1 + } +}