From f284886d5ceeacfe0ea41c43c29d2d9603ac7fe3 Mon Sep 17 00:00:00 2001 From: Porter Westling Date: Mon, 22 Sep 2014 09:25:27 -0700 Subject: [PATCH] read and write entire item stack using PacketHandler in TransporterStack --- .../common/transporter/TransporterStack.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/mekanism/common/transporter/TransporterStack.java b/src/main/java/mekanism/common/transporter/TransporterStack.java index d14f20402..909452980 100644 --- a/src/main/java/mekanism/common/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/transporter/TransporterStack.java @@ -1,18 +1,16 @@ package mekanism.common.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.ILogisticalTransporter; +import mekanism.common.PacketHandler; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterPathfinder.Destination; -import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -27,7 +25,7 @@ public class TransporterStack public EnumColor color = null; public boolean initiatedPath = false; - + public ForgeDirection idleDir = ForgeDirection.UNKNOWN; public List pathToTarget = new ArrayList(); @@ -65,9 +63,7 @@ public class TransporterStack getPrev(tileEntity).write(data); - data.add(MekanismUtils.getID(itemStack)); - data.add(itemStack.stackSize); - data.add(itemStack.getItemDamage()); + data.add(itemStack); } public void read(ByteBuf dataStream) @@ -93,7 +89,7 @@ public class TransporterStack clientPrev = Coord4D.read(dataStream); - itemStack = new ItemStack(Item.getItemById(dataStream.readInt()), dataStream.readInt(), dataStream.readInt()); + itemStack = PacketHandler.readStack(dataStream); } public void write(NBTTagCompound nbtTags)