Added steam particles, layering is a bit funky with dandelion particles but oh well
This commit is contained in:
parent
a63ec77330
commit
6527afb90a
|
@ -23,6 +23,7 @@ import biomesoplenty.items.projectiles.RenderDart;
|
|||
import biomesoplenty.mobs.EntityGlob;
|
||||
import biomesoplenty.mobs.RenderGlob;
|
||||
import biomesoplenty.particles.EntityDandelionFX;
|
||||
import biomesoplenty.particles.EntitySteamFX;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
@ -42,6 +43,7 @@ public class ClientProxy extends CommonProxy {
|
|||
RenderingRegistry.registerBlockHandler(new PlantsRenderer());
|
||||
RenderingRegistry.registerBlockHandler(new SmallBlockRenderer());
|
||||
|
||||
//TODO: Remove upon Fluid API being integrated into Forge
|
||||
FluidRegistry.renderIdFluid = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderingRegistry.registerBlockHandler(RenderBlockFluid.instance);
|
||||
}
|
||||
|
@ -58,7 +60,7 @@ public class ClientProxy extends CommonProxy {
|
|||
else if (string == "dandelion")
|
||||
entityfx = new EntityDandelionFX(mc.theWorld, x, y, z, 2.0F);
|
||||
|
||||
mc.effectRenderer.addEffect(entityfx);
|
||||
mc.effectRenderer.addEffect(entityfx);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -19,6 +19,7 @@ public class BOPLiquidHelper
|
|||
@SideOnly(Side.CLIENT)
|
||||
public void textureHook(TextureStitchEvent.Post event)
|
||||
{
|
||||
//TODO: Remove upon Fluid API being integrated into Forge
|
||||
FluidRegistry.WATER.setIcons(BlockFluid.func_94424_b("water"), BlockFluid.func_94424_b("water_flow"));
|
||||
FluidRegistry.LAVA.setIcons(BlockFluid.func_94424_b("lava"), BlockFluid.func_94424_b("lava_flow"));
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@ import net.minecraft.potion.PotionEffect;
|
|||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import biomesoplenty.BiomesOPlenty;
|
||||
import biomesoplenty.api.Liquids;
|
||||
import biomesoplenty.api.Potions;
|
||||
import biomesoplenty.ftfluidsapi.BlockFluidClassic;
|
||||
|
@ -48,7 +49,7 @@ public class BlockFluidSpringWater extends BlockFluidClassic
|
|||
|
||||
if (par5Random.nextInt(6) == 0)
|
||||
{
|
||||
par1World.spawnParticle("smoke", (double)((float)par2 + par5Random.nextFloat()), (double)((float)par3 + 1.0F), (double)((float)par4 + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D);
|
||||
BiomesOPlenty.proxy.spawnParticle("steam", (double)((float)par2 + par5Random.nextFloat()), (double)((float)par3 + 1.0F), (double)((float)par4 + par5Random.nextFloat()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -5,11 +5,13 @@ import net.minecraft.client.renderer.RenderEngine;
|
|||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
|
||||
public class EntityDandelionFX extends EntityFX {
|
||||
|
||||
public int blendmode = 1;
|
||||
public class EntityDandelionFX extends EntityFX
|
||||
{
|
||||
private static final String texture = "/mods/BiomesOPlenty/textures/particles/dandelion.png";
|
||||
|
||||
public EntityDandelionFX(World par1World, double par2, double par4, double par6, float par8)
|
||||
|
@ -32,7 +34,7 @@ public class EntityDandelionFX extends EntityFX {
|
|||
@Override
|
||||
public int getFXLayer()
|
||||
{
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -47,7 +49,7 @@ public class EntityDandelionFX extends EntityFX {
|
|||
|
||||
@Override
|
||||
public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
|
||||
{
|
||||
{
|
||||
FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture);
|
||||
float sizeFactor = 0.1F * this.particleScale;
|
||||
float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - EntityFX.interpPosX);
|
||||
|
@ -77,6 +79,7 @@ public class EntityDandelionFX extends EntityFX {
|
|||
this.setDead();
|
||||
}
|
||||
|
||||
this.motionY += 0.004D;
|
||||
this.moveEntity(this.motionX, this.motionY, this.motionZ);
|
||||
|
||||
if (this.posY == this.prevPosY)
|
||||
|
|
|
@ -0,0 +1,119 @@
|
|||
package biomesoplenty.particles;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.renderer.RenderEngine;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
|
||||
public class EntitySteamFX extends EntityFX
|
||||
{
|
||||
private static final String texture = "/mods/BiomesOPlenty/textures/particles/steam.png";
|
||||
|
||||
public EntitySteamFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12)
|
||||
{
|
||||
this(par1World, par2, par4, par6, par8, par10, par12, 1.0F);
|
||||
}
|
||||
|
||||
public EntitySteamFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12, float par14)
|
||||
{
|
||||
super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
this.motionX *= 0.10000000149011612D;
|
||||
this.motionY *= 0.10000000149011612D;
|
||||
this.motionZ *= 0.10000000149011612D;
|
||||
this.motionX += par8;
|
||||
this.motionY += par10;
|
||||
this.motionZ += par12;
|
||||
this.particleScale *= 0.75F;
|
||||
this.particleScale *= par14;
|
||||
this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D));
|
||||
this.particleMaxAge = (int)((float)this.particleMaxAge * par14);
|
||||
this.noClip = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getFXLayer()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setParticleTextureIndex(int par1)
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setParticleIcon(RenderEngine par1RenderEngine, Icon par2Icon)
|
||||
{
|
||||
}
|
||||
|
||||
public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
|
||||
{
|
||||
float f6 = ((float)this.particleAge + par2) / (float)this.particleMaxAge * 32.0F;
|
||||
|
||||
if (f6 < 0.0F)
|
||||
{
|
||||
f6 = 0.0F;
|
||||
}
|
||||
|
||||
if (f6 > 1.0F)
|
||||
{
|
||||
f6 = 1.0F;
|
||||
}
|
||||
|
||||
this.particleScale = this.particleScale * f6;
|
||||
|
||||
FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture);
|
||||
|
||||
float sizeFactor = 0.1F * this.particleScale;
|
||||
float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - EntityFX.interpPosX);
|
||||
float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * par2 - EntityFX.interpPosY);
|
||||
float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - EntityFX.interpPosZ);
|
||||
//float var16 = 1.2F - (float)Math.random() * 0.5F;
|
||||
float var16 = 1.2F * 0.5F;
|
||||
par1Tessellator.setColorRGBA_F(this.particleRed * var16, this.particleGreen * var16, this.particleBlue * var16, 1.0F);
|
||||
par1Tessellator.addVertexWithUV(var13 - par3 * sizeFactor - par6 * sizeFactor, var14 - par4 * sizeFactor, var15 - par5 * sizeFactor - par7 * sizeFactor, 0.0D, 1.0D);
|
||||
par1Tessellator.addVertexWithUV(var13 - par3 * sizeFactor + par6 * sizeFactor, var14 + par4 * sizeFactor, var15 - par5 * sizeFactor + par7 * sizeFactor, 1.0D, 1.0D);
|
||||
par1Tessellator.addVertexWithUV(var13 + par3 * sizeFactor + par6 * sizeFactor, var14 + par4 * sizeFactor, var15 + par5 * sizeFactor + par7 * sizeFactor, 1.0D, 0.0D);
|
||||
par1Tessellator.addVertexWithUV(var13 + par3 * sizeFactor - par6 * sizeFactor, var14 - par4 * sizeFactor, var15 + par5 * sizeFactor - par7 * sizeFactor, 0.0D, 0.0D);
|
||||
}
|
||||
|
||||
/**
|
||||
* Called to update the entity's position/logic.
|
||||
*/
|
||||
public void onUpdate()
|
||||
{
|
||||
this.prevPosX = this.posX;
|
||||
this.prevPosY = this.posY;
|
||||
this.prevPosZ = this.posZ;
|
||||
|
||||
if (this.particleAge++ >= this.particleMaxAge)
|
||||
{
|
||||
this.setDead();
|
||||
}
|
||||
|
||||
this.motionY += 0.004D;
|
||||
this.moveEntity(this.motionX, this.motionY, this.motionZ);
|
||||
|
||||
if (this.posY == this.prevPosY)
|
||||
{
|
||||
this.motionX *= 1.1D;
|
||||
this.motionZ *= 1.1D;
|
||||
}
|
||||
|
||||
this.motionX *= 0.9599999785423279D;
|
||||
this.motionY *= 0.9599999785423279D;
|
||||
this.motionZ *= 0.9599999785423279D;
|
||||
|
||||
if (this.onGround)
|
||||
{
|
||||
this.motionX *= 0.699999988079071D;
|
||||
this.motionZ *= 0.699999988079071D;
|
||||
}
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 179 B |
Loading…
Reference in New Issue