tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some things!!

Browse source
This commit is contained in:
Aidan C. Brady 2013-10-25 17:11:15 -04:00
parent 8d9ee35679
commit b49defae88
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/mekanism/common/PacketHandler.java
View file

@ -58,6 +58,7 @@ public class PacketHandler implements IPacketHandler
packetType.read(dataStream, entityplayer, entityplayer.worldObj);
} catch(Exception e) {
System.err.println("[Mekanism] Error while reading '" + packetType.getName() + "' packet.");
e.printStackTrace();
}
} catch(Exception e) {
System.err.println("[Mekanism] Error while handling packet.");

13
common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
View file

@ -84,7 +84,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
if(inInventory != null && inInventory.itemStack != null)
{
if(TransporterUtils.insert((TileEntity)inventory, transporter, inInventory.itemStack, color))
if(TransporterUtils.insert(this, transporter, inInventory.itemStack, color))
{
inventory.setInventorySlotContents(inInventory.slotID, null);
setActive(true);
@ -147,7 +147,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
filters.clear();
for(int i = 0; i < dataStream.readInt(); i++)
int amount = dataStream.readInt();
for(int i = 0; i < amount; i++)
{
filters.add(TransporterFilter.readFromPacket(dataStream));
}
@ -189,6 +191,13 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
{
return 1;
}
@Override
public int[] getAccessibleSlotsFromSide(int side)
{
return new int[] {0};
}
@Override
public RedstoneControl getControlType()

6
common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
View file

@ -202,7 +202,6 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
public boolean insert(Object3D original, ItemStack itemStack, EnumColor color)
{
needsSync = true;
TransporterStack stack = new TransporterStack();
stack.itemStack = itemStack;
stack.originalLocation = original;
@ -215,6 +214,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
if(stack.recalculatePath(this))
{
needsSync = true;
transit.add(stack);
return true;
}
@ -341,7 +341,9 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
transit.clear();
for(int i = 0; i < dataStream.readInt(); i++)
int amount = dataStream.readInt();
for(int i = 0; i < amount; i++)
{
transit.add(TransporterStack.readFromPacket(dataStream));
}

2
common/mekanism/common/transporter/TransporterStack.java
View file

@ -19,7 +19,7 @@ public class TransporterStack
public int progress;
public EnumColor color = EnumColor.AQUA;
public EnumColor color = null;
public boolean initiatedPath = false;