From 8add71f5acbabe4d0e841b3e49194722a019a87c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 20 Dec 2020 22:27:01 +0000 Subject: [PATCH] Port to new fabric networking api --- .../packets/ServerboundPackets.java | 164 ++++++++---------- src/main/resources/fabric.mod.json | 4 +- 2 files changed, 78 insertions(+), 90 deletions(-) diff --git a/src/main/java/techreborn/packets/ServerboundPackets.java b/src/main/java/techreborn/packets/ServerboundPackets.java index 5c40a52f4..bc0fcea62 100644 --- a/src/main/java/techreborn/packets/ServerboundPackets.java +++ b/src/main/java/techreborn/packets/ServerboundPackets.java @@ -24,17 +24,12 @@ package techreborn.packets; -import net.fabricmc.fabric.api.network.PacketContext; -import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.network.Packet; -import net.minecraft.network.listener.ServerPlayPacketListener; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import reborncore.common.network.ExtendedPacketBuffer; +import reborncore.common.network.IdentifiedPacket; import reborncore.common.network.NetworkManager; import techreborn.TechReborn; import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; @@ -47,8 +42,6 @@ import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity; import techreborn.config.TechRebornConfig; import techreborn.init.TRContent; -import java.util.function.BiConsumer; - public class ServerboundPackets { public static final Identifier AESU = new Identifier(TechReborn.MOD_ID, "aesu"); @@ -61,80 +54,79 @@ public class ServerboundPackets { public static final Identifier EXPERIENCE = new Identifier(TechReborn.MOD_ID, "experience"); public static void init() { - registerPacketHandler(AESU, (extendedPacketBuffer, context) -> { - BlockPos pos = extendedPacketBuffer.readBlockPos(); - int buttonID = extendedPacketBuffer.readInt(); - boolean shift = extendedPacketBuffer.readBoolean(); - boolean ctrl = extendedPacketBuffer.readBoolean(); + NetworkManager.registerServerBoundHandler(AESU, (server, player, handler, buf, responseSender) -> { + BlockPos pos = buf.readBlockPos(); + int buttonID = buf.readInt(); + boolean shift = buf.readBoolean(); + boolean ctrl = buf.readBoolean(); - context.getTaskQueue().execute(() -> { - BlockEntity blockEntity = context.getPlayer().world.getBlockEntity(pos); + server.execute(() -> { + BlockEntity blockEntity = player.world.getBlockEntity(pos); if (blockEntity instanceof AdjustableSUBlockEntity) { ((AdjustableSUBlockEntity) blockEntity).handleGuiInputFromClient(buttonID, shift, ctrl); } }); }); - registerPacketHandler(AUTO_CRAFTING_LOCK, (extendedPacketBuffer, context) -> { - BlockPos machinePos = extendedPacketBuffer.readBlockPos(); - boolean locked = extendedPacketBuffer.readBoolean(); + NetworkManager.registerServerBoundHandler(AUTO_CRAFTING_LOCK, (server, player, handler, buf, responseSender) -> { + BlockPos machinePos = buf.readBlockPos(); + boolean locked = buf.readBoolean(); - context.getTaskQueue().execute(() -> { - BlockEntity BlockEntity = context.getPlayer().world.getBlockEntity(machinePos); + server.execute(() -> { + BlockEntity BlockEntity = player.world.getBlockEntity(machinePos); if (BlockEntity instanceof AutoCraftingTableBlockEntity) { ((AutoCraftingTableBlockEntity) BlockEntity).locked = locked; } }); }); - registerPacketHandler(FUSION_CONTROL_SIZE, (extendedPacketBuffer, context) -> { - int sizeDelta = extendedPacketBuffer.readInt(); - BlockPos pos = extendedPacketBuffer.readBlockPos(); + NetworkManager.registerServerBoundHandler(FUSION_CONTROL_SIZE, (server, player, handler, buf, responseSender) -> { + int sizeDelta = buf.readInt(); + BlockPos pos = buf.readBlockPos(); - context.getTaskQueue().execute(() -> { - BlockEntity blockEntity = context.getPlayer().world.getBlockEntity(pos); + server.execute(() -> { + BlockEntity blockEntity = player.world.getBlockEntity(pos); if (blockEntity instanceof FusionControlComputerBlockEntity) { ((FusionControlComputerBlockEntity) blockEntity).changeSize(sizeDelta); } }); }); - registerPacketHandler(ROLLING_MACHINE_LOCK, (extendedPacketBuffer, context) -> { - BlockPos machinePos = extendedPacketBuffer.readBlockPos(); - boolean locked = extendedPacketBuffer.readBoolean(); + NetworkManager.registerServerBoundHandler(ROLLING_MACHINE_LOCK, (server, player, handler, buf, responseSender) -> { + BlockPos machinePos = buf.readBlockPos(); + boolean locked = buf.readBoolean(); - context.getTaskQueue().execute(() -> { - BlockEntity BlockEntity = context.getPlayer().world.getBlockEntity(machinePos); + server.execute(() -> { + BlockEntity BlockEntity = player.world.getBlockEntity(machinePos); if (BlockEntity instanceof RollingMachineBlockEntity) { ((RollingMachineBlockEntity) BlockEntity).locked = locked; } }); }); - registerPacketHandler(STORAGE_UNIT_LOCK, (extendedPacketBuffer, context) -> { - BlockPos machinePos = extendedPacketBuffer.readBlockPos(); - boolean locked = extendedPacketBuffer.readBoolean(); + NetworkManager.registerServerBoundHandler(STORAGE_UNIT_LOCK, (server, player, handler, buf, responseSender) -> { + BlockPos machinePos = buf.readBlockPos(); + boolean locked = buf.readBoolean(); - context.getTaskQueue().execute(() -> { - BlockEntity BlockEntity = context.getPlayer().world.getBlockEntity(machinePos); + server.execute(() -> { + BlockEntity BlockEntity = player.world.getBlockEntity(machinePos); if (BlockEntity instanceof StorageUnitBaseBlockEntity) { ((StorageUnitBaseBlockEntity) BlockEntity).setLocked(locked); } }); }); - registerPacketHandler(REFUND, (extendedPacketBuffer, context) -> { + NetworkManager.registerServerBoundHandler(REFUND, (server, player, handler, buf, responseSender) -> { if (!TechRebornConfig.allowManualRefund) { return; } - context.getTaskQueue().execute(() -> { - PlayerEntity playerMP = context.getPlayer(); - for (int i = 0; i < playerMP.inventory.size(); i++) { - ItemStack stack = playerMP.inventory.getStack(i); + server.execute(() -> { + for (int i = 0; i < player.inventory.size(); i++) { + ItemStack stack = player.inventory.getStack(i); if (stack.getItem() == TRContent.MANUAL) { - playerMP.inventory.removeStack(i); - playerMP.inventory.insertStack(new ItemStack(Items.BOOK)); - playerMP.inventory.insertStack(TRContent.Ingots.REFINED_IRON.getStack()); + player.inventory.removeStack(i); + player.inventory.insertStack(new ItemStack(Items.BOOK)); + player.inventory.insertStack(TRContent.Ingots.REFINED_IRON.getStack()); return; } } @@ -142,88 +134,84 @@ public class ServerboundPackets { }); - registerPacketHandler(CHUNKLOADER, (extendedPacketBuffer, context) -> { - BlockPos pos = extendedPacketBuffer.readBlockPos(); - int buttonID = extendedPacketBuffer.readInt(); - boolean sync = extendedPacketBuffer.readBoolean(); + NetworkManager.registerServerBoundHandler(CHUNKLOADER, (server, player, handler, buf, responseSender) -> { + BlockPos pos = buf.readBlockPos(); + int buttonID = buf.readInt(); + boolean sync = buf.readBoolean(); - context.getTaskQueue().execute(() -> { - BlockEntity blockEntity = context.getPlayer().world.getBlockEntity(pos); + server.execute(() -> { + BlockEntity blockEntity = player.world.getBlockEntity(pos); if (blockEntity instanceof ChunkLoaderBlockEntity) { - ((ChunkLoaderBlockEntity) blockEntity).handleGuiInputFromClient(buttonID, sync ? context.getPlayer() : null); + ((ChunkLoaderBlockEntity) blockEntity).handleGuiInputFromClient(buttonID, sync ? player : null); } }); }); - registerPacketHandler(EXPERIENCE, (extendedPacketBuffer, context) -> { - BlockPos pos = extendedPacketBuffer.readBlockPos(); + NetworkManager.registerServerBoundHandler(EXPERIENCE, (server, player, handler, buf, responseSender) -> { + BlockPos pos = buf.readBlockPos(); - context.getTaskQueue().execute(() -> { - BlockEntity blockEntity = context.getPlayer().world.getBlockEntity(pos); + server.execute(() -> { + BlockEntity blockEntity = player.world.getBlockEntity(pos); if (blockEntity instanceof IronFurnaceBlockEntity) { - ((IronFurnaceBlockEntity) blockEntity).handleGuiInputFromClient(context.getPlayer()); + ((IronFurnaceBlockEntity) blockEntity).handleGuiInputFromClient(player); } }); }); } - private static void registerPacketHandler(Identifier identifier, BiConsumer consumer) { - ServerSidePacketRegistry.INSTANCE.register(identifier, (packetContext, packetByteBuf) -> consumer.accept(new ExtendedPacketBuffer(packetByteBuf), packetContext)); - } - - public static Packet createPacketAesu(int buttonID, boolean shift, boolean ctrl, AdjustableSUBlockEntity blockEntity) { - return NetworkManager.createServerBoundPacket(AESU, extendedPacketBuffer -> { - extendedPacketBuffer.writeBlockPos(blockEntity.getPos()); - extendedPacketBuffer.writeInt(buttonID); - extendedPacketBuffer.writeBoolean(shift); - extendedPacketBuffer.writeBoolean(ctrl); + public static IdentifiedPacket createPacketAesu(int buttonID, boolean shift, boolean ctrl, AdjustableSUBlockEntity blockEntity) { + return NetworkManager.createServerBoundPacket(AESU, buf -> { + buf.writeBlockPos(blockEntity.getPos()); + buf.writeInt(buttonID); + buf.writeBoolean(shift); + buf.writeBoolean(ctrl); }); } - public static Packet createPacketAutoCraftingTableLock(AutoCraftingTableBlockEntity machine, boolean locked) { - return NetworkManager.createServerBoundPacket(AUTO_CRAFTING_LOCK, extendedPacketBuffer -> { - extendedPacketBuffer.writeBlockPos(machine.getPos()); - extendedPacketBuffer.writeBoolean(locked); + public static IdentifiedPacket createPacketAutoCraftingTableLock(AutoCraftingTableBlockEntity machine, boolean locked) { + return NetworkManager.createServerBoundPacket(AUTO_CRAFTING_LOCK, buf -> { + buf.writeBlockPos(machine.getPos()); + buf.writeBoolean(locked); }); } - public static Packet createPacketFusionControlSize(int sizeDelta, BlockPos pos) { - return NetworkManager.createServerBoundPacket(FUSION_CONTROL_SIZE, extendedPacketBuffer -> { - extendedPacketBuffer.writeInt(sizeDelta); - extendedPacketBuffer.writeBlockPos(pos); + public static IdentifiedPacket createPacketFusionControlSize(int sizeDelta, BlockPos pos) { + return NetworkManager.createServerBoundPacket(FUSION_CONTROL_SIZE, buf -> { + buf.writeInt(sizeDelta); + buf.writeBlockPos(pos); }); } - public static Packet createPacketRollingMachineLock(RollingMachineBlockEntity machine, boolean locked) { - return NetworkManager.createServerBoundPacket(ROLLING_MACHINE_LOCK, extendedPacketBuffer -> { - extendedPacketBuffer.writeBlockPos(machine.getPos()); - extendedPacketBuffer.writeBoolean(locked); + public static IdentifiedPacket createPacketRollingMachineLock(RollingMachineBlockEntity machine, boolean locked) { + return NetworkManager.createServerBoundPacket(ROLLING_MACHINE_LOCK, buf -> { + buf.writeBlockPos(machine.getPos()); + buf.writeBoolean(locked); }); } - public static Packet createPacketStorageUnitLock(StorageUnitBaseBlockEntity machine, boolean locked) { - return NetworkManager.createServerBoundPacket(STORAGE_UNIT_LOCK, extendedPacketBuffer -> { - extendedPacketBuffer.writeBlockPos(machine.getPos()); - extendedPacketBuffer.writeBoolean(locked); + public static IdentifiedPacket createPacketStorageUnitLock(StorageUnitBaseBlockEntity machine, boolean locked) { + return NetworkManager.createServerBoundPacket(STORAGE_UNIT_LOCK, buf -> { + buf.writeBlockPos(machine.getPos()); + buf.writeBoolean(locked); }); } - public static Packet createRefundPacket() { + public static IdentifiedPacket createRefundPacket() { return NetworkManager.createServerBoundPacket(REFUND, extendedPacketBuffer -> { }); } - public static Packet createPacketChunkloader(int buttonID, ChunkLoaderBlockEntity blockEntity, boolean sync) { - return NetworkManager.createServerBoundPacket(CHUNKLOADER, extendedPacketBuffer -> { - extendedPacketBuffer.writeBlockPos(blockEntity.getPos()); - extendedPacketBuffer.writeInt(buttonID); - extendedPacketBuffer.writeBoolean(sync); + public static IdentifiedPacket createPacketChunkloader(int buttonID, ChunkLoaderBlockEntity blockEntity, boolean sync) { + return NetworkManager.createServerBoundPacket(CHUNKLOADER, buf -> { + buf.writeBlockPos(blockEntity.getPos()); + buf.writeInt(buttonID); + buf.writeBoolean(sync); }); } - public static Packet createPacketExperience(IronFurnaceBlockEntity blockEntity) { + public static IdentifiedPacket createPacketExperience(IronFurnaceBlockEntity blockEntity) { return NetworkManager.createServerBoundPacket(EXPERIENCE, extendedPacketBuffer -> extendedPacketBuffer.writeBlockPos(blockEntity.getPos())); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 07c3492ff..b8da82b0e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,9 +28,9 @@ }, "depends": { "fabricloader": ">=0.6.3", - "fabric": "*", + "fabric": ">=0.28.3", "reborncore": "*", - "team_reborn_energy": ">=0.1.0", + "team_reborn_energy": ">=0.1.1", "fabric-biome-api-v1": ">=3.0.0" }, "authors": [