diff --git a/src/main/java/forestry/apiculture/entities/EntityFXBee.java b/src/main/java/forestry/apiculture/entities/EntityFXBee.java index 1ba6af580..df915b04f 100644 --- a/src/main/java/forestry/apiculture/entities/EntityFXBee.java +++ b/src/main/java/forestry/apiculture/entities/EntityFXBee.java @@ -86,6 +86,6 @@ public class EntityFXBee extends EntityFX { @Override public int getFXLayer() { - return 2; + return 1; } } diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 206292fe2..9f6a7aa71 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -280,10 +280,10 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple fxY += upSpread; // display fx on all 4 sides - Proxies.render.addEntitySwarmFX(worldObj, (fxX - distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); - Proxies.render.addEntitySwarmFX(worldObj, (fxX + distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); - Proxies.render.addEntitySwarmFX(worldObj, (fxX + leftRightSpreadFromCenter), fxY, (fxZ - distanceFromCenter)); - Proxies.render.addEntitySwarmFX(worldObj, (fxX + leftRightSpreadFromCenter), fxY, (fxZ + distanceFromCenter)); + Proxies.render.addEntityHoneyDustFX(worldObj, (fxX - distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); + Proxies.render.addEntityHoneyDustFX(worldObj, (fxX + distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); + Proxies.render.addEntityHoneyDustFX(worldObj, (fxX + leftRightSpreadFromCenter), fxY, (fxZ - distanceFromCenter)); + Proxies.render.addEntityHoneyDustFX(worldObj, (fxX + leftRightSpreadFromCenter), fxY, (fxZ + distanceFromCenter)); } } } diff --git a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java index ac90849cb..58e202d52 100644 --- a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java @@ -111,10 +111,10 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing float upSpread = (world.rand.nextFloat() * 6F) / 16F; fxY += upSpread; - Proxies.render.addEntitySwarmFX(world, (fxX - distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); - Proxies.render.addEntitySwarmFX(world, (fxX + distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); - Proxies.render.addEntitySwarmFX(world, (fxX + leftRightSpreadFromCenter), fxY, (fxZ - distanceFromCenter)); - Proxies.render.addEntitySwarmFX(world, (fxX + leftRightSpreadFromCenter), fxY, (fxZ + distanceFromCenter)); + Proxies.render.addEntityHoneyDustFX(world, (fxX - distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); + Proxies.render.addEntityHoneyDustFX(world, (fxX + distanceFromCenter), fxY, (fxZ + leftRightSpreadFromCenter)); + Proxies.render.addEntityHoneyDustFX(world, (fxX + leftRightSpreadFromCenter), fxY, (fxZ - distanceFromCenter)); + Proxies.render.addEntityHoneyDustFX(world, (fxX + leftRightSpreadFromCenter), fxY, (fxZ + distanceFromCenter)); } @Override diff --git a/src/main/java/forestry/core/entities/EntityFXHoneydust.java b/src/main/java/forestry/core/entities/EntityFXHoneydust.java index 6282979da..1590cc6cf 100644 --- a/src/main/java/forestry/core/entities/EntityFXHoneydust.java +++ b/src/main/java/forestry/core/entities/EntityFXHoneydust.java @@ -15,13 +15,9 @@ import net.minecraft.world.World; public class EntityFXHoneydust extends EntityReddustFX { - public EntityFXHoneydust(World world, double d, double d1, double d2, float f, float f1, float f2) { - this(world, d, d1, d2, 1.0F, f, f1, f2); - } - - public EntityFXHoneydust(World world, double d, double d1, double d2, float f, float f1, float f2, float f3) { - super(world, d, d1, d2, f, f1, f2, f3); - particleRed = 0.9F + (world.rand.nextFloat() * 0.2F); + public EntityFXHoneydust(World world, double x, double y, double z, float f1, float f2, float f3) { + super(world, x, y, z, 1.0F, f1, f2, f3); + particleRed = 0.9F + (world.rand.nextFloat() * 0.1F); particleGreen = 0.75F + (world.rand.nextFloat() * 0.2F); particleBlue = 0F + (world.rand.nextFloat() * 0.2F); } diff --git a/src/main/java/forestry/core/entities/EntityFXSnow.java b/src/main/java/forestry/core/entities/EntityFXSnow.java index 6a4705dd8..8838603ef 100644 --- a/src/main/java/forestry/core/entities/EntityFXSnow.java +++ b/src/main/java/forestry/core/entities/EntityFXSnow.java @@ -35,7 +35,7 @@ public class EntityFXSnow extends EntityFX { @Override public int getFXLayer() { - return 2; + return 1; } @Override diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 139faeb1a..9ce2b871a 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -99,21 +99,21 @@ public class ProxyRender { /* FX */ - public void addBeeHiveFX(String texture, World world, double d1, double d2, double d3, int color) { + public void addBeeHiveFX(String texture, World world, double x, double y, double z, int color) { } - public void addEntitySwarmFX(World world, double d1, double d2, double d3) { + public void addEntityHoneyDustFX(World world, double x, double y, double z) { } - public void addEntityExplodeFX(World world, double d1, double d2, double d3) { + public void addEntityExplodeFX(World world, double x, double y, double z) { } - public void addEntitySnowFX(World world, double d1, double d2, double d3) { + public void addEntitySnowFX(World world, double x, double y, double z) { } - public void addEntityIgnitionFX(World world, double d1, double d2, double d3) { + public void addEntityIgnitionFX(World world, double x, double y, double z) { } - public void addEntityPotionFX(World world, double d1, double d2, double d3, int color) { + public void addEntityPotionFX(World world, double x, double y, double z, int color) { } } diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 0c73cf052..0efd91b27 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.statemap.IStateMapper; @@ -65,7 +66,7 @@ public class ProxyRenderClient extends ProxyRender { @Override public boolean fancyGraphicsEnabled() { - return Proxies.common.getClientInstance().gameSettings.fancyGraphics; + return Minecraft.getMinecraft().gameSettings.fancyGraphics; } @Override @@ -113,12 +114,12 @@ public class ProxyRenderClient extends ProxyRender { @Override public IResourceManager getSelectedTexturePack() { - return Proxies.common.getClientInstance().getResourceManager(); + return Minecraft.getMinecraft().getResourceManager(); } @Override public void bindTexture(ResourceLocation location) { - Proxies.common.getClientInstance().getTextureManager().bindTexture(location); + Minecraft.getMinecraft().getTextureManager().bindTexture(location); } @Override @@ -159,12 +160,12 @@ public class ProxyRenderClient extends ProxyRender { ModelManager.registerModels(); } - public static boolean shouldSpawnParticle(World world) { + private static boolean shouldSpawnParticle(World world) { if (!Config.enableParticleFX) { return false; } - Minecraft mc = FMLClientHandler.instance().getClient(); + Minecraft mc = Minecraft.getMinecraft(); int particleSetting = mc.gameSettings.particleSetting; // minimal @@ -182,56 +183,60 @@ public class ProxyRenderClient extends ProxyRender { } @Override - public void addBeeHiveFX(String icon, World world, double d1, double d2, double d3, int color) { + public void addBeeHiveFX(String icon, World world, double x, double y, double z, int color) { if (!shouldSpawnParticle(world)) { return; } - EntityFX fx = new EntityFXBee(world, d1, d2, d3, color); + EntityFX fx = new EntityFXBee(world, x, y, z, color); TextureAtlasSprite sprite = TextureManager.getInstance().getDefault(icon); fx.setParticleIcon(sprite); ParticleRenderer.getInstance().addEffect(fx); } @Override - public void addEntitySwarmFX(World world, double d1, double d2, double d3) { + public void addEntityHoneyDustFX(World world, double x, double y, double z) { if (!shouldSpawnParticle(world)) { return; } - Proxies.common.getClientInstance().effectRenderer.addEffect(new EntityFXHoneydust(world, d1, d2, d3, 0, 0, 0)); + EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new EntityFXHoneydust(world, x, y, z, 0, 0, 0)); } @Override - public void addEntityExplodeFX(World world, double d1, double d2, double d3) { + public void addEntityExplodeFX(World world, double x, double y, double z) { if (!shouldSpawnParticle(world)) { return; } - EntityFX entityfx = Proxies.common.getClientInstance().effectRenderer.spawnEffectParticle(EnumParticleTypes.EXPLOSION_NORMAL.getParticleID(), d1, d2, d3, 0, 0, 0); - Proxies.common.getClientInstance().effectRenderer.addEffect(entityfx); + EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + EntityFX entityfx = effectRenderer.spawnEffectParticle(EnumParticleTypes.EXPLOSION_NORMAL.getParticleID(), x, y, z, 0, 0, 0); + effectRenderer.addEffect(entityfx); } @Override - public void addEntitySnowFX(World world, double d1, double d2, double d3) { + public void addEntitySnowFX(World world, double x, double y, double z) { if (!shouldSpawnParticle(world)) { return; } - Proxies.common.getClientInstance().effectRenderer.addEffect(new EntityFXSnow(world, d1 + world.rand.nextGaussian(), d2, d3 + world.rand.nextGaussian())); + EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new EntityFXSnow(world, x + world.rand.nextGaussian(), y, z + world.rand.nextGaussian())); } @Override - public void addEntityIgnitionFX(World world, double d1, double d2, double d3) { + public void addEntityIgnitionFX(World world, double x, double y, double z) { if (!shouldSpawnParticle(world)) { return; } - Proxies.common.getClientInstance().effectRenderer.addEffect(new EntityFXIgnition(world, d1, d2, d3)); + EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new EntityFXIgnition(world, x, y, z)); } @Override - public void addEntityPotionFX(World world, double d1, double d2, double d3, int color) { + public void addEntityPotionFX(World world, double x, double y, double z, int color) { if (!shouldSpawnParticle(world)) { return; } @@ -240,10 +245,11 @@ public class ProxyRenderClient extends ProxyRender { float green = (color >> 8 & 255) / 255.0F; float blue = (color & 255) / 255.0F; - EntityFX entityfx = Proxies.common.getClientInstance().effectRenderer.spawnEffectParticle(EnumParticleTypes.SPELL.getParticleID(), d1, d2, d3, 0, 0, 0); + EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + EntityFX entityfx = effectRenderer.spawnEffectParticle(EnumParticleTypes.SPELL.getParticleID(), x, y, z, 0, 0, 0); entityfx.setRBGColorF(red, green, blue); - Proxies.common.getClientInstance().effectRenderer.addEffect(entityfx); + effectRenderer.addEffect(entityfx); } private static class BlockModeStateMapper extends StateMapperBase {