Change "usesTransparency" to "isEnabled"

This commit is contained in:
Sollace 2021-12-14 23:32:05 +02:00
parent f6341208da
commit f2bd8bb3b3
4 changed files with 13 additions and 12 deletions

View file

@ -28,7 +28,7 @@ abstract class MixinItemRenderer {
"getDirectItemGlintConsumer" + PARAMS "getDirectItemGlintConsumer" + PARAMS
}, at = @At("HEAD"), cancellable = true) }, at = @At("HEAD"), cancellable = true)
private static void onGetArmorVertexConsumer(VertexConsumerProvider provider, RenderLayer layer, boolean solid, boolean glint, CallbackInfoReturnable<VertexConsumer> info) { private static void onGetArmorVertexConsumer(VertexConsumerProvider provider, RenderLayer layer, boolean solid, boolean glint, CallbackInfoReturnable<VertexConsumer> info) {
if (LevitatingItemRenderer.usesTransparency()) { if (LevitatingItemRenderer.isEnabled()) {
info.setReturnValue(provider.getBuffer(LevitatingItemRenderer.getRenderLayer())); info.setReturnValue(provider.getBuffer(LevitatingItemRenderer.getRenderLayer()));
} }
} }

View file

@ -27,7 +27,7 @@ abstract class MixinSpriteIdentifier {
cancellable = true cancellable = true
) )
public void onGetBuffer(VertexConsumerProvider provider, Function<Identifier, RenderLayer> layerFunction, CallbackInfoReturnable<VertexConsumer> info) { public void onGetBuffer(VertexConsumerProvider provider, Function<Identifier, RenderLayer> layerFunction, CallbackInfoReturnable<VertexConsumer> info) {
if (LevitatingItemRenderer.usesTransparency()) { if (LevitatingItemRenderer.isEnabled()) {
SpriteIdentifier self = (SpriteIdentifier)(Object)this; SpriteIdentifier self = (SpriteIdentifier)(Object)this;
info.setReturnValue(self.getSprite().getTextureSpecificVertexConsumer(provider.getBuffer(LevitatingItemRenderer.getRenderLayer(self.getAtlasId())))); info.setReturnValue(self.getSprite().getTextureSpecificVertexConsumer(provider.getBuffer(LevitatingItemRenderer.getRenderLayer(self.getAtlasId()))));

View file

@ -15,14 +15,14 @@ abstract class MixinTexturedRenderLayers {
@Inject(method = "getEntityCutout()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) @Inject(method = "getEntityCutout()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true)
private static void onGetItemOpaque(CallbackInfoReturnable<RenderLayer> info) { private static void onGetItemOpaque(CallbackInfoReturnable<RenderLayer> info) {
if (LevitatingItemRenderer.usesTransparency()) { if (LevitatingItemRenderer.isEnabled()) {
info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); info.setReturnValue(LevitatingItemRenderer.getRenderLayer());
} }
} }
@Inject(method = "getEntityTranslucentCull()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true) @Inject(method = "getEntityTranslucentCull()Lnet/minecraft/client/render/RenderLayer;", at = @At("HEAD"), cancellable = true)
private static void onGetItemTranslucent(CallbackInfoReturnable<RenderLayer> info) { private static void onGetItemTranslucent(CallbackInfoReturnable<RenderLayer> info) {
if (LevitatingItemRenderer.usesTransparency()) { if (LevitatingItemRenderer.isEnabled()) {
info.setReturnValue(LevitatingItemRenderer.getRenderLayer()); info.setReturnValue(LevitatingItemRenderer.getRenderLayer());
} }
} }

View file

@ -25,15 +25,15 @@ import net.minecraft.world.World;
public class LevitatingItemRenderer { public class LevitatingItemRenderer {
static int tint; private static int tint;
private static boolean usingTransparency; private static boolean enabled;
public static boolean usesTransparency() { public static boolean isEnabled() {
return usingTransparency; return enabled;
} }
public static RenderLayer getRenderLayer(Identifier texture) { public static RenderLayer getRenderLayer(Identifier texture) {
if (!usesTransparency()) { if (!isEnabled()) {
return RenderLayer.getEntityTranslucent(texture); return RenderLayer.getEntityTranslucent(texture);
} }
return MagicGlow.getTintedTexturedLayer(texture, Color.r(tint), Color.g(tint), Color.b(tint), 0.8F); 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.scale(1.1F, 1.1F, 1.1F);
stack.translate(0.01F, 0.01F, 0.01F); 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); 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); 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); 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) { private void setColor(int glowColor) {
usingTransparency = true; enabled = true;
tint = glowColor; tint = glowColor;
} }
private void unsetColor() { private void unsetColor() {
usingTransparency = false; enabled = false;
tint = 0;
} }
/** /**
@ -98,6 +98,7 @@ public class LevitatingItemRenderer {
matrix.scale(1.1F, 1.1F, 1.1F); matrix.scale(1.1F, 1.1F, 1.1F);
matrix.translate(0.015F, 0.01F, 0.01F); matrix.translate(0.015F, 0.01F, 0.01F);
itemRenderer.renderItem(entity, stack, mode, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV, posLong); itemRenderer.renderItem(entity, stack, mode, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV, posLong);
matrix.translate(-0.03F, -0.02F, -0.02F); matrix.translate(-0.03F, -0.02F, -0.02F);
itemRenderer.renderItem(entity, stack, mode, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV, posLong); itemRenderer.renderItem(entity, stack, mode, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV, posLong);