Compare commits
2 Commits
main
...
MultiSleep
Author | SHA1 | Date |
---|---|---|
Hanno Reents | 46de36d7b6 | |
Hanno Reents | 75d9508fe9 |
|
@ -7,5 +7,4 @@ für den ReentsEntertainment Minecraft Server
|
||||||
|
|
||||||
TODO:
|
TODO:
|
||||||
- Gird-Blöcke
|
- Gird-Blöcke
|
||||||
- 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)
|
|
||||||
|
|
||||||
|
|
|
@ -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'
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.2
|
||||||
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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
|
@ -0,0 +1,78 @@
|
||||||
|
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;
|
||||||
|
import networking.packet.getNameOfRespawnButtonsS2CPacket;
|
||||||
|
|
||||||
|
@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 und dem Knopf sein soll (der Nullpunkt (0|0) ist soswohl im Fenster als auch beim Knopf oben links die Ecke)
|
||||||
|
int xOffset = this.width / 2 - widthButton / 2; //Die Mitte wird ausgerechnet (Mitte vom fenster minus halbe Breite des knopfes um tatsächlich die Mitte zu haben, weil koordinaten und so
|
||||||
|
this.addDrawableChild(
|
||||||
|
new ButtonWidget(xOffset - 2 * (widthButton + 5), yOffset, widthButton, heightButton, Text.of(getNameOfRespawnButtonsS2CPacket()), button -> { //Knopf wird erzeugt
|
||||||
|
REServerModClient.LOGGER.info("First Button for using spawn pressed!");
|
||||||
|
PacketByteBuf buffer = PacketByteBufs.create(); //Neuer Buffer wird erstellt
|
||||||
|
buffer.writeInt(1); //Beschrieben, damit der Server weiss, welcher knopf gedrueckt wurde
|
||||||
|
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,21 @@
|
||||||
|
package modchest.networking;
|
||||||
|
|
||||||
|
import modchest.REServerMod;
|
||||||
|
import modchest.networking.packet.getNamesOfRespawnButtonsS2CPacket;
|
||||||
|
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 final Identifier set_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "set_names_of_respawn_button");
|
||||||
|
public static final Identifier get_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "get_names_of_respawn_buttons");
|
||||||
|
|
||||||
|
public static void registerC2SPackets() { //Identifier fuer packets werden registriert (Identifier die der Server aufruft um beim CLient was auszufuehren)
|
||||||
|
ClientPlayNetworking.registerGlobalReceiver(request_respawn, respawnRequestS2CPacket::receive); //was der Client dann machen soll steht in der receive Methode
|
||||||
|
|
||||||
|
ClientPlayNetworking.registerGlobalReceiver(request_respawn, getNamesOfRespawnButtonsS2CPacket::receive);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
package modchest.networking.packet;
|
||||||
|
|
||||||
|
import modchest.REServerModClient;
|
||||||
|
import net.fabricmc.fabric.api.networking.v1.PacketSender;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
||||||
|
import net.minecraft.network.PacketByteBuf;
|
||||||
|
|
||||||
|
public class getNamesOfRespawnButtonsS2CPacket {
|
||||||
|
|
||||||
|
public static String[] receive(MinecraftClient minecraftClient, ClientPlayNetworkHandler clientPlayNetworkHandler, PacketByteBuf packetByteBuf, PacketSender packetSender) {
|
||||||
|
String[] namesFromServer = new String[5];
|
||||||
|
for (int i = 0; i < 5; i++) {
|
||||||
|
namesFromServer[i] = (buf.readString(32767));
|
||||||
|
}
|
||||||
|
|
||||||
|
return namesFromServer;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,18 +1,14 @@
|
||||||
package modchestClient.networking.packet;
|
package modchest.networking.packet;
|
||||||
|
|
||||||
|
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();
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -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,
|
"required": true,
|
||||||
"package": "modchestClient.mixin",
|
"package": "modchest.mixin.client",
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_17",
|
||||||
"client": [
|
"client": [
|
||||||
"DeathScreen",
|
"DeathScreen",
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,32 +3,32 @@ package modchest.block;
|
||||||
import modchest.block.custom.steeringWheelBlock;
|
import modchest.block.custom.steeringWheelBlock;
|
||||||
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 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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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...
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
/*
|
|
||||||
package modchest.data;
|
package modchest.data;
|
||||||
|
|
||||||
import modchest.item.modItems;
|
|
||||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
|
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
|
||||||
import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
|
import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
|
||||||
import modchest.block.modBlocks;
|
|
||||||
|
|
||||||
//vereinfacht das erstellen der einzelnen JSON files, bisher nicht verwendet, am besten auch nie verwenden; unten auskommentierter code ist example-code! Hier: die Loot-Tables also was ein Item beim Abbau dropt
|
//vereinfacht das erstellen der einzelnen JSON files, bisher nicht verwendet, am besten auch nie verwenden; unten auskommentierter code ist example-code! Hier: die Loot-Tables also was ein Item beim Abbau dropt
|
||||||
public class ModLootTableGenerator extends FabricBlockLootTableProvider {
|
public class ModLootTableGenerator extends FabricBlockLootTableProvider {
|
||||||
|
@ -17,4 +14,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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
|
|
@ -1,13 +1,9 @@
|
||||||
/*
|
|
||||||
package modchest.data;
|
package modchest.data;
|
||||||
|
|
||||||
import modchest.block.modBlocks;
|
|
||||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
|
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
|
||||||
import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
|
import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
|
||||||
import net.minecraft.data.client.BlockStateModelGenerator;
|
import net.minecraft.data.client.BlockStateModelGenerator;
|
||||||
import net.minecraft.data.client.ItemModelGenerator;
|
import net.minecraft.data.client.ItemModelGenerator;
|
||||||
import modchest.item.modItems;
|
|
||||||
import net.minecraft.data.client.Models;
|
|
||||||
|
|
||||||
//vereinfacht das erstellen der einzelnen JSON files, bisher nicht verwendet, am besten auch nie verwenden; unten auskommentierter code ist example-code! Hier: Für die generierung der Texturen
|
//vereinfacht das erstellen der einzelnen JSON files, bisher nicht verwendet, am besten auch nie verwenden; unten auskommentierter code ist example-code! Hier: Für die generierung der Texturen
|
||||||
public class ModModelProvider extends FabricModelProvider {
|
public class ModModelProvider extends FabricModelProvider {
|
||||||
|
@ -25,4 +21,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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
|
|
@ -1,12 +1,9 @@
|
||||||
/*
|
|
||||||
package modchest.data;
|
package modchest.data;
|
||||||
|
|
||||||
import modchest.item.modItems;
|
|
||||||
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
|
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
|
||||||
import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
|
import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
|
||||||
import net.minecraft.data.server.recipe.RecipeJsonProvider;
|
import net.minecraft.data.server.recipe.RecipeJsonProvider;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
//vereinfacht das erstellen der einzelnen JSON files, bisher nicht verwendet, am besten auch nie verwenden; unten auskommentierter code ist example-code! Hier: würden die Rezepte erstellt werden
|
//vereinfacht das erstellen der einzelnen JSON files, bisher nicht verwendet, am besten auch nie verwenden; unten auskommentierter code ist example-code! Hier: würden die Rezepte erstellt werden
|
||||||
|
@ -20,4 +17,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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
|
|
||||||
);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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() {
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package modchest.mixin;
|
package modchest.mixin;
|
||||||
|
|
||||||
import modchest.REServerMod;
|
|
||||||
import modchest.util.ServerPlayerEntityInterface;
|
import modchest.util.ServerPlayerEntityInterface;
|
||||||
import net.minecraft.nbt.NbtCompound;
|
import net.minecraft.nbt.NbtCompound;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
|
@ -30,24 +29,13 @@ public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInter
|
||||||
|
|
||||||
@Inject(method = "writeCustomDataToNbt", at = @At("TAIL"))
|
@Inject(method = "writeCustomDataToNbt", at = @At("TAIL"))
|
||||||
public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) { //Immer wenn eine andere Methode aufruft, dass Daten abgespeichert werden sollen, tun wir das jetzt auch
|
public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) { //Immer wenn eine andere Methode aufruft, dass Daten abgespeichert werden sollen, tun wir das jetzt auch
|
||||||
if (dataSaver != null) { //wenn der dataSaver null ist, wuerde sonst ein Error kommen, weil Minecraft keine leeren NBTs absepeicheern kann :(
|
nbt.put("REServerMod", this.dataSaver);
|
||||||
try {
|
//REServerMod.LOGGER.info("writeCustomDataToNbt called");
|
||||||
nbt.put("REServerMod", this.dataSaver);
|
|
||||||
} catch (Exception e) {
|
|
||||||
REServerMod.LOGGER.info("Error while saving custom NBt-Data: " + e);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
REServerMod.LOGGER.info("write failed! This probably means, that the player hasn't set a custom spanpoint yet");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "readCustomDataFromNbt", at = @At("TAIL"))
|
@Inject(method = "readCustomDataFromNbt", at = @At("TAIL"))
|
||||||
public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) { //gleiches beim einlesen. Werden NBT-Daten eingelesen, tun wird das auch
|
public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) { //gleiches beim einlesen. Werden NBT-Daten eingelesen, tun wird das auch
|
||||||
try {
|
dataSaver = (NbtCompound) nbt.get("REServerMod");
|
||||||
dataSaver = (NbtCompound) nbt.get("REServerMod");
|
|
||||||
} catch (Exception e) {
|
|
||||||
REServerMod.LOGGER.info("Error while saving custom NBt-Data: " + e);
|
|
||||||
}
|
|
||||||
//REServerMod.LOGGER.info("readCustomDataFromNbt called with following Data: " + Arrays.toString(nbt.getIntArray("REServerMod.sleep_data")));
|
//REServerMod.LOGGER.info("readCustomDataFromNbt called with following Data: " + Arrays.toString(nbt.getIntArray("REServerMod.sleep_data")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ 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.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
@ -20,7 +20,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();
|
||||||
|
|
|
@ -2,41 +2,23 @@ package modchest.networking;
|
||||||
|
|
||||||
import modchest.REServerMod;
|
import modchest.REServerMod;
|
||||||
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
|
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
|
||||||
|
import modchest.networking.packet.setNamesOfRespawnButtonsC2SPacket;
|
||||||
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 final Identifier set_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "set_names_of_respawn_buttons");
|
||||||
|
public static final Identifier get_names_of_respawn_buttons = new Identifier(REServerMod.MOD_ID, "get_names_of_respawn_buttons");
|
||||||
|
|
||||||
public static void registerS2CPackets() { //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren)
|
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) -> {
|
ServerPlayNetworking.registerGlobalReceiver(set_names_of_respawn_buttons, setNamesOfRespawnButtonsC2SPacket::receive);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
20
src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
Normal file → Executable file
20
src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
Normal file → Executable file
|
@ -1,10 +1,14 @@
|
||||||
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;
|
||||||
|
@ -13,27 +17,27 @@ import net.minecraft.world.World;
|
||||||
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);
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
package modchest.networking.packet;
|
||||||
|
|
||||||
|
import modchest.REServerMod;
|
||||||
|
import modchest.util.setAndGetMultiButtonsSpawn;
|
||||||
|
import net.fabricmc.fabric.api.networking.v1.PacketSender;
|
||||||
|
import net.minecraft.network.PacketByteBuf;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.network.ServerPlayNetworkHandler;
|
||||||
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
public class setNamesOfRespawnButtonsC2SPacket {
|
||||||
|
public static void receive(MinecraftServer server, ServerPlayerEntity player, //Passiert auf dem Server!!!
|
||||||
|
ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
|
||||||
|
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn();
|
||||||
|
try {
|
||||||
|
String names = buf.readString(32767);
|
||||||
|
|
||||||
|
setAndGet.setMultiSpawnNames(player, names);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawnnameserror"));
|
||||||
|
REServerMod.LOGGER.info("Following Error, when trying to save names of " + player.getDisplayName() + "'s Spawnpoints: " + e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
8
src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java
Normal file → Executable file
8
src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java
Normal file → Executable file
|
@ -2,15 +2,19 @@ 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;
|
||||||
|
|
||||||
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"));
|
||||||
|
|
|
@ -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;
|
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();
|
||||||
|
|
|
@ -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 {
|
||||||
|
@ -82,6 +83,56 @@ public class setAndGetMultiButtonsSpawn {
|
||||||
return posXYZ;
|
return posXYZ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public synchronized void setMultiSpawnNames(ServerPlayerEntity player, Arry<String> names) {
|
||||||
|
ServerPlayerEntityInterface castedPlayer = (ServerPlayerEntityInterface) player;
|
||||||
|
NbtCompound topNbt = ((ServerPlayerEntityInterface) player).getDataSaver(); //alle daten der mod werden in diesem NBT Gespeichert
|
||||||
|
if (topNbt.get("multi_sleep") == null) { //die daten fuer multi-sleep werden in dem nbt-tag "multi_sleep" gespeichert, der wiederum um anderen nbt gespeichert wird
|
||||||
|
topNbt.put("multi_sleep", new NbtCompound()); //sollte dieser nbt-tag nicht existieren, wird ein neuer erstellt
|
||||||
|
}
|
||||||
|
NbtCompound subNbt = (NbtCompound) topNbt.get("multi_sleep"); //nbt tag mit allen daten fuer multi-sleep wird geladen
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (subNbt != null) {
|
||||||
|
subNbt.putIntArray("names", names);
|
||||||
|
topNbt.put("multi_sleep", subNbt); //speichert den tag unter multi_sleep im top-tag ab
|
||||||
|
castedPlayer.setDataSaver(topNbt); //speichert den top-tag wieder im spieler ab
|
||||||
|
} else {
|
||||||
|
REServerMod.LOGGER.info("Error when trying to write spawn to file!");
|
||||||
|
player.sendMessage(Text.translatable("chat.modchest.multispawn.spawnnotsaved"));
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
REServerMod.LOGGER.info("Error when saving Spawnpoint! Exception: " + e);
|
||||||
|
player.sendMessage(Text.translatable("chat.modchest.multispawn.spawnnotsaved"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized int[] getMultiSpawnNames(ServerPlayerEntity player) {
|
||||||
|
ServerPlayerEntityInterface castedPlayer = (ServerPlayerEntityInterface) player;
|
||||||
|
NbtCompound topNbt = ((ServerPlayerEntityInterface) player).getDataSaver();
|
||||||
|
if (topNbt.get("multi_sleep") == null) {
|
||||||
|
topNbt.put("multi_sleep", new NbtCompound());
|
||||||
|
}
|
||||||
|
NbtCompound subNbt = (NbtCompound) topNbt.get("multi_sleep"); //wie bei setMultiSpawn()
|
||||||
|
String names;
|
||||||
|
if (subNbt != null) {
|
||||||
|
names = subNbt.getString("names"); // holt sich den Namen
|
||||||
|
}
|
||||||
|
|
||||||
|
if (name.length == 0) { //das gleiche fuer den Namen
|
||||||
|
String names = {"#1", "#2", "#3", "#4", "#5"};
|
||||||
|
try {
|
||||||
|
subNbt.putString("names", names);
|
||||||
|
topNbt.put("multi_sleep", subNbt);
|
||||||
|
castedPlayer.setDataSaver(topNbt);
|
||||||
|
} catch (Exception e) {
|
||||||
|
REServerMod.LOGGER.info("Sorry! Error when loading Spawnpoint! Exception: " + e);
|
||||||
|
player.sendMessage(Text.translatable("chat.modchest.multispawn.getable"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return names;
|
||||||
|
}
|
||||||
|
|
||||||
public synchronized void setMultiSpawnVanilla(ServerPlayerEntity player) { //bevor der Spieler respawnt, speichern wir einmal seinen Vanillaspawn ab, um ihn spaeter wieder darauf zu setzen
|
public synchronized void setMultiSpawnVanilla(ServerPlayerEntity player) { //bevor der Spieler respawnt, speichern wir einmal seinen Vanillaspawn ab, um ihn spaeter wieder darauf zu setzen
|
||||||
BlockPos posAlt = player.getSpawnPointPosition(); //Spawnpunkt der Vanilla-respawn-funktion wird gespeichert
|
BlockPos posAlt = player.getSpawnPointPosition(); //Spawnpunkt der Vanilla-respawn-funktion wird gespeichert
|
||||||
RegistryKey<World> dimAlt = player.getSpawnPointDimension();//Dimension "
|
RegistryKey<World> dimAlt = player.getSpawnPointDimension();//Dimension "
|
||||||
|
|
|
@ -9,8 +9,7 @@
|
||||||
"Theo Dupuis",
|
"Theo Dupuis",
|
||||||
"Paula Dupuis",
|
"Paula Dupuis",
|
||||||
"Jakob Kircher",
|
"Jakob Kircher",
|
||||||
"Clemens von Molo",
|
"Clemens von Molo"
|
||||||
"Hanno Reents"
|
|
||||||
],
|
],
|
||||||
"contact": {
|
"contact": {
|
||||||
"homepage": "reents.tv",
|
"homepage": "reents.tv",
|
||||||
|
@ -24,7 +23,7 @@
|
||||||
"modchest.REServerMod"
|
"modchest.REServerMod"
|
||||||
],
|
],
|
||||||
"client": [
|
"client": [
|
||||||
"modchestClient.REServerModClient"
|
"modchest.REServerModClient"
|
||||||
],
|
],
|
||||||
"fabric-datagen": [
|
"fabric-datagen": [
|
||||||
"modchest.REServerModDataGenerator"
|
"modchest.REServerModDataGenerator"
|
||||||
|
@ -39,7 +38,7 @@
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.14.23",
|
"fabricloader": ">=0.14.23",
|
||||||
"minecraft": "~1.21",
|
"minecraft": "~1.19.2",
|
||||||
"java": ">=17",
|
"java": ">=17",
|
||||||
"fabric-api": "*"
|
"fabric-api": "*"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue