Compare commits
No commits in common. "main" and "malte-patch-1" have entirely different histories.
main
...
malte-patc
|
|
@ -1,5 +1,5 @@
|
|||
plugins {
|
||||
id 'fabric-loom' version '1.6-SNAPSHOT'
|
||||
id 'fabric-loom' version '1.4-SNAPSHOT'
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ loom {
|
|||
inherit server
|
||||
name "Data Generation"
|
||||
vmArg "-Dfabric-api.datagen"
|
||||
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/java")}"
|
||||
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
|
||||
vmArg "-Dfabric-api.datagen.modid=reservermod"
|
||||
|
||||
runDir "build/datagen"
|
||||
|
|
@ -46,7 +46,7 @@ sourceSets {
|
|||
main {
|
||||
resources {
|
||||
srcDirs += [
|
||||
'src/main/java'
|
||||
'src/main/generated'
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ org.gradle.parallel=true
|
|||
|
||||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/develop
|
||||
minecraft_version=1.21
|
||||
yarn_mappings=1.21+build.9
|
||||
loader_version=0.15.11
|
||||
minecraft_version=1.19.2
|
||||
yarn_mappings=1.19.2+build.28
|
||||
loader_version=0.14.23
|
||||
|
||||
# Mod Properties
|
||||
mod_version=1.0.4
|
||||
mod_version=1.0.3
|
||||
maven_group=modchest
|
||||
archives_base_name=reservermod
|
||||
|
||||
# Dependencies
|
||||
fabric_version=0.100.7+1.21
|
||||
fabric_version=0.76.1+1.19.2
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
@ -1,249 +0,0 @@
|
|||
#!/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" "$@"
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
@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
|
||||
4
src/client/java/modchestClient/REServerModClient.java → src/client/java/modchest/REServerModClient.java
Executable file → Normal file
4
src/client/java/modchestClient/REServerModClient.java → src/client/java/modchest/REServerModClient.java
Executable file → Normal file
|
|
@ -1,6 +1,6 @@
|
|||
package modchestClient;
|
||||
package modchest;
|
||||
|
||||
import modchestClient.networking.modNetworkingClient;
|
||||
import modchest.networking.modNetworkingClient;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
package modchest.mixin.client;
|
||||
|
||||
import modchest.REServerModClient;
|
||||
import modchest.networking.modNetworkingClient;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.network.PacketByteBuf;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
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;
|
||||
|
||||
@Mixin(net.minecraft.client.gui.screen.DeathScreen.class)
|
||||
public class DeathScreen extends Screen {
|
||||
protected DeathScreen(Text title) {
|
||||
super(Text.of("useless"));
|
||||
} //Da wir einen bereits bestehenden Screen erweitern, wird dieser Text nie angezeigt
|
||||
|
||||
@Inject(method = "init", at = @At("TAIL")) //Dieser Code wird in den eigentlich bereits bestehenden Code der Klasse DeathScreen hinzugefügt
|
||||
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 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
|
||||
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
|
||||
sendPacket(buffer); //Und an den Server gesendet zum Speichern; Die gesamte logik passiert auf dem server, damit man keien fake koordinaten oder so eingeben kann
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset - (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#2"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Second Button for using spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(2);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset, yOffset, widthButton, heightButton, Text.translatable("#3"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Third Button for using spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(3);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset + (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#4"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Fourth Button for using spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(4);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset + 2 * (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#5"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Fifth Button for using spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(5);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
@Unique
|
||||
private synchronized void sendPacket(PacketByteBuf buffer) {
|
||||
try {
|
||||
ClientPlayNetworking.send(modNetworkingClient.death_multi_respawn_buttons, buffer);
|
||||
} catch (Exception e) {}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
package modchest.mixin.client;
|
||||
|
||||
import modchest.REServerModClient;
|
||||
import modchest.networking.modNetworkingClient;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.network.PacketByteBuf;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
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;
|
||||
|
||||
@Mixin(net.minecraft.client.gui.screen.SleepingChatScreen.class)
|
||||
public class SleepingChatScreen extends Screen { //Sehr identisch zu Death Screen, siehe dort fuer Kommentare!!
|
||||
protected SleepingChatScreen(Text title) {
|
||||
super(Text.of("useless"));
|
||||
}
|
||||
|
||||
@Inject(method = "init", at = @At("TAIL"))
|
||||
private void addMultiSleepButtons(CallbackInfo info) {
|
||||
int widthButton = 40;
|
||||
int heightButton = 20;
|
||||
int yOffset = 5;
|
||||
int xOffset = this.width / 2 - widthButton / 2;
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset - 2 * (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#1"), button -> {
|
||||
REServerModClient.LOGGER.info("First Button for saving spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(1);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset - (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#2"), button -> {
|
||||
REServerModClient.LOGGER.info("Second Button for saving spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(2);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset, yOffset, widthButton, heightButton, Text.translatable("#3"), button -> {
|
||||
REServerModClient.LOGGER.info("Third Button for saving spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(3);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset + (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#4"), button -> {
|
||||
REServerModClient.LOGGER.info("Fourth Button for saving spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(4);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
this.addDrawableChild(
|
||||
new ButtonWidget(xOffset + 2 * (widthButton + 5), yOffset, widthButton, heightButton, Text.translatable("#5"), button -> {
|
||||
REServerModClient.LOGGER.info("Fifth Button for saving spawn pressed!");
|
||||
PacketByteBuf buffer = PacketByteBufs.create();
|
||||
buffer.writeInt(5);
|
||||
sendPacket(buffer);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
@Unique
|
||||
private synchronized void sendPacket(PacketByteBuf buffer) {
|
||||
try {
|
||||
ClientPlayNetworking.send(modNetworkingClient.start_sleeping_call_buttons, buffer);
|
||||
} catch (Exception e) {}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package modchest.networking;
|
||||
|
||||
import modchest.REServerMod;
|
||||
import modchest.networking.packet.respawnRequestS2CPacket;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
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 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
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +1,15 @@
|
|||
package modchestClient.networking.packet;
|
||||
package modchest.networking.packet;
|
||||
|
||||
import modchest.REServerModClient;
|
||||
import net.fabricmc.fabric.api.networking.v1.PacketSender;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.network.packet.CustomPayload;
|
||||
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
||||
import net.minecraft.network.PacketByteBuf;
|
||||
|
||||
public class respawnRequestS2CPacket {
|
||||
/*
|
||||
|
||||
public static void receive(MinecraftClient minecraftClient, ClientPlayNetworkHandler clientPlayNetworkHandler, PacketByteBuf packetByteBuf, PacketSender packetSender) {
|
||||
//REServerModClient.LOGGER.info("Server asked for respawn after pressing a saved respawn button!");
|
||||
minecraftClient.player.requestRespawn();
|
||||
}
|
||||
*/
|
||||
public static void receive(MinecraftClient minecraftClient, CustomPayload payload) {
|
||||
//REServerModClient.LOGGER.info("Server asked for respawn after pressing a saved respawn button!");
|
||||
assert minecraftClient.player != null;
|
||||
minecraftClient.player.requestRespawn();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
package modchestClient.mixin;
|
||||
|
||||
import modchestClient.REServerModClient;
|
||||
import modchestClient.networking.payload.startSleepingCallButtons;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
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;
|
||||
|
||||
@Mixin(net.minecraft.client.gui.screen.DeathScreen.class)
|
||||
public class DeathScreen extends Screen {
|
||||
protected DeathScreen(Text title) {
|
||||
super(Text.of("useless"));
|
||||
} //Da wir einen bereits bestehenden Screen erweitern, wird dieser Text nie angezeigt
|
||||
|
||||
@Inject(method = "init", at = @At("TAIL")) //Dieser Code wird in den eigentlich bereits bestehenden Code der Klasse DeathScreen hinzugefügt
|
||||
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 knopf sein soll (der Nullpunkt (0|0) ist sowohl 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(
|
||||
ButtonWidget.builder(Text.translatable("#1"), button -> { //Knopf wird erzeugt
|
||||
REServerModClient.LOGGER.info("First Button for using spawn pressed!");
|
||||
sendPacket(1); //Und an den Server gesendet zum Speichern; die gesamte logik passiert auf dem server, damit man keine fake koordinaten oder so eingeben kann
|
||||
}).dimensions(xOffset - 2 * (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#2"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Second Button for using spawn pressed!");
|
||||
sendPacket(2);
|
||||
}).dimensions(xOffset - (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#3"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Third Button for using spawn pressed!");
|
||||
sendPacket(3);
|
||||
}).dimensions(xOffset, yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#4"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Fourth Button for using spawn pressed!");
|
||||
sendPacket(4);
|
||||
}).dimensions(xOffset + (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#5"), button -> { //Kommentare siehe knopf #1
|
||||
REServerModClient.LOGGER.info("Fifth Button for using spawn pressed!");
|
||||
sendPacket(5);
|
||||
}).dimensions(xOffset + 2 * (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
}
|
||||
|
||||
@Unique
|
||||
private synchronized void sendPacket(int number) {
|
||||
try {
|
||||
ClientPlayNetworking.send(new startSleepingCallButtons(number));
|
||||
} catch (Exception e) {
|
||||
REServerModClient.LOGGER.info("Error when trying to network to server in DeathScreen class: " + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
package modchestClient.mixin;
|
||||
|
||||
import modchestClient.REServerModClient;
|
||||
import modchestClient.networking.payload.deathMultiRespawnButtons;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
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;
|
||||
|
||||
@Mixin(net.minecraft.client.gui.screen.SleepingChatScreen.class)
|
||||
public class SleepingChatScreen extends Screen { //Sehr identisch zu Death Screen, siehe dort fuer Kommentare!
|
||||
protected SleepingChatScreen(Text title) {
|
||||
super(Text.of("useless"));
|
||||
}
|
||||
|
||||
@Inject(method = "init", at = @At("TAIL"))
|
||||
private void addMultiSleepButtons(CallbackInfo info) {
|
||||
int widthButton = 40;
|
||||
int heightButton = 20;
|
||||
int yOffset = 5;
|
||||
int xOffset = this.width / 2 - widthButton / 2;
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#1"), button -> {
|
||||
REServerModClient.LOGGER.info("First Button for saving spawn pressed!");
|
||||
sendPacket(1);
|
||||
}).dimensions(xOffset - 2 * (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#2"), button -> {
|
||||
REServerModClient.LOGGER.info("Second Button for saving spawn pressed!");
|
||||
|
||||
sendPacket(2);
|
||||
}).dimensions(xOffset - (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#3"), button -> {
|
||||
REServerModClient.LOGGER.info("Third Button for saving spawn pressed!");
|
||||
sendPacket(3);
|
||||
}).dimensions(xOffset, yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#4"), button -> {
|
||||
REServerModClient.LOGGER.info("Fourth Button for saving spawn pressed!");
|
||||
sendPacket(4);
|
||||
}).dimensions(xOffset + (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
this.addDrawableChild(
|
||||
ButtonWidget.builder(Text.translatable("#5"), button -> {
|
||||
REServerModClient.LOGGER.info("Fifth Button for saving spawn pressed!");
|
||||
sendPacket(5);
|
||||
}).dimensions(xOffset + 2 * (widthButton + 5), yOffset, widthButton, heightButton).build()
|
||||
);
|
||||
}
|
||||
|
||||
@Unique
|
||||
private synchronized void sendPacket(int number) {
|
||||
try {
|
||||
ClientPlayNetworking.send(new deathMultiRespawnButtons(number));
|
||||
} catch (Exception e) {
|
||||
REServerModClient.LOGGER.info("Error when trying to network to server in sleepingChatScreen class: " + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
package modchestClient.networking;
|
||||
|
||||
import modchest.REServerMod;
|
||||
import modchestClient.networking.packet.respawnRequestS2CPacket;
|
||||
import modchestClient.networking.payload.requestRespawn;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
public class modNetworkingClient { //Identifier werden eingeführt //alle Identifier muessen leider IMMER auf Client und Server (doppelt) eingefuehrt werden
|
||||
public static final Identifier request_respawn = Identifier.of(REServerMod.MOD_ID, "request_respawn");
|
||||
public static final Identifier start_sleeping_call_buttons = Identifier.of(REServerMod.MOD_ID, "start_sleeping_call_buttons");
|
||||
public static final Identifier death_call_respawn_buttons = Identifier.of(REServerMod.MOD_ID, "death_call_respawn_buttons");
|
||||
|
||||
public static void registerC2SPackets() { //Identifier fuer packets werden registriert (Identifier die der Server aufruft um beim CLient was auszufuehren)
|
||||
//PayloadTypeRegistry.playC2S().register(startSleepingCallButtons.ID, startSleepingCallButtons.CODEC);
|
||||
//PayloadTypeRegistry.playC2S().register(deathMultiRespawnButtons.ID, deathMultiRespawnButtons.CODEC);
|
||||
PayloadTypeRegistry.playS2C().register(requestRespawn.ID, requestRespawn.CODEC);
|
||||
|
||||
|
||||
ClientPlayNetworking.registerGlobalReceiver(requestRespawn.ID, (payload, context) -> {
|
||||
context.client().execute(() -> {
|
||||
respawnRequestS2CPacket.receive(context.client(), payload);
|
||||
}
|
||||
);});
|
||||
|
||||
|
||||
//ClientPlayNetworking.registerGlobalReceiver(request_respawn, respawnRequestS2CPacket::receive); //was der Client dann machen soll steht in der receive Methode
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
package modchestClient.networking.payload;
|
||||
|
||||
import modchest.networking.modNetworkingServer;
|
||||
import net.minecraft.network.RegistryByteBuf;
|
||||
import net.minecraft.network.codec.PacketCodec;
|
||||
import net.minecraft.network.codec.PacketCodecs;
|
||||
import net.minecraft.network.packet.CustomPayload;
|
||||
|
||||
public record deathMultiRespawnButtons(int number) implements CustomPayload {
|
||||
public static final CustomPayload.Id<deathMultiRespawnButtons> ID = new CustomPayload.Id<>(modNetworkingServer.death_call_respawn_buttons);
|
||||
public static final PacketCodec<RegistryByteBuf, deathMultiRespawnButtons> CODEC = PacketCodec.tuple(PacketCodecs.INTEGER, deathMultiRespawnButtons::number, deathMultiRespawnButtons::new);
|
||||
//PacketCodec.tuple(PacketCodecs.INTEGER, requestRespawn::new);
|
||||
|
||||
@Override
|
||||
public Id<? extends CustomPayload> getId() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package modchestClient.networking.payload;
|
||||
|
||||
import modchestClient.networking.modNetworkingClient;
|
||||
import net.minecraft.network.RegistryByteBuf;
|
||||
import net.minecraft.network.codec.PacketCodec;
|
||||
import net.minecraft.network.codec.PacketCodecs;
|
||||
import net.minecraft.network.packet.CustomPayload;
|
||||
|
||||
public record requestRespawn(int number) implements CustomPayload {
|
||||
public static final CustomPayload.Id<requestRespawn> ID = new CustomPayload.Id<>(modNetworkingClient.request_respawn);
|
||||
public static final PacketCodec<RegistryByteBuf, requestRespawn> CODEC = PacketCodec.tuple(PacketCodecs.INTEGER, requestRespawn::number, requestRespawn::new);
|
||||
|
||||
@Override
|
||||
public Id<? extends CustomPayload> getId() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package modchestClient.networking.payload;
|
||||
|
||||
import modchest.networking.modNetworkingServer;
|
||||
import net.minecraft.network.RegistryByteBuf;
|
||||
import net.minecraft.network.codec.PacketCodec;
|
||||
import net.minecraft.network.codec.PacketCodecs;
|
||||
import net.minecraft.network.packet.CustomPayload;
|
||||
|
||||
public record startSleepingCallButtons(int number) implements CustomPayload {
|
||||
public static final CustomPayload.Id<startSleepingCallButtons> ID = new CustomPayload.Id<>(modNetworkingServer.start_sleeping_call_buttons);
|
||||
public static final PacketCodec<RegistryByteBuf, startSleepingCallButtons> CODEC = PacketCodec.tuple(PacketCodecs.INTEGER, startSleepingCallButtons::number, startSleepingCallButtons::new);
|
||||
|
||||
@Override
|
||||
public Id<? extends CustomPayload> getId() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"required": true,
|
||||
"package": "modchestClient.mixin",
|
||||
"package": "modchest.mixin.client",
|
||||
"compatibilityLevel": "JAVA_17",
|
||||
"client": [
|
||||
"DeathScreen",
|
||||
|
|
|
|||
|
|
@ -1,30 +1,30 @@
|
|||
package modchest.block.custom;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import modchest.block.entity.modBlockEntities;
|
||||
import modchest.block.entity.steeringWheelEntity;
|
||||
import net.minecraft.block.BlockEntityProvider;
|
||||
import net.minecraft.block.BlockRenderType;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.BlockWithEntity;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.block.entity.BlockEntityTicker;
|
||||
import net.minecraft.block.entity.BlockEntityType;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.screen.NamedScreenHandlerFactory;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.ItemScatterer;
|
||||
import net.minecraft.util.hit.BlockHitResult;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
//gibt dem Block steering_wheel eigenschaften, wie z.B. das Interaktionsmenü, oder Grafiken
|
||||
public class steeringWheelBlock extends BlockWithEntity {
|
||||
public class steeringWheelBlock extends BlockWithEntity implements BlockEntityProvider {
|
||||
public steeringWheelBlock(Settings settings) {
|
||||
super(settings);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected MapCodec<? extends BlockWithEntity> getCodec() {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/* stuff benötigt um das Interaktionsmenü zu laden!*/
|
||||
@Override
|
||||
|
|
@ -43,7 +43,7 @@ public class steeringWheelBlock extends BlockWithEntity {
|
|||
super.onStateReplaced(state, world, pos, newState, moved);
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
||||
@Override //wird bei einem rechtsklick aufgerufen (ersellt das Blockentity)
|
||||
public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
|
||||
if (!world.isClient) {
|
||||
|
|
@ -55,7 +55,7 @@ public class steeringWheelBlock extends BlockWithEntity {
|
|||
}
|
||||
return ActionResult.SUCCESS;
|
||||
}
|
||||
*/
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
|
||||
|
|
@ -64,6 +64,6 @@ public class steeringWheelBlock extends BlockWithEntity {
|
|||
|
||||
@Nullable
|
||||
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
|
||||
return validateTicker( type, modBlockEntities.steering_wheel_interface, steeringWheelEntity::tick);
|
||||
return checkType( type, modBlockEntities.steering_wheel_interface, steeringWheelEntity::tick);
|
||||
}
|
||||
}
|
||||
|
|
@ -4,17 +4,16 @@ import modchest.REServerMod;
|
|||
import modchest.block.modBlocks;
|
||||
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
|
||||
import net.minecraft.block.entity.BlockEntityType;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.registry.Registry;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
//rendert letztendlich die Interaktionsmenüs der Blöcke
|
||||
public class modBlockEntities {
|
||||
public static BlockEntityType<steeringWheelEntity> steering_wheel_interface; // Interaktionsmenü wird erstellt
|
||||
|
||||
public static void registerBlockEntities() {
|
||||
steering_wheel_interface = Registry.register(Registries.BLOCK_ENTITY_TYPE,
|
||||
Identifier.of(REServerMod.MOD_ID, "steering_wheel_interface"), // Interkationsmenü wird gerendert
|
||||
steering_wheel_interface = Registry.register(Registry.BLOCK_ENTITY_TYPE,
|
||||
new Identifier(REServerMod.MOD_ID, "steering_wheel_interface"), // Interkationsmenü wird gerendert
|
||||
FabricBlockEntityTypeBuilder.create(steeringWheelEntity::new, modBlocks.steering_wheel).build(null));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,32 +3,32 @@ package modchest.block;
|
|||
import modchest.block.custom.steeringWheelBlock;
|
||||
import modchest.item.modItemGroup;
|
||||
import modchest.REServerMod;
|
||||
import net.minecraft.item.Item;
|
||||
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
||||
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Material;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.registry.Registry;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
//setzt die blöcke auf
|
||||
public class modBlocks {
|
||||
public static Block steering_wheel; // Block wird erstellt; das entsprechende Item zum Block muss in "modItemGroup" getrennt zur mod Block Gruppe hinzugefügt werden"
|
||||
public static Block steering_wheel; // Block wird erstellt
|
||||
|
||||
public static void setBlocks() {// Block wird definiert
|
||||
steering_wheel = registerBlock("steering_wheel",
|
||||
new steeringWheelBlock(FabricBlockSettings.create().strength(1.0f).requiresTool()),
|
||||
modItemGroup.item_group1);
|
||||
new steeringWheelBlock(FabricBlockSettings.of(Material.WOOD).strength(1.0f).requiresTool()),
|
||||
modItemGroup.modchest);
|
||||
|
||||
}
|
||||
|
||||
private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben
|
||||
// definierten Blöcke dem Register
|
||||
// hinzu
|
||||
Registry.register(Registries.ITEM, Identifier.of(REServerMod.MOD_ID, name),
|
||||
new BlockItem(block, new Item.Settings()));
|
||||
return Registry.register(Registries.BLOCK, Identifier.of(REServerMod.MOD_ID, name), block);
|
||||
Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name),
|
||||
new BlockItem(block, new FabricItemSettings().group(group)));
|
||||
return Registry.register(Registry.BLOCK, new Identifier(REServerMod.MOD_ID, name), block);
|
||||
}
|
||||
|
||||
public static void registerModBlocks() { // Error Logger halt...
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/*
|
||||
package modchest.data;
|
||||
|
||||
import modchest.item.modItems;
|
||||
|
|
@ -17,4 +16,3 @@ public class ModLootTableGenerator extends FabricBlockLootTableProvider {
|
|||
//oreDrops(modBlocks.steering_wheel, modItems.shipblock); mit silktouch würde steering_wheel gedroped werden, ohne würde shipblock gedroped werden
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
/*
|
||||
package modchest.data;
|
||||
|
||||
import modchest.block.modBlocks;
|
||||
|
|
@ -25,4 +24,3 @@ public class ModModelProvider extends FabricModelProvider {
|
|||
//itemModelGenerator.register(modItems.shipblock, Models.GENERATED); //ergänzt die Texturen für die Items
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
/*
|
||||
package modchest.data;
|
||||
|
||||
import modchest.item.modItems;
|
||||
|
|
@ -20,4 +19,3 @@ public class ModRecipeGenerator extends FabricRecipeProvider {
|
|||
//offerSmelting(exporter, List.of(modItems.shipblock), , ); //generiert das rezept zum herstellen (hier mir braten)
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
|
@ -4,11 +4,11 @@ import modchest.REServerMod;
|
|||
import modchest.util.setAndGetMultiButtonsSpawn;
|
||||
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
|
||||
import net.minecraft.nbt.NbtCompound;
|
||||
import net.minecraft.registry.RegistryKey;
|
||||
import net.minecraft.registry.RegistryKeys;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraft.util.registry.RegistryKey;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class playerAfterRespawnEvent implements ServerPlayerEvents.AfterRespawn { //Wenn die Multi-Spawn mod verwendet wurde, muss der Vanillaspawn wieder gesetzt werden
|
||||
|
|
@ -23,7 +23,7 @@ public class playerAfterRespawnEvent implements ServerPlayerEvents.AfterRespawn
|
|||
|
||||
String[] parts = nbt.getString("dimension").split(":"); //holt sich die gespeicherte Dimension; trennt den String entspreichend; damit sollte es auch funktionieren, sollte eine Mod weitere Dimensionen hinzufuegen
|
||||
parts = parts[2].split("]");
|
||||
RegistryKey<World> dim = RegistryKey.of(RegistryKeys.WORLD, Identifier.of(parts[0]));
|
||||
RegistryKey<World> dim = RegistryKey.of(Registry.WORLD_KEY, new Identifier(parts[0]));
|
||||
|
||||
float angle = nbt.getFloat("angle"); //Und den blickwinkel
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,19 @@
|
|||
package modchest.item;
|
||||
|
||||
import modchest.REServerMod;
|
||||
import modchest.block.modBlocks;
|
||||
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
|
||||
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
|
||||
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.registry.Registry;
|
||||
import net.minecraft.registry.RegistryKey;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
//definiert eine neue Itemgruppe mit dem identifier itemlist1, wird in einer de .json files dann in "Malte's Mod" umbenannt fürs spiel; in der Liste sollen alle Items dieser Mod im Creative Inventar angezeigt werden
|
||||
public class modItemGroup {
|
||||
public static final RegistryKey<ItemGroup> item_group_key1 = RegistryKey.of(Registries.ITEM_GROUP.getKey(), Identifier.of(REServerMod.MOD_ID, "item_group_key1"));
|
||||
public static final ItemGroup item_group1 = FabricItemGroup.builder()
|
||||
.icon(() -> new ItemStack(Blocks.COBBLESTONE)) //Icon ist halt bisher noch ein Cobblestone, weil ich keine sprits erstellt habe... :(
|
||||
.displayName(Text.translatable("itemGroup.modchest.itemlist1"))
|
||||
.build();
|
||||
|
||||
public static ItemGroup modchest;
|
||||
|
||||
|
||||
public static void modchest() {
|
||||
//Registriert die Gruppe
|
||||
Registry.register(Registries.ITEM_GROUP, item_group_key1, item_group1);
|
||||
|
||||
//Registers the items to the group
|
||||
ItemGroupEvents.modifyEntriesEvent(item_group_key1).register(item_group1 -> {
|
||||
item_group1.add(modItems.pirates_coin);
|
||||
item_group1.add(modBlocks.steering_wheel);
|
||||
}
|
||||
|
||||
);
|
||||
|
||||
modchest = FabricItemGroupBuilder.build(
|
||||
new Identifier("modchest", "itemlist1"),
|
||||
() -> new ItemStack(Blocks.COBBLESTONE)); //Icon ist halt bisher noch ein Cobblestone, weil ich keine sprits erstellt habe... :(
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ package modchest.item;
|
|||
|
||||
import modchest.REServerMod;
|
||||
import modchest.item.custom.piratesCoinItem;
|
||||
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.registry.Registry;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
//Liste der Items die hinzugefügt werden, ausgenommen Blöcke
|
||||
public class modItems {
|
||||
|
|
@ -14,15 +14,15 @@ public class modItems {
|
|||
public static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist
|
||||
// im detail erklärt was das Item machen soll
|
||||
|
||||
public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt; das entsprechende Item zum Block muss in "modItemGroup" getrennt zur mod Block Gruppe hinzugefügt werden"
|
||||
shipblock = registerItem("shipblock", new Item(new Item.Settings()));
|
||||
public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt
|
||||
shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest)));
|
||||
pirates_coin = registerItem("pirates_coin",
|
||||
new piratesCoinItem(new Item.Settings().maxCount(16)));
|
||||
new piratesCoinItem(new FabricItemSettings().group(modItemGroup.modchest).maxCount(16)));
|
||||
}
|
||||
|
||||
private static Item registerItem(String name, Item item) { // Methode, die die Items dann letztendlich hinzufügt;
|
||||
// nicht bearbeiten ist eine generische MEthode
|
||||
return Registry.register(Registries.ITEM, Identifier.of(REServerMod.MOD_ID, name), item);
|
||||
return Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name), item);
|
||||
}
|
||||
|
||||
public static void registerModItems() {
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ import org.spongepowered.asm.mixin.injection.At;
|
|||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
@Mixin(ServerPlayerEntity.class)
|
||||
public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface {
|
||||
@Unique
|
||||
|
|
|
|||
|
|
@ -5,14 +5,16 @@ import modchest.util.setAndGetMultiButtonsSpawn;
|
|||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import net.minecraft.block.BedBlock;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
|
|
@ -20,7 +22,7 @@ import java.util.Objects;
|
|||
public class bedBlock {
|
||||
|
||||
@Inject(method = "onBreak", at = @At("HEAD"))
|
||||
public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable<BlockState> cir) { //Ueberprueft, wenn ein Bett zerstoert wird, ob jemand dieses Bett als Spawnpunkt hat
|
||||
public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfo ci) { //Ueberprueft, wenn ein Bett zerstoert wird, ob jemand dieses Bett als Spawnpunkt hat
|
||||
if (!world.isClient) { //Stellt sicher, dass das ganze nicht auf dem Client gerechnet wird, weil der Code sonst abstuertzt
|
||||
|
||||
int posBedX = pos.getX();
|
||||
|
|
|
|||
|
|
@ -3,40 +3,17 @@ package modchest.networking;
|
|||
import modchest.REServerMod;
|
||||
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
|
||||
import modchest.networking.packet.setNewRespawnsC2SPacket;
|
||||
import modchest.networking.payload.deathMultiRespawnButtons;
|
||||
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
import modchest.networking.payload.startSleepingCallButtons;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
public class modNetworkingServer { //Identifier werden eingeführt
|
||||
public static final Identifier request_respawn = Identifier.of(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 = Identifier.of(REServerMod.MOD_ID, "start_sleeping_call_buttons");
|
||||
public static final Identifier death_call_respawn_buttons = Identifier.of(REServerMod.MOD_ID, "death_call_respawn_buttons");
|
||||
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 void registerS2CPackets() { //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren)
|
||||
PayloadTypeRegistry.playC2S().register(startSleepingCallButtons.ID, startSleepingCallButtons.CODEC);
|
||||
PayloadTypeRegistry.playC2S().register(deathMultiRespawnButtons.ID, deathMultiRespawnButtons.CODEC);
|
||||
//PayloadTypeRegistry.playC2S().register(requestRespawn.ID, requestRespawn.CODEC);
|
||||
ServerPlayNetworking.registerGlobalReceiver(start_sleeping_call_buttons, setNewRespawnsC2SPacket::receive); //was der Server dann machen soll steht in der receive Methode
|
||||
|
||||
ServerPlayNetworking.registerGlobalReceiver(startSleepingCallButtons.ID, (payload, context) -> {
|
||||
context.server().execute(() -> {
|
||||
setNewRespawnsC2SPacket.receive(context.server(), context.player(), payload.number());
|
||||
}
|
||||
);});
|
||||
|
||||
ServerPlayNetworking.registerGlobalReceiver(deathMultiRespawnButtons.ID, (payload, context) -> {
|
||||
context.server().execute(() -> {
|
||||
deathScreenMultiButtonsC2SPacket.receive(context.server(), context.player(), payload.number());
|
||||
}
|
||||
);});
|
||||
|
||||
|
||||
|
||||
|
||||
//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(death_multi_respawn_buttons, deathScreenMultiButtonsC2SPacket::receive);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,44 @@
|
|||
package modchest.networking.packet;
|
||||
|
||||
import modchest.REServerMod;
|
||||
import modchest.networking.payload.requestRespawn;
|
||||
import modchest.networking.modNetworkingServer;
|
||||
import modchest.util.setAndGetMultiButtonsSpawn;
|
||||
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
|
||||
import net.fabricmc.fabric.api.networking.v1.PacketSender;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
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 net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class deathScreenMultiButtonsC2SPacket {
|
||||
public static void receive(MinecraftServer server, ServerPlayerEntity player, int number) { //Passiert auf dem Server!!!
|
||||
|
||||
public static void receive(MinecraftServer server, ServerPlayerEntity player, //Passiert auf dem Server!!!
|
||||
ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
|
||||
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn(); //um die nicht-statischen Methoden aufzurufen, erzeugen wir ein Objekt. Wir speichern aber keine Daten in der Klasse, daher ist das OK
|
||||
int num; //num steht fuer Number, und sagt, welcher der 5 Knoepfe gedrueckt wurde, da das Spiel abstuertzt wenn man buf.readInt() mehr als einmal ausfuehrt
|
||||
try {
|
||||
num = number; //Um Spielabstuertze definitiv zu verhindern in einem try block, hat aber nie Probleme gemacht, also eine reine absicherung
|
||||
num = buf.readInt(); //Um Spielabstuertze definitiv zu verhindern in einem try block, hat aber nie Probleme gemacht, also eine reine absicherung
|
||||
} catch (Exception e) {
|
||||
REServerMod.LOGGER.info("Following Error when trying to get the number of pressed Button: " + e + "continuing with Button 1");
|
||||
REServerMod.LOGGER.info("Following Error when trying to get the number of pressed Button: " + e + "continuing bwith Button 1");
|
||||
num = 1;
|
||||
}
|
||||
setAndGet.setMultiSpawnVanilla(player);
|
||||
|
||||
int[] posXYZ = setAndGet.getMultiSpawn(player, number); //neue Koordinaten werden vom Server geholt
|
||||
int[] posXYZ = setAndGet.getMultiSpawn(player, num); //neue Koordinaten werden vom Server geholt
|
||||
|
||||
if (posXYZ.length == 3 && posXYZ[0] < 77889900) { //Stellt sicher, dass die 3 spawnkoordinaten nicht null sind; Koordinaten 77889900 sind ausserhalb der Welt und werden daher von mir in setAndGetMultiSpawnButtonsSpawn als Errorcodes verwendet
|
||||
try {
|
||||
//REServerMod.LOGGER.info("try Respawning from Multi-Sapwn");
|
||||
player.setSpawnPoint(World.OVERWORLD, new BlockPos(posXYZ[0], posXYZ[1], posXYZ[2]), 0, true, true); //neuer Spawn wird gesetzt
|
||||
ServerPlayNetworking.send(player, new requestRespawn(1)); //Anfrage an den Client zum respawnen wird gesendet
|
||||
ServerPlayNetworking.send(player, modNetworkingServer.request_respawn, PacketByteBufs.create()); //Anfrage an den Client zum respawnen wird gesendet
|
||||
player.sendMessage((Text.translatable("chat.modchest.multispawn.respawned", num)));
|
||||
REServerMod.LOGGER.info("Respawned Player " + player.getNameForScoreboard() + " at " + Arrays.toString(setAndGet.getMultiSpawn(player, num)));
|
||||
REServerMod.LOGGER.info("Respawned Player " + player.getEntityName() + " at " + Arrays.toString(setAndGet.getMultiSpawn(player, num)));
|
||||
setAndGet.setMultiSpawn(player, 6);
|
||||
} catch (Exception e) {
|
||||
REServerMod.LOGGER.info("Sorry! Following error, trying to respawn player " + player.getDisplayName() + ": " + e);
|
||||
|
|
|
|||
|
|
@ -2,15 +2,21 @@ 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 setNewRespawnsC2SPacket {
|
||||
public static void receive(MinecraftServer server, ServerPlayerEntity player, int number) {
|
||||
public static void receive(MinecraftServer server, ServerPlayerEntity player, //Passiert auf dem Server!!!
|
||||
ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
|
||||
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn();
|
||||
try {
|
||||
switch (number) { //Wird nur einmal angefragt, daher muss buf.readInt() nicht als variable gesetzt werden
|
||||
switch (buf.readInt()) { //Wird nur einmal angefragt, daher muss buf.readInt() nicht als variable gesetzt werden
|
||||
case 1:
|
||||
setAndGet.setMultiSpawn(player, 1); //Spawnpunkt wird gespeichert
|
||||
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "1"));
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
package modchest.networking.payload;
|
||||
|
||||
import modchest.networking.modNetworkingServer;
|
||||
import net.minecraft.network.RegistryByteBuf;
|
||||
import net.minecraft.network.codec.PacketCodec;
|
||||
import net.minecraft.network.codec.PacketCodecs;
|
||||
import net.minecraft.network.packet.CustomPayload;
|
||||
|
||||
public record deathMultiRespawnButtons(int number) implements CustomPayload {
|
||||
public static final CustomPayload.Id<deathMultiRespawnButtons> ID = new CustomPayload.Id<>(modNetworkingServer.death_call_respawn_buttons);
|
||||
public static final PacketCodec<RegistryByteBuf, deathMultiRespawnButtons> CODEC = PacketCodec.tuple(PacketCodecs.INTEGER, deathMultiRespawnButtons::number, deathMultiRespawnButtons::new);
|
||||
|
||||
@Override
|
||||
public Id<? extends CustomPayload> getId() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package modchest.networking.payload;
|
||||
|
||||
import modchest.networking.modNetworkingServer;
|
||||
import net.minecraft.network.RegistryByteBuf;
|
||||
import net.minecraft.network.codec.PacketCodec;
|
||||
import net.minecraft.network.codec.PacketCodecs;
|
||||
import net.minecraft.network.packet.CustomPayload;
|
||||
|
||||
public record requestRespawn(int number) implements CustomPayload {
|
||||
public static final CustomPayload.Id<requestRespawn> ID = new CustomPayload.Id<>(modNetworkingServer.request_respawn);
|
||||
public static final PacketCodec<RegistryByteBuf, requestRespawn> CODEC = PacketCodec.tuple(PacketCodecs.INTEGER, requestRespawn::number, requestRespawn::new);
|
||||
|
||||
@Override
|
||||
public Id<? extends CustomPayload> getId() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package modchest.networking.payload;
|
||||
|
||||
import modchest.networking.modNetworkingServer;
|
||||
import net.minecraft.network.RegistryByteBuf;
|
||||
import net.minecraft.network.codec.PacketCodec;
|
||||
import net.minecraft.network.codec.PacketCodecs;
|
||||
import net.minecraft.network.packet.CustomPayload;
|
||||
|
||||
public record startSleepingCallButtons(int number) implements CustomPayload {
|
||||
public static final CustomPayload.Id<startSleepingCallButtons> ID = new CustomPayload.Id<>(modNetworkingServer.start_sleeping_call_buttons);
|
||||
public static final PacketCodec<RegistryByteBuf, startSleepingCallButtons> CODEC = PacketCodec.tuple(PacketCodecs.INTEGER, startSleepingCallButtons::number, startSleepingCallButtons::new);
|
||||
|
||||
@Override
|
||||
public Id<? extends CustomPayload> getId() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
package modchest.util;
|
||||
|
||||
import net.minecraft.nbt.NbtCompound;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
public interface ServerPlayerEntityInterface {
|
||||
NbtCompound getDataSaver();
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@ package modchest.util;
|
|||
|
||||
import modchest.REServerMod;
|
||||
import net.minecraft.nbt.NbtCompound;
|
||||
import net.minecraft.registry.RegistryKey;
|
||||
import net.minecraft.nbt.NbtElement;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.registry.RegistryKey;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class setAndGetMultiButtonsSpawn {
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 453 B After Width: | Height: | Size: 453 B |
|
Before Width: | Height: | Size: 311 B After Width: | Height: | Size: 311 B |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 85 KiB |
0
src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
Executable file → Normal file
0
src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
Executable file → Normal file
0
src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json
Executable file → Normal file
0
src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json
Executable file → Normal file
|
|
@ -9,8 +9,7 @@
|
|||
"Theo Dupuis",
|
||||
"Paula Dupuis",
|
||||
"Jakob Kircher",
|
||||
"Clemens von Molo",
|
||||
"Hanno Reents"
|
||||
"Clemens von Molo"
|
||||
],
|
||||
"contact": {
|
||||
"homepage": "reents.tv",
|
||||
|
|
@ -24,7 +23,7 @@
|
|||
"modchest.REServerMod"
|
||||
],
|
||||
"client": [
|
||||
"modchestClient.REServerModClient"
|
||||
"modchest.REServerModClient"
|
||||
],
|
||||
"fabric-datagen": [
|
||||
"modchest.REServerModDataGenerator"
|
||||
|
|
@ -39,7 +38,7 @@
|
|||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.14.23",
|
||||
"minecraft": "~1.21",
|
||||
"minecraft": "~1.19.2",
|
||||
"java": ">=17",
|
||||
"fabric-api": "*"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue