diff --git a/build.properties b/build.properties index 49e9b5070..42166d355 100644 --- a/build.properties +++ b/build.properties @@ -2,9 +2,9 @@ #Mon Sep 09 22:18:15 CDT 2019 mod_name=Botania cf_meta_version=1.14.4 -forge_version=1.14.4-28.1.0 +forge_version=1.14.4-28.1.44 dir_repo=./ -mc_mappings=20190801-1.14.3 +mc_mappings=20191011-1.14.3 version=r1.10 dir_output=../Build Output/Botania/ mc_version=1.14.2 diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index eb5116a00..0598fafa3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -34,7 +34,6 @@ import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GLCapabilities; -import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; @@ -59,7 +58,6 @@ public final class DebugHandler { if(version.contains("GRADLE")) version = "N/A"; - event.getLeft().add(PREFIX + "pS: " + ParticleRenderDispatcher.sparkleFxCount + ", pFS: " + ParticleRenderDispatcher.fakeSparkleFxCount + ", pW: " + ParticleRenderDispatcher.wispFxCount + ", pDIW: " + ParticleRenderDispatcher.depthIgnoringWispFxCount + ", pLB: " + ParticleRenderDispatcher.lightningCount); event.getLeft().add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); if (Minecraft.getInstance().isSingleplayer()) { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index bbef2f078..7ee473c42 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -25,7 +25,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.GL11; import vazkii.botania.client.fx.FXLightning; -import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; @@ -47,7 +46,6 @@ public class LightningHandler { IProfiler profiler = Minecraft.getInstance().getProfiler(); profiler.startSection("botania-particles"); - ParticleRenderDispatcher.dispatch(); profiler.startSection("redString"); RedStringRenderer.renderAll(); profiler.endStartSection("lightning"); @@ -69,8 +67,6 @@ public class LightningHandler { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - ParticleRenderDispatcher.lightningCount = 0; - render.bindTexture(outsideResource); int counter = 0; diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index b5bd52668..88d35c0a5 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -76,7 +76,6 @@ public class FXLightning extends Particle { } public void renderBolt(int pass, boolean inner) { - ParticleRenderDispatcher.lightningCount++; BufferBuilder wr = Tessellator.getInstance().getBuffer(); float boltAge = age < 0 ? 0 : (float) age / (float) maxAge; diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index b457bd91c..db2c90ef2 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.BufferBuilder; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.Direction; @@ -32,25 +33,18 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import javax.annotation.Nonnull; -import java.util.ArrayDeque; -import java.util.Queue; 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); - 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; - private float f2; - private float f3; - private float f4; - private float f5; + private final boolean corrupt; + public final boolean fake; + private final int multiplier; + public final int particle = 16; + private final boolean slowdown = true; public FXSparkle(World world, double x, double y, double z, float size, float red, float green, float blue, int m, @@ -73,34 +67,12 @@ public class FXSparkle extends Particle { this.canCollide = !fake && !noClip; } - public static void dispatchQueuedRenders(Tessellator tessellator) { - ParticleRenderDispatcher.sparkleFxCount = 0; - ParticleRenderDispatcher.fakeSparkleFxCount = 0; - - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getInstance().textureManager.bindTexture(ConfigHandler.CLIENT.matrixMode.get() ? vanillaParticles : particles); - - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - for(FXSparkle sparkle : queuedRenders) - sparkle.renderQueued(tessellator); - tessellator.draw(); - - ShaderHelper.useShader(ShaderHelper.filmGrain); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - for(FXSparkle sparkle : queuedCorruptRenders) - sparkle.renderQueued(tessellator); - tessellator.draw(); - ShaderHelper.releaseShader(); - - queuedRenders.clear(); - queuedCorruptRenders.clear(); + public void setCanCollide(boolean canCollide) { + this.canCollide = canCollide; } - private void renderQueued(Tessellator tessellator) { - if(fake) - ParticleRenderDispatcher.fakeSparkleFxCount++; - else ParticleRenderDispatcher.sparkleFxCount++; - + @Override + public void renderParticle(BufferBuilder buffer, ActiveRenderInfo entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { int part = particle + age/multiplier; float var8 = part % 8 / 8.0F; @@ -110,34 +82,15 @@ public class FXSparkle extends Particle { 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); - float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); + float var13 = (float)(prevPosX + (posX - prevPosX) * partialTicks - interpPosX); + float var14 = (float)(prevPosY + (posY - prevPosY) * partialTicks - interpPosY); + float var15 = (float)(prevPosZ + (posZ - prevPosZ) * partialTicks - interpPosZ); float var16 = 1.0F; - tessellator.getBuffer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); - tessellator.getBuffer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); - tessellator.getBuffer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); - tessellator.getBuffer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); - - } - - public void setCanCollide(boolean canCollide) { - this.canCollide = canCollide; - } - - @Override - public void renderParticle(BufferBuilder buffer, ActiveRenderInfo entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { - this.f = partialTicks; - this.f1 = rotationX; - this.f2 = rotationZ; - this.f3 = rotationYZ; - this.f4 = rotationXY; - this.f5 = rotationXZ; - - if(corrupt) - queuedCorruptRenders.add(this); - else queuedRenders.add(this); + buffer.pos(var13 - rotationX * var12 - rotationXY * var12, var14 - rotationZ * var12, var15 - rotationYZ * var12 - rotationXZ * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + buffer.pos(var13 - rotationX * var12 + rotationXY * var12, var14 + rotationZ * var12, var15 - rotationYZ * var12 + rotationXZ * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + buffer.pos(var13 + rotationX * var12 + rotationXY * var12, var14 + rotationZ * var12, var15 + rotationYZ * var12 + rotationXZ * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + buffer.pos(var13 + rotationX * var12 - rotationXY * var12, var14 - rotationZ * var12, var15 + rotationYZ * var12 - rotationXZ * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); } @Override @@ -174,15 +127,13 @@ public class FXSparkle extends Particle { @Nonnull @Override public IParticleRenderType getRenderType() { - return IParticleRenderType.CUSTOM; + return corrupt ? CORRUPT_RENDER : NORMAL_RENDER; } public void setGravity(float value) { particleGravity = value; } - - // [VanillaCopy] Entity.pushOutOfBlocks with tweaks private void wiggleAround(double x, double y, double z) { @@ -225,9 +176,60 @@ public class FXSparkle extends Particle { } } - public boolean corrupt = false; - public boolean fake = false; - private int multiplier = 2; - public final int particle = 16; - public final boolean slowdown = true; + private static void beginRenderCommon(BufferBuilder buffer, TextureManager textureManager) { + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F); + GlStateManager.disableLighting(); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F); + textureManager.bindTexture(ConfigHandler.CLIENT.matrixMode.get() ? vanillaParticles : particles); + buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + } + + private static void endRenderCommon() { + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); + GlStateManager.disableBlend(); + GlStateManager.depthMask(true); + GL11.glPopAttrib(); + } + + private static final IParticleRenderType NORMAL_RENDER = new IParticleRenderType() { + @Override + public void beginRender(BufferBuilder bufferBuilder, TextureManager textureManager) { + beginRenderCommon(bufferBuilder, textureManager); + } + + @Override + public void finishRender(Tessellator tessellator) { + tessellator.draw(); + endRenderCommon(); + } + + @Override + public String toString() { + return "botania:sparkle"; + } + }; + + private static final IParticleRenderType CORRUPT_RENDER = new IParticleRenderType() { + @Override + public void beginRender(BufferBuilder bufferBuilder, TextureManager textureManager) { + beginRenderCommon(bufferBuilder, textureManager); + ShaderHelper.useShader(ShaderHelper.filmGrain); + } + + @Override + public void finishRender(Tessellator tessellator) { + tessellator.draw(); + ShaderHelper.releaseShader(); + endRenderCommon(); + } + + @Override + public String toString() { + return "botania:corrupt_sparkle"; + } + }; } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 7d9275b49..8e42a7411 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -13,13 +13,12 @@ package vazkii.botania.client.fx; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.IParticleRenderType; import net.minecraft.client.particle.Particle; -import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.BufferBuilder; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -35,17 +34,10 @@ 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); - 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; - private float f2; - private float f3; - private float f4; - private float f5; + private final boolean depthTest; + private final float moteParticleScale; + private final int moteHalfLife; public FXWisp(World world, double d, double d1, double d2, double xSpeed, double ySpeed, double zSpeed, float size, float red, float green, float blue, boolean depthTest, float maxAgeMul) { @@ -71,38 +63,8 @@ public class FXWisp extends Particle { prevPosZ = posZ; } - public static void dispatchQueuedRenders(Tessellator tessellator) { - ParticleRenderDispatcher.wispFxCount = 0; - ParticleRenderDispatcher.depthIgnoringWispFxCount = 0; - - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getInstance().textureManager.bindTexture(ConfigHandler.CLIENT.matrixMode.get() ? vanillaParticles : particles); - - if(!queuedRenders.isEmpty()) { - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); - for(FXWisp wisp : queuedRenders) - wisp.renderQueued(tessellator, true); - tessellator.draw(); - } - - if(!queuedDepthIgnoringRenders.isEmpty()) { - GlStateManager.disableDepthTest(); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); - for(FXWisp wisp : queuedDepthIgnoringRenders) - wisp.renderQueued(tessellator, false); - tessellator.draw(); - GlStateManager.enableDepthTest(); - } - - queuedRenders.clear(); - queuedDepthIgnoringRenders.clear(); - } - - private void renderQueued(Tessellator tessellator, boolean depthEnabled) { - if(depthEnabled) - ParticleRenderDispatcher.wispFxCount++; - else ParticleRenderDispatcher.depthIgnoringWispFxCount++; - + @Override + public void renderParticle(BufferBuilder buffer, ActiveRenderInfo entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { float agescale = (float)age / (float) moteHalfLife; if (agescale > 1F) agescale = 2 - agescale; @@ -110,36 +72,22 @@ public class FXWisp extends Particle { particleScale = moteParticleScale * agescale; float f10 = 0.5F * particleScale; - float f11 = (float)(prevPosX + (posX - prevPosX) * f - interpPosX); - float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); - float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); + float f11 = (float)(prevPosX + (posX - prevPosX) * partialTicks - interpPosX); + float f12 = (float)(prevPosY + (posY - prevPosY) * partialTicks - interpPosY); + float f13 = (float)(prevPosZ + (posZ - prevPosZ) * partialTicks - interpPosZ); int combined = 15 << 20 | 15 << 4; int k3 = combined >> 16 & 0xFFFF; int l3 = combined & 0xFFFF; - tessellator.getBuffer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getBuffer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getBuffer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getBuffer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - } - - @Override - public void renderParticle(BufferBuilder buffer, ActiveRenderInfo entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { - this.f = partialTicks; - this.f1 = rotationX; - this.f2 = rotationZ; - this.f3 = rotationYZ; - this.f4 = rotationXY; - this.f5 = rotationXZ; - - if(depthTest) - queuedRenders.add(this); - else queuedDepthIgnoringRenders.add(this); + buffer.pos(f11 - rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 - rotationYZ * f10 - rotationXZ * f10).tex(0, 1).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + buffer.pos(f11 - rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 - rotationYZ * f10 + rotationXZ * f10).tex(1, 1).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + buffer.pos(f11 + rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 + rotationYZ * f10 + rotationXZ * f10).tex(1, 0).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + buffer.pos(f11 + rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 + rotationYZ * f10 - rotationXZ * f10).tex(0, 0).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); } @Nonnull @Override public IParticleRenderType getRenderType() { - return IParticleRenderType.CUSTOM; + return depthTest ? NORMAL_RENDER : DIW_RENDER; } // [VanillaCopy] of super, without drag when onGround is true @@ -171,7 +119,61 @@ public class FXWisp extends Particle { motionZ = mz; } - private boolean depthTest; - private final float moteParticleScale; - private final int moteHalfLife; + private static void beginRenderCommon(BufferBuilder bufferBuilder, TextureManager textureManager) { + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F); + GlStateManager.disableLighting(); + + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F); + textureManager.bindTexture(ConfigHandler.CLIENT.matrixMode.get() ? vanillaParticles : particles); + bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + } + + private static void endRenderCommon() { + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); + GlStateManager.disableBlend(); + GlStateManager.depthMask(true); + GL11.glPopAttrib(); + } + + private static final IParticleRenderType NORMAL_RENDER = new IParticleRenderType() { + @Override + public void beginRender(BufferBuilder bufferBuilder, TextureManager textureManager) { + beginRenderCommon(bufferBuilder, textureManager); + } + + @Override + public void finishRender(Tessellator tessellator) { + tessellator.draw(); + endRenderCommon(); + } + + @Override + public String toString() { + return "botania:wisp"; + } + }; + + private static final IParticleRenderType DIW_RENDER = new IParticleRenderType() { + @Override + public void beginRender(BufferBuilder bufferBuilder, TextureManager textureManager) { + beginRenderCommon(bufferBuilder, textureManager); + GlStateManager.disableDepthTest(); + } + + @Override + public void finishRender(Tessellator tessellator) { + tessellator.draw(); + GlStateManager.enableDepthTest(); + endRenderCommon(); + } + + @Override + public String toString() { + return "botania:depth_ignoring_wisp"; + } + }; } diff --git a/src/main/java/vazkii/botania/client/fx/ModParticles.java b/src/main/java/vazkii/botania/client/fx/ModParticles.java index 0382c430a..68dca9ec1 100644 --- a/src/main/java/vazkii/botania/client/fx/ModParticles.java +++ b/src/main/java/vazkii/botania/client/fx/ModParticles.java @@ -1,6 +1,9 @@ package vazkii.botania.client.fx; +import net.minecraft.client.Minecraft; import net.minecraft.particles.ParticleType; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -22,4 +25,13 @@ public class ModParticles { register(evt.getRegistry(), new WispParticleType(), "wisp"); register(evt.getRegistry(), new SparkleParticleType(), "sparkle"); } + + @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) + public static class FactoryHandler { + @SubscribeEvent + public static void registerFactories(ParticleFactoryRegisterEvent evt) { + Minecraft.getInstance().particles.registerFactory(ModParticles.WISP, WispParticleType.FACTORY); + Minecraft.getInstance().particles.registerFactory(ModParticles.SPARKLE, SparkleParticleType.FACTORY); + } + } } diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java deleted file mode 100644 index 714576afe..000000000 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ /dev/null @@ -1,67 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * File Created @ [Jul 2, 2014, 12:12:45 AM (GMT)] - */ -package vazkii.botania.client.fx; - -import net.minecraft.client.Minecraft; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.profiler.IProfiler; -import net.minecraft.profiler.Profiler; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import org.lwjgl.opengl.GL11; -import vazkii.botania.common.lib.LibMisc; - -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) -public final class ParticleRenderDispatcher { - - public static int wispFxCount = 0; - public static int depthIgnoringWispFxCount = 0; - public static int sparkleFxCount = 0; - public static int fakeSparkleFxCount = 0; - public static int lightningCount = 0; - - @SubscribeEvent - public static void registerFactories(ParticleFactoryRegisterEvent evt) { - Minecraft.getInstance().particles.registerFactory(ModParticles.WISP, WispParticleType.FACTORY); - Minecraft.getInstance().particles.registerFactory(ModParticles.SPARKLE, SparkleParticleType.FACTORY); - } - - // Called from LightningHandler.onRenderWorldLast since that was - // already registered. /shrug - public static void dispatch() { - Tessellator tessellator = Tessellator.getInstance(); - - IProfiler profiler = Minecraft.getInstance().getProfiler(); - - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GlStateManager.depthMask(false); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F); - GlStateManager.disableLighting(); - - profiler.startSection("sparkle"); - FXSparkle.dispatchQueuedRenders(tessellator); - profiler.endStartSection("wisp"); - FXWisp.dispatchQueuedRenders(tessellator); - profiler.endSection(); - - GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); - GlStateManager.disableBlend(); - GlStateManager.depthMask(true); - GL11.glPopAttrib(); - } - -} diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index df734f966..211b3a48e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -111,7 +111,7 @@ public class RenderTileAltar extends TileEntityRenderer { GlStateManager.disableAlphaTest(); if(lava) GlStateManager.disableLighting(); - GlStateManager.color4f(1F, 1F, 1F, alpha); + GlStateManager.color4f(1F, 1F, 1F, 1F); GlStateManager.translatef(w, -0.3F, w); GlStateManager.rotatef(90F, 1F, 0F, 0F); GlStateManager.scalef(s, s, s); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 9d52028a6..0674800a0 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ Botania is a mod that adds nature magic to Minecraft [[dependencies.botania]] modId="forge" mandatory=true - versionRange="[28.1.0,)" + versionRange="[28.1.44,)" ordering="NONE" side="BOTH"