tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

More dynamic rendering!

Browse source
This commit is contained in:
Aidan Brady 2013-08-05 16:59:22 -04:00
parent 4e35a9f6d5
commit bf500ae6dc
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/resonantinduction/battery/BlockBattery.java
View file

@ -46,7 +46,7 @@ public class BlockBattery extends BlockBase implements ITileEntityProvider
if (tileEntity.structure.inventory.remove(itemStack)) if (tileEntity.structure.inventory.remove(itemStack))
{ {
entityPlayer.dropPlayerItem(itemStack); entityPlayer.dropPlayerItem(itemStack);
tileEntity.updateInventory(); tileEntity.updateAllClients();
} }
} }
} }
@ -73,7 +73,7 @@ public class BlockBattery extends BlockBase implements ITileEntityProvider
tileEntity.structure.inventory.add(entityPlayer.getCurrentEquippedItem()); tileEntity.structure.inventory.add(entityPlayer.getCurrentEquippedItem());
tileEntity.structure.sortInventory(); tileEntity.structure.sortInventory();
entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, null); entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, null);
tileEntity.updateInventory(); tileEntity.updateAllClients();
} }
/** /**

19
src/resonantinduction/battery/TileEntityBattery.java
View file

@ -18,6 +18,7 @@ import resonantinduction.api.ITesla;
import resonantinduction.base.IPacketReceiver; import resonantinduction.base.IPacketReceiver;
import resonantinduction.base.ListUtil; import resonantinduction.base.ListUtil;
import resonantinduction.base.TileEntityBase; import resonantinduction.base.TileEntityBase;
import resonantinduction.base.Vector3;
import resonantinduction.tesla.TeslaGrid; import resonantinduction.tesla.TeslaGrid;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
@ -61,6 +62,7 @@ public class TileEntityBattery extends TileEntityBase implements IPacketReceiver
structure.inventory.add(structure.visibleInventory[0]); structure.inventory.add(structure.visibleInventory[0]);
structure.visibleInventory[0] = null; structure.visibleInventory[0] = null;
structure.sortInventory(); structure.sortInventory();
updateAllClients();
} }
} }
@ -95,7 +97,7 @@ public class TileEntityBattery extends TileEntityBase implements IPacketReceiver
player.closeScreen(); player.closeScreen();
} }
updateInventory(); updateClient();
} }
prevStructure = structure; prevStructure = structure;
@ -105,15 +107,24 @@ public class TileEntityBattery extends TileEntityBase implements IPacketReceiver
if(playersUsing.size() > 0) if(playersUsing.size() > 0)
{ {
updateInventory(); updateClient();
} }
} }
} }
public void updateInventory() public void updateClient()
{ {
PacketHandler.sendTileEntityPacketToClients(this, getNetworkedData(new ArrayList()).toArray()); PacketHandler.sendTileEntityPacketToClients(this, getNetworkedData(new ArrayList()).toArray());
} }
public void updateAllClients()
{
for(Vector3 vec : structure.locations)
{
TileEntityBattery battery = (TileEntityBattery)vec.getTileEntity(worldObj);
PacketHandler.sendTileEntityPacketToClients(battery, battery.getNetworkedData(new ArrayList()).toArray());
}
}
@Override @Override
public void validate() public void validate()