Added simple networking

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

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" "$@"

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

src/client/java/modchest/mixin/client/DeathScreen.java

@@ -13,6 +13,7 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import networking.packet.getNameOfRespawnButtonsS2CPacket;
 
 @Mixin(net.minecraft.client.gui.screen.DeathScreen.class)
 public class DeathScreen extends Screen {
@@ -24,10 +25,10 @@ public class DeathScreen extends Screen {
     private void addMultiSleepButtons(CallbackInfo info) {;
         int widthButton = 40;       //Die generelle Breite der knoepfe wird definiert
         int heightButton = 20;      // " hoehe "
-        int yOffset = 5;            //Wie gross der Abstand zwischen der oberen Kante un dem knop sein soll (der Nullpunkt (0|0) ist soswohl im Fenster als auch beim Knopf oben links die Ecke)
+        int yOffset = 5;            //Wie gross der Abstand zwischen der oberen Kante und dem Knopf sein soll (der Nullpunkt (0|0) ist soswohl im Fenster als auch beim Knopf oben links die Ecke)
         int xOffset = this.width / 2 - widthButton / 2;     //Die Mitte wird ausgerechnet (Mitte vom fenster minus halbe Breite des knopfes um tatsächlich die Mitte zu haben, weil koordinaten und so
         this.addDrawableChild(
-                new ButtonWidget(xOffset - 2 * (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#1"), button -> {  //Knopf wird erzeugt
+                new ButtonWidget(xOffset - 2 * (widthButton + 5), yOffset, widthButton, heightButton, Text.of(getNameOfRespawnButtonsS2CPacket()), button -> {  //Knopf wird erzeugt
                     REServerModClient.LOGGER.info("First Button for using spawn pressed!");
                     PacketByteBuf buffer = PacketByteBufs.create();     //Neuer Buffer wird erstellt
                     buffer.writeInt(1);     //Beschrieben, damit der Server weiss, welcher knopf gedrueckt wurde

src/client/java/modchest/networking/modNetworkingClient.java

@@ -9,7 +9,12 @@ public class modNetworkingClient {      //Identifier werden eingeführt
     public static final Identifier request_respawn = new Identifier(REServerMod.MOD_ID, "request_respawn");     //alle Identifier muessen leider IMMER auf Client und Server (doppelt) eingefuehrt werden
     public static final Identifier start_sleeping_call_buttons = new Identifier(REServerMod.MOD_ID, "start_sleeping_call_buttons");
     public static final Identifier death_multi_respawn_buttons = new Identifier(REServerMod.MOD_ID, "death_call_respawn_buttons");
+    public static final Identifier set_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "set_names_of_respawn_button");
+    public static final Identifier get_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "get_names_of_respawn_buttons");
+
     public static void registerC2SPackets() {       //Identifier fuer packets werden registriert (Identifier die der Server aufruft um beim CLient was auszufuehren)
         ClientPlayNetworking.registerGlobalReceiver(request_respawn, respawnRequestS2CPacket::receive); //was der Client dann machen soll steht in der receive Methode
+
+        ClientPlayNetworking.registerGlobalReceiver(request_respawn, getNamesOfRespawnButtonsS2CPacket::receive);
     }
 }

src/client/java/modchest/networking/packet/getNamesOfRespawnButtonsS2CPacket.java

@@ -0,0 +1,19 @@
+package modchest.networking.packet;
+
+import modchest.REServerModClient;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.network.PacketByteBuf;
+
+public class getNamesOfRespawnButtonsS2CPacket {
+
+    public static void receive(MinecraftClient minecraftClient, ClientPlayNetworkHandler clientPlayNetworkHandler, PacketByteBuf packetByteBuf, PacketSender packetSender) {
+        String[] namesFromServer = new String[5];
+        for (int i = 0; i < 5; i++) {
+            namesFromServer[i] = (buf.readString(32767));
+        }
+
+        return namesFromServer;
+    }
+}

src/main/java/modchest/networking/modNetworkingServer.java

@@ -10,10 +10,14 @@ public class modNetworkingServer {      //Identifier werden eingeführt
     public static final Identifier request_respawn = new Identifier(REServerMod.MOD_ID, "request_respawn");     //alle Identifier muessen leider IMMER auf Client und Server (doppelt) eingefuehrt werden
     public static final Identifier start_sleeping_call_buttons = new Identifier(REServerMod.MOD_ID, "start_sleeping_call_buttons");
     public static final Identifier death_multi_respawn_buttons = new Identifier(REServerMod.MOD_ID, "death_call_respawn_buttons");
+    public static final Identifier set_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "set_names_of_respawn_buttons");
+    public static final Identifier get_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "get_names_of_respawn_buttons");
 
     public static void registerS2CPackets() {       //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren)
         ServerPlayNetworking.registerGlobalReceiver(start_sleeping_call_buttons, setNewRespawnsC2SPacket::receive); //was der Server dann machen soll steht in der receive Methode
 
         ServerPlayNetworking.registerGlobalReceiver(death_multi_respawn_buttons, deathScreenMultiButtonsC2SPacket::receive);
+
+        ServerPlayNetworking.registerGlobalReceiver(set_names_of_respawn_buttons, setNamesOfRespawnButtonsC2SPacket::receive);
     }
 }

src/main/java/modchest/networking/packet/setNamesOfRespawnButtonsC2SPacket.java

@@ -0,0 +1,28 @@
+package modchest.networking.packet;
+
+import modchest.REServerMod;
+import modchest.util.setAndGetMultiButtonsSpawn;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.Arrays;
+
+public class setNamesOfRespawnButtonsC2SPacket {
+    public static void receive(MinecraftServer server, ServerPlayerEntity player,                               //Passiert auf dem Server!!!
+                               ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
+        setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn();
+        try {
+            String names = buf.readString(32767);
+
+            setAndGet.setMultiSpawnNames(player, names);
+
+        } catch (Exception e) {
+            player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawnnameserror"));
+            REServerMod.LOGGER.info("Following Error, when trying to save names of " + player.getDisplayName() + "'s Spawnpoints: " + e);
+        }
+    }
+}

src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java

@@ -83,6 +83,55 @@ public class setAndGetMultiButtonsSpawn {
         return posXYZ;
     }
 
+    public synchronized void setMultiSpawnNames(ServerPlayerEntity player, Arry<String> names) {
+        ServerPlayerEntityInterface castedPlayer = (ServerPlayerEntityInterface) player;
+        NbtCompound topNbt = ((ServerPlayerEntityInterface) player).getDataSaver();     //alle daten der mod werden in diesem NBT Gespeichert
+        if (topNbt.get("multi_sleep") == null) {    //die daten fuer multi-sleep werden in dem nbt-tag "multi_sleep" gespeichert, der wiederum um anderen nbt gespeichert wird
+            topNbt.put("multi_sleep", new NbtCompound());   //sollte dieser nbt-tag nicht existieren, wird ein neuer erstellt
+        }
+        NbtCompound subNbt = (NbtCompound) topNbt.get("multi_sleep");   //nbt tag mit allen daten fuer multi-sleep wird geladen
+
+        try {
+            if (subNbt != null) {
+                subNbt.putIntArray("names", names);
+                topNbt.put("multi_sleep", subNbt);  //speichert den tag unter multi_sleep im top-tag ab
+                castedPlayer.setDataSaver(topNbt);      //speichert den top-tag wieder im spieler ab
+            } else {
+                REServerMod.LOGGER.info("Error when trying to write spawn to file!");
+                player.sendMessage(Text.translatable("chat.modchest.multispawn.spawnnotsaved"));
+            }
+        } catch (Exception e) {
+            REServerMod.LOGGER.info("Error when saving Spawnpoint! Exception: " + e);
+            player.sendMessage(Text.translatable("chat.modchest.multispawn.spawnnotsaved"));
+        }
+    }
+
+    public synchronized int[] getMultiSpawnNames(ServerPlayerEntity player) {
+        ServerPlayerEntityInterface castedPlayer = (ServerPlayerEntityInterface) player;
+        NbtCompound topNbt = ((ServerPlayerEntityInterface) player).getDataSaver();
+        if (topNbt.get("multi_sleep") == null) {
+            topNbt.put("multi_sleep", new NbtCompound());
+        }
+        NbtCompound subNbt = (NbtCompound) topNbt.get("multi_sleep");   //wie bei setMultiSpawn()
+        if (subNbt != null) {
+            name = subNbt.getIntArray("names");  // holt sich den Namen
+        }
+
+        if (name.length == 0) { //das gleiche fuer den Namen
+            String[] names = {"#1", "#2", "#3", "#4", "#5"};
+            try {
+                subNbt.putIntArray("names", names);
+                topNbt.put("multi_sleep", subNbt);
+                castedPlayer.setDataSaver(topNbt);
+            } catch (Exception e) {
+                REServerMod.LOGGER.info("Sorry! Error when loading Spawnpoint! Exception: " + e);
+                player.sendMessage(Text.translatable("chat.modchest.multispawn.getable"));
+            }
+        }
+
+        return names;
+    }
+
     public synchronized void setMultiSpawnVanilla(ServerPlayerEntity player) {      //bevor der Spieler respawnt, speichern wir einmal seinen Vanillaspawn ab, um ihn spaeter wieder darauf zu setzen
         BlockPos posAlt = player.getSpawnPointPosition();           //Spawnpunkt der Vanilla-respawn-funktion wird gespeichert
         RegistryKey<World> dimAlt = player.getSpawnPointDimension();//Dimension "