Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed turbine connections, multiblock creation, and packet syncing.

Browse source
This commit is contained in:
Robert S 2014-06-08 09:29:44 -04:00
parent d76f41a148
commit e880c244ec
2 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbine.java
View file

@ -19,7 +19,7 @@ public class BlockTurbine extends BlockRotatable
{
super(id, Material.iron);
setTextureName(Reference.PREFIX + "material_wood_surface");
rotationMask = Byte.parseByte("111111", 2);
rotationMask = Byte.parseByte("111111", 2);
}
@Override
@ -108,29 +108,26 @@ public class BlockTurbine extends BlockRotatable
if (tileEntity instanceof TileTurbine)
{
if (!world.isRemote)
TileTurbine tile = (TileTurbine) tileEntity;
if (tile.getMultiBlock().isConstructed())
{
TileTurbine tile = (TileTurbine) tileEntity;
tile.getMultiBlock().deconstruct();
tile.multiBlockRadius++;
if (tile.getMultiBlock().isConstructed())
if (!tile.getMultiBlock().construct())
{
tile.getMultiBlock().deconstruct();
tile.multiBlockRadius++;
if (!tile.getMultiBlock().construct())
{
tile.multiBlockRadius = 1;
}
return true;
tile.multiBlockRadius = 1;
}
else
return true;
}
else
{
if (!tile.getMultiBlock().construct())
{
if (!tile.getMultiBlock().construct())
{
tile.multiBlockRadius = 1;
tile.getMultiBlock().construct();
}
tile.multiBlockRadius = 1;
tile.getMultiBlock().construct();
}
}

15
mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java
View file

@ -1,5 +1,6 @@
package resonantinduction.mechanical.energy.turbine;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@ -18,6 +19,7 @@ import resonant.lib.References;
import resonant.lib.content.module.TileBase;
import resonant.lib.multiblock.IMultiBlockStructure;
import resonant.lib.network.IPacketReceiverWithID;
import resonant.lib.network.PacketHandler;
import resonant.lib.network.Synced;
import resonant.lib.network.Synced.SyncedInput;
import resonant.lib.network.Synced.SyncedOutput;
@ -119,7 +121,9 @@ public class TileTurbine extends TileBase implements IMultiBlockStructure<TileTu
@Override
public Packet getDescriptionPacket()
{
return References.PACKET_TILE.getPacketWithID(0, this, tier);
NBTTagCompound tag = new NBTTagCompound();
writeToNBT(tag);
return References.PACKET_TILE.getPacketWithID(0, this, tag);
}
public void sendPowerUpdate()
@ -235,7 +239,14 @@ public class TileTurbine extends TileBase implements IMultiBlockStructure<TileTu
{
if (id == 0)
{
this.tier = data.readInt();
try
{
readFromNBT(PacketHandler.readNBTTagCompound(data));
}
catch (IOException e)
{
e.printStackTrace();
}
}
else if (id == 1)
{