diff --git a/src/minecraft/biomesoplenty/ClientProxy.java b/src/minecraft/biomesoplenty/ClientProxy.java index 4cb8a7457..9c17d8bd8 100644 --- a/src/minecraft/biomesoplenty/ClientProxy.java +++ b/src/minecraft/biomesoplenty/ClientProxy.java @@ -29,31 +29,21 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(new FoliageRenderer()); RenderingRegistry.registerBlockHandler(new PlantsRenderer()); } - + @Override - public void spawnMud(World world, double x, double y, double z, double xVel, double yVel, double zVel) + public void spawnParticle(String string, double x, double y, double z) { EntityFX entityfx = null; - entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.mudball.get(), mc.renderEngine); - mc.effectRenderer.addEffect(entityfx); + if (string == "mud") + entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.mudball.get(), mc.renderEngine); + else if (string == "dart") + entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.dart.get(), mc.renderEngine); + else if (string == "dandelion") + entityfx = new EntityDandelionFX(mc.theWorld, x, y, z, 1.0F); + + mc.effectRenderer.addEffect(entityfx); } - - @Override - public void spawnDart(World world, double x, double y, double z, double xVel, double yVel, double zVel) - { - EntityFX entityfx = null; - - entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.dart.get(), mc.renderEngine); - mc.effectRenderer.addEffect(entityfx); - } - - @Override - public void spawnDandelion(World world, double x, double y, double z, double xVel, double yVel, double zVel) - { - EntityDandelionFX entityfx = new EntityDandelionFX(mc.theWorld, x, y, z, 1.0F); - mc.effectRenderer.addEffect(entityfx); - } @Override public int addArmor(String armor) diff --git a/src/minecraft/biomesoplenty/CommonProxy.java b/src/minecraft/biomesoplenty/CommonProxy.java index a1383efca..2d8bc5886 100644 --- a/src/minecraft/biomesoplenty/CommonProxy.java +++ b/src/minecraft/biomesoplenty/CommonProxy.java @@ -1,5 +1,8 @@ package biomesoplenty; +import biomesoplenty.api.Items; +import net.minecraft.client.particle.EntityBreakingFX; +import net.minecraft.client.particle.EntityFX; import net.minecraft.world.World; public class CommonProxy { @@ -17,19 +20,8 @@ public class CommonProxy { { return 0; } - - public void spawnMud(World world, double x, double y, double z, double xVel, double yVel, double zVel) - { - - } - public void spawnDart(World world, double x, double y, double z, double xVel, double yVel, double zVel) - { - - } - - public void spawnDandelion(World world, double x, double y, double z, double xVel, double yVel, double zVel) - { - - } + public void spawnParticle(String string, double x, double y, double z) + { + } } \ No newline at end of file diff --git a/src/minecraft/biomesoplenty/items/projectiles/EntityDart.java b/src/minecraft/biomesoplenty/items/projectiles/EntityDart.java index deea07505..1639e0d94 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/EntityDart.java +++ b/src/minecraft/biomesoplenty/items/projectiles/EntityDart.java @@ -231,7 +231,7 @@ public class EntityDart extends EntityArrow for (int p = 0; i < 16; ++i) { - BiomesOPlenty.proxy.spawnDandelion(this.worldObj, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); + BiomesOPlenty.proxy.spawnParticle("dandelion", this.posX, this.posY, this.posZ); } this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); diff --git a/src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java b/src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java index 7a653384b..59f78430b 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java +++ b/src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java @@ -43,7 +43,7 @@ public class EntityMudball extends EntityThrowable for (int i = 0; i < 16; ++i) { - BiomesOPlenty.proxy.spawnMud(this.worldObj, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); + BiomesOPlenty.proxy.spawnParticle("mud", this.posX, this.posY, this.posZ); } if (!this.worldObj.isRemote) diff --git a/src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java b/src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java index 5200a81c2..613892f73 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java +++ b/src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java @@ -232,7 +232,7 @@ public class EntityPoisonDart extends EntityArrow for (int p = 0; i < 16; ++i) { - BiomesOPlenty.proxy.spawnDart(this.worldObj, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); + BiomesOPlenty.proxy.spawnParticle("dart", this.posX, this.posY, this.posZ); } this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F));