From fef1fb6fb6921350c669bc77da0d56aa319eca2a Mon Sep 17 00:00:00 2001 From: Tonius Date: Mon, 28 Jul 2014 15:01:58 +0200 Subject: [PATCH] Committed the other files I meant to commit. --- .../client/render/RenderTickHandler.java | 13 ++++---- .../render/particle/EntityJetpackSmokeFX.java | 32 +++++++++++++++++++ 2 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 207dcd417..c72d46924 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -7,17 +7,16 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; +import mekanism.client.render.particle.EntityJetpackFlameFX; +import mekanism.client.render.particle.EntityJetpackSmokeFX; import mekanism.common.Mekanism; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.particle.EntityFlameFX; -import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; @@ -40,7 +39,7 @@ public class RenderTickHandler { if(event.phase == Phase.END) { - if(mc.thePlayer != null && mc.theWorld != null) + if(mc.thePlayer != null && mc.theWorld != null && !mc.isGamePaused()) { EntityPlayer player = mc.thePlayer; World world = mc.thePlayer.worldObj; @@ -77,7 +76,7 @@ public class RenderTickHandler } } - if(player != null && !(mc.currentScreen instanceof GuiChat) && player.getEquipmentInSlot(3) != null) + if(player != null && mc.currentScreen == null && player.getEquipmentInSlot(3) != null) { ItemStack stack = player.getEquipmentInSlot(3); @@ -173,11 +172,11 @@ public class RenderTickHandler if(s.equals("flame")) { - fx = new EntityFlameFX(world, x, y, z, velX, velY, velZ); + fx = new EntityJetpackFlameFX(world, x, y, z, velX, velY, velZ); } else if(s.equals("smoke")) { - fx = new EntitySmokeFX(world, x, y, z, velX, velY, velZ); + fx = new EntityJetpackSmokeFX(world, x, y, z, velX, velY, velZ); } mc.effectRenderer.addEffect(fx); diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java new file mode 100644 index 000000000..d3cddce1c --- /dev/null +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java @@ -0,0 +1,32 @@ +package mekanism.client.render.particle; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntitySmokeFX; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.World; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class EntityJetpackSmokeFX extends EntitySmokeFX { + + private static Minecraft mc = FMLClientHandler.instance().getClient(); + + public EntityJetpackSmokeFX(World world, double posX, double posY, double posZ, double velX, double velY, double velZ) { + super(world, posX, posY, posZ, velX, velY, velZ); + this.noClip = false; + } + + @Override + public int getBrightnessForRender(float p_70013_1_) { + return 190 + (int) (20F * (1.0F - mc.gameSettings.gammaSetting)); + } + + @Override + public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) { + if (this.particleAge > 0) + super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + } + +}