Basic maintanance on the mixins

This commit is contained in:
Sollace 2019-11-29 11:30:18 +02:00
parent 3255325655
commit 5697a92643
8 changed files with 9 additions and 17 deletions

View file

@ -12,7 +12,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.Camera; import net.minecraft.client.render.Camera;
@Mixin(Camera.class) @Mixin(Camera.class)
public abstract class MixinCamera { abstract class MixinCamera {
@Inject(method = "clipToSpace(D)D", @Inject(method = "clipToSpace(D)D",
at = @At("RETURN"), at = @At("RETURN"),
cancellable = true) cancellable = true)

View file

@ -2,20 +2,15 @@ package com.minelittlepony.client.mixin;
import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.IPony;
import com.mojang.authlib.GameProfile;
import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityDimensions;
import net.minecraft.entity.EntityPose; import net.minecraft.entity.EntityPose;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@Mixin(ClientPlayerEntity.class) @Mixin(ClientPlayerEntity.class)
public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity { abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity {
public MixinClientPlayerEntity() { super(null, null); }
public MixinClientPlayerEntity(ClientWorld clientWorld_1, GameProfile gameProfile_1) {
super(clientWorld_1, gameProfile_1);
}
@Override @Override
public float getActiveEyeHeight(EntityPose entityPose_1, EntityDimensions entitySize_1) { public float getActiveEyeHeight(EntityPose entityPose_1, EntityDimensions entitySize_1) {

View file

@ -15,8 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.UUID; import java.util.UUID;
@Mixin(DefaultSkinHelper.class) @Mixin(DefaultSkinHelper.class)
public abstract class MixinDefaultPlayerSkin { abstract class MixinDefaultPlayerSkin {
@Inject(method = "getTexture()Lnet/minecraft/util/Identifier;", @Inject(method = "getTexture()Lnet/minecraft/util/Identifier;",
at = @At("HEAD"), at = @At("HEAD"),
cancellable = true) cancellable = true)

View file

@ -11,8 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(EntityRenderDispatcher.class) @Mixin(EntityRenderDispatcher.class)
public class MixinEntityRenderDispatcher { abstract class MixinEntityRenderDispatcher {
@Redirect( @Redirect(
method = "getRenderer(Lnet/minecraft/entity/Entity;)Lnet/minecraft/client/render/entity/EntityRenderer;", method = "getRenderer(Lnet/minecraft/entity/Entity;)Lnet/minecraft/client/render/entity/EntityRenderer;",
at = @At( at = @At(

View file

@ -18,8 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
@Mixin(FirstPersonRenderer.class) @Mixin(FirstPersonRenderer.class)
public class MixinFirstPersonRenderer { abstract class MixinFirstPersonRenderer {
@Redirect(method = "renderFirstPersonItem(" @Redirect(method = "renderFirstPersonItem("
+ "Lnet/minecraft/client/network/AbstractClientPlayerEntity;FF" + "Lnet/minecraft/client/network/AbstractClientPlayerEntity;FF"
+ "Lnet/minecraft/util/Hand;F" + "Lnet/minecraft/util/Hand;F"

View file

@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ItemRenderer.class) @Mixin(ItemRenderer.class)
public abstract class MixinItemRenderer implements SynchronousResourceReloadListener { abstract class MixinItemRenderer implements SynchronousResourceReloadListener {
@Inject(method = "Lnet/minecraft/client/render/item/ItemRenderer;renderGlint(" @Inject(method = "Lnet/minecraft/client/render/item/ItemRenderer;renderGlint("
+ "Lnet/minecraft/client/texture/TextureManager;" + "Lnet/minecraft/client/texture/TextureManager;"

View file

@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.minelittlepony.client.HorseCam; import com.minelittlepony.client.HorseCam;
@Mixin(PlayerMoveC2SPacket.Both.class) @Mixin(PlayerMoveC2SPacket.Both.class)
public abstract class MixinPlayerMoveC2SPacket_Both extends PlayerMoveC2SPacket { abstract class MixinPlayerMoveC2SPacket_Both extends PlayerMoveC2SPacket {
@Inject(method = "<init>(DDDFFZ)V", @Inject(method = "<init>(DDDFFZ)V",
at = @At("RETURN")) at = @At("RETURN"))
private void onInit(CallbackInfo info) { private void onInit(CallbackInfo info) {

View file

@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.minelittlepony.client.HorseCam; import com.minelittlepony.client.HorseCam;
@Mixin(PlayerMoveC2SPacket.LookOnly.class) @Mixin(PlayerMoveC2SPacket.LookOnly.class)
public abstract class MixinPlayerMoveC2SPacket_LookOnly extends PlayerMoveC2SPacket { abstract class MixinPlayerMoveC2SPacket_LookOnly extends PlayerMoveC2SPacket {
@Inject(method = "<init>(FFZ)V", @Inject(method = "<init>(FFZ)V",
at = @At("RETURN")) at = @At("RETURN"))
private void onInit(CallbackInfo info) { private void onInit(CallbackInfo info) {