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

Make other transmitters work visually again, make the unicable's transparency more of a smooth exponential decay type thing and remove it's weird noop constructor

Browse source
This commit is contained in:
Ben Spiers 2013-12-13 01:58:25 +00:00
parent 98c8068a0f
commit 55dd8f5bf9
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/client/render/RenderPartTransmitter.java
View file

@ -364,7 +364,7 @@ public class RenderPartTransmitter implements IIconRegister
boolean connected = PartTransmitter.connectionMapContainsSide(cable.getAllCurrentConnections(), side); boolean connected = PartTransmitter.connectionMapContainsSide(cable.getAllCurrentConnections(), side);
String name = side.name().toLowerCase(); String name = side.name().toLowerCase();
name += connected ? "Out" : "In"; name += connected ? "Out" : "In";
renderTransparency(MekanismRenderer.energyIcon, cableContentsModels.get(name), new ColourRGBA(1.0, 1.0, 1.0, cable.getTransmitterNetwork().clientEnergyScale)); renderTransparency(MekanismRenderer.energyIcon, cableContentsModels.get(name), new ColourRGBA(1.0, 1.0, 1.0, cable.currentPower));
} }
public void renderGasSide(ForgeDirection side, PartPressurizedTube tube) public void renderGasSide(ForgeDirection side, PartPressurizedTube tube)

6
common/mekanism/common/multipart/PartMechanicalPipe.java
View file

@ -126,12 +126,6 @@ public class PartMechanicalPipe extends PartTransmitter<FluidNetwork> implements
return new FluidTankInfo[] {dummyTank.getInfo()}; return new FluidTankInfo[] {dummyTank.getInfo()};
} }
@Override
public boolean doesTick()
{
return true;
}
@Override @Override
public void update() public void update()
{ {

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

@ -513,7 +513,7 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N>> extends TM
@Override @Override
public boolean doesTick() public boolean doesTick()
{ {
return FMLCommonHandler.instance().getEffectiveSide().isClient(); return true;
} }
@Override @Override

18
common/mekanism/common/multipart/PartUniversalCable.java
View file

@ -53,11 +53,21 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
{ {
public static PartTransmitterIcons cableIcons; public static PartTransmitterIcons cableIcons;
public double currentPower = 0;
public PartUniversalCable() @Override
{ public void update()
super(); {
} if(world().isRemote)
{
double targetPower = getTransmitterNetwork().clientEnergyScale;
if(Math.abs(currentPower - targetPower) > 0.01)
{
currentPower = (9*currentPower + targetPower)/10;
}
}
super.update();
}
@Override @Override
public String getType() public String getType()