mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Formatting and code readability cleanup (#5467)
* First pass reformatting code to be more readable (common still not done) * Replace google common collect calls with Java calls where possible * Remove a bunch of unnecessary parenthesis leaving clarifying ones * Add some missing @Nonnull annotations * Fix checking wrong type * Remove unnecessary continue/return statements and simplify comparision check * Pass exception instead of directly printing stack trace * Work on cleaning up common, through config so far * Work on cleaning up common, through integration so far * Work on cleaning up common, through network so far * Work on cleaning up common, through tier so far * Remove empty constructors that get created by default anyways * Work on cleaning up common, through transmitters so far * Work on cleaning up common, through utils so far * Finish cleaning up spacing for common
This commit is contained in:
1 parent
91ef2a5c3d
commit
0d4b50908f
909 files changed
+6234
-15623
No files matched your search
@@ -20,22 +20,20 @@ public class PacketFlamethrowerData implements IMessageHandler<FlamethrowerDataM
|
||||
// Queue up the processing on the central thread
|
||||
EntityPlayer player = PacketHandler.getPlayer(context);
|
||||
PacketHandler.handlePacket(() -> {
|
||||
if (message.packetType == FlamethrowerPacket.UPDATE) {
|
||||
Mekanism.playerState.setFlamethrowerState(message.uuid, message.value, false);
|
||||
|
||||
// If we got this packet on the server, resend out to all clients in same dimension
|
||||
// TODO: Why is this a dimensional thing?!
|
||||
if (!player.world.isRemote) {
|
||||
Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension());
|
||||
}
|
||||
} else if (message.packetType == FlamethrowerPacket.MODE) {
|
||||
ItemStack stack = player.getHeldItem(message.currentHand);
|
||||
if (!stack.isEmpty() && stack.getItem() instanceof ItemFlamethrower) {
|
||||
((ItemFlamethrower) stack.getItem()).incrementMode(stack);
|
||||
}
|
||||
}
|
||||
},
|
||||
player);
|
||||
if (message.packetType == FlamethrowerPacket.UPDATE) {
|
||||
Mekanism.playerState.setFlamethrowerState(message.uuid, message.value, false);
|
||||
// If we got this packet on the server, resend out to all clients in same dimension
|
||||
// TODO: Why is this a dimensional thing?!
|
||||
if (!player.world.isRemote) {
|
||||
Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension());
|
||||
}
|
||||
} else if (message.packetType == FlamethrowerPacket.MODE) {
|
||||
ItemStack stack = player.getHeldItem(message.currentHand);
|
||||
if (!stack.isEmpty() && stack.getItem() instanceof ItemFlamethrower) {
|
||||
((ItemFlamethrower) stack.getItem()).incrementMode(stack);
|
||||
}
|
||||
}
|
||||
}, player);
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -57,7 +55,6 @@ public class PacketFlamethrowerData implements IMessageHandler<FlamethrowerDataM
|
||||
|
||||
public FlamethrowerDataMessage(FlamethrowerPacket type, EnumHand hand, UUID uuid, boolean state) {
|
||||
packetType = type;
|
||||
|
||||
if (type == FlamethrowerPacket.UPDATE) {
|
||||
this.uuid = uuid;
|
||||
value = state;
|
||||
@@ -69,7 +66,6 @@ public class PacketFlamethrowerData implements IMessageHandler<FlamethrowerDataM
|
||||
@Override
|
||||
public void toBytes(ByteBuf dataStream) {
|
||||
dataStream.writeInt(packetType.ordinal());
|
||||
|
||||
if (packetType == FlamethrowerPacket.UPDATE) {
|
||||
PacketHandler.writeUUID(dataStream, uuid);
|
||||
dataStream.writeBoolean(value);
|
||||
@@ -81,7 +77,6 @@ public class PacketFlamethrowerData implements IMessageHandler<FlamethrowerDataM
|
||||
@Override
|
||||
public void fromBytes(ByteBuf dataStream) {
|
||||
packetType = FlamethrowerPacket.values()[dataStream.readInt()];
|
||||
|
||||
if (packetType == FlamethrowerPacket.UPDATE) {
|
||||
uuid = PacketHandler.readUUID(dataStream);
|
||||
value = dataStream.readBoolean();
|
||||
@@ -90,4 +85,4 @@ public class PacketFlamethrowerData implements IMessageHandler<FlamethrowerDataM
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user