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

Connections complete, colors now update renderer properly

Browse source
This commit is contained in:
Aidan Brady 2013-12-20 21:34:16 -05:00
parent d3661b3cd8
commit 15aa17e441
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/mekanism/api/transmitters/TransmissionType.java
View file

@ -28,9 +28,6 @@ public enum TransmissionType
{
return true;
}
else {
System.out.println(((ITransmitter)sideTile).getTransmissionType());
}
}
if(this == GAS && currentTile instanceof IGasTransmitter)

13
common/mekanism/common/multipart/PartLogisticalTransporter.java
View file

@ -109,9 +109,14 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
{
TileEntity tileEntity = Coord4D.get(tile()).getFromSide(side).getTileEntity(world());
if(TransmissionType.checkTransmissionType(tileEntity, getTransmitter().getType()) && isConnectable(tileEntity))
if(TransmissionType.checkTransmissionType(tileEntity, getTransmitter().getType()))
{
connections |= 1 << side.ordinal();
ILogisticalTransporter transporter = (ILogisticalTransporter)tileEntity;
if(getColor() == null || transporter.getColor() == null || getColor() == transporter.getColor())
{
connections |= 1 << side.ordinal();
}
}
}
}
@ -164,6 +169,8 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
@Override
public void update()
{
super.update();
if(world().isRemote)
{
for(TransporterStack stack : transit)
@ -655,6 +662,8 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
protected boolean onConfigure(EntityPlayer player, int part, int side)
{
TransporterUtils.incrementColor(this);
refreshConnections();
tile().notifyPartChange(this);
PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getNetworkedData(new ArrayList())), Coord4D.get(tile()), 50D);
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleColor") + ": " + (color != null ? color.getName() : EnumColor.BLACK + MekanismUtils.localize("gui.none"))));

10
common/mekanism/common/multipart/PartSidedPipe.java
View file

@ -170,7 +170,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
{
TileEntity tileEntity = Coord4D.get(tile()).getFromSide(side).getTileEntity(world());
if(TransmissionType.checkTransmissionType(tileEntity, getTransmitter().getType()) && isConnectable(tileEntity))
if(TransmissionType.checkTransmissionType(tileEntity, getTransmitter().getType()))
{
connections |= 1 << side.ordinal();
}
@ -179,11 +179,6 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
return connections;
}
public boolean isConnectable(TileEntity tileEntity)
{
return true;
}
public byte getPossibleAcceptorConnections()
{
@ -448,9 +443,10 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
}
}
onRefresh();
if(!world().isRemote)
{
System.out.println("send desc");
currentTransmitterConnections = possibleTransmitters;
currentAcceptorConnections = possibleAcceptors;

2
common/mekanism/common/multipart/PartTransmitter.java
View file

@ -49,7 +49,7 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N>> extends Pa
{
TileEntity tileEntity = Coord4D.get(tile()).getFromSide(side).getTileEntity(world());
if(TransmissionType.checkTransmissionType(tileEntity, getTransmissionType()) && isConnectable(tileEntity))
if(TransmissionType.checkTransmissionType(tileEntity, getTransmissionType()))
{
((DynamicNetwork<?,N>)getTransmitterNetwork()).merge(((IGridTransmitter<N>)tileEntity).getTransmitterNetwork());
}