From 55dd8f5bf9ae3c32a967b4c16dae74bebf15ef36 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 13 Dec 2013 01:58:25 +0000 Subject: [PATCH] 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 --- .../client/render/RenderPartTransmitter.java | 2 +- .../common/multipart/PartMechanicalPipe.java | 6 ------ .../common/multipart/PartTransmitter.java | 2 +- .../common/multipart/PartUniversalCable.java | 18 ++++++++++++++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/common/mekanism/client/render/RenderPartTransmitter.java b/common/mekanism/client/render/RenderPartTransmitter.java index cb454ab38..39367951e 100644 --- a/common/mekanism/client/render/RenderPartTransmitter.java +++ b/common/mekanism/client/render/RenderPartTransmitter.java @@ -364,7 +364,7 @@ public class RenderPartTransmitter implements IIconRegister boolean connected = PartTransmitter.connectionMapContainsSide(cable.getAllCurrentConnections(), side); String name = side.name().toLowerCase(); 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) diff --git a/common/mekanism/common/multipart/PartMechanicalPipe.java b/common/mekanism/common/multipart/PartMechanicalPipe.java index 499326c8c..f1369b2ee 100644 --- a/common/mekanism/common/multipart/PartMechanicalPipe.java +++ b/common/mekanism/common/multipart/PartMechanicalPipe.java @@ -126,12 +126,6 @@ public class PartMechanicalPipe extends PartTransmitter implements return new FluidTankInfo[] {dummyTank.getInfo()}; } - @Override - public boolean doesTick() - { - return true; - } - @Override public void update() { diff --git a/common/mekanism/common/multipart/PartTransmitter.java b/common/mekanism/common/multipart/PartTransmitter.java index d2399d41f..eaf39775b 100644 --- a/common/mekanism/common/multipart/PartTransmitter.java +++ b/common/mekanism/common/multipart/PartTransmitter.java @@ -513,7 +513,7 @@ public abstract class PartTransmitter> extends TM @Override public boolean doesTick() { - return FMLCommonHandler.instance().getEffectiveSide().isClient(); + return true; } @Override diff --git a/common/mekanism/common/multipart/PartUniversalCable.java b/common/mekanism/common/multipart/PartUniversalCable.java index 03ae6e1f0..b5a9e3217 100644 --- a/common/mekanism/common/multipart/PartUniversalCable.java +++ b/common/mekanism/common/multipart/PartUniversalCable.java @@ -53,11 +53,21 @@ public class PartUniversalCable extends PartTransmitter implement { public static PartTransmitterIcons cableIcons; + public double currentPower = 0; - public PartUniversalCable() - { - super(); - } + @Override + public void update() + { + if(world().isRemote) + { + double targetPower = getTransmitterNetwork().clientEnergyScale; + if(Math.abs(currentPower - targetPower) > 0.01) + { + currentPower = (9*currentPower + targetPower)/10; + } + } + super.update(); + } @Override public String getType()