From b9980ffaac9e2e0e3b60be03778bd97d2e4ae093 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 3 Jul 2019 23:46:01 -0700 Subject: [PATCH] temporarily fix particles --- src/main/java/vazkii/botania/client/fx/FXSparkle.java | 9 ++++----- src/main/java/vazkii/botania/client/fx/FXWisp.java | 10 ++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index e61b97aad..b5682c059 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -35,7 +35,7 @@ import javax.annotation.Nonnull; import java.util.ArrayDeque; import java.util.Queue; -public class FXSparkle extends SpriteTexturedParticle { +public class FXSparkle extends Particle { private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); @@ -43,6 +43,7 @@ public class FXSparkle extends SpriteTexturedParticle { private static final Queue queuedRenders = new ArrayDeque<>(); private static final Queue queuedCorruptRenders = new ArrayDeque<>(); + protected float particleScale = (this.rand.nextFloat() * 0.5F + 0.5F) * 2.0F; // Queue values private float f; private float f1; @@ -104,6 +105,7 @@ public class FXSparkle extends SpriteTexturedParticle { float var10 = part / 8 / 8.0F; float var11 = var10 + 0.0624375F*2; float var12 = 0.1F * particleScale; + boolean shrink = true; if (shrink) var12 *= (maxAge-age+1)/(float)maxAge; float var13 = (float)(prevPosX + (posX - prevPosX) * f - interpPosX); float var14 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); @@ -169,7 +171,7 @@ public class FXSparkle extends SpriteTexturedParticle { @Nonnull @Override public IParticleRenderType getRenderType() { - return IParticleRenderType.NO_RENDER; + return IParticleRenderType.CUSTOM; } public void setGravity(float value) { @@ -223,9 +225,6 @@ public class FXSparkle extends SpriteTexturedParticle { public boolean corrupt = false; public boolean fake = false; private int multiplier = 2; - private final boolean shrink = true; public final int particle = 16; - public boolean tinkle = false; public final boolean slowdown = true; - public int currentColor = 0; } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 16ed9e94d..a348e16a5 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -30,7 +30,7 @@ import javax.annotation.Nonnull; import java.util.ArrayDeque; import java.util.Queue; -public class FXWisp extends SpriteTexturedParticle { +public class FXWisp extends Particle { private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); @@ -38,6 +38,7 @@ public class FXWisp extends SpriteTexturedParticle { private static final Queue queuedRenders = new ArrayDeque<>(); private static final Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); + protected float particleScale = (this.rand.nextFloat() * 0.5F + 0.5F) * 2.0F; // Queue values private float f; private float f1; @@ -145,7 +146,7 @@ public class FXWisp extends SpriteTexturedParticle { @Nonnull @Override public IParticleRenderType getRenderType() { - return IParticleRenderType.NO_RENDER; + return IParticleRenderType.CUSTOM; } // [VanillaCopy] of super, without drag when onGround is true @@ -177,10 +178,7 @@ public class FXWisp extends SpriteTexturedParticle { motionZ = mz; } - private boolean depthTest = true; - public boolean distanceLimit = true; + private boolean depthTest; private final float moteParticleScale; private final int moteHalfLife; - public boolean tinkle = false; - public int blendmode = 1; }