diff --git a/src/main/java/com/minelittlepony/client/model/components/UnicornHorn.java b/src/main/java/com/minelittlepony/client/model/components/UnicornHorn.java index d3bc5423..3b1bab53 100644 --- a/src/main/java/com/minelittlepony/client/model/components/UnicornHorn.java +++ b/src/main/java/com/minelittlepony/client/model/components/UnicornHorn.java @@ -37,9 +37,10 @@ public class UnicornHorn implements IPart { .pitch = 0.5F; glow.offset(HORN_X + x, HORN_Y + y, HORN_Z + z) + .setAlpha(0.4f) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z) - .setAlpha(0.4f).box(0, 0, 0, 1, 4, 1, stretch + 0.5F) - .setAlpha(0.2f).box(0, 0, 0, 1, 3, 1, stretch + 0.8F); + .box(0, 0, 0, 1, 4, 1, stretch + 0.5F) + .box(0, 0, 0, 1, 3, 1, stretch + 0.8F); } @Override diff --git a/src/main/java/com/minelittlepony/client/util/render/GlowRenderer.java b/src/main/java/com/minelittlepony/client/util/render/GlowRenderer.java index 94b91077..66693d20 100644 --- a/src/main/java/com/minelittlepony/client/util/render/GlowRenderer.java +++ b/src/main/java/com/minelittlepony/client/util/render/GlowRenderer.java @@ -3,8 +3,6 @@ package com.minelittlepony.client.util.render; import net.minecraft.client.MinecraftClient; import net.minecraft.client.model.Model; -import org.lwjgl.opengl.GL11; - public class GlowRenderer extends AbstractRenderer { int tint; @@ -26,10 +24,6 @@ public class GlowRenderer extends AbstractRenderer { return this; } - public void applyTint(float alpha) { - Color.glColor(tint, alpha); - } - @Override public void createBox(float offX, float offY, float offZ, int width, int height, int depth, float scaleFactor, boolean mirrored) { boxes.add(new HornGlow(this, textureOffsetX, textureOffsetY, offX, offY, offZ, width, height, depth, scaleFactor, alpha)); @@ -37,10 +31,10 @@ public class GlowRenderer extends AbstractRenderer { @Override public void render(float scale) { - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); MinecraftClient.getInstance().gameRenderer.disableLightmap(); + Color.glColor(tint, alpha); super.render(scale); - GL11.glPopAttrib(); + MinecraftClient.getInstance().gameRenderer.enableLightmap(); } @Override diff --git a/src/main/java/com/minelittlepony/client/util/render/HornGlow.java b/src/main/java/com/minelittlepony/client/util/render/HornGlow.java index c3a36bc0..c74af468 100644 --- a/src/main/java/com/minelittlepony/client/util/render/HornGlow.java +++ b/src/main/java/com/minelittlepony/client/util/render/HornGlow.java @@ -7,15 +7,11 @@ import net.minecraft.client.render.BufferBuilder; */ public class HornGlow extends Box { - private final float alpha; - private Quad[] polygons; public HornGlow(GlowRenderer renderer, int texX, int texY, float xMin, float yMin, float zMin, int w, int h, int d, float scale, float alpha) { super(renderer, texX, texY, xMin, yMin, zMin, w, h, d, scale); - this.alpha = alpha; - float xMax = xMin + w + scale; float yMax = yMin + h + scale; float zMax = zMin + d + scale; @@ -65,8 +61,6 @@ public class HornGlow extends Box { @Override public void render(BufferBuilder buffer, float scale) { - parent.applyTint(alpha); - for (Quad i : polygons) { i.render(buffer, scale); }