PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-23 04:57:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed skulls not always rendering with magic effects

Browse source
This commit is contained in:
Sollace 2018-06-20 23:54:41 +02:00
parent 232089bfad
commit d08c43ffba
5 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/com/minelittlepony/mixin/MixinGlStateManager.java Normal file
View file

@ -0,0 +1,25 @@
package com.minelittlepony.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.render.PonySkullRenderer;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.GlStateManager.DestFactor;
import net.minecraft.client.renderer.GlStateManager.SourceFactor;
@Mixin(GlStateManager.class)
public abstract class MixinGlStateManager {
@Inject(method = "enableBlendProfile(Lnet/minecraft/client/renderer/GlStateManager$Profile;)V", at = @At("HEAD"), cancellable = true)
private static void enableBlendProfile(GlStateManager.Profile profile, CallbackInfo info) {
if (profile == GlStateManager.Profile.PLAYER_SKIN && PonySkullRenderer.ponyInstance.usesTransparency()) {
GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO);
info.cancel();
}
}
}

2
src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java
View file

@ -35,6 +35,7 @@ public class LevitatingItemRenderer {
RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
((IRenderItem) renderItem).useTransparency(true);
PonySkullRenderer.ponyInstance.useTransparency(true);
scale(1.1, 1.1, 1.1);
@ -44,6 +45,7 @@ public class LevitatingItemRenderer {
renderItem.renderItem(drop, entity, transform, hand == EnumHandSide.LEFT);
((IRenderItem) renderItem).useTransparency(false);
PonySkullRenderer.ponyInstance.useTransparency(false);
unsetColor();
enableLighting();
popMatrix();

4
src/main/java/com/minelittlepony/render/PonySkullRenderer.java
View file

@ -139,6 +139,10 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende
transparency = use;
}
public boolean usesTransparency() {
return transparency;
}
/**
* A skull, just a skull.
*

6
src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java
View file

@ -18,8 +18,6 @@ import com.voxelmodpack.hdskins.HDSkinManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.GlStateManager.DestFactor;
import net.minecraft.client.renderer.GlStateManager.SourceFactor;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.entity.player.EntityPlayer;
@ -39,12 +37,8 @@ public class RenderPonyPlayer extends RenderPonyBase {
@Override
public void preRender(boolean transparency) {
if (transparency) {
GlStateManager.tryBlendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO);
} else {
GlStateManager.enableBlendProfile(GlStateManager.Profile.PLAYER_SKIN);
}
}
@Override
public ResourceLocation getSkinResource(GameProfile profile) {

3
src/main/resources/minelp.mixin.json
View file

@ -9,6 +9,7 @@
"MixinNetworkPlayerInfo",
"MixinRenderItem",
"MixinItemRenderer",
"MixinRenderManager"
"MixinRenderManager",
"MixinGlStateManager"
]
}