Compare commits

..

7 Commits

Author SHA1 Message Date
Paula 816f2bbcd0 status effects added
Wenn man den Block benutzt kriegt man jetzt einen tollen Statuseffekt
2024-07-14 12:56:48 +02:00
Paula 8d79df62a3 folder
damit es übersichtlicher ist sind alle blöcke jetzt in einem ordner
2024-07-13 15:54:57 +02:00
Paula a072d525a5 finish
-nochmal überprüft
-ein paar Kommentare hinzugefügt
-der Block ist jetzt nicht mehr durchsichtig
2024-07-13 15:25:34 +02:00
Paula e8fadaa2d5 recipe added
Der Block kann jetzt am Crafting table erstellt werden + useBlockCallback ist jetzt einfacher
2024-07-13 15:03:46 +02:00
Paula 6214c2c6b7 features added
Man kriegt jetzt essen und der Block wird kleiner
2024-06-02 11:16:06 +02:00
Paula c8cdce2c06 seven more suspicious blocks
die restlichen sieben Blöcke um den großen schrumpfen lassen zu können mit models, blockstates, texture und language Anpassungen
2024-06-01 14:33:49 +02:00
Paula 25ff4d1bc4 suspiciousBlock added
Textur und normal großer suspicious Block hinzugefügt
2024-06-01 12:36:22 +02:00
106 changed files with 831 additions and 505 deletions

0
.gitignore vendored Executable file → Normal file
View File

0
LICENSE Executable file → Normal file
View File

5
README.md Executable file → Normal file
View File

@ -2,10 +2,9 @@
für den ReentsEntertainment Minecraft Server für den ReentsEntertainment Minecraft Server
Ändert folgendes: Ändert folgendes:
- fügt multi-sleep hinzu: du kannst beim schlafen dein bett in einem von fünf slots speichern. Nach dem Tod kannst du auswählen bei welchem du respawnen willst; - nichts
TODO: TODO:
- Gird-Blöcke - Betten auswählen zum spawnen
- Client-seitig alle Ordner mit "client[...] benennen, für einfache Importe (fixt z.B. das Problem für networking, alle keys doppelt importieren zu müssen)

0
Workspace/Icons/schiffsblock.xcf Executable file → Normal file
View File

6
build.gradle Executable file → Normal file
View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.6-SNAPSHOT' id 'fabric-loom' version '1.4-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
@ -33,7 +33,7 @@ loom {
inherit server inherit server
name "Data Generation" name "Data Generation"
vmArg "-Dfabric-api.datagen" 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" vmArg "-Dfabric-api.datagen.modid=reservermod"
runDir "build/datagen" runDir "build/datagen"
@ -46,7 +46,7 @@ sourceSets {
main { main {
resources { resources {
srcDirs += [ srcDirs += [
'src/main/java' 'src/main/generated'
] ]
} }
} }

10
gradle.properties Executable file → Normal file
View File

@ -4,14 +4,14 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.21 minecraft_version=1.19.2
yarn_mappings=1.21+build.9 yarn_mappings=1.19.2+build.28
loader_version=0.15.11 loader_version=0.14.23
# Mod Properties # Mod Properties
mod_version=1.0.4 mod_version=1.0.3
maven_group=modchest maven_group=modchest
archives_base_name=reservermod archives_base_name=reservermod
# Dependencies # Dependencies
fabric_version=0.100.7+1.21 fabric_version=0.76.1+1.19.2

2
gradle/wrapper/gradle-wrapper.properties vendored Executable file → Normal file
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

14
gradlew vendored Executable file → Normal file
View File

@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045 # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045 # shellcheck disable=SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # 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"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command;
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# and any embedded shellness will be escaped. # shell script including quotes and variable substitutions, so put them in
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # double quotes to make sure that they get re-expanded; and
# treated as '${Hostname}' itself on the command line. # * put everything else in single quotes, so that it's not re-expanded.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

184
gradlew.bat vendored Executable file → Normal file
View File

@ -1,92 +1,92 @@
@rem @rem
@rem Copyright 2015 the original author or authors. @rem Copyright 2015 the original author or authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @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 not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem https://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @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 distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@rem @rem
@rem ########################################################################## @rem ##########################################################################
@rem Set local scope for the variables with windows NT shell @rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused @rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter. @rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi 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. @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" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:findJavaFromJavaHome :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL% set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE% exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
:omega :omega

0
settings.gradle Executable file → Normal file
View File

View File

@ -1,6 +1,6 @@
package modchestClient; package modchest;
import modchestClient.networking.modNetworkingClient; import modchest.networking.modNetworkingClient;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -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) {}
}
}

View File

@ -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) {}
}
}

View File

@ -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
}
}

View File

@ -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.client.MinecraftClient;
import net.minecraft.network.packet.CustomPayload; import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.PacketByteBuf;
public class respawnRequestS2CPacket { public class respawnRequestS2CPacket {
/*
public static void receive(MinecraftClient minecraftClient, ClientPlayNetworkHandler clientPlayNetworkHandler, PacketByteBuf packetByteBuf, PacketSender packetSender) { 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!"); //REServerModClient.LOGGER.info("Server asked for respawn after pressing a saved respawn button!");
minecraftClient.player.requestRespawn(); 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();
}
} }

View File

@ -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);
}
}
}

View File

@ -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);
}
}
}

View File

@ -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
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

2
src/client/resources/reservermod.client.mixins.json Executable file → Normal file
View File

@ -1,6 +1,6 @@
{ {
"required": true, "required": true,
"package": "modchestClient.mixin", "package": "modchest.mixin.client",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"client": [ "client": [
"DeathScreen", "DeathScreen",

7
src/documentation/Development Executable file → Normal file
View File

@ -8,15 +8,14 @@ Archimedes ship mod code (Mod die Schiffe hinzufügt): (1.7.10, alt aber leich
Valkyrien Skies Mod (Fügt Schiffe + Flugzeuge hinzu): (1.19.2 + Fabric, aber etwas komplexer) Valkyrien Skies Mod (Fügt Schiffe + Flugzeuge hinzu): (1.19.2 + Fabric, aber etwas komplexer)
https://github.com/ValkyrienSkies https://github.com/ValkyrienSkies
In Arbeit:
- (Paula) Grid-Block: Blöcke in diversen Formen. Wenn man mit einem Block rechtsklick macht, nimmt der Grid-Block die entsprechende Textur an. Mit einem neuen Werkzeug
dem Hammer kann man mit rechtsklick die Textur wieder entfernen, mit linksklick den ganzen Block abbauen. Sinn: Mehr baumöglichkeiten, und wenn man z.B.
Deko-Blätter platziert baut man die nicht mehr ausversehen ab.
Ideen für Features: Ideen für Features:
- Suspicous Block: Entsteht wenn wasser auf honig trifft (wie Cobblestone aus Wasser und Lava): hat 8 Level, jedes Level kann mit einer Schale eingesammelt - Suspicous Block: Entsteht wenn wasser auf honig trifft (wie Cobblestone aus Wasser und Lava): hat 8 Level, jedes Level kann mit einer Schale eingesammelt
werden und gibt ein zufälliges suspicous stew. Sinn: Für eine Bar o.ä. werden und gibt ein zufälliges suspicous stew. Sinn: Für eine Bar o.ä.
- Grid-Block: Blöcke in diversen Formen. Wenn man mit einem Block rechtsklick macht, nimmt der Grid-Block die entsprechende Textur an. Mit einem neuen Werkzeug
dem Hammer kann man mit rechtsklick die Textur wieder entfernen, mit linksklick den ganzen Block abbauen. Sinn: Mehr baumöglichkeiten, und wenn man z.B.
Deko-Blätter platziert baut man die nicht mehr ausversehen ab.
- Schiffe: Man baut ein Schiff aus Blöcken, setzt einen Steuerrad drauf und man kann damit über die Meere - Schiffe: Man baut ein Schiff aus Blöcken, setzt einen Steuerrad drauf und man kann damit über die Meere
fahren (Blöcke sollten weiterhin abbaubar und platzierbar sein, damit man epische Seeschlachten mit den Söldnern machen kann) fahren (Blöcke sollten weiterhin abbaubar und platzierbar sein, damit man epische Seeschlachten mit den Söldnern machen kann)
Es sollte eine maximale Anzahl Blöcke geben (Server Ressourcen schonen) die erhöht werden kann mit einem entsprechenden weiteren Block. Es sollte eine maximale Anzahl Blöcke geben (Server Ressourcen schonen) die erhöht werden kann mit einem entsprechenden weiteren Block.

0
src/documentation/Documentation Executable file → Normal file
View File

2
src/documentation/Features Executable file → Normal file
View File

@ -1,2 +1,2 @@
Bereits vorhandene Features: Bereits vorhandene Features:
- multi-sleep (man hat 5 spawnpunkte zu auswahl) - keins....

View File

@ -0,0 +1,11 @@
package modchest.block.custom.gridBlocks;
import net.minecraft.block.Block;
public class gridBlock extends Block{
public gridBlock(Settings settings) {
super(settings);
}
}

View File

@ -1,30 +1,30 @@
package modchest.block.custom; package modchest.block.custom;
import com.mojang.serialization.MapCodec;
import modchest.block.entity.modBlockEntities; import modchest.block.entity.modBlockEntities;
import modchest.block.entity.steeringWheelEntity; import modchest.block.entity.steeringWheelEntity;
import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.BlockWithEntity; import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityTicker;
import net.minecraft.block.entity.BlockEntityType; 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.ItemScatterer;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
//gibt dem Block steering_wheel eigenschaften, wie z.B. das Interaktionsmenü, oder Grafiken //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) { public steeringWheelBlock(Settings settings) {
super(settings); super(settings);
} }
@Override
protected MapCodec<? extends BlockWithEntity> getCodec() {
return null;
}
/* stuff benötigt um das Interaktionsmenü zu laden!*/ /* stuff benötigt um das Interaktionsmenü zu laden!*/
@Override @Override
@ -43,7 +43,7 @@ public class steeringWheelBlock extends BlockWithEntity {
super.onStateReplaced(state, world, pos, newState, moved); super.onStateReplaced(state, world, pos, newState, moved);
} }
} }
/*
@Override //wird bei einem rechtsklick aufgerufen (ersellt das Blockentity) @Override //wird bei einem rechtsklick aufgerufen (ersellt das Blockentity)
public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
if (!world.isClient) { if (!world.isClient) {
@ -55,7 +55,7 @@ public class steeringWheelBlock extends BlockWithEntity {
} }
return ActionResult.SUCCESS; return ActionResult.SUCCESS;
} }
*/
@Nullable @Nullable
@Override @Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
@ -64,6 +64,6 @@ public class steeringWheelBlock extends BlockWithEntity {
@Nullable @Nullable
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) { 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);
} }
} }

View File

@ -0,0 +1,11 @@
package modchest.block.custom.suspiciousBlocks;
import net.minecraft.block.Block;
public class suspiciousBlock extends Block {
//beim rechtsklick mit einer schüssel kriegt man suspicious stew und der block wird kleiner -> siehe useBlockCallback
public suspiciousBlock(Settings settings) {
super(settings);
}
}

View File

@ -0,0 +1,9 @@
package modchest.block.custom.suspiciousBlocks;
public class suspiciousBlockMinusDrei extends suspiciousBlock {
//siehe suspiciousBlock
public suspiciousBlockMinusDrei(Settings settings) {
super(settings);
}
}

View File

@ -0,0 +1,9 @@
package modchest.block.custom.suspiciousBlocks;
public class suspiciousBlockMinusEins extends suspiciousBlock {
//siehe suspiciousBlock
public suspiciousBlockMinusEins(Settings settings) {
super(settings);
}
}

View File

@ -0,0 +1,9 @@
package modchest.block.custom.suspiciousBlocks;
public class suspiciousBlockMinusFuenf extends suspiciousBlock {
//siehe suspiciousBlock
public suspiciousBlockMinusFuenf(Settings settings) {
super(settings);
}
}

View File

@ -0,0 +1,9 @@
package modchest.block.custom.suspiciousBlocks;
public class suspiciousBlockMinusSechs extends suspiciousBlock {
//siehe suspiciousBlock
public suspiciousBlockMinusSechs(Settings settings) {
super(settings);
}
}

View File

@ -0,0 +1,9 @@
package modchest.block.custom.suspiciousBlocks;
public class suspiciousBlockMinusSieben extends suspiciousBlock {
//siehe suspiciousBlock
public suspiciousBlockMinusSieben(Settings settings) {
super(settings);
}
}

View File

@ -0,0 +1,9 @@
package modchest.block.custom.suspiciousBlocks;
public class suspiciousBlockMinusVier extends suspiciousBlock {
//siehe suspiciousBlock
public suspiciousBlockMinusVier(Settings settings) {
super(settings);
}
}

View File

@ -0,0 +1,9 @@
package modchest.block.custom.suspiciousBlocks;
public class suspiciousBlockMinusZwei extends suspiciousBlock {
//siehe suspiciousBlock
public suspiciousBlockMinusZwei(Settings settings) {
super(settings);
}
}

View File

@ -4,17 +4,16 @@ import modchest.REServerMod;
import modchest.block.modBlocks; import modchest.block.modBlocks;
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
import net.minecraft.block.entity.BlockEntityType; 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.Identifier;
import net.minecraft.util.registry.Registry;
//rendert letztendlich die Interaktionsmenüs der Blöcke //rendert letztendlich die Interaktionsmenüs der Blöcke
public class modBlockEntities { public class modBlockEntities {
public static BlockEntityType<steeringWheelEntity> steering_wheel_interface; // Interaktionsmenü wird erstellt public static BlockEntityType<steeringWheelEntity> steering_wheel_interface; // Interaktionsmenü wird erstellt
public static void registerBlockEntities() { public static void registerBlockEntities() {
steering_wheel_interface = Registry.register(Registries.BLOCK_ENTITY_TYPE, steering_wheel_interface = Registry.register(Registry.BLOCK_ENTITY_TYPE,
Identifier.of(REServerMod.MOD_ID, "steering_wheel_interface"), // Interkationsmenü wird gerendert new Identifier(REServerMod.MOD_ID, "steering_wheel_interface"), // Interkationsmenü wird gerendert
FabricBlockEntityTypeBuilder.create(steeringWheelEntity::new, modBlocks.steering_wheel).build(null)); FabricBlockEntityTypeBuilder.create(steeringWheelEntity::new, modBlocks.steering_wheel).build(null));
} }
} }

View File

@ -1,34 +1,82 @@
package modchest.block; package modchest.block;
import modchest.block.custom.steeringWheelBlock; import modchest.block.custom.steeringWheelBlock;
import modchest.block.custom.suspiciousBlocks.suspiciousBlock;
import modchest.item.modItemGroup; import modchest.item.modItemGroup;
import modchest.REServerMod; 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.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.Material;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
//setzt die blöcke auf //setzt die blöcke auf
public class modBlocks { 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 Block suspicious_block;
public static Block suspicious_block_minus_eins;
public static Block suspicious_block_minus_zwei;
public static Block suspicious_block_minus_drei;
public static Block suspicious_block_minus_vier;
public static Block suspicious_block_minus_fuenf;
public static Block suspicious_block_minus_sechs;
public static Block suspicious_block_minus_sieben;
public static void setBlocks() {// Block wird definiert public static void setBlocks() {// Block wird definiert
steering_wheel = registerBlock("steering_wheel", steering_wheel = registerBlock("steering_wheel",
new steeringWheelBlock(FabricBlockSettings.create().strength(1.0f).requiresTool()), new steeringWheelBlock(FabricBlockSettings.of(Material.WOOD).strength(1.0f).requiresTool()),
modItemGroup.item_group1); modItemGroup.modchest);
suspicious_block = registerBlock("suspicious_block",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
suspicious_block_minus_eins = registerBlock("suspicious_block_minus_eins",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
suspicious_block_minus_zwei = registerBlock("suspicious_block_minus_zwei",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
suspicious_block_minus_drei = registerBlock("suspicious_block_minus_drei",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
suspicious_block_minus_vier = registerBlock("suspicious_block_minus_vier",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
suspicious_block_minus_fuenf = registerBlock("suspicious_block_minus_fuenf",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
suspicious_block_minus_sechs = registerBlock("suspicious_block_minus_sechs",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
suspicious_block_minus_sieben = registerBlock("suspicious_block_minus_sieben",
new suspiciousBlock(FabricBlockSettings.of(Material.SPONGE).strength(1.0f).requiresTool()
.nonOpaque()),
modItemGroup.modchest);
} }
private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben
// definierten Blöcke dem Register // definierten Blöcke dem Register
// hinzu // hinzu
Registry.register(Registries.ITEM, Identifier.of(REServerMod.MOD_ID, name), Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name),
new BlockItem(block, new Item.Settings())); new BlockItem(block, new FabricItemSettings().group(group)));
return Registry.register(Registries.BLOCK, Identifier.of(REServerMod.MOD_ID, name), block); return Registry.register(Registry.BLOCK, new Identifier(REServerMod.MOD_ID, name), block);
} }
public static void registerModBlocks() { // Error Logger halt... public static void registerModBlocks() { // Error Logger halt...

View File

@ -1,4 +1,3 @@
/*
package modchest.data; package modchest.data;
import modchest.item.modItems; 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 //oreDrops(modBlocks.steering_wheel, modItems.shipblock); mit silktouch würde steering_wheel gedroped werden, ohne würde shipblock gedroped werden
} }
} }
*/

View File

@ -1,4 +1,3 @@
/*
package modchest.data; package modchest.data;
import modchest.block.modBlocks; 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 //itemModelGenerator.register(modItems.shipblock, Models.GENERATED); //ergänzt die Texturen für die Items
} }
} }
*/

View File

@ -1,4 +1,3 @@
/*
package modchest.data; package modchest.data;
import modchest.item.modItems; 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) //offerSmelting(exporter, List.of(modItems.shipblock), , ); //generiert das rezept zum herstellen (hier mir braten)
} }
} }
*/

View File

@ -4,11 +4,11 @@ import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn; import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.World; import net.minecraft.world.World;
public class playerAfterRespawnEvent implements ServerPlayerEvents.AfterRespawn { //Wenn die Multi-Spawn mod verwendet wurde, muss der Vanillaspawn wieder gesetzt werden 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 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("]"); 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 float angle = nbt.getFloat("angle"); //Und den blickwinkel

View File

@ -0,0 +1,66 @@
package modchest.event;
import modchest.block.custom.suspiciousBlocks.suspiciousBlock;
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
import net.minecraft.block.BlockState;
import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class useBlockCallback implements UseBlockCallback {
@Override
public ActionResult interact(PlayerEntity player, World world, Hand hand, BlockHitResult hitResult) {
BlockPos pos = hitResult.getBlockPos();
BlockState state = world.getBlockState(hitResult.getBlockPos());
String hitResultString = state.getBlock().toString();
StatusEffect[] statusArray = {
StatusEffects.ABSORPTION, StatusEffects.BAD_OMEN, StatusEffects.BLINDNESS,
StatusEffects.CONDUIT_POWER, StatusEffects.DARKNESS, StatusEffects.DOLPHINS_GRACE,
StatusEffects.FIRE_RESISTANCE, StatusEffects.GLOWING, StatusEffects.HASTE, StatusEffects.HEALTH_BOOST,
StatusEffects.HERO_OF_THE_VILLAGE, StatusEffects.HUNGER, StatusEffects.INSTANT_DAMAGE,
StatusEffects.INSTANT_HEALTH, StatusEffects.INVISIBILITY, StatusEffects.JUMP_BOOST,
StatusEffects.LEVITATION, StatusEffects.LUCK, StatusEffects.MINING_FATIGUE, StatusEffects.NAUSEA,
StatusEffects.NIGHT_VISION, StatusEffects.POISON, StatusEffects.REGENERATION, StatusEffects.RESISTANCE,
StatusEffects.SATURATION, StatusEffects.SLOWNESS, StatusEffects.SLOW_FALLING, StatusEffects.SPEED,
StatusEffects.STRENGTH, StatusEffects.UNLUCK, StatusEffects.WATER_BREATHING, StatusEffects.WEAKNESS,
StatusEffects.WITHER};
int randomNumber = (int)(Math.random() * 33);
StatusEffectInstance effect = new StatusEffectInstance(statusArray[randomNumber]);
//Random random = new Random(statusArray.length);
if (player.getMainHandStack().getItem().equals(Items.BOWL)) {
if (hitResultString.equals("Block{modchest:suspicious_block}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_eins}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_zwei}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_zwei}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_drei}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_vier}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_fuenf}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_sechs}") ||
hitResultString.equals("Block{modchest:suspicious_block_minus_sieben}")) {
player.getMainHandStack().decrement(1); // sonst unendlich viel Schüsseln, auch nicht schlecht
ItemStack stewStack = Items.SUSPICIOUS_STEW.getDefaultStack();
player.giveItemStack(stewStack);
//player.addStatusEffect(StatusEffectInstance.class.cast(/*statusArray[randomNumber]*/StatusEffects.ABSORPTION));
player.addStatusEffect(effect);
world.setBlockState(pos, suspiciousBlock
.getStateFromRawId(suspiciousBlock.getRawIdFromState(state) + 1)); // sorgt dafür, dass
// der suspicious
// Block um eins
// kleiner wird wenn
// man ihn mit der
// Schüssel benutzt
return ActionResult.SUCCESS;
}
}
return ActionResult.PASS;
}
}

View File

@ -1,39 +1,19 @@
package modchest.item; package modchest.item;
import modchest.REServerMod; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
import modchest.block.modBlocks;
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; 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; 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 //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 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 ItemGroup modchest;
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 void modchest() { public static void modchest() {
//Registriert die Gruppe modchest = FabricItemGroupBuilder.build(
Registry.register(Registries.ITEM_GROUP, item_group_key1, item_group1); new Identifier("modchest", "itemlist1"),
() -> new ItemStack(Blocks.COBBLESTONE)); //Icon ist halt bisher noch ein Cobblestone, weil ich keine sprits erstellt habe... :(
//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);
}
);
} }
} }

View File

@ -2,10 +2,10 @@ package modchest.item;
import modchest.REServerMod; import modchest.REServerMod;
import modchest.item.custom.piratesCoinItem; import modchest.item.custom.piratesCoinItem;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.registry.Registry;
import net.minecraft.registry.Registries;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
//Liste der Items die hinzugefügt werden, ausgenommen Blöcke //Liste der Items die hinzugefügt werden, ausgenommen Blöcke
public class modItems { 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 public static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist
// im detail erklärt was das Item machen soll // 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" public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt
shipblock = registerItem("shipblock", new Item(new Item.Settings())); shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest)));
pirates_coin = registerItem("pirates_coin", 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; private static Item registerItem(String name, Item item) { // Methode, die die Items dann letztendlich hinzufügt;
// nicht bearbeiten ist eine generische MEthode // 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() { public static void registerModItems() {

View File

@ -10,6 +10,8 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Arrays;
@Mixin(ServerPlayerEntity.class) @Mixin(ServerPlayerEntity.class)
public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface { public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface {
@Unique @Unique

View File

@ -5,14 +5,16 @@ import modchest.util.setAndGetMultiButtonsSpawn;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import net.minecraft.block.BedBlock; import net.minecraft.block.BedBlock;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; 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.List;
import java.util.Objects; import java.util.Objects;
@ -20,7 +22,7 @@ import java.util.Objects;
public class bedBlock { public class bedBlock {
@Inject(method = "onBreak", at = @At("HEAD")) @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 if (!world.isClient) { //Stellt sicher, dass das ganze nicht auf dem Client gerechnet wird, weil der Code sonst abstuertzt
int posBedX = pos.getX(); int posBedX = pos.getX();

View File

@ -3,40 +3,17 @@ package modchest.networking;
import modchest.REServerMod; import modchest.REServerMod;
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket; import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
import modchest.networking.packet.setNewRespawnsC2SPacket; 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 net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import modchest.networking.payload.startSleepingCallButtons;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
public class modNetworkingServer { //Identifier werden eingeführt 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 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 = Identifier.of(REServerMod.MOD_ID, "start_sleeping_call_buttons"); public static final Identifier start_sleeping_call_buttons = new Identifier(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 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) 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); ServerPlayNetworking.registerGlobalReceiver(start_sleeping_call_buttons, setNewRespawnsC2SPacket::receive); //was der Server dann machen soll steht in der receive Methode
PayloadTypeRegistry.playC2S().register(deathMultiRespawnButtons.ID, deathMultiRespawnButtons.CODEC);
//PayloadTypeRegistry.playC2S().register(requestRespawn.ID, requestRespawn.CODEC);
ServerPlayNetworking.registerGlobalReceiver(startSleepingCallButtons.ID, (payload, context) -> { ServerPlayNetworking.registerGlobalReceiver(death_multi_respawn_buttons, deathScreenMultiButtonsC2SPacket::receive);
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);
} }
} }

View File

@ -1,39 +1,44 @@
package modchest.networking.packet; package modchest.networking.packet;
import modchest.REServerMod; import modchest.REServerMod;
import modchest.networking.payload.requestRespawn; import modchest.networking.modNetworkingServer;
import modchest.util.setAndGetMultiButtonsSpawn; 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.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.awt.*;
import java.util.Arrays; import java.util.Arrays;
public class deathScreenMultiButtonsC2SPacket { 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 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 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 { 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) { } 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; num = 1;
} }
setAndGet.setMultiSpawnVanilla(player); 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 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 { try {
//REServerMod.LOGGER.info("try Respawning from Multi-Sapwn"); //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 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))); 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); setAndGet.setMultiSpawn(player, 6);
} catch (Exception e) { } catch (Exception e) {
REServerMod.LOGGER.info("Sorry! Following error, trying to respawn player " + player.getDisplayName() + ": " + e); REServerMod.LOGGER.info("Sorry! Following error, trying to respawn player " + player.getDisplayName() + ": " + e);
@ -46,4 +51,4 @@ public class deathScreenMultiButtonsC2SPacket {
} }
} }
} }
} }

View File

@ -2,15 +2,21 @@ package modchest.networking.packet;
import modchest.REServerMod; import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn; 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.MinecraftServer;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import java.util.Arrays;
public class setNewRespawnsC2SPacket { 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(); setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn();
try { 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: case 1:
setAndGet.setMultiSpawn(player, 1); //Spawnpunkt wird gespeichert setAndGet.setMultiSpawn(player, 1); //Spawnpunkt wird gespeichert
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "1")); player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "1"));

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -1,6 +1,8 @@
package modchest.util; package modchest.util;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Unique;
public interface ServerPlayerEntityInterface { public interface ServerPlayerEntityInterface {
NbtCompound getDataSaver(); NbtCompound getDataSaver();

View File

@ -3,10 +3,12 @@ package modchest.util;
import modchest.block.entity.modBlockEntities; import modchest.block.entity.modBlockEntities;
import modchest.block.modBlocks; import modchest.block.modBlocks;
import modchest.event.playerAfterRespawnEvent; import modchest.event.playerAfterRespawnEvent;
import modchest.event.useBlockCallback;
import modchest.item.modItemGroup; import modchest.item.modItemGroup;
import modchest.item.modItems; import modchest.item.modItems;
import modchest.networking.modNetworkingServer; import modchest.networking.modNetworkingServer;
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
public class initializer { public class initializer {
public static void itemGroups() { public static void itemGroups() {
@ -22,6 +24,7 @@ public class initializer {
public static void events() { //Events, bei denen custom Code ausgefuehrt wird, werden eingefuehrt public static void events() { //Events, bei denen custom Code ausgefuehrt wird, werden eingefuehrt
ServerPlayerEvents.AFTER_RESPAWN.register(new playerAfterRespawnEvent()); ServerPlayerEvents.AFTER_RESPAWN.register(new playerAfterRespawnEvent());
UseBlockCallback.EVENT.register(new useBlockCallback());
} }
public static void networking() { //Identifier unter denen der Server zuhoert werden registriert public static void networking() { //Identifier unter denen der Server zuhoert werden registriert

View File

@ -2,10 +2,11 @@ package modchest.util;
import modchest.REServerMod; import modchest.REServerMod;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.registry.RegistryKey; import net.minecraft.nbt.NbtElement;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.World; import net.minecraft.world.World;
public class setAndGetMultiButtonsSpawn { public class setAndGetMultiButtonsSpawn {

View File

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block"}
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block_minus_drei"}
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block_minus_eins"}
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block_minus_fuenf"}
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block_minus_sechs"}
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block_minus_sieben"}
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block_minus_vier"}
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"": {"model": "modchest:block/suspicious_block_minus_zwei"}
}
}

0
src/main/resources/assets/modchest/icon.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
src/main/resources/assets/modchest/icon.png.old Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 453 B

8
src/main/resources/assets/modchest/lang/de_de.json Executable file → Normal file
View File

@ -2,6 +2,14 @@
"item.modchest.shipblock": "Schiffsblock", "item.modchest.shipblock": "Schiffsblock",
"item.modchest.pirates_coin": "OP Piraten ding zum Testen", "item.modchest.pirates_coin": "OP Piraten ding zum Testen",
"block.modchest.steering_wheel": "Lenkrad", "block.modchest.steering_wheel": "Lenkrad",
"block.modchest.suspicious_block": "verdächtiger Block :)",
"block.modchest.suspicious_block_minus_eins": "durchaus verdächtiger Block",
"block.modchest.suspicious_block_minus_zwei": "sehr verdächtiger Block ",
"block.modchest.suspicious_block_minus_drei": "überaus verdächtiger Block",
"block.modchest.suspicious_block_minus_vier": "äußerst verdächtiger Block",
"block.modchest.suspicious_block_minus_fuenf": "seeeeeeeehr verdächtiger Block",
"block.modchest.suspicious_block_minus_sechs": "unglaublich verdächtiger Block",
"block.modchest.suspicious_block_minus_sieben": "unschlagbar verdächtiger Block",
"itemGroup.modchest.itemlist1": "Malte's Mod", "itemGroup.modchest.itemlist1": "Malte's Mod",
"chat.modchest.multispawn.beddestroyed": "Scheint so, als wäre das Bett zerstört worden!", "chat.modchest.multispawn.beddestroyed": "Scheint so, als wäre das Bett zerstört worden!",

8
src/main/resources/assets/modchest/lang/en_pt.json Executable file → Normal file
View File

@ -2,6 +2,14 @@
"item.modchest.shipblock": "Hanno, änder die Sprache!", "item.modchest.shipblock": "Hanno, änder die Sprache!",
"item.modchest.pirates_coin": "Ya coin for tha pirrrrrates!", "item.modchest.pirates_coin": "Ya coin for tha pirrrrrates!",
"block.modchest.steering_wheel": "Ne, du kriegst keine hilfreichen Angaben mit der Sprache!", "block.modchest.steering_wheel": "Ne, du kriegst keine hilfreichen Angaben mit der Sprache!",
"block.modchest.suspicious_block": "somethin' fishy with this block",
"block.modchest.suspicious_block_minus_eins": "somethin' fishy with this block",
"block.modchest.suspicious_block_minus_zwei": "somethin' fishy with this block",
"block.modchest.suspicious_block_minus_drei": "somethin' fishy with this block",
"block.modchest.suspicious_block_minus_vier": "somethin' fishy with this block",
"block.modchest.suspicious_block_minus_fuenf": "somethin' fishy with this block",
"block.modchest.suspicious_block_minus_sechs": "somethin' fishy with this block",
"block.modchest.suspicious_block_minus_sieben": "somethin' fishy with this block",
"itemGroup.modchest.itemlist1": "Änder doch endlich die Sprache...", "itemGroup.modchest.itemlist1": "Änder doch endlich die Sprache...",
"chat.modchest.multispawn.beddestroyed": "Sorry, mate! Looks like that cap'n doesn't like you", "chat.modchest.multispawn.beddestroyed": "Sorry, mate! Looks like that cap'n doesn't like you",

8
src/main/resources/assets/modchest/lang/en_us.json Executable file → Normal file
View File

@ -2,6 +2,14 @@
"item.modchest.shipblock": "Shipblock", "item.modchest.shipblock": "Shipblock",
"item.modchest.pirates_coin": "Pirate's Coin", "item.modchest.pirates_coin": "Pirate's Coin",
"block.modchest.steering_wheel": "Steering Wheel", "block.modchest.steering_wheel": "Steering Wheel",
"block.modchest.suspicious_block": "sus",
"block.modchest.suspicious_block_minus_eins": "sus",
"block.modchest.suspicious_block_minus_zwei": "sus",
"block.modchest.suspicious_block_minus_drei": "sus",
"block.modchest.suspicious_block_minus_vier": "sus",
"block.modchest.suspicious_block_minus_fuenf": "sus",
"block.modchest.suspicious_block_minus_sechs": "ssus",
"block.modchest.suspicious_block_minus_sieben": "sus",
"itemGroup.modchest.itemlist1": "new blocks", "itemGroup.modchest.itemlist1": "new blocks",
"chat.modchest.multispawn.beddestroyed": "Oh shit! Looks like that bed got destroyed!", "chat.modchest.multispawn.beddestroyed": "Oh shit! Looks like that bed got destroyed!",

View File

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "modchest:block/suspicious_block_texture"
}
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/cube_all",
"textures": {
"0": "modchest:block/suspicious_block_texture",
"particle": "modchest:block/suspicious_block_texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 10, 16],
"faces": {
"north": {"uv": [0, 0, 16, 10], "texture": "#0"},
"east": {"uv": [0, 0, 16, 10], "texture": "#0"},
"south": {"uv": [0, 0, 16, 10], "texture": "#0"},
"west": {"uv": [0, 0, 16, 10], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/cube_all",
"textures": {
"0": "modchest:block/suspicious_block_texture",
"particle": "modchest:block/suspicious_block_texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 14, 16],
"faces": {
"north": {"uv": [0, 0, 16, 14], "texture": "#0"},
"east": {"uv": [0, 0, 16, 14], "texture": "#0"},
"south": {"uv": [0, 0, 16, 14], "texture": "#0"},
"west": {"uv": [0, 0, 16, 14], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/cube_all",
"textures": {
"0": "modchest:block/suspicious_block_texture",
"particle": "modchest:block/suspicious_block_texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 6, 16],
"faces": {
"north": {"uv": [0, 0, 16, 6], "texture": "#0"},
"east": {"uv": [0, 0, 16, 6], "texture": "#0"},
"south": {"uv": [0, 0, 16, 6], "texture": "#0"},
"west": {"uv": [0, 0, 16, 6], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/cube_all",
"textures": {
"0": "modchest:block/suspicious_block_texture",
"particle": "modchest:block/suspicious_block_texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 4, 16],
"faces": {
"north": {"uv": [0, 0, 16, 4], "texture": "#0"},
"east": {"uv": [0, 0, 16, 4], "texture": "#0"},
"south": {"uv": [0, 0, 16, 4], "texture": "#0"},
"west": {"uv": [0, 0, 16, 4], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/cube_all",
"textures": {
"0": "modchest:block/suspicious_block_texture",
"particle": "modchest:block/suspicious_block_texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 2, 16],
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#0"},
"east": {"uv": [0, 0, 16, 2], "texture": "#0"},
"south": {"uv": [0, 0, 16, 2], "texture": "#0"},
"west": {"uv": [0, 0, 16, 2], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/cube_all",
"textures": {
"0": "modchest:block/suspicious_block_texture",
"particle": "modchest:block/suspicious_block_texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 0, 16, 8], "texture": "#0"},
"east": {"uv": [0, 0, 16, 8], "texture": "#0"},
"south": {"uv": [0, 0, 16, 8], "texture": "#0"},
"west": {"uv": [0, 0, 16, 8], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

View File

@ -0,0 +1,21 @@
{
"parent": "block/cube_all",
"textures": {
"0": "modchest:block/suspicious_block_texture",
"particle": "modchest:block/suspicious_block_texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 12, 16],
"faces": {
"north": {"uv": [0, 0, 16, 12], "texture": "#0"},
"east": {"uv": [0, 0, 16, 12], "texture": "#0"},
"south": {"uv": [0, 0, 16, 12], "texture": "#0"},
"west": {"uv": [0, 0, 16, 12], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
]
}

View File

View File

View File

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block_minus_drei"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block_minus_eins"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block_minus_fuenf"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block_minus_sechs"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block_minus_sieben"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block_minus_vier"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modchest:block/suspicious_block_minus_zwei"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 377 B

View File

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

0
src/main/resources/data/icon.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

View File

View File

View File

View File

View File

View File

Some files were not shown because too many files have changed in this diff Show More