Move PacketHelper methods into DataStreams

This commit is contained in:
mezz committed 2015-06-09 00:23:36 -07:00
1 parent ff97fd8067
commit fa092e2a1b
57 files changed
+459 -508

No files matched your search

@@ -10,8 +10,6 @@
******************************************************************************/
package forestry.mail.network;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.UUID;
@@ -23,8 +21,9 @@ import forestry.api.mail.EnumAddressee;
import forestry.api.mail.IMailAddress;
import forestry.api.mail.PostManager;
import forestry.api.mail.TradeStationInfo;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.ForestryPacket;
import forestry.core.network.PacketHelper;
import forestry.core.network.PacketId;
import forestry.mail.EnumStationState;
@@ -34,7 +33,7 @@ public class PacketLetterInfo extends ForestryPacket {
public TradeStationInfo tradeInfo;
public IMailAddress address;
public PacketLetterInfo(DataInputStream data) throws IOException {
public PacketLetterInfo(DataInputStreamForestry data) throws IOException {
super(data);
}
@@ -49,7 +48,7 @@ public class PacketLetterInfo extends ForestryPacket {
}
@Override
public void writeData(DataOutputStream data) throws IOException {
public void writeData(DataOutputStreamForestry data) throws IOException {
if (type == null) {
data.writeShort(-1);
@@ -88,15 +87,15 @@ public class PacketLetterInfo extends ForestryPacket {
data.writeLong(tradeInfo.owner.getId().getLeastSignificantBits());
data.writeUTF(tradeInfo.owner.getName());
PacketHelper.writeItemStack(tradeInfo.tradegood, data);
PacketHelper.writeItemStacks(tradeInfo.required, data);
data.writeItemStack(tradeInfo.tradegood);
data.writeItemStacks(tradeInfo.required);
data.writeShort(tradeInfo.state.ordinal());
}
}
@Override
public void readData(DataInputStream data) throws IOException {
public void readData(DataInputStreamForestry data) throws IOException {
if (data.readShort() < 0) {
return;
@@ -120,8 +119,8 @@ public class PacketLetterInfo extends ForestryPacket {
ItemStack tradegood;
ItemStack[] required;
tradegood = PacketHelper.readItemStack(data);
required = PacketHelper.readItemStacks(data);
tradegood = data.readItemStack();
required = data.readItemStacks();
this.tradeInfo = new TradeStationInfo(address, owner, tradegood, required, EnumStationState.values()[data.readShort()]);
}
@@ -10,10 +10,10 @@
******************************************************************************/
package forestry.mail.network;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.ForestryPacket;
import forestry.core.network.PacketId;
import forestry.mail.POBoxInfo;
@@ -22,7 +22,7 @@ public class PacketPOBoxInfo extends ForestryPacket {
public POBoxInfo poboxInfo;
public PacketPOBoxInfo(DataInputStream data) throws IOException {
public PacketPOBoxInfo(DataInputStreamForestry data) throws IOException {
super(data);
}
@@ -32,7 +32,7 @@ public class PacketPOBoxInfo extends ForestryPacket {
}
@Override
protected void writeData(DataOutputStream data) throws IOException {
protected void writeData(DataOutputStreamForestry data) throws IOException {
if (poboxInfo == null) {
data.writeShort(-1);
return;
@@ -44,7 +44,7 @@ public class PacketPOBoxInfo extends ForestryPacket {
}
@Override
protected void readData(DataInputStream data) throws IOException {
protected void readData(DataInputStreamForestry data) throws IOException {
short isNotNull = data.readShort();
if (isNotNull < 0) {
@@ -10,11 +10,11 @@
******************************************************************************/
package forestry.mail.network;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import forestry.api.mail.EnumAddressee;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.ForestryPacket;
import forestry.core.network.PacketId;
@@ -23,7 +23,7 @@ public class PacketRequestLetterInfo extends ForestryPacket {
private String recipientName;
private short addressType;
public PacketRequestLetterInfo(DataInputStream data) throws IOException {
public PacketRequestLetterInfo(DataInputStreamForestry data) throws IOException {
super(data);
}
@@ -34,14 +34,14 @@ public class PacketRequestLetterInfo extends ForestryPacket {
}
@Override
protected void writeData(DataOutputStream data) throws IOException {
protected void writeData(DataOutputStreamForestry data) throws IOException {
super.writeData(data);
data.writeUTF(recipientName);
data.writeShort(addressType);
}
@Override
protected void readData(DataInputStream data) throws IOException {
protected void readData(DataInputStreamForestry data) throws IOException {
super.readData(data);
recipientName = data.readUTF();
addressType = data.readShort();