PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-16 17:44:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix naming collission between MagicGlow.Color and util.Color

Browse source
This commit is contained in:
Sollace 2021-06-21 23:39:31 +02:00
parent 8541fe3fb6
commit ad82af2e56
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/com/minelittlepony/client/render/MagicGlow.java
View file

@ -8,6 +8,7 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.minelittlepony.common.util.Color;
import java.util.function.BiFunction; import java.util.function.BiFunction;
@ -27,7 +28,7 @@ public abstract class MagicGlow extends RenderPhase {
private static final BiFunction<Identifier, Integer, RenderLayer> TINTED_LAYER = Util.memoize((texture, color) -> { private static final BiFunction<Identifier, Integer, RenderLayer> TINTED_LAYER = Util.memoize((texture, color) -> {
return RenderLayer.of("mlp_tint_layer", VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, VertexFormat.DrawMode.QUADS, 256, true, true, RenderLayer.MultiPhaseParameters.builder() return RenderLayer.of("mlp_tint_layer", VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, VertexFormat.DrawMode.QUADS, 256, true, true, RenderLayer.MultiPhaseParameters.builder()
.texture(new Color(texture, color)) .texture(new Colored(texture, color))
.shader(EYES_SHADER) .shader(EYES_SHADER)
.writeMaskState(COLOR_MASK) .writeMaskState(COLOR_MASK)
.depthTest(LEQUAL_DEPTH_TEST) .depthTest(LEQUAL_DEPTH_TEST)
@ -42,22 +43,22 @@ public abstract class MagicGlow extends RenderPhase {
} }
public static RenderLayer getTintedTexturedLayer(Identifier texture, float red, float green, float blue, float alpha) { public static RenderLayer getTintedTexturedLayer(Identifier texture, float red, float green, float blue, float alpha) {
return TINTED_LAYER.apply(texture, com.minelittlepony.common.util.Color.argbToHex(alpha, red, green, blue)); return TINTED_LAYER.apply(texture, Color.argbToHex(alpha, red, green, blue));
} }
private static class Color extends Texture { private static class Colored extends Texture {
private final float red; private final float red;
private final float green; private final float green;
private final float blue; private final float blue;
private final float alpha; private final float alpha;
public Color(Identifier texture, int color) { public Colored(Identifier texture, int color) {
super(texture, false, false); super(texture, false, false);
this.red = com.minelittlepony.common.util.Color.r(color); this.red = Color.r(color);
this.green = com.minelittlepony.common.util.Color.g(color); this.green = Color.g(color);
this.blue = com.minelittlepony.common.util.Color.b(color); this.blue = Color.b(color);
this.alpha = com.minelittlepony.common.util.Color.a(color); this.alpha = Color.a(color);
} }
@Override @Override
@ -75,10 +76,10 @@ public abstract class MagicGlow extends RenderPhase {
@Override @Override
public boolean equals(Object other) { public boolean equals(Object other) {
return super.equals(other) return super.equals(other)
&& ((Color)other).red == red && ((Colored)other).red == red
&& ((Color)other).green == green && ((Colored)other).green == green
&& ((Color)other).blue == blue && ((Colored)other).blue == blue
&& ((Color)other).alpha == alpha; && ((Colored)other).alpha == alpha;
} }
} }
} }