Skip to content

Commit d5bb1a0

Browse files
refactor: comment out mixins that we can't implement yet
1 parent b94727c commit d5bb1a0

16 files changed

+46
-44
lines changed

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/item/MixinItemBow.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.spongepowered.asm.mixin.injection.At;
3232

3333
@Mixin(BowItem.class)
34-
public abstract class MixinItemBow extends Item {
35-
@WrapOperation(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;method_0_7937(Lnet/minecraft/item/Item;)Z"))
34+
public abstract class MixinItemBow {
35+
/* @WrapOperation(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;method_0_7937(Lnet/minecraft/item/Item;)Z"))
3636
private boolean onItemRightClick$hasItem(PlayerInventory instance, Item itemIn, Operation<Boolean> original) {
3737
boolean hasItem = original.call(instance, itemIn);
3838
@@ -45,5 +45,5 @@ public abstract class MixinItemBow extends Item {
4545
}
4646
4747
return false;
48-
}
48+
}*/
4949
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinLayerArmorBase.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
import net.minecraft.client.render.VertexConsumerProvider;
2929
import net.minecraft.client.render.entity.model.EntityModel;
3030
import com.mojang.blaze3d.systems.RenderSystem;
31-
import net.minecraft.client.render.entity.LivingEntityRenderer;
3231
import net.minecraft.client.render.entity.feature.ArmorFeatureRenderer;
33-
import net.minecraft.class_995;
3432
import net.minecraft.client.render.entity.state.BipedEntityRenderState;
3533
import net.minecraft.client.util.math.MatrixStack;
3634
import net.minecraft.entity.LivingEntity;
@@ -41,14 +39,7 @@
4139

4240

4341
@Mixin(ArmorFeatureRenderer.class)
44-
public abstract class MixinLayerArmorBase<T extends EntityModel> implements class_995<LivingEntity> {
45-
46-
@Shadow
47-
@Final
48-
private LivingEntityRenderer<?> field_4828;
49-
50-
@Shadow
51-
private float alpha;
42+
public abstract class MixinLayerArmorBase<T extends EntityModel> {
5243

5344
@Unique
5445
private boolean modifiedAlpha = false;
@@ -59,7 +50,7 @@ private void onRenderAllArmor(MatrixStack matrixStack, VertexConsumerProvider ve
5950
original.call(matrixStack, vertexConsumerProvider, i, bipedEntityRenderState, f, g);
6051
}
6152
}
62-
53+
/*
6354
@Inject(method = "renderArmor", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ArmorItem;method_0_8149(Lnet/minecraft/item/ItemStack;)I"))
6455
private void setAlpha(LivingEntity entitylivingbaseIn, float p_177182_2_, float p_177182_3_, float partialTicks, float p_177182_5_, float p_177182_6_, float p_177182_7_, float scale, int armorSlot, CallbackInfo ci) {
6556
if (Utils.INSTANCE.getInSkyblock() && entitylivingbaseIn == Skytils.getMc().player) {
@@ -82,5 +73,5 @@ private void resetAlpha(LivingEntity entitylivingbaseIn, float p_177182_2_, floa
8273
@Inject(method = "renderArmor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;method_4171(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/client/render/entity/model/EntityModel;FFFFFFF)V"), cancellable = true)
8374
private void replaceArmorGlint(LivingEntity entitylivingbaseIn, float p_177182_2_, float p_177182_3_, float partialTicks, float p_177182_5_, float p_177182_6_, float p_177182_7_, float scale, int armorSlot, CallbackInfo ci) {
8475
LayerArmorBaseHookKt.replaceArmorGlint(this, this.field_4828, entitylivingbaseIn, p_177182_2_, p_177182_3_, partialTicks, p_177182_5_, p_177182_6_, p_177182_7_, scale, armorSlot, ci);
85-
}
76+
}*/
8677
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinLayerCape.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.mojang.blaze3d.systems.RenderSystem;
2323
import net.minecraft.client.render.entity.PlayerEntityRenderer;
2424
import net.minecraft.client.render.entity.feature.CapeFeatureRenderer;
25-
import net.minecraft.class_995;
2625
import org.spongepowered.asm.mixin.Final;
2726
import org.spongepowered.asm.mixin.Mixin;
2827
import org.spongepowered.asm.mixin.Shadow;
@@ -31,8 +30,8 @@
3130
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3231

3332
@Mixin(value = CapeFeatureRenderer.class, priority = 1010)
34-
public abstract class MixinLayerCape implements class_995<AbstractClientPlayerEntity> {
35-
@Shadow
33+
public abstract class MixinLayerCape{
34+
/* @Shadow
3635
@Final
3736
private PlayerEntityRenderer field_4840;
3837
@@ -42,5 +41,5 @@ private void scaleChild(AbstractClientPlayerEntity entity, float limbSwing, floa
4241
RenderSystem.method_4453(0.5, 0.5, 0.5);
4342
RenderSystem.method_4348(0.0F, 24.0F * scale, 0.0F);
4443
}
45-
}
44+
}*/
4645
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinLayerCustomHead.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
2323
import gg.skytils.skytilsmod.mixins.hooks.renderer.LayerCustomHeadHookKt;
2424
import net.minecraft.client.render.entity.feature.HeadFeatureRenderer;
25-
import net.minecraft.class_995;
2625
import net.minecraft.entity.LivingEntity;
2726
import net.minecraft.entity.player.PlayerEntity;
2827
import org.spongepowered.asm.mixin.Mixin;
@@ -31,8 +30,9 @@
3130
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3231

3332
@Mixin(HeadFeatureRenderer.class)
34-
public abstract class MixinLayerCustomHead implements class_995<LivingEntity> {
33+
public abstract class MixinLayerCustomHead {
3534

35+
/*
3636
@WrapOperation(method = "method_4199", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;isSneaking()Z"))
3737
private boolean disableSneakOffset(LivingEntity instance, Operation<Boolean> original) {
3838
return (!(instance instanceof PlayerEntity) || !instance.isBaby()) && original.call(instance);
@@ -52,5 +52,6 @@ private void renderCustomHeadLayerPost(LivingEntity entity, float p_177141_2_, f
5252
private void renderGlintOnSkull(LivingEntity entitylivingbaseIn, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale, CallbackInfo ci) {
5353
LayerCustomHeadHookKt.renderGlintOnSkull(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks, p_177141_5_, p_177141_6_, p_177141_7_, scale, ci);
5454
}
55+
*/
5556

5657
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinModelBiped.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3333

3434
@Mixin(BipedEntityModel.class)
35-
public abstract class MixinModelBiped extends EntityModel {
36-
@Shadow public ModelPart hat;
35+
public abstract class MixinModelBiped {
36+
/* @Shadow public ModelPart hat;
3737
3838
@Inject(method = "setAngles", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;popMatrix()V", ordinal = 0))
3939
private void renderChildHeadPost(Entity entityIn, float f, float g, float h, float i, float j, float scale, CallbackInfo ci) {
@@ -45,5 +45,5 @@ private void renderChildHeadPost(Entity entityIn, float f, float g, float h, flo
4545
@WrapWithCondition(method = "setAngles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/ModelPart;render(F)V", ordinal = 6))
4646
private boolean renderChildHeadwear(ModelPart instance, float j, @Local(argsOnly = true) Entity entityIn) {
4747
return !this.child || !(entityIn instanceof PlayerEntity);
48-
}
48+
}*/
4949
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderDragon.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public abstract class MixinRenderDragon {
4747
@Unique
4848
private EnderDragonEntity lastDragon = null;
4949

50-
@Inject(method = "render(Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;FFFFFF)V", at = @At("HEAD"))
50+
/* @Inject(method = "render(Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;FFFFFF)V", at = @At("HEAD"))
5151
private void onRenderModel(EnderDragonEntity entitylivingbaseIn, float f, float g, float h, float i, float j, float scaleFactor, CallbackInfo ci) {
5252
lastDragon = entitylivingbaseIn;
5353
}
@@ -60,7 +60,7 @@ private float replaceHurtOpacity(float value) {
6060
@Inject(method = "render(Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;FFFFFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/EntityModel;setAngles(Lnet/minecraft/entity/Entity;FFFFFF)V", ordinal = 2, shift = At.Shift.AFTER))
6161
private void afterRenderHurtFrame(EnderDragonEntity entitylivingbaseIn, float f, float g, float h, float i, float j, float scaleFactor, CallbackInfo ci) {
6262
MasterMode7Features.INSTANCE.afterRenderHurtFrame((EnderDragonEntityRenderer) (Object) this, entitylivingbaseIn, f, g, h, i, j, scaleFactor, ci);
63-
}
63+
}*/
6464

6565
///#if MC==10809
6666
//$$ @Inject(method = "getTexture", at = @At("HEAD"), cancellable = true)

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderItem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
@Mixin(ItemRenderer.class)
3131
public abstract class MixinRenderItem {
32-
@Inject(method = "renderItemAndGlow(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/BlockStateModel;)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;method_4384(FFF)V", shift = At.Shift.AFTER))
32+
/* @Inject(method = "renderItemAndGlow(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/BlockStateModel;)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;method_4384(FFF)V", shift = At.Shift.AFTER))
3333
private void renderItemPre(ItemStack stack, BlockStateModel model, CallbackInfo ci) {
3434
RenderItemHookKt.renderItemPre(stack, model, ci);
3535
}
3636
3737
@Inject(method = "renderItemAndGlow(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/BlockStateModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/ItemRenderer;method_4011(Lnet/minecraft/client/render/model/BlockStateModel;)V", shift = At.Shift.BEFORE), cancellable = true)
3838
private void modifyGlintRendering(ItemStack stack, BlockStateModel model, CallbackInfo ci) {
3939
RenderItemHookKt.modifyGlintRendering(stack, model, ci);
40-
}
40+
}*/
4141
}

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRendererLivingEntity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636

3737
@Mixin(LivingEntityRenderer.class)
3838
public abstract class MixinRendererLivingEntity<T extends LivingEntity> {
39-
@Inject(method = "getOverlayColor", at = @At("HEAD"), cancellable = true)
39+
/* @Inject(method = "getOverlayColor", at = @At("HEAD"), cancellable = true)
4040
private void setColorMultiplier(T entity, float lightBrightness, float partialTickTime, CallbackInfoReturnable<Integer> cir) {
4141
RendererLivingEntityHookKt.setColorMultiplier(entity, lightBrightness, partialTickTime, cir);
42-
}
42+
}*/
4343

4444
@WrapOperation(method = "getOverlay", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/entity/state/LivingEntityRenderState;hurt:Z"))
4545
private static boolean changeHurtState(LivingEntityRenderState instance, Operation<Boolean> original) {
46-
return RendererLivingEntityHookKt.replaceHurtState(((ExtensionEntityRenderState) instance).getSkytilsEntity(), original);
46+
return RendererLivingEntityHookKt.replaceHurtState(instance, original);
4747
}
4848

4949
@Inject(method = "scale", at = @At("RETURN"))

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinTileEntityItemStackRenderer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package gg.skytils.skytilsmod.mixins.transformers.renderer;
2020

21+
/*
2122
import gg.skytils.skytilsmod.mixins.hooks.renderer.TileEntityItemStackRendererHookKt;
2223
import net.minecraft.client.render.item.BuiltinModelItemRenderer;
2324
import net.minecraft.item.ItemStack;
@@ -33,3 +34,4 @@ private void fixGlintForSkulls(ItemStack itemStack, CallbackInfo ci) {
3334
TileEntityItemStackRendererHookKt.fixGlintForSkulls(itemStack, ci);
3435
}
3536
}
37+
*/

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinTileEntitySkullRenderer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333

3434

3535
@Mixin(SkullBlockEntityRenderer.class)
36-
public abstract class MixinTileEntitySkullRenderer extends BlockEntityRenderer<SkullBlockEntity> {
37-
@Inject(method = "method_3581", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/EntityModel;setAngles(Lnet/minecraft/entity/Entity;FFFFFF)V", shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILSOFT)
36+
public abstract class MixinTileEntitySkullRenderer {
37+
/* @Inject(method = "method_3581", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/EntityModel;setAngles(Lnet/minecraft/entity/Entity;FFFFFF)V", shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILSOFT)
3838
private void addGlintToSkull(float x, float y, float z, Direction face, float rotation, int type, GameProfile profile, int p_180543_8_, CallbackInfo ci, EntityModel model) {
3939
TileEntitySkullRendererHookKt.addGlintToSkull(x, y, z, face, rotation, type, profile, p_180543_8_, ci, model);
40-
}
40+
}*/
4141
}

0 commit comments

Comments
 (0)