From 2a13d44fee34c7de1fb6504ed8a6b74a7feee560 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Thu, 27 Feb 2025 01:11:09 +0100 Subject: [PATCH] slight cleanup --- src/main/java/org/auraclient/auraclient/AuraClient.java | 4 ---- .../auraclient/mixin/AbstractClientPlayerEntityMixin.java | 4 ++++ .../auraclient/auraclient/mixin/MinecraftClientMixin.java | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/auraclient/auraclient/AuraClient.java b/src/main/java/org/auraclient/auraclient/AuraClient.java index 3e2df23..a13a366 100644 --- a/src/main/java/org/auraclient/auraclient/AuraClient.java +++ b/src/main/java/org/auraclient/auraclient/AuraClient.java @@ -17,8 +17,4 @@ public class AuraClient implements ModInitializer { public void onInitialize() { Cloaks.initialize(); } - - public static void tick() { - Cloaks.tick(); - } } diff --git a/src/main/java/org/auraclient/auraclient/mixin/AbstractClientPlayerEntityMixin.java b/src/main/java/org/auraclient/auraclient/mixin/AbstractClientPlayerEntityMixin.java index 85e7525..c828883 100644 --- a/src/main/java/org/auraclient/auraclient/mixin/AbstractClientPlayerEntityMixin.java +++ b/src/main/java/org/auraclient/auraclient/mixin/AbstractClientPlayerEntityMixin.java @@ -1,5 +1,6 @@ package org.auraclient.auraclient.mixin; +import org.auraclient.auraclient.AuraClient; import org.auraclient.auraclient.cloaks.Cloaks; import net.fabricmc.api.EnvType; @@ -17,7 +18,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public class AbstractClientPlayerEntityMixin { @Inject(at = @At("RETURN"), method = "getSkinTextures", cancellable = true) private void getSkinTextures(CallbackInfoReturnable cir) { + // AbstractClientPlayerEntity player = (AbstractClientPlayerEntity) (Object) this; + if (((AbstractClientPlayerEntity) (Object) this) instanceof ClientPlayerEntity && Cloaks.capeCacheIdentifier != null) { + // AuraClient.LOGGER.info("Rendering skin for: " + player.getUuid()); SkinTextures textures = cir.getReturnValue(); cir.setReturnValue(new SkinTextures( textures.texture(), diff --git a/src/main/java/org/auraclient/auraclient/mixin/MinecraftClientMixin.java b/src/main/java/org/auraclient/auraclient/mixin/MinecraftClientMixin.java index 0f0ee98..179a7e7 100644 --- a/src/main/java/org/auraclient/auraclient/mixin/MinecraftClientMixin.java +++ b/src/main/java/org/auraclient/auraclient/mixin/MinecraftClientMixin.java @@ -1,6 +1,7 @@ package org.auraclient.auraclient.mixin; -import org.auraclient.auraclient.AuraClient; +import org.auraclient.auraclient.cloaks.Cloaks; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; @@ -14,6 +15,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MinecraftClientMixin { @Inject(at = @At("HEAD"), method = "tick") private void tick(CallbackInfo ci) { - AuraClient.tick(); + Cloaks.tick(); } }