From 693cb6807aa60bffa0cbae086002316e3b81c559 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 24 Jul 2018 14:27:17 +0100 Subject: [PATCH] Inital pass of cleaning up the networking, I will prob do some more in 1.13 --- src/main/java/techreborn/packets/PacketAesu.java | 8 ++++---- .../java/techreborn/packets/PacketFusionControlSize.java | 6 +++--- src/main/java/techreborn/packets/PacketIdsu.java | 4 ++-- .../java/techreborn/packets/PacketRollingMachineLock.java | 4 ++-- src/main/java/techreborn/packets/PacketSetRecipe.java | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/techreborn/packets/PacketAesu.java b/src/main/java/techreborn/packets/PacketAesu.java index 49f4fb5f2..3c6c275e4 100644 --- a/src/main/java/techreborn/packets/PacketAesu.java +++ b/src/main/java/techreborn/packets/PacketAesu.java @@ -31,7 +31,7 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.storage.TileAdjustableSU; -public class PacketAesu implements INetworkPacket { +public class PacketAesu implements INetworkPacket { int buttonID; BlockPos pos; @@ -57,10 +57,10 @@ public class PacketAesu implements INetworkPacket { } @Override - public void processData(PacketAesu message, MessageContext context) { - TileEntity tile = context.getServerHandler().player.world.getTileEntity(message.pos); + public void processData(MessageContext context) { + TileEntity tile = context.getServerHandler().player.world.getTileEntity(pos); if (tile instanceof TileAdjustableSU){ - ((TileAdjustableSU) tile).handleGuiInputFromClient(message.buttonID); + ((TileAdjustableSU) tile).handleGuiInputFromClient(buttonID); } } } diff --git a/src/main/java/techreborn/packets/PacketFusionControlSize.java b/src/main/java/techreborn/packets/PacketFusionControlSize.java index 9193ab84e..6024ea630 100644 --- a/src/main/java/techreborn/packets/PacketFusionControlSize.java +++ b/src/main/java/techreborn/packets/PacketFusionControlSize.java @@ -31,7 +31,7 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.fusionReactor.TileFusionControlComputer; -public class PacketFusionControlSize implements INetworkPacket { +public class PacketFusionControlSize implements INetworkPacket { int sizeDelta; BlockPos pos; @@ -57,8 +57,8 @@ public class PacketFusionControlSize implements INetworkPacket { +public class PacketIdsu implements INetworkPacket { int buttonID; BlockPos pos; @@ -56,7 +56,7 @@ public class PacketIdsu implements INetworkPacket { } @Override - public void processData(PacketIdsu message, MessageContext context) { + public void processData(MessageContext context) { // if (!pos.getWorld().isRemote) { // pos.handleGuiInputFromClient(buttonID); // } diff --git a/src/main/java/techreborn/packets/PacketRollingMachineLock.java b/src/main/java/techreborn/packets/PacketRollingMachineLock.java index 4d1438ff1..b22e4dd85 100644 --- a/src/main/java/techreborn/packets/PacketRollingMachineLock.java +++ b/src/main/java/techreborn/packets/PacketRollingMachineLock.java @@ -31,7 +31,7 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.tier1.TileRollingMachine; -public class PacketRollingMachineLock implements INetworkPacket { +public class PacketRollingMachineLock implements INetworkPacket { BlockPos machinePos; boolean locked; @@ -57,7 +57,7 @@ public class PacketRollingMachineLock implements INetworkPacket { +public class PacketSetRecipe implements INetworkPacket { BlockPos pos; ResourceLocation recipe; @@ -70,10 +70,10 @@ public class PacketSetRecipe implements INetworkPacket { } @Override - public void processData(PacketSetRecipe message, MessageContext context) { - TileEntity tileEntity = context.getServerHandler().player.world.getTileEntity(message.pos); + public void processData(MessageContext context) { + TileEntity tileEntity = context.getServerHandler().player.world.getTileEntity(pos); if (tileEntity instanceof TileAutoCraftingTable) { - ((TileAutoCraftingTable) tileEntity).setCurrentRecipe(message.recipe, message.custom); + ((TileAutoCraftingTable) tileEntity).setCurrentRecipe(recipe, custom); } } }