diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/Workspace/Icons/schiffsblock.xcf b/Workspace/Icons/schiffsblock.xcf old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755 diff --git a/src/client/java/modchest/REServerModClient.java b/src/client/java/modchest/REServerModClient.java old mode 100644 new mode 100755 diff --git a/src/client/java/modchest/mixin/client/SleepingChatScreen.java b/src/client/java/modchest/mixin/client/SleepingChatScreen.java old mode 100644 new mode 100755 diff --git a/src/client/java/modchest/networking/modNetworkingClient.java b/src/client/java/modchest/networking/modNetworkingClient.java index d59b3c9..3d4c55b 100755 --- a/src/client/java/modchest/networking/modNetworkingClient.java +++ b/src/client/java/modchest/networking/modNetworkingClient.java @@ -1,6 +1,7 @@ package modchest.networking; import modchest.REServerMod; +import modchest.networking.packet.getNamesOfRespawnButtonsS2CPacket; import modchest.networking.packet.respawnRequestS2CPacket; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.minecraft.util.Identifier; diff --git a/src/client/java/modchest/networking/packet/getNamesOfRespawnButtonsS2CPacket.java b/src/client/java/modchest/networking/packet/getNamesOfRespawnButtonsS2CPacket.java index fa6b7d8..8c1fdb8 100755 --- a/src/client/java/modchest/networking/packet/getNamesOfRespawnButtonsS2CPacket.java +++ b/src/client/java/modchest/networking/packet/getNamesOfRespawnButtonsS2CPacket.java @@ -8,7 +8,7 @@ import net.minecraft.network.PacketByteBuf; public class getNamesOfRespawnButtonsS2CPacket { - public static void receive(MinecraftClient minecraftClient, ClientPlayNetworkHandler clientPlayNetworkHandler, PacketByteBuf packetByteBuf, PacketSender packetSender) { + public static String[] receive(MinecraftClient minecraftClient, ClientPlayNetworkHandler clientPlayNetworkHandler, PacketByteBuf packetByteBuf, PacketSender packetSender) { String[] namesFromServer = new String[5]; for (int i = 0; i < 5; i++) { namesFromServer[i] = (buf.readString(32767)); diff --git a/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java b/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java old mode 100644 new mode 100755 index d2e9aa9..bcae61f --- a/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java +++ b/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java @@ -1,6 +1,5 @@ package modchest.networking.packet; -import modchest.REServerModClient; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; diff --git a/src/client/resources/reservermod.client.mixins.json b/src/client/resources/reservermod.client.mixins.json old mode 100644 new mode 100755 diff --git a/src/documentation/Development b/src/documentation/Development old mode 100644 new mode 100755 diff --git a/src/documentation/Documentation b/src/documentation/Documentation old mode 100644 new mode 100755 diff --git a/src/documentation/Features b/src/documentation/Features old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/REServerModDataGenerator.java b/src/main/java/modchest/REServerModDataGenerator.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/block/custom/steeringWheelBlock.java b/src/main/java/modchest/block/custom/steeringWheelBlock.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/block/entity/ImplementedInventory.java b/src/main/java/modchest/block/entity/ImplementedInventory.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/block/entity/modBlockEntities.java b/src/main/java/modchest/block/entity/modBlockEntities.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/block/entity/steeringWheelEntity.java b/src/main/java/modchest/block/entity/steeringWheelEntity.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/block/modBlocks.java b/src/main/java/modchest/block/modBlocks.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/data/ModLootTableGenerator.java b/src/main/java/modchest/data/ModLootTableGenerator.java old mode 100644 new mode 100755 index 71f1434..04b40fb --- a/src/main/java/modchest/data/ModLootTableGenerator.java +++ b/src/main/java/modchest/data/ModLootTableGenerator.java @@ -1,9 +1,7 @@ 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 { diff --git a/src/main/java/modchest/data/ModModelProvider.java b/src/main/java/modchest/data/ModModelProvider.java old mode 100644 new mode 100755 index dfdf2e6..7cd60fe --- a/src/main/java/modchest/data/ModModelProvider.java +++ b/src/main/java/modchest/data/ModModelProvider.java @@ -1,12 +1,9 @@ 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 { diff --git a/src/main/java/modchest/data/ModRecipeGenerator.java b/src/main/java/modchest/data/ModRecipeGenerator.java old mode 100644 new mode 100755 index 7a4f16c..61fcd4f --- a/src/main/java/modchest/data/ModRecipeGenerator.java +++ b/src/main/java/modchest/data/ModRecipeGenerator.java @@ -1,11 +1,9 @@ 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 diff --git a/src/main/java/modchest/data/ModWorldGenerator.java b/src/main/java/modchest/data/ModWorldGenerator.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/item/custom/piratesCoinItem.java b/src/main/java/modchest/item/custom/piratesCoinItem.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/item/modItemGroup.java b/src/main/java/modchest/item/modItemGroup.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/item/modItems.java b/src/main/java/modchest/item/modItems.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java b/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java old mode 100644 new mode 100755 index 06c2e4a..07feff8 --- a/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java +++ b/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java @@ -1,6 +1,5 @@ package modchest.mixin; -import modchest.REServerMod; import modchest.util.ServerPlayerEntityInterface; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.network.ServerPlayerEntity; @@ -10,8 +9,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 diff --git a/src/main/java/modchest/mixin/bedBlock.java b/src/main/java/modchest/mixin/bedBlock.java index a995ba4..f0c7265 100755 --- a/src/main/java/modchest/mixin/bedBlock.java +++ b/src/main/java/modchest/mixin/bedBlock.java @@ -5,7 +5,6 @@ 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; @@ -14,7 +13,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; import java.util.List; import java.util.Objects; diff --git a/src/main/java/modchest/networking/modNetworkingServer.java b/src/main/java/modchest/networking/modNetworkingServer.java index 0974f00..04629f6 100755 --- a/src/main/java/modchest/networking/modNetworkingServer.java +++ b/src/main/java/modchest/networking/modNetworkingServer.java @@ -2,6 +2,7 @@ package modchest.networking; import modchest.REServerMod; import modchest.networking.packet.deathScreenMultiButtonsC2SPacket; +import modchest.networking.packet.setNamesOfRespawnButtonsC2SPacket; import modchest.networking.packet.setNewRespawnsC2SPacket; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.util.Identifier; diff --git a/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java b/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java old mode 100644 new mode 100755 index 63440ce..5044584 --- a/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java +++ b/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java @@ -14,7 +14,6 @@ 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 { diff --git a/src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java b/src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java index 92419bf..f1b06c0 100755 --- a/src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java +++ b/src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java @@ -9,8 +9,6 @@ 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) { diff --git a/src/main/java/modchest/util/ServerPlayerEntityInterface.java b/src/main/java/modchest/util/ServerPlayerEntityInterface.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/util/initializer.java b/src/main/java/modchest/util/initializer.java old mode 100644 new mode 100755 diff --git a/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java b/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java index ef78569..773db52 100755 --- a/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java +++ b/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java @@ -113,14 +113,15 @@ public class setAndGetMultiButtonsSpawn { topNbt.put("multi_sleep", new NbtCompound()); } NbtCompound subNbt = (NbtCompound) topNbt.get("multi_sleep"); //wie bei setMultiSpawn() + String names; if (subNbt != null) { - name = subNbt.getIntArray("names"); // holt sich den Namen + names = subNbt.getString("names"); // holt sich den Namen } if (name.length == 0) { //das gleiche fuer den Namen - String[] names = {"#1", "#2", "#3", "#4", "#5"}; + String names = {"#1", "#2", "#3", "#4", "#5"}; try { - subNbt.putIntArray("names", names); + subNbt.putString("names", names); topNbt.put("multi_sleep", subNbt); castedPlayer.setDataSaver(topNbt); } catch (Exception e) { diff --git a/src/main/resources/assets/modchest/blockstates/steering_wheel.json b/src/main/resources/assets/modchest/blockstates/steering_wheel.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/icon.png b/src/main/resources/assets/modchest/icon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/icon.png.old b/src/main/resources/assets/modchest/icon.png.old old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/lang/de_de.json b/src/main/resources/assets/modchest/lang/de_de.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/lang/en_pt.json b/src/main/resources/assets/modchest/lang/en_pt.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/lang/en_us.json b/src/main/resources/assets/modchest/lang/en_us.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/models/block/steering_wheel.json b/src/main/resources/assets/modchest/models/block/steering_wheel.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/models/item/pirates_coin.json b/src/main/resources/assets/modchest/models/item/pirates_coin.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/models/item/shipblock.json b/src/main/resources/assets/modchest/models/item/shipblock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/models/item/steering_wheel.json b/src/main/resources/assets/modchest/models/item/steering_wheel.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/modchest/textures/item/pirates_coin.png b/src/main/resources/assets/modchest/textures/item/pirates_coin.png old mode 100644 new mode 100755 diff --git a/src/main/resources/data/icon.png b/src/main/resources/data/icon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json b/src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/modchest/recipes/pirates_coin.json b/src/main/resources/data/modchest/recipes/pirates_coin.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/modchest/recipes/shipblock.json b/src/main/resources/data/modchest/recipes/shipblock.json old mode 100644 new mode 100755 diff --git a/src/main/resources/data/modchest/recipes/steering_wheel.json b/src/main/resources/data/modchest/recipes/steering_wheel.json old mode 100644 new mode 100755 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json old mode 100644 new mode 100755 diff --git a/src/main/resources/reservermod.mixins.json b/src/main/resources/reservermod.mixins.json old mode 100644 new mode 100755