From f2bd8bb3b31d3d087b971747274640fc87a41a75 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 14 Dec 2021 23:32:05 +0200 Subject: [PATCH] Change "usesTransparency" to "isEnabled" --- .../client/mixin/MixinItemRenderer.java | 2 +- .../client/mixin/MixinSpriteIdentifier.java | 2 +- .../client/mixin/MixinTexturedRenderLayers.java | 4 ++-- .../client/render/LevitatingItemRenderer.java | 17 +++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java b/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java index d7041d6b..ea3b02fb 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java @@ -28,7 +28,7 @@ abstract class MixinItemRenderer { "getDirectItemGlintConsumer" + PARAMS }, at = @At("HEAD"), cancellable = true) private static void onGetArmorVertexConsumer(VertexConsumerProvider provider, RenderLayer layer, boolean solid, boolean glint, CallbackInfoReturnable info) { - if (LevitatingItemRenderer.usesTransparency()) { + if (LevitatingItemRenderer.isEnabled()) { info.setReturnValue(provider.getBuffer(LevitatingItemRenderer.getRenderLayer())); } } diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java b/src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java index 9b2f6fec..b3b54167 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinSpriteIdentifier.java @@ -27,7 +27,7 @@ abstract class MixinSpriteIdentifier { cancellable = true ) public void onGetBuffer(VertexConsumerProvider provider, Function layerFunction, CallbackInfoReturnable info) { - if (LevitatingItemRenderer.usesTransparency()) { + if (LevitatingItemRenderer.isEnabled()) { SpriteIdentifier self = (SpriteIdentifier)(Object)this; info.setReturnValue(self.getSprite().getTextureSpecificVertexConsumer(provider.getBuffer(LevitatingItemRenderer.getRenderLayer(self.getAtlasId())))); diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java b/src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java index d1ef3154..143d6f63 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinTexturedRenderLayers.java @@ -15,14 +15,14 @@ abstract class MixinTexturedRenderLayers { @Inject(method = "getEntityCutout()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) private static void onGetItemOpaque(CallbackInfoReturnable info) { - if (LevitatingItemRenderer.usesTransparency()) { + if (LevitatingItemRenderer.isEnabled()) { info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); } } @Inject(method = "getEntityTranslucentCull()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) private static void onGetItemTranslucent(CallbackInfoReturnable info) { - if (LevitatingItemRenderer.usesTransparency()) { + if (LevitatingItemRenderer.isEnabled()) { info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); } } diff --git a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index ec06dc0d..afd29ed2 100644 --- a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -25,15 +25,15 @@ import net.minecraft.world.World; public class LevitatingItemRenderer { - static int tint; - private static boolean usingTransparency; + private static int tint; + private static boolean enabled; - public static boolean usesTransparency() { - return usingTransparency; + public static boolean isEnabled() { + return enabled; } public static RenderLayer getRenderLayer(Identifier texture) { - if (!usesTransparency()) { + if (!isEnabled()) { return RenderLayer.getEntityTranslucent(texture); } return MagicGlow.getTintedTexturedLayer(texture, Color.r(tint), Color.g(tint), Color.b(tint), 0.8F); @@ -55,6 +55,7 @@ public class LevitatingItemRenderer { stack.scale(1.1F, 1.1F, 1.1F); stack.translate(0.01F, 0.01F, 0.01F); + renderItem.renderItem(entity, drop, transform, hand == Arm.LEFT, stack, renderContext, entity.world, 0x0F00F0, OverlayTexture.DEFAULT_UV, 0); stack.translate(-0.02F, -0.02F, -0.02F); renderItem.renderItem(entity, drop, transform, hand == Arm.LEFT, stack, renderContext, entity.world, 0x0F00F0, OverlayTexture.DEFAULT_UV, 0); @@ -64,13 +65,12 @@ public class LevitatingItemRenderer { } private void setColor(int glowColor) { - usingTransparency = true; + enabled = true; tint = glowColor; } private void unsetColor() { - usingTransparency = false; - tint = 0; + enabled = false; } /** @@ -98,6 +98,7 @@ public class LevitatingItemRenderer { matrix.scale(1.1F, 1.1F, 1.1F); matrix.translate(0.015F, 0.01F, 0.01F); + itemRenderer.renderItem(entity, stack, mode, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV, posLong); matrix.translate(-0.03F, -0.02F, -0.02F); itemRenderer.renderItem(entity, stack, mode, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV, posLong);