From d5bcd3114508213adc35c41e30eca8fa15ab6daf Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Nov 2019 18:06:50 +0200 Subject: [PATCH] This is no longer applicable --- .../client/mixin/MixinGlStateManager.java | 24 ------------------ .../client/mixin/MixinItemRenderer.java | 10 -------- .../client/render/LevitatingItemRenderer.java | 25 +++++-------------- src/main/resources/minelp.mixin.json | 1 - 4 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 src/main/java/com/minelittlepony/client/mixin/MixinGlStateManager.java diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinGlStateManager.java b/src/main/java/com/minelittlepony/client/mixin/MixinGlStateManager.java deleted file mode 100644 index 7e2bd7cd..00000000 --- a/src/main/java/com/minelittlepony/client/mixin/MixinGlStateManager.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.minelittlepony.client.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.minelittlepony.client.render.LevitatingItemRenderer; - -import com.mojang.blaze3d.platform.GlStateManager; - -@Mixin(GlStateManager.class) -public abstract class MixinGlStateManager { - - @Inject(method = "setProfile(" - + "Lcom/mojang/blaze3d/platform/GlStateManager$RenderMode;)V", - at = @At("HEAD"), - cancellable = true) - private static void enableBlendProfile(GlStateManager.RenderMode profile, CallbackInfo info) { - if (profile == GlStateManager.RenderMode.PLAYER_SKIN && LevitatingItemRenderer.enableItemGlowRenderProfile()) { - info.cancel(); - } - } -} diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java b/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java index 69ad1a7e..d7be363f 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinItemRenderer.java @@ -3,9 +3,7 @@ package com.minelittlepony.client.mixin; import com.minelittlepony.client.render.LevitatingItemRenderer; import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.texture.TextureManager; -import net.minecraft.item.ItemStack; import net.minecraft.resource.SynchronousResourceReloadListener; import org.spongepowered.asm.mixin.Mixin; @@ -17,14 +15,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ItemRenderer.class) public abstract class MixinItemRenderer implements SynchronousResourceReloadListener { - @Inject(method = "renderItemAndGlow(" - + "Lnet/minecraft/item/ItemStack;" - + "Lnet/minecraft/client/render/model/BakedModel;)V", - at = @At("HEAD")) - private void onRenderItem(ItemStack stack, BakedModel model, CallbackInfo info) { - LevitatingItemRenderer.enableItemGlowRenderProfile(); - } - @Inject(method = "Lnet/minecraft/client/render/item/ItemRenderer;renderGlint(" + "Lnet/minecraft/client/texture/TextureManager;" + "Ljava/lang/Runnable;I)V", diff --git a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index 6ca1b935..191091f1 100644 --- a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -5,8 +5,6 @@ import org.lwjgl.opengl.GL14; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.Color; -import com.mojang.blaze3d.platform.GlStateManager.DestFactor; -import com.mojang.blaze3d.platform.GlStateManager.SourceFactor; import javax.annotation.Nullable; @@ -31,15 +29,6 @@ public class LevitatingItemRenderer { private static boolean usingTransparency; - public static boolean enableItemGlowRenderProfile() { - if (usesTransparency()) { - enableBlend(); - blendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO); - } - - return usesTransparency(); - } - public static boolean usesTransparency() { return usingTransparency; } @@ -48,14 +37,15 @@ public class LevitatingItemRenderer { * Renders a magical overlay over an item in third person. */ public void renderItemGlow(LivingEntity entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, int glowColor, MatrixStack stack, VertexConsumerProvider renderContext) { + + // TODO: mixin into RenderLayer.getItemLayer(itemstack) to enable transparency + usingTransparency = true; + stack.push(); - disableLighting(); setColor(glowColor); ItemRenderer renderItem = MinecraftClient.getInstance().getItemRenderer(); - usingTransparency = true; - stack.scale(1.1F, 1.1F, 1.1F); stack.translate(0.01F, 0.01F, 0.01F); @@ -63,12 +53,11 @@ public class LevitatingItemRenderer { stack.translate(-0.02F, -0.02F, -0.02F); renderItem.method_23177(entity, drop, transform, hand == Arm.LEFT, stack, renderContext, entity.world, 0x0F00F0, OverlayTexture.DEFAULT_UV); - usingTransparency = false; + unsetColor(); - enableLighting(); stack.pop(); - // I hate rendering + usingTransparency = false; } private void setColor(int glowColor) { @@ -118,8 +107,6 @@ public class LevitatingItemRenderer { } matrix.pop(); - - // I hate rendering } /** diff --git a/src/main/resources/minelp.mixin.json b/src/main/resources/minelp.mixin.json index 0be2a5d2..a03d4df0 100644 --- a/src/main/resources/minelp.mixin.json +++ b/src/main/resources/minelp.mixin.json @@ -10,7 +10,6 @@ "MixinDefaultPlayerSkin", "MixinEntityRenderDispatcher", "MixinFirstPersonRenderer", - "MixinGlStateManager", "MixinItemRenderer", "MixinClientPlayerEntity", "MixinPlayerMoveC2SPacket_Both",