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

Finished new changes, canTransferGas() functionality temporarily severed

Browse source
This commit is contained in:
Aidan C. Brady 2013-08-19 07:55:47 -04:00
parent 30f7bfa126
commit de10fa2d58
4 changed files with 66 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/mekanism/api/GasTransmission.java
View file

@ -3,6 +3,7 @@ package mekanism.api;
import java.util.HashSet;
import java.util.Set;
import mekanism.common.MekanismUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
@ -26,14 +27,7 @@ public final class GasTransmission
{
TileEntity tube = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj);
if(tileEntity instanceof IPressurizedTube)
{
if(((IPressurizedTube)tileEntity).canTransferGasToTube(tube))
{
tubes[orientation.ordinal()] = tube;
}
}
else if(tube instanceof IPressurizedTube)
if(MekanismUtils.checkNetwork(tube, GasNetwork.class))
{
tubes[orientation.ordinal()] = tube;
}
@ -51,8 +45,6 @@ public final class GasTransmission
{
IGasAcceptor[] acceptors = new IGasAcceptor[] {null, null, null, null, null, null};
if(!(tileEntity instanceof IPressurizedTube))
{
for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS)
{
TileEntity acceptor = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj);
@ -62,7 +54,6 @@ public final class GasTransmission
acceptors[orientation.ordinal()] = (IGasAcceptor)acceptor;
}
}
}
return acceptors;
}
@ -76,8 +67,6 @@ public final class GasTransmission
{
ITubeConnection[] connections = new ITubeConnection[] {null, null, null, null, null, null};
if(!(tileEntity instanceof IPressurizedTube))
{
for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS)
{
TileEntity connection = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj);
@ -87,7 +76,6 @@ public final class GasTransmission
connections[orientation.ordinal()] = (ITubeConnection)connection;
}
}
}
return connections;
}
@ -104,9 +92,9 @@ public final class GasTransmission
{
TileEntity pointer = Object3D.get(sender).getFromSide(facing).getTileEntity(sender.worldObj);
if(pointer instanceof IPressurizedTube)
if(MekanismUtils.checkNetwork(pointer, GasNetwork.class))
{
return ((IPressurizedTube)pointer).getNetwork().emit(amount, type, sender);
return ((ITransmitter<GasNetwork>)pointer).getNetwork().emit(amount, type, sender);
}
return amount;
@ -130,9 +118,9 @@ public final class GasTransmission
{
TileEntity sideTile = Object3D.get(pointer).getFromSide(side).getTileEntity(pointer.worldObj);
if(sideTile instanceof IPressurizedTube)
if(MekanismUtils.checkNetwork(sideTile, GasNetwork.class))
{
networks.add(((IPressurizedTube)sideTile).getNetwork());
networks.add(((ITransmitter<GasNetwork>)sideTile).getNetwork());
}
}

6
common/mekanism/client/GasClientUpdate.java
View file

@ -4,8 +4,8 @@ import java.util.List;
import mekanism.api.EnumGas;
import mekanism.api.GasNetwork.NetworkFinder;
import mekanism.api.IPressurizedTube;
import mekanism.api.Object3D;
import mekanism.common.TileEntityPressurizedTube;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@ -32,9 +32,9 @@ public class GasClientUpdate
{
TileEntity tileEntity = object.getTileEntity(worldObj);
if(tileEntity instanceof IPressurizedTube)
if(tileEntity instanceof TileEntityPressurizedTube)
{
((IPressurizedTube)tileEntity).onTransfer(gasType);
((TileEntityPressurizedTube)tileEntity).onTransfer(gasType);
}
}
}

6
common/mekanism/client/RenderPressurizedTube.java
View file

@ -71,8 +71,6 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
model.renderCenter(connectable);
if(tileEntity.canTransferGas())
{
for(int i = 0; i < 6; i++)
{
TileEntity sideTile = Object3D.get(tileEntity).getFromSide(ForgeDirection.getOrientation(i)).getTileEntity(tileEntity.worldObj);
@ -109,7 +107,6 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
model.renderSide(ForgeDirection.getOrientation(i), connectable[i]);
}
}
}
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
@ -130,8 +127,6 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
tileEntity.refGas = null;
}
if(tileEntity.canTransferGas())
{
for(int i = 0; i < 6; i++)
{
if(connectable[i])
@ -139,7 +134,6 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer
getListAndRender(ForgeDirection.getOrientation(i), tileEntity.refGas).render();
}
}
}
getListAndRender(ForgeDirection.UNKNOWN, tileEntity.refGas).render();

18
common/mekanism/common/TileEntityPressurizedTube.java
View file

@ -83,8 +83,6 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
public void refreshNetwork()
{
if(!worldObj.isRemote)
{
if(canTransferGas())
{
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
@ -98,20 +96,6 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
getNetwork().refresh();
}
else {
getNetwork().split(this);
}
}
}
public boolean canTransferGas()
{
return worldObj.getBlockPowerInput(xCoord, yCoord, zCoord) == 0;
}
public boolean canTransferGasToTube(TileEntity tile)
{
return canTransferGas();
}
public void onTransfer(EnumGas type)
@ -130,7 +114,7 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
@Override
public boolean canTubeConnect(ForgeDirection side)
{
return canTransferGas();
return true;
}
@Override