From a2bb224bf5eb219e1e802712825e148d548f77e1 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 22 Jul 2014 17:41:34 +0100 Subject: [PATCH] Fix transmitter render pass to stop things occluding incorrectly, make lasers get stronger and weaker as they start and stop --- src/main/java/mekanism/client/entity/EntityLaser.java | 5 ++++- src/main/java/mekanism/common/multipart/PartSidedPipe.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index 61372dbce..939fc6c75 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -11,8 +11,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +@SideOnly(Side.CLIENT) public class EntityLaser extends EntityFX { double length; @@ -21,7 +24,7 @@ public class EntityLaser extends EntityFX public EntityLaser(World world, Coord4D start, Coord4D end, ForgeDirection direction) { super(world, (start.xCoord + end.xCoord)/2D + 0.5D, (start.yCoord + end.yCoord)/2D + 0.5D, (start.zCoord+end.zCoord)/2D + 0.5D); - particleMaxAge = 1; + particleMaxAge = 5; particleRed = 1; particleGreen = 0; particleBlue = 0; diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 07f06d11a..a4227926e 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -312,7 +312,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, @SideOnly(Side.CLIENT) public boolean renderStatic(Vector3 pos, int pass) { - if(pass == 1) + if(pass == 0) { RenderPartTransmitter.getInstance().renderStatic(this); return true;