_I did this to myself_

This commit is contained in:
Sollace 2019-12-10 18:11:26 +02:00
parent b7c2452800
commit 2f0a08f6c6
4 changed files with 10 additions and 10 deletions

View file

@ -8,7 +8,7 @@ import com.minelittlepony.client.render.PonyRenderDispatcher;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import net.minecraft.client.render.FirstPersonRenderer; import net.minecraft.client.render.item.HeldItemRenderer;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.model.json.ModelTransformation.Type; import net.minecraft.client.render.model.json.ModelTransformation.Type;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.render.item.ItemRenderer;
@Mixin(FirstPersonRenderer.class) @Mixin(HeldItemRenderer.class)
abstract class MixinFirstPersonRenderer { abstract class MixinFirstPersonRenderer {
private static final String LivingEntity = "Lnet/minecraft/entity/LivingEntity;"; private static final String LivingEntity = "Lnet/minecraft/entity/LivingEntity;";
private static final String MatrixStack = "Lnet/minecraft/client/util/math/MatrixStack;"; private static final String MatrixStack = "Lnet/minecraft/client/util/math/MatrixStack;";

View file

@ -55,9 +55,9 @@ 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.method_23177(entity, drop, transform, hand == Arm.LEFT, stack, renderContext, entity.world, 0x0F00F0, OverlayTexture.DEFAULT_UV); renderItem.renderItem(entity, drop, transform, hand == Arm.LEFT, stack, renderContext, entity.world, 0x0F00F0, OverlayTexture.DEFAULT_UV);
stack.translate(-0.02F, -0.02F, -0.02F); 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); renderItem.renderItem(entity, drop, transform, hand == Arm.LEFT, stack, renderContext, entity.world, 0x0F00F0, OverlayTexture.DEFAULT_UV);
stack.pop(); stack.pop();
unsetColor(); unsetColor();
@ -90,7 +90,7 @@ public class LevitatingItemRenderer {
setupPerspective(itemRenderer, entity, stack, left, matrix); setupPerspective(itemRenderer, entity, stack, left, matrix);
} }
itemRenderer.method_23177(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV); itemRenderer.renderItem(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV);
if (doMagic) { if (doMagic) {
setColor(pony.getMetadata().getGlowColor()); setColor(pony.getMetadata().getGlowColor());
@ -98,16 +98,16 @@ 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.method_23177(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV); itemRenderer.renderItem(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV);
matrix.translate(-0.03F, -0.02F, -0.02F); matrix.translate(-0.03F, -0.02F, -0.02F);
itemRenderer.method_23177(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV); itemRenderer.renderItem(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV);
unsetColor(); unsetColor();
} }
matrix.pop(); matrix.pop();
} else { } else {
itemRenderer.method_23177(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV); itemRenderer.renderItem(entity, stack, transform, left, matrix, renderContext, world, lightUv, OverlayTexture.DEFAULT_UV);
} }
} }

View file

@ -73,7 +73,7 @@ public class HeldItemFeature<T extends LivingEntity, M extends EntityModel<T> &
stack.translate(left * -0.2F, 0, 0); stack.translate(left * -0.2F, 0, 0);
preItemRender(entity, drop, transform, arm, stack); preItemRender(entity, drop, transform, arm, stack);
MinecraftClient.getInstance().getItemRenderer().method_23177(entity, drop, transform, arm == Arm.LEFT, stack, renderContext, entity.world, lightUv, OverlayTexture.DEFAULT_UV); MinecraftClient.getInstance().getItemRenderer().renderItem(entity, drop, transform, arm == Arm.LEFT, stack, renderContext, entity.world, lightUv, OverlayTexture.DEFAULT_UV);
postItemRender(entity, drop, transform, arm, stack, renderContext); postItemRender(entity, drop, transform, arm, stack, renderContext);
stack.pop(); stack.pop();

View file

@ -72,7 +72,7 @@ public class SkullFeature<T extends LivingEntity, M extends EntityModel<T> & IPo
stack.scale(0.625F, -0.625F, -0.625F); stack.scale(0.625F, -0.625F, -0.625F);
stack.translate(0, 0.4F, -0.21F); stack.translate(0, 0.4F, -0.21F);
MinecraftClient.getInstance().getFirstPersonRenderer().renderItem(entity, itemstack, ModelTransformation.Type.HEAD, false, stack, renderContext, lightUv); MinecraftClient.getInstance().getHeldItemRenderer().renderItem(entity, itemstack, ModelTransformation.Type.HEAD, false, stack, renderContext, lightUv);
} }
private void renderSkull(MatrixStack stack, VertexConsumerProvider renderContext, ItemStack itemstack, boolean isVillager, float limbDistance, int lightUv) { private void renderSkull(MatrixStack stack, VertexConsumerProvider renderContext, ItemStack itemstack, boolean isVillager, float limbDistance, int lightUv) {