Malte/minecraft-mod
Malte
/
minecraft-mod
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

main #22

Merged
Hanno merged 7 commits from main into mc-1.21 2024-07-19 17:50:28 +02:00
Conversation 0 Commits 7 Files Changed 92 +412 -1379
92 changed files with 412 additions and 1379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a83637dbc - Show all commits

4
build.gradle
View File

@ -33,7 +33,7 @@ loom {
inherit server
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/java")}"
vmArg "-Dfabric-api.datagen.modid=reservermod"
runDir "build/datagen"
@ -46,7 +46,7 @@ sourceSets {
main {
resources {
srcDirs += [
'src/main/generated'
'src/main/java'
]
}
}

77
old-src/client/java/modchest/mixin/client/DeathScreen.java
View File

@ -1,77 +0,0 @@
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) {}
}
}

77
old-src/client/java/modchest/mixin/client/SleepingChatScreen.java
View File

@ -1,77 +0,0 @@
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) {}
}
}

15
old-src/client/java/modchest/networking/modNetworkingClient.java
View File

@ -1,15 +0,0 @@
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
}
}

69
old-src/main/java/modchest/block/custom/steeringWheelBlock.java
View File

@ -1,69 +0,0 @@
package modchest.block.custom;
import modchest.block.entity.modBlockEntities;
import modchest.block.entity.steeringWheelEntity;
import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityTicker;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.ItemScatterer;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
//gibt dem Block steering_wheel eigenschaften, wie z.B. das Interaktionsmenü, oder Grafiken
public class steeringWheelBlock extends BlockWithEntity implements BlockEntityProvider {
public steeringWheelBlock(Settings settings) {
super(settings);
}
/* stuff benötigt um das Interaktionsmenü zu laden!*/
@Override
public BlockRenderType getRenderType(BlockState state) {
return BlockRenderType.MODEL;
}
@Override
public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
if (state.getBlock() != newState.getBlock()) {
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof steeringWheelEntity) {
ItemScatterer.spawn(world, pos, (steeringWheelEntity)blockEntity);
world.updateComparators(pos,this);
}
super.onStateReplaced(state, world, pos, newState, moved);
}
}
@Override //wird bei einem rechtsklick aufgerufen (ersellt das Blockentity)
public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
if (!world.isClient) {
NamedScreenHandlerFactory screenHandlerFactory = state.createScreenHandlerFactory(world, pos);
if (screenHandlerFactory != null) {
player.openHandledScreen(screenHandlerFactory);
}
}
return ActionResult.SUCCESS;
}
@Nullable
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new steeringWheelEntity(pos, state);
}
@Nullable
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
return checkType( type, modBlockEntities.steering_wheel_interface, steeringWheelEntity::tick);
}
}

19
old-src/main/java/modchest/block/entity/modBlockEntities.java
View File

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

37
old-src/main/java/modchest/block/modBlocks.java
View File

@ -1,37 +0,0 @@
package modchest.block;
import modchest.block.custom.steeringWheelBlock;
import modchest.item.modItemGroup;
import modchest.REServerMod;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.Material;
import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
//setzt die blöcke auf
public class modBlocks {
public static Block steering_wheel; // Block wird erstellt
public static void setBlocks() {// Block wird definiert
steering_wheel = registerBlock("steering_wheel",
new steeringWheelBlock(FabricBlockSettings.of(Material.WOOD).strength(1.0f).requiresTool()),
modItemGroup.modchest);
}
private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben
// definierten Blöcke dem Register
// hinzu
Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name),
new BlockItem(block, new FabricItemSettings().group(group)));
return Registry.register(Registry.BLOCK, new Identifier(REServerMod.MOD_ID, name), block);
}
public static void registerModBlocks() { // Error Logger halt...
REServerMod.LOGGER.info("Registering ModBlocks for " + REServerMod.MOD_ID);
}
}

18
old-src/main/java/modchest/data/ModLootTableGenerator.java
View File

@ -1,18 +0,0 @@
package modchest.data;
import modchest.item.modItems;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
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
public class ModLootTableGenerator extends FabricBlockLootTableProvider {
protected ModLootTableGenerator(FabricDataGenerator dataGenerator) {
super(dataGenerator);
}
@Override
protected void generateBlockLootTables() {
//oreDrops(modBlocks.steering_wheel, modItems.shipblock); mit silktouch würde steering_wheel gedroped werden, ohne würde shipblock gedroped werden
}
}

26
old-src/main/java/modchest/data/ModModelProvider.java
View File

@ -1,26 +0,0 @@
package modchest.data;
import modchest.block.modBlocks;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
import net.minecraft.data.client.BlockStateModelGenerator;
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
public class ModModelProvider extends FabricModelProvider {
public ModModelProvider(FabricDataGenerator dataGenerator) {
super(dataGenerator);
}
@Override
public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
//blockStateModelGenerator.registerCubeAllModelTexturePool(modBlocks.steering_wheel); //fügt textur Parameter hinzu, wie z.B. textur ändern wenn es altert (bei Weizen z.B.)
}
@Override
public void generateItemModels(ItemModelGenerator itemModelGenerator) {
//itemModelGenerator.register(modItems.shipblock, Models.GENERATED); //ergänzt die Texturen für die Items
}
}

36
old-src/main/java/modchest/event/playerAfterRespawnEvent.java
View File

@ -1,36 +0,0 @@
package modchest.event;
import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.World;
public class playerAfterRespawnEvent implements ServerPlayerEvents.AfterRespawn { //Wenn die Multi-Spawn mod verwendet wurde, muss der Vanillaspawn wieder gesetzt werden
@Override
public void afterRespawn(ServerPlayerEntity oldPlayer, ServerPlayerEntity newPlayer, boolean alive) {
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn(); //Damit die Methoden benutzt werden koennen, muss ein Objekt erstellt werden; ist aber egal, weil eh keine Daten in dieser Klasse gespeichert werden
NbtCompound nbt = setAndGet.getMultiSpawnVanilla(newPlayer); //holt sich den nbt-tag
if (nbt != null) {
try {
int[] location = nbt.getIntArray("location"); //holt sich den gespeicherten Ort
BlockPos blockPos = new BlockPos(location[0], location[1], location[2]);
String[] parts = nbt.getString("dimension").split(":"); //holt sich die gespeicherte Dimension; trennt den String entspreichend; damit sollte es auch funktionieren, sollte eine Mod weitere Dimensionen hinzufuegen
parts = parts[2].split("]");
RegistryKey<World> dim = RegistryKey.of(Registry.WORLD_KEY, new Identifier(parts[0]));
float angle = nbt.getFloat("angle"); //Und den blickwinkel
newPlayer.setSpawnPoint(dim, blockPos, angle, true, false);
} catch (Exception e) {
REServerMod.LOGGER.info("Following error when trying set " + newPlayer.getDisplayName() + "'s Vanilla Spawn: " + e);
}
}
}
}

19
old-src/main/java/modchest/item/modItemGroup.java
View File

@ -1,19 +0,0 @@
package modchest.item;
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
import net.minecraft.block.Blocks;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
//definiert eine neue Itemgruppe mit dem identifier itemlist1, wird in einer de .json files dann in "Malte's Mod" umbenannt fürs spiel; in der Liste sollen alle Items dieser Mod im Creative Inventar angezeigt werden
public class modItemGroup {
public static ItemGroup modchest;
public static void modchest() {
modchest = FabricItemGroupBuilder.build(
new Identifier("modchest", "itemlist1"),
() -> new ItemStack(Blocks.COBBLESTONE)); //Icon ist halt bisher noch ein Cobblestone, weil ich keine sprits erstellt habe... :(
}
}

32
old-src/main/java/modchest/item/modItems.java
View File

@ -1,32 +0,0 @@
package modchest.item;
import modchest.REServerMod;
import modchest.item.custom.piratesCoinItem;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.item.Item;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
//Liste der Items die hinzugefügt werden, ausgenommen Blöcke
public class modItems {
public static Item shipblock; // shipblock wird erstellt, sollte man mal umbenenne. Ist eine Zutat die man für
// das steering_wheel braucht zum craften, mehr macht es bisher nicht
public static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist
// im detail erklärt was das Item machen soll
public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt
shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest)));
pirates_coin = registerItem("pirates_coin",
new piratesCoinItem(new FabricItemSettings().group(modItemGroup.modchest).maxCount(16)));
}
private static Item registerItem(String name, Item item) { // Methode, die die Items dann letztendlich hinzufügt;
// nicht bearbeiten ist eine generische MEthode
return Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name), item);
}
public static void registerModItems() {
REServerMod.LOGGER.info("Registering Mod Items for " + REServerMod.MOD_ID);
} // und natürlich ein Error logger
}

88
old-src/main/java/modchest/mixin/bedBlock.java
View File

@ -1,88 +0,0 @@
package modchest.mixin;
import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import net.minecraft.block.BedBlock;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@Mixin(BedBlock.class)
public class bedBlock {
@Inject(method = "onBreak", at = @At("HEAD"))
public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfo ci) { //Ueberprueft, wenn ein Bett zerstoert wird, ob jemand dieses Bett als Spawnpunkt hat
if (!world.isClient) { //Stellt sicher, dass das ganze nicht auf dem Client gerechnet wird, weil der Code sonst abstuertzt
int posBedX = pos.getX();
int posBedY = pos.getY();
int posBedZ = pos.getZ();
String bedData = state.toString();
if (Objects.equals(bedData.split("part=")[1], "foot]")) { //das fussende wurde zerstoert, damit der Code also geht, muss in richtung kopfende eins gegangen werden
switch (bedData.split("facing=")[1].split(",")[0]) {
case "east":
posBedX++;
break;
case "west":
posBedX--;
break;
case "south":
posBedZ++;
break;
case "north":
posBedZ--;
break;
default:
break;
}
}
if (posBedX < 0) { //Es gibt leider einen rundungsfehler. Wenn Das Bett negative koordinaten hat, rundet es weg von der Null wahrend der Spieler richtung Null aufrundet
posBedX++;
}
if (posBedY < 0) {
posBedY++;
}
if (posBedZ < 0) {
posBedZ++;
}
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn(); //Damit die Methoden benutzt werden koennen, muss ein Objekt erstellt werden; ist aber egal, weil eh keine Daten in dieser Klasse gespeichert werden
List<? extends PlayerEntity> playerArray = null;
try { //Sollte der Code doch ausversehen auf dem Client ausgefuehrt werden, wuerde die folgende Zeile einen Error schmeissen
playerArray = world.getPlayers(); //holt sich die liste aller Spieler auf dem server
} catch (Exception e) {
REServerMod.LOGGER.info("Error when trying to get players Array after Bed was destroyed: " + e);
}
for (int i = 0; i < playerArray.size(); i++) { //geht fuer jeden Spieler durch
for (int j = 1; j <= 5; j++) { //und fuer alle Speicherslots dieser
int[] posXYZ = new int[0];
try { //Sollte der Code doch ausversehen auf dem Client ausgefuehrt werden, wuerde die folgende Zeile einen Error schmeissen
posXYZ = setAndGet.getMultiSpawn((ServerPlayerEntity) playerArray.get(i), j);
} catch (Exception e) {
REServerMod.LOGGER.info("Error casting playerArray to ServerPlayerEntity: " + e);
}
if (posBedX == posXYZ[0] && posBedY == posXYZ[1] && posBedZ == posXYZ[2]) { //Gleicht ab, ob die Koordinaten uebereinstimmen
try { //Sollte der Code doch ausversehen auf dem Client ausgefuehrt werden, wuerde die folgende Zeile einen Error schmeissen
setAndGet.setMultiSpawnBlank((ServerPlayerEntity) playerArray.get(i), j); //Wird ein bett zerstoert, wird der Spawnpunkt geblanked
} catch (Exception e) {
REServerMod.LOGGER.info("Error when trying to get players Array after Bed was destroyed: " + e);
}
}
}
}
}
}
}

19
old-src/main/java/modchest/networking/modNetworkingServer.java
View File

@ -1,19 +0,0 @@
package modchest.networking;
import modchest.REServerMod;
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
import modchest.networking.packet.setNewRespawnsC2SPacket;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.util.Identifier;
public class modNetworkingServer { //Identifier werden eingeführt
public static final Identifier request_respawn = new Identifier(REServerMod.MOD_ID, "request_respawn"); //alle Identifier muessen leider IMMER auf Client und Server (doppelt) eingefuehrt werden
public static final Identifier start_sleeping_call_buttons = new Identifier(REServerMod.MOD_ID, "start_sleeping_call_buttons");
public static final Identifier death_multi_respawn_buttons = new Identifier(REServerMod.MOD_ID, "death_call_respawn_buttons");
public static void registerS2CPackets() { //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren)
ServerPlayNetworking.registerGlobalReceiver(start_sleeping_call_buttons, setNewRespawnsC2SPacket::receive); //was der Server dann machen soll steht in der receive Methode
ServerPlayNetworking.registerGlobalReceiver(death_multi_respawn_buttons, deathScreenMultiButtonsC2SPacket::receive);
}
}

54
old-src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
View File

@ -1,54 +0,0 @@
package modchest.networking.packet;
import modchest.REServerMod;
import modchest.networking.modNetworkingServer;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.awt.*;
import java.util.Arrays;
public class deathScreenMultiButtonsC2SPacket {
public static void receive(MinecraftServer server, ServerPlayerEntity player, //Passiert auf dem Server!!!
ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn(); //um die nicht-statischen Methoden aufzurufen, erzeugen wir ein Objekt. Wir speichern aber keine Daten in der Klasse, daher ist das OK
int num; //num steht fuer Number, und sagt, welcher der 5 Knoepfe gedrueckt wurde, da das Spiel abstuertzt wenn man buf.readInt() mehr als einmal ausfuehrt
try {
num = buf.readInt(); //Um Spielabstuertze definitiv zu verhindern in einem try block, hat aber nie Probleme gemacht, also eine reine absicherung
} catch (Exception e) {
REServerMod.LOGGER.info("Following Error when trying to get the number of pressed Button: " + e + "continuing bwith Button 1");
num = 1;
}
setAndGet.setMultiSpawnVanilla(player);
int[] posXYZ = setAndGet.getMultiSpawn(player, num); //neue Koordinaten werden vom Server geholt
if (posXYZ.length == 3 && posXYZ[0] < 77889900) { //Stellt sicher, dass die 3 spawnkoordinaten nicht null sind; Koordinaten 77889900 sind ausserhalb der Welt und werden daher von mir in setAndGetMultiSpawnButtonsSpawn als Errorcodes verwendet
try {
//REServerMod.LOGGER.info("try Respawning from Multi-Sapwn");
player.setSpawnPoint(World.OVERWORLD, new BlockPos(posXYZ[0], posXYZ[1], posXYZ[2]), 0, true, true); //neuer Spawn wird gesetzt
ServerPlayNetworking.send(player, modNetworkingServer.request_respawn, PacketByteBufs.create()); //Anfrage an den Client zum respawnen wird gesendet
player.sendMessage((Text.translatable("chat.modchest.multispawn.respawned", num)));
REServerMod.LOGGER.info("Respawned Player " + player.getEntityName() + " at " + Arrays.toString(setAndGet.getMultiSpawn(player, num)));
setAndGet.setMultiSpawn(player, 6);
} catch (Exception e) {
REServerMod.LOGGER.info("Sorry! Following error, trying to respawn player " + player.getDisplayName() + ": " + e);
}
} else {
if (posXYZ[0] == 77889944) { //Dieser Errorcode bedeutet, dass das Bett zerstoert wurde
player.sendMessage(Text.translatable("chat.modchest.multispawn.beddestroyed"));
} else {
player.sendMessage(Text.translatable("chat.modchest.multispawn.spawnnotset"));
}
}
}
}

168
old-src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
View File

@ -1,168 +0,0 @@
package modchest.util;
import modchest.REServerMod;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.World;
public class setAndGetMultiButtonsSpawn {
public synchronized void setMultiSpawn(ServerPlayerEntity player, int spawn) {
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
spawn--; //weil der Array mit Slot 0 beginnt, rutscht alles eins auf
int[] fullArray = new int[3]; //ein kleiner zwischenspeicher
fullArray[0] = (int) player.getX();
fullArray[1] = (int) player.getY();
fullArray[2] = (int) player.getZ();
try {
if (subNbt != null) {
subNbt.putIntArray(String.valueOf(spawn), fullArray); //speichert unseren array an der entsprechenden nummer ab
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[] getMultiSpawn(ServerPlayerEntity player, int spawn) {
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()
spawn--; //weil der Array mit Slot 0 beginnt, rutscht alles eins auf
int[] fullArray = new int[0];
if (subNbt != null) {
fullArray = subNbt.getIntArray(String.valueOf(spawn)); //holt sich den ganzen Array, mit allen gespeicherten Spawnpunkten; struktur wird etwas weiter unten erklaert
}
if (fullArray.length != 3) { //sollte der Array leer oder anderweitig ungueltig sein wird er neu erstellt
int[] tempArray = new int[3];
for (int i = 0; i < 3; i++) {
tempArray[i] = 77889922; //Lueckenfueller; wird in deathScreenMultiButtonsC2SPacket uebrprueft und rausgefiltert
}
try { //wenn wir gerade den Array erstellt haben, weil er ungueltig war, wird er hier in den nbt-tag abgespseichert
subNbt.putIntArray(String.valueOf(spawn), fullArray);
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"));
}
}
fullArray = subNbt.getIntArray(String.valueOf(spawn)); //wir laden ihn uns wieder, nur um sicher zu gehen
int[] posXYZ = new int[3]; //zwischenspeicher
try { //schaut, ob wir die daten laden koennen
posXYZ[0] = fullArray[0];
posXYZ[1] = fullArray[1];
posXYZ[2] = fullArray[2];
} catch (Exception e) { //sonst geben wir folgenden Errorcode zurueck
posXYZ[0] = 77889933;
posXYZ[1] = 77889933;
posXYZ[2] = 77889933;
}
return posXYZ;
}
public synchronized void setMultiSpawnVanilla(ServerPlayerEntity player) { //bevor der Spieler respawnt, speichern wir einmal seinen Vanillaspawn ab, um ihn spaeter wieder darauf zu setzen
BlockPos posAlt = player.getSpawnPointPosition(); //Spawnpunkt der Vanilla-respawn-funktion wird gespeichert
RegistryKey<World> dimAlt = player.getSpawnPointDimension();//Dimension "
float angleAlt = player.getSpawnAngle(); //Blickrichtung "
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"); //alles in der set-Methode ganz oben erklaert
try { //sicheerheit, weil hier mal wieder viel zwischen datentypen gewechselt wird
NbtCompound vanillaSpawnData = new NbtCompound();
int[] location = new int[3]; //spawnpunkt wird in einen Array komprimiert
location[0] = posAlt.getX();
location[1] = posAlt.getY();
location[2] = posAlt.getZ();
vanillaSpawnData.putIntArray("location", location); //und abgespeichert
vanillaSpawnData.putString("dimension", dimAlt.toString()); //dimension wird abgespeichert
vanillaSpawnData.putFloat("angle", angleAlt); //auch die Blickrichtung
vanillaSpawnData.putBoolean("used", false); //wird auf true gesetzt, sobald der Spawnpunkt wieder zurueck gesetzt wurde
subNbt.put("vanillaSpawnData", vanillaSpawnData); //spawnpunkt wird im sub-nbt gespeichert
topNbt.put("multi_sleep", subNbt); //und im top-nbt
castedPlayer.setDataSaver(topNbt); //um dann im player gespeichert zu werden
} catch (Exception e) {
REServerMod.LOGGER.info("Sorry! Error when saving Spawnpoint! Exception: " + e);
}
}
public synchronized NbtCompound getMultiSpawnVanilla(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"); //steht alles wieder in der ersten methode
if (subNbt != null) {
NbtCompound nbt = (NbtCompound) subNbt.get("vanillaSpawnData"); //hollt sich die daten
if (nbt != null) {
if (!nbt.getBoolean("used")) {
nbt.putBoolean("used", true); //setzt den verwendet boolean auf true; nicht ganz perfekt, sollte ein fehler beim speichern auftreten wird es nicht nochmal versucht, speichert aber massiv an coding und leistung
subNbt.put("vanillaSpawnData", nbt);
topNbt.put("multi_sleep", subNbt); //muss den bearbeiteten nbt wieder abgespeichert (nur der boolean wurde ueberschrieben)
castedPlayer.setDataSaver(topNbt);
return nbt; //gibt den nbt-tag an die aufrufende Methode
} else {
return null;
}
}
} else {
return null;
}
return null;
}
public synchronized void setMultiSpawnBlank(ServerPlayerEntity player, int spawn) { //wird aufgerufen wenn das Bett dieses Spielers zerstoert wurde
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"); //alles wieder wie in der ersten Methode;
spawn--; //weil der Array mit Slot 0 beginnt, rutscht alles eins auf
int[] fullArray = new int[0];
if (subNbt != null) {
fullArray = subNbt.getIntArray(String.valueOf(spawn)); //holt sich den ganzen Array, mit allen gespeicherten Spawnpunkten; struktur wird etwas weiter unten erklaert
}
fullArray[0] = 77889944; //Errorcode der in deathScreenMultiButtonsC2SPacket als zerstoertes Bett rausgefiltert wird
fullArray[1] = 77889944;
fullArray[2] = 77889944;
try {
subNbt.putIntArray(String.valueOf(spawn), fullArray); //wird abgespeichert
topNbt.put("multi_sleep", subNbt);
castedPlayer.setDataSaver(topNbt);
} catch (Exception e) {
REServerMod.LOGGER.info("Sorry! Error when saving Spawnpoint! Exception: " + e);
}
}
}

4
old-src/client/java/modchest/REServerModClient.java → src/client/java/modchestClient/REServerModClient.java
View File

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

67
src/client/java/modchestClient/mixin/DeathScreen.java Executable file
View File

@ -0,0 +1,67 @@
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);
}
}
}

68
src/client/java/modchestClient/mixin/SleepingChatScreen.java Executable file
View File

@ -0,0 +1,68 @@
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);
}
}
}

30
src/client/java/modchestClient/networking/modNetworkingClient.java Executable file
View File

@ -0,0 +1,30 @@
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
}
}

15
old-src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java → src/client/java/modchestClient/networking/packet/respawnRequestS2CPacket.java
View File

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

18
src/client/java/modchestClient/networking/payload/deathMultiRespawnButtons.java Normal file
View File

@ -0,0 +1,18 @@
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;
}
}

17
src/client/java/modchestClient/networking/payload/requestRespawn.java Normal file
View File

@ -0,0 +1,17 @@
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;
}
}

17
src/client/java/modchestClient/networking/payload/startSleepingCallButtons.java Normal file
View File

@ -0,0 +1,17 @@
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
old-src/client/resources/reservermod.client.mixins.json → src/client/resources/reservermod.client.mixins.json
View File

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

0
old-src/documentation/Development → src/documentation/Development
View File

0
old-src/documentation/Documentation → src/documentation/Documentation
View File

0
old-src/documentation/Features → src/documentation/Features
View File

0
old-src/main/java/modchest/REServerMod.java → src/main/java/modchest/REServerMod.java Executable file → Normal file
View File

0
old-src/main/java/modchest/REServerModDataGenerator.java → src/main/java/modchest/REServerModDataGenerator.java Executable file → Normal file
View File

18
src/modchest/block/custom/steeringWheelBlock.java → src/main/java/modchest/block/custom/steeringWheelBlock.java
View File

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

0
old-src/main/java/modchest/block/entity/ImplementedInventory.java → src/main/java/modchest/block/entity/ImplementedInventory.java Executable file → Normal file
View File

5
src/modchest/block/entity/modBlockEntities.java → src/main/java/modchest/block/entity/modBlockEntities.java
View File

@ -4,6 +4,7 @@ import modchest.REServerMod;
import modchest.block.modBlocks;
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
@ -12,8 +13,8 @@ public class modBlockEntities {
public static BlockEntityType<steeringWheelEntity> steering_wheel_interface; // Interaktionsmenü wird erstellt
public static void registerBlockEntities() {
steering_wheel_interface = Registry.register(Registry.BLOCK_ENTITY_TYPE,
new Identifier(REServerMod.MOD_ID, "steering_wheel_interface"), // Interkationsmenü wird gerendert
steering_wheel_interface = Registry.register(Registries.BLOCK_ENTITY_TYPE,
Identifier.of(REServerMod.MOD_ID, "steering_wheel_interface"), // Interkationsmenü wird gerendert
FabricBlockEntityTypeBuilder.create(steeringWheelEntity::new, modBlocks.steering_wheel).build(null));
}
}

0
old-src/main/java/modchest/block/entity/steeringWheelEntity.java → src/main/java/modchest/block/entity/steeringWheelEntity.java Executable file → Normal file
View File

16
src/modchest/block/modBlocks.java → src/main/java/modchest/block/modBlocks.java
View File

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

2
src/modchest/data/ModLootTableGenerator.java → src/main/java/modchest/data/ModLootTableGenerator.java
View File

@ -1,3 +1,4 @@
/*
package modchest.data;
import modchest.item.modItems;
@ -16,3 +17,4 @@ 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
}
}
*/

2
src/modchest/data/ModModelProvider.java → src/main/java/modchest/data/ModModelProvider.java
View File

@ -1,3 +1,4 @@
/*
package modchest.data;
import modchest.block.modBlocks;
@ -24,3 +25,4 @@ public class ModModelProvider extends FabricModelProvider {
//itemModelGenerator.register(modItems.shipblock, Models.GENERATED); //ergänzt die Texturen für die Items
}
}
*/

2
old-src/main/java/modchest/data/ModRecipeGenerator.java → src/main/java/modchest/data/ModRecipeGenerator.java Executable file → Normal file
View File

@ -1,3 +1,4 @@
/*
package modchest.data;
import modchest.item.modItems;
@ -19,3 +20,4 @@ public class ModRecipeGenerator extends FabricRecipeProvider {
//offerSmelting(exporter, List.of(modItems.shipblock), , ); //generiert das rezept zum herstellen (hier mir braten)
}
}
*/

0
old-src/main/java/modchest/data/ModWorldGenerator.java → src/main/java/modchest/data/ModWorldGenerator.java Executable file → Normal file
View File

4
src/modchest/event/playerAfterRespawnEvent.java → src/main/java/modchest/event/playerAfterRespawnEvent.java
View File

@ -4,8 +4,8 @@ import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
@ -23,7 +23,7 @@ public class playerAfterRespawnEvent implements ServerPlayerEvents.AfterRespawn
String[] parts = nbt.getString("dimension").split(":"); //holt sich die gespeicherte Dimension; trennt den String entspreichend; damit sollte es auch funktionieren, sollte eine Mod weitere Dimensionen hinzufuegen
parts = parts[2].split("]");
RegistryKey<World> dim = RegistryKey.of(Registry.WORLD_KEY, new Identifier(parts[0]));
RegistryKey<World> dim = RegistryKey.of(RegistryKeys.WORLD, Identifier.of(parts[0]));
float angle = nbt.getFloat("angle"); //Und den blickwinkel

0
old-src/main/java/modchest/item/custom/piratesCoinItem.java → src/main/java/modchest/item/custom/piratesCoinItem.java Executable file → Normal file
View File

39
src/main/java/modchest/item/modItemGroup.java Normal file
View File

@ -0,0 +1,39 @@
package modchest.item;
import modchest.REServerMod;
import modchest.block.modBlocks;
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
import net.minecraft.block.Blocks;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
//definiert eine neue Itemgruppe mit dem identifier itemlist1, wird in einer de .json files dann in "Malte's Mod" umbenannt fürs spiel; in der Liste sollen alle Items dieser Mod im Creative Inventar angezeigt werden
public class modItemGroup {
public static final RegistryKey<ItemGroup> item_group_key1 = RegistryKey.of(Registries.ITEM_GROUP.getKey(), Identifier.of(REServerMod.MOD_ID, "item_group_key1"));
public static final ItemGroup item_group1 = FabricItemGroup.builder()
.icon(() -> new ItemStack(Blocks.COBBLESTONE)) //Icon ist halt bisher noch ein Cobblestone, weil ich keine sprits erstellt habe... :(
.displayName(Text.translatable("itemGroup.modchest.itemlist1"))
.build();
public static void modchest() {
//Registriert die Gruppe
Registry.register(Registries.ITEM_GROUP, item_group_key1, item_group1);
//Registers the items to the group
ItemGroupEvents.modifyEntriesEvent(item_group_key1).register(item_group1 -> {
item_group1.add(modItems.pirates_coin);
item_group1.add(modBlocks.steering_wheel);
}
);
}
}

10
src/modchest/item/modItems.java → src/main/java/modchest/item/modItems.java
View File

@ -2,9 +2,9 @@ package modchest.item;
import modchest.REServerMod;
import modchest.item.custom.piratesCoinItem;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.item.Item;
import net.minecraft.registry.Registry;
import net.minecraft.registry.Registries;
import net.minecraft.util.Identifier;
//Liste der Items die hinzugefügt werden, ausgenommen Blöcke
@ -14,15 +14,15 @@ public class modItems {
public static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist
// im detail erklärt was das Item machen soll
public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt
shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest)));
public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt; das entsprechende Item zum Block muss in "modItemGroup" getrennt zur mod Block Gruppe hinzugefügt werden"
shipblock = registerItem("shipblock", new Item(new Item.Settings()));
pirates_coin = registerItem("pirates_coin",
new piratesCoinItem(new FabricItemSettings().group(modItemGroup.modchest).maxCount(16)));
new piratesCoinItem(new Item.Settings().maxCount(16)));
}
private static Item registerItem(String name, Item item) { // Methode, die die Items dann letztendlich hinzufügt;
// nicht bearbeiten ist eine generische MEthode
return Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name), item);
return Registry.register(Registries.ITEM, Identifier.of(REServerMod.MOD_ID, name), item);
}
public static void registerModItems() {

2
old-src/main/java/modchest/mixin/ServerPlayerEntityMixin.java → src/main/java/modchest/mixin/ServerPlayerEntityMixin.java Executable file → Normal file
View File

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

6
src/modchest/mixin/bedBlock.java → src/main/java/modchest/mixin/bedBlock.java
View File

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

42
src/main/java/modchest/networking/modNetworkingServer.java Normal file
View File

@ -0,0 +1,42 @@
package modchest.networking;
import modchest.REServerMod;
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
import modchest.networking.packet.setNewRespawnsC2SPacket;
import modchest.networking.payload.deathMultiRespawnButtons;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import modchest.networking.payload.startSleepingCallButtons;
import net.minecraft.util.Identifier;
public class modNetworkingServer { //Identifier werden eingeführt
public static final Identifier request_respawn = Identifier.of(REServerMod.MOD_ID, "request_respawn"); //alle Identifier muessen leider IMMER auf Client und Server (doppelt) eingefuehrt werden
public static final Identifier start_sleeping_call_buttons = Identifier.of(REServerMod.MOD_ID, "start_sleeping_call_buttons");
public static final Identifier death_call_respawn_buttons = Identifier.of(REServerMod.MOD_ID, "death_call_respawn_buttons");
public static void registerS2CPackets() { //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren)
PayloadTypeRegistry.playC2S().register(startSleepingCallButtons.ID, startSleepingCallButtons.CODEC);
PayloadTypeRegistry.playC2S().register(deathMultiRespawnButtons.ID, deathMultiRespawnButtons.CODEC);
//PayloadTypeRegistry.playC2S().register(requestRespawn.ID, requestRespawn.CODEC);
ServerPlayNetworking.registerGlobalReceiver(startSleepingCallButtons.ID, (payload, context) -> {
context.server().execute(() -> {
setNewRespawnsC2SPacket.receive(context.server(), context.player(), payload.number());
}
);});
ServerPlayNetworking.registerGlobalReceiver(deathMultiRespawnButtons.ID, (payload, context) -> {
context.server().execute(() -> {
deathScreenMultiButtonsC2SPacket.receive(context.server(), context.player(), payload.number());
}
);});
//ServerPlayNetworking.registerGlobalReceiver(start_sleeping_call_buttons, setNewRespawnsC2SPacket::receive); //was der Server dann machen soll steht in der receive Methode
//ServerPlayNetworking.registerGlobalReceiver(death_multi_respawn_buttons, deathScreenMultiButtonsC2SPacket::receive);
}
}

21
src/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java → src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
View File

@ -1,42 +1,37 @@
package modchest.networking.packet;
import modchest.REServerMod;
import modchest.networking.modNetworkingServer;
import modchest.networking.payload.requestRespawn;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.awt.*;
import java.util.Arrays;
public class deathScreenMultiButtonsC2SPacket {
public static void receive(MinecraftServer server, ServerPlayerEntity player, //Passiert auf dem Server!!!
ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
public static void receive(MinecraftServer server, ServerPlayerEntity player, int number) { //Passiert auf dem Server!!!
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn(); //um die nicht-statischen Methoden aufzurufen, erzeugen wir ein Objekt. Wir speichern aber keine Daten in der Klasse, daher ist das OK
int num; //num steht fuer Number, und sagt, welcher der 5 Knoepfe gedrueckt wurde, da das Spiel abstuertzt wenn man buf.readInt() mehr als einmal ausfuehrt
try {
num = buf.readInt(); //Um Spielabstuertze definitiv zu verhindern in einem try block, hat aber nie Probleme gemacht, also eine reine absicherung
num = number; //Um Spielabstuertze definitiv zu verhindern in einem try block, hat aber nie Probleme gemacht, also eine reine absicherung
} catch (Exception e) {
REServerMod.LOGGER.info("Following Error when trying to get the number of pressed Button: " + e + "continuing bwith Button 1");
REServerMod.LOGGER.info("Following Error when trying to get the number of pressed Button: " + e + "continuing with Button 1");
num = 1;
}
setAndGet.setMultiSpawnVanilla(player);
int[] posXYZ = setAndGet.getMultiSpawn(player, num); //neue Koordinaten werden vom Server geholt
int[] posXYZ = setAndGet.getMultiSpawn(player, number); //neue Koordinaten werden vom Server geholt
if (posXYZ.length == 3 && posXYZ[0] < 77889900) { //Stellt sicher, dass die 3 spawnkoordinaten nicht null sind; Koordinaten 77889900 sind ausserhalb der Welt und werden daher von mir in setAndGetMultiSpawnButtonsSpawn als Errorcodes verwendet
try {
//REServerMod.LOGGER.info("try Respawning from Multi-Sapwn");
player.setSpawnPoint(World.OVERWORLD, new BlockPos(posXYZ[0], posXYZ[1], posXYZ[2]), 0, true, true); //neuer Spawn wird gesetzt
ServerPlayNetworking.send(player, modNetworkingServer.request_respawn, PacketByteBufs.create()); //Anfrage an den Client zum respawnen wird gesendet
ServerPlayNetworking.send(player, new requestRespawn(1)); //Anfrage an den Client zum respawnen wird gesendet
player.sendMessage((Text.translatable("chat.modchest.multispawn.respawned", num)));
REServerMod.LOGGER.info("Respawned Player " + player.getNameForScoreboard() + " at " + Arrays.toString(setAndGet.getMultiSpawn(player, num)));
setAndGet.setMultiSpawn(player, 6);
@ -51,4 +46,4 @@ public class deathScreenMultiButtonsC2SPacket {
}
}
}
}
}

10
old-src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java → src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java Executable file → Normal file
View File

@ -2,21 +2,15 @@ package modchest.networking.packet;
import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.Arrays;
public class setNewRespawnsC2SPacket {
public static void receive(MinecraftServer server, ServerPlayerEntity player, //Passiert auf dem Server!!!
ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
public static void receive(MinecraftServer server, ServerPlayerEntity player, int number) {
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn();
try {
switch (buf.readInt()) { //Wird nur einmal angefragt, daher muss buf.readInt() nicht als variable gesetzt werden
switch (number) { //Wird nur einmal angefragt, daher muss buf.readInt() nicht als variable gesetzt werden
case 1:
setAndGet.setMultiSpawn(player, 1); //Spawnpunkt wird gespeichert
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "1"));

17
src/main/java/modchest/networking/payload/deathMultiRespawnButtons.java Normal file
View File

@ -0,0 +1,17 @@
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;
}
}

17
src/main/java/modchest/networking/payload/requestRespawn.java Normal file
View File

@ -0,0 +1,17 @@
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;
}
}

17
src/main/java/modchest/networking/payload/startSleepingCallButtons.java Normal file
View File

@ -0,0 +1,17 @@
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;
}
}

2
old-src/main/java/modchest/util/ServerPlayerEntityInterface.java → src/main/java/modchest/util/ServerPlayerEntityInterface.java Executable file → Normal file
View File

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

0
old-src/main/java/modchest/util/initializer.java → src/main/java/modchest/util/initializer.java Executable file → Normal file
View File

1
src/modchest/util/setAndGetMultiButtonsSpawn.java → src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
View File

@ -2,7 +2,6 @@ package modchest.util;
import modchest.REServerMod;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.registry.RegistryKey;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;

0
old-src/main/resources/assets/modchest/blockstates/steering_wheel.json → src/main/resources/assets/modchest/blockstates/steering_wheel.json
View File

0
old-src/main/resources/assets/modchest/icon.png → src/main/resources/assets/modchest/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
old-src/main/resources/assets/modchest/icon.png.old → src/main/resources/assets/modchest/icon.png.old
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 453 B

0
old-src/main/resources/assets/modchest/lang/de_de.json → src/main/resources/assets/modchest/lang/de_de.json
View File

0
old-src/main/resources/assets/modchest/lang/en_pt.json → src/main/resources/assets/modchest/lang/en_pt.json
View File

0
old-src/main/resources/assets/modchest/lang/en_us.json → src/main/resources/assets/modchest/lang/en_us.json
View File

0
old-src/main/resources/assets/modchest/models/block/steering_wheel.json → src/main/resources/assets/modchest/models/block/steering_wheel.json
View File

0
old-src/main/resources/assets/modchest/models/item/pirates_coin.json → src/main/resources/assets/modchest/models/item/pirates_coin.json
View File

0
old-src/main/resources/assets/modchest/models/item/shipblock.json → src/main/resources/assets/modchest/models/item/shipblock.json
View File

0
old-src/main/resources/assets/modchest/models/item/steering_wheel.json → src/main/resources/assets/modchest/models/item/steering_wheel.json
View File

0
old-src/main/resources/assets/modchest/textures/item/pirates_coin.png → src/main/resources/assets/modchest/textures/item/pirates_coin.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

0
old-src/main/resources/data/icon.png → src/main/resources/data/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
old-src/main/resources/data/minecraft/tags/blocks/mineable/axe.json → src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
View File

0
old-src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json → src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json
View File

0
old-src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json → src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View File

0
old-src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json → src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json
View File

0
old-src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json → src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
View File

0
old-src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json → src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
View File

0
old-src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json → src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json
View File

0
old-src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json → src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json
View File

0
old-src/main/resources/data/modchest/recipes/pirates_coin.json → src/main/resources/data/modchest/recipes/pirates_coin.json
View File

0
old-src/main/resources/data/modchest/recipes/shipblock.json → src/main/resources/data/modchest/recipes/shipblock.json
View File

0
old-src/main/resources/data/modchest/recipes/steering_wheel.json → src/main/resources/data/modchest/recipes/steering_wheel.json
View File

7
old-src/main/resources/fabric.mod.json → src/main/resources/fabric.mod.json
View File

@ -9,7 +9,8 @@
"Theo Dupuis",
"Paula Dupuis",
"Jakob Kircher",
"Clemens von Molo"
"Clemens von Molo",
"Hanno Reents"
],
"contact": {
"homepage": "reents.tv",
@ -23,7 +24,7 @@
"modchest.REServerMod"
],
"client": [
"modchest.REServerModClient"
"modchestClient.REServerModClient"
],
"fabric-datagen": [
"modchest.REServerModDataGenerator"
@ -38,7 +39,7 @@
],
"depends": {
"fabricloader": ">=0.14.23",
"minecraft": "~1.19.2",
"minecraft": "~1.21",
"java": ">=17",
"fabric-api": "*"
},

0
old-src/main/resources/reservermod.mixins.json → src/main/resources/reservermod.mixins.json
View File

23
src/modchest/REServerMod.java
View File

@ -1,23 +0,0 @@
package modchest;
import net.fabricmc.api.ModInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import modchest.util.initializer;
//Main file; Hier wird alles aufgesetzt
public class REServerMod implements ModInitializer {
public static final String MOD_ID = "modchest";
public static final Logger LOGGER = LoggerFactory.getLogger("modchest"); // Erster Error Logger
@Override
public void onInitialize() { //Der uebersicht halber sind jetzt alle initializer in Klassen in util in initializer
initializer.itemGroups();
initializer.itemsAndBlocks();
initializer.events();
initializer.networking();
LOGGER.info("Modchest successfully loaded!");
}
}

11
src/modchest/REServerModDataGenerator.java
View File

@ -1,11 +0,0 @@
package modchest;
import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
public class REServerModDataGenerator implements DataGeneratorEntrypoint {
@Override
public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
}
}

212
src/modchest/block/entity/ImplementedInventory.java
View File

@ -1,212 +0,0 @@
package modchest.block.entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.Inventories;
import net.minecraft.inventory.Inventory;
import net.minecraft.inventory.SidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.util.collection.DefaultedList;
import net.minecraft.util.math.Direction;
import org.jetbrains.annotations.Nullable;
import java.util.List;
/**
* A simple {@code SidedInventory} implementation with only default methods + an item list getter.
*
* <h2>Reading and writing to tags</h2>
* Use {@link Inventories#writeNbt(NbtCompound, DefaultedList)} and {@link Inventories#readNbt(NbtCompound, DefaultedList)}
* on {@linkplain #getItems() the item list}.
*
* License: <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0</a>
* @author Juuz
*/
@FunctionalInterface
public interface ImplementedInventory extends SidedInventory {
/**
* Gets the item list of this inventory.
* Must return the same instance every time it's called.
*
* @return the item list
*/
DefaultedList<ItemStack> getItems();
/**
* Creates an inventory from the item list.
*
* @param items the item list
* @return a new inventory
*/
static ImplementedInventory of(DefaultedList<ItemStack> items) {
return () -> items;
}
/**
* Creates a new inventory with the size.
*
* @param size the inventory size
* @return a new inventory
*/
static ImplementedInventory ofSize(int size) {
return of(DefaultedList.ofSize(size, ItemStack.EMPTY));
}
// SidedInventory
/**
* Gets the available slots to automation on the side.
*
* <p>The default implementation returns an array of all slots.
*
* @param side the side
* @return the available slots
*/
@Override
default int[] getAvailableSlots(Direction side) {
int[] result = new int[getItems().size()];
for (int i = 0; i < result.length; i++) {
result[i] = i;
}
return result;
}
/**
* Returns true if the stack can be inserted in the slot at the side.
*
* <p>The default implementation returns true.
*
* @param slot the slot
* @param stack the stack
* @param side the side
* @return true if the stack can be inserted
*/
@Override
default boolean canInsert(int slot, ItemStack stack, @Nullable Direction side) {
return true;
}
/**
* Returns true if the stack can be extracted from the slot at the side.
*
* <p>The default implementation returns true.
*
* @param slot the slot
* @param stack the stack
* @param side the side
* @return true if the stack can be extracted
*/
@Override
default boolean canExtract(int slot, ItemStack stack, Direction side) {
return true;
}
// Inventory
/**
* Returns the inventory size.
*
* <p>The default implementation returns the size of {@link #getItems()}.
*
* @return the inventory size
*/
@Override
default int size() {
return getItems().size();
}
/**
* @return true if this inventory has only empty stacks, false otherwise
*/
@Override
default boolean isEmpty() {
for (int i = 0; i < size(); i++) {
ItemStack stack = getStack(i);
if (!stack.isEmpty()) {
return false;
}
}
return true;
}
/**
* Gets the item in the slot.
*
* @param slot the slot
* @return the item in the slot
*/
@Override
default ItemStack getStack(int slot) {
return getItems().get(slot);
}
/**
* Takes a stack of the size from the slot.
*
* <p>(default implementation) If there are less items in the slot than what are requested,
* takes all items in that slot.
*
* @param slot the slot
* @param count the item count
* @return a stack
*/
@Override
default ItemStack removeStack(int slot, int count) {
ItemStack result = Inventories.splitStack(getItems(), slot, count);
if (!result.isEmpty()) {
markDirty();
}
return result;
}
/**
* Removes the current stack in the {@code slot} and returns it.
*
* <p>The default implementation uses {@link Inventories#removeStack(List, int)}
*
* @param slot the slot
* @return the removed stack
*/
@Override
default ItemStack removeStack(int slot) {
return Inventories.removeStack(getItems(), slot);
}
/**
* Replaces the current stack in the {@code slot} with the provided stack.
*
* <p>If the stack is too big for this inventory ({@link Inventory#getMaxCountPerStack()}),
* it gets resized to this inventory's maximum amount.
*
* @param slot the slot
* @param stack the stack
*/
@Override
default void setStack(int slot, ItemStack stack) {
getItems().set(slot, stack);
if (stack.getCount() > getMaxCountPerStack()) {
stack.setCount(getMaxCountPerStack());
}
}
/**
* Clears {@linkplain #getItems() the item list}}.
*/
@Override
default void clear() {
getItems().clear();
}
@Override
default void markDirty() {
// Override if you want behavior.
}
@Override
default boolean canPlayerUse(PlayerEntity player) {
return true;
}
}

68
src/modchest/block/entity/steeringWheelEntity.java
View File

@ -1,68 +0,0 @@
package modchest.block.entity;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.screen.PropertyDelegate;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.text.Text;
import net.minecraft.util.collection.DefaultedList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
//definiert das Interkationsmenü
public class steeringWheelEntity extends BlockEntity implements NamedScreenHandlerFactory, ImplementedInventory {
public final PropertyDelegate propertyDelegate; //synchonisiert Eigenschaften zwischen client und server
private final DefaultedList<ItemStack> inventory = DefaultedList.ofSize(3, ItemStack.EMPTY);
public steeringWheelEntity(BlockPos pos, BlockState state) {
super(modBlockEntities.steering_wheel_interface, pos, state);
this.propertyDelegate = new PropertyDelegate() {
@Override
public int get(int index) {
return 0;
}
@Override
public void set(int index, int value) {
}
@Override
public int size() {
return 0;
}
};
}
@Override
public DefaultedList<ItemStack> getItems() {
return this.inventory;
}
@Override
public Text getDisplayName() {
return Text.literal("Bereit kaputte Schiffe zu fliegen?");
} //TODO: setzt den Namen. Muss noch an die einzelnen Sprachen angepasst werden!
@Nullable
@Override
public ScreenHandler createMenu(int syncId, PlayerInventory inv, PlayerEntity player) {
return null;
}
public static void tick(World world, BlockPos pos, BlockState state, steeringWheelEntity e) { //wird pro tick aufgerufen
if(world.isClient()) {
return;
}
}
}

21
src/modchest/data/ModRecipeGenerator.java
View File

@ -1,21 +0,0 @@
package modchest.data;
import modchest.item.modItems;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
import net.minecraft.data.server.recipe.RecipeJsonProvider;
import java.util.List;
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
public class ModRecipeGenerator extends FabricRecipeProvider {
public ModRecipeGenerator(FabricDataGenerator dataGenerator) {
super(dataGenerator);
}
@Override
protected void generateRecipes(Consumer<RecipeJsonProvider> exporter) {
//offerSmelting(exporter, List.of(modItems.shipblock), , ); //generiert das rezept zum herstellen (hier mir braten)
}
}

5
src/modchest/data/ModWorldGenerator.java
View File

@ -1,5 +0,0 @@
package modchest.data;
//relevant für die Biom generierung; bisher nicht verwendet, duh, der code ist leer...
public class ModWorldGenerator{
}

30
src/modchest/item/custom/piratesCoinItem.java
View File

@ -1,30 +0,0 @@
package modchest.item.custom;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;
import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult;
import net.minecraft.world.World;
//Ein Item das super teuer sein soll, aber paar special features haben soll. Bin mir noch nicht ganz sicher; evtl. soll es wie ein goldener Apfel einfach paar effekte geben nur länger und stärkere oder wie ein totem of undying dich wiederbeleben, allerdings egal wo es im Inventar ist (muss also nciht in der hand oder off-Hand sein)
public class piratesCoinItem extends Item {
public piratesCoinItem(Settings settings) {
super(settings);
}
@Override
public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) { //welche abilities soll das Item haben? Bisher kann man damit nur seinen chat voll spammen...
if(!world.isClient && hand == Hand.MAIN_HAND) {
outputMessage(user, "boah hast du viele Ressourcen gewasted!");
}
return super.use(world, user, hand);
}
private void outputMessage(PlayerEntity player, String msg) {
player.sendMessage(Text.literal(msg));
} //damit ich fancyer aussehe habe ich diese Methode total unnötiger weise in eine extra Methode ausgelagert... kann man wohl bald mal löschen
}

19
src/modchest/item/modItemGroup.java
View File

@ -1,19 +0,0 @@
package modchest.item;
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
import net.minecraft.block.Blocks;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
//definiert eine neue Itemgruppe mit dem identifier itemlist1, wird in einer de .json files dann in "Malte's Mod" umbenannt fürs spiel; in der Liste sollen alle Items dieser Mod im Creative Inventar angezeigt werden
public class modItemGroup {
public static ItemGroup modchest;
public static void modchest() {
modchest = FabricItemGroupBuilder.build(
new Identifier("modchest", "itemlist1"),
() -> new ItemStack(Blocks.COBBLESTONE)); //Icon ist halt bisher noch ein Cobblestone, weil ich keine sprits erstellt habe... :(
}
}

61
src/modchest/mixin/ServerPlayerEntityMixin.java
View File

@ -1,61 +0,0 @@
package modchest.mixin;
import modchest.REServerMod;
import modchest.util.ServerPlayerEntityInterface;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.network.ServerPlayerEntity;
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 java.util.Arrays;
@Mixin(ServerPlayerEntity.class)
public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface {
@Unique
private NbtCompound dataSaver = new NbtCompound(); //Weil die nbt daten beim tod geloescht werden, muessen sie rueber kopiert werden; der neue nbtTag existiert aber noch nciht, daher muessen sie hier zwischengespeichert werden
@Override
public NbtCompound getDataSaver() { //Um errors zu vermeiden, sorgt er dafuer, dass es immer ein persistentData gibt
if (this.dataSaver == null) {
this.dataSaver = new NbtCompound();
}
return this.dataSaver;
}
@Override
public void setDataSaver(NbtCompound data) { //Um errors zu vermeiden, sorgt er dafuer, dass es immer ein persistentData gibt
this.dataSaver = data;
}
@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
if (dataSaver != null) { //wenn der dataSaver null ist, wuerde sonst ein Error kommen, weil Minecraft keine leeren NBTs absepeicheern kann :(
try {
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"))
public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) { //gleiches beim einlesen. Werden NBT-Daten eingelesen, tun wird das auch
try {
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")));
}
@Inject(method = "copyFrom", at = @At("TAIL"))
public void copyFrom(ServerPlayerEntity oldPlayer, boolean alive, CallbackInfo ci) { //Beim Tod des Spielers werden die NBT-Daten kopiert, damit die Spawnpunkte nicht verloren gehen, kopieren wir sie auch mit rueber
dataSaver = ((ServerPlayerEntityInterface) oldPlayer).getDataSaver();
//REServerMod.LOGGER.info("copyFrom called");
}
}

19
src/modchest/networking/modNetworkingServer.java
View File

@ -1,19 +0,0 @@
package modchest.networking;
import modchest.REServerMod;
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
import modchest.networking.packet.setNewRespawnsC2SPacket;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.util.Identifier;
public class modNetworkingServer { //Identifier werden eingeführt
public static final Identifier request_respawn = new Identifier(REServerMod.MOD_ID, "request_respawn"); //alle Identifier muessen leider IMMER auf Client und Server (doppelt) eingefuehrt werden
public static final Identifier start_sleeping_call_buttons = new Identifier(REServerMod.MOD_ID, "start_sleeping_call_buttons");
public static final Identifier death_multi_respawn_buttons = new Identifier(REServerMod.MOD_ID, "death_call_respawn_buttons");
public static void registerS2CPackets() { //Identifier fuer packets werden registriert (Identifier die der Client aufruft um beim Server was auszufuehren)
ServerPlayNetworking.registerGlobalReceiver(start_sleeping_call_buttons, setNewRespawnsC2SPacket::receive); //was der Server dann machen soll steht in der receive Methode
ServerPlayNetworking.registerGlobalReceiver(death_multi_respawn_buttons, deathScreenMultiButtonsC2SPacket::receive);
}
}

46
src/modchest/networking/packet/setNewRespawnsC2SPacket.java
View File

@ -1,46 +0,0 @@
package modchest.networking.packet;
import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.Arrays;
public class setNewRespawnsC2SPacket {
public static void receive(MinecraftServer server, ServerPlayerEntity player, //Passiert auf dem Server!!!
ServerPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
setAndGetMultiButtonsSpawn setAndGet = new setAndGetMultiButtonsSpawn();
try {
switch (buf.readInt()) { //Wird nur einmal angefragt, daher muss buf.readInt() nicht als variable gesetzt werden
case 1:
setAndGet.setMultiSpawn(player, 1); //Spawnpunkt wird gespeichert
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "1"));
break;
case 2:
setAndGet.setMultiSpawn(player, 2);
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "2"));
break;
case 3:
setAndGet.setMultiSpawn(player, 3);
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "3"));
break;
case 4:
setAndGet.setMultiSpawn(player, 4);
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "4"));
break;
case 5:
setAndGet.setMultiSpawn(player, 5);
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawn", "5"));
break;
}
} catch (Exception e) {
player.sendMessage(Text.translatable("chat.modchest.multispawn.setspawnerror"));
REServerMod.LOGGER.info("Following Error, when trying to save " + player.getDisplayName() + "'s Spawnpoint: " + e);
}
}
}

10
src/modchest/util/ServerPlayerEntityInterface.java
View File

@ -1,10 +0,0 @@
package modchest.util;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Unique;
public interface ServerPlayerEntityInterface {
NbtCompound getDataSaver();
void setDataSaver(NbtCompound data);
}

30
src/modchest/util/initializer.java
View File

@ -1,30 +0,0 @@
package modchest.util;
import modchest.block.entity.modBlockEntities;
import modchest.block.modBlocks;
import modchest.event.playerAfterRespawnEvent;
import modchest.item.modItemGroup;
import modchest.item.modItems;
import modchest.networking.modNetworkingServer;
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
public class initializer {
public static void itemGroups() {
modItemGroup.modchest(); // Item Gruppe fürs Creative-Inventar wird erstellt; In dieser Gruppe sollen
// dann alle Items und Blöcke dieser Mod angezeigt werden
}
public static void itemsAndBlocks() {
modItems.setItems(); // die Items werden erstellt
modBlocks.setBlocks(); // Hier werden die Blöcke erstellt
modBlockEntities.registerBlockEntities(); // Die Interaktionsmenüs für die Blöcke werden erstellt
}
public static void events() { //Events, bei denen custom Code ausgefuehrt wird, werden eingefuehrt
ServerPlayerEvents.AFTER_RESPAWN.register(new playerAfterRespawnEvent());
}
public static void networking() { //Identifier unter denen der Server zuhoert werden registriert
modNetworkingServer.registerS2CPackets();
}
}