From 411484a33f6fa407de332ec9eddf8ecb65ee078c Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Mon, 16 Mar 2026 21:07:06 +0100 Subject: feat(): support java 1.21.11 --- .../anhgelus/molehunt/client/MolehuntClient.java | 14 +++++++------- .../client/mixin/NoCustomizableSkinOverlay.java | 2 +- .../anhgelus/molehunt/client/mixin/NoNametags.java | 11 +++++++---- .../world/anhgelus/molehunt/client/mixin/NoSkin.java | 19 ++++++++++--------- 4 files changed, 25 insertions(+), 21 deletions(-) (limited to 'src/client/java') diff --git a/src/client/java/world/anhgelus/molehunt/client/MolehuntClient.java b/src/client/java/world/anhgelus/molehunt/client/MolehuntClient.java index 75c927e..03198ee 100644 --- a/src/client/java/world/anhgelus/molehunt/client/MolehuntClient.java +++ b/src/client/java/world/anhgelus/molehunt/client/MolehuntClient.java @@ -28,13 +28,13 @@ public class MolehuntClient implements ClientModInitializer { ClientLifecycleEvents.CLIENT_STARTED.register(client -> { var options = client.options; - options.togglePlayerModelPart(PlayerModelPart.CAPE, true); - options.togglePlayerModelPart(PlayerModelPart.HAT, true); - options.togglePlayerModelPart(PlayerModelPart.JACKET, true); - options.togglePlayerModelPart(PlayerModelPart.LEFT_SLEEVE, true); - options.togglePlayerModelPart(PlayerModelPart.RIGHT_SLEEVE, true); - options.togglePlayerModelPart(PlayerModelPart.LEFT_PANTS_LEG, true); - options.togglePlayerModelPart(PlayerModelPart.RIGHT_PANTS_LEG, true); + options.setPlayerModelPart(PlayerModelPart.CAPE, true); + options.setPlayerModelPart(PlayerModelPart.HAT, true); + options.setPlayerModelPart(PlayerModelPart.JACKET, true); + options.setPlayerModelPart(PlayerModelPart.LEFT_SLEEVE, true); + options.setPlayerModelPart(PlayerModelPart.RIGHT_SLEEVE, true); + options.setPlayerModelPart(PlayerModelPart.LEFT_PANTS_LEG, true); + options.setPlayerModelPart(PlayerModelPart.RIGHT_PANTS_LEG, true); }); } diff --git a/src/client/java/world/anhgelus/molehunt/client/mixin/NoCustomizableSkinOverlay.java b/src/client/java/world/anhgelus/molehunt/client/mixin/NoCustomizableSkinOverlay.java index 2ca0b4c..c2c0ab0 100644 --- a/src/client/java/world/anhgelus/molehunt/client/mixin/NoCustomizableSkinOverlay.java +++ b/src/client/java/world/anhgelus/molehunt/client/mixin/NoCustomizableSkinOverlay.java @@ -14,7 +14,7 @@ public abstract class NoCustomizableSkinOverlay { @Shadow private void setPlayerModelPart(PlayerModelPart part, boolean enabled) {} - @Inject(at = @At("HEAD"), method = "togglePlayerModelPart", cancellable = true) + @Inject(at = @At("HEAD"), method = "setPlayerModelPart", cancellable = true) public void togglePlayerModelPart(PlayerModelPart part, boolean enabled, CallbackInfo ci) { if (MolehuntClient.showSkins()) return; setPlayerModelPart(part, true); diff --git a/src/client/java/world/anhgelus/molehunt/client/mixin/NoNametags.java b/src/client/java/world/anhgelus/molehunt/client/mixin/NoNametags.java index 7f334a0..555fb00 100644 --- a/src/client/java/world/anhgelus/molehunt/client/mixin/NoNametags.java +++ b/src/client/java/world/anhgelus/molehunt/client/mixin/NoNametags.java @@ -1,9 +1,12 @@ package world.anhgelus.molehunt.client.mixin; -import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.command.OrderedRenderCommandQueue; import net.minecraft.client.render.entity.EntityRenderer; +import net.minecraft.client.render.entity.state.EntityRenderState; +import net.minecraft.client.render.state.CameraRenderState; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -12,10 +15,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import world.anhgelus.molehunt.client.MolehuntClient; @Mixin(EntityRenderer.class) -public class NoNametags { +public class NoNametags { @Inject(at = @At("HEAD"), method = "render", cancellable = true) - private void renderLabelOrNot(T entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { - if (!(entity instanceof PlayerEntity) || MolehuntClient.showNameTags() || !MolehuntClient.gameStarted()) return; + private void renderLabelOrNot(S state, MatrixStack matrices, OrderedRenderCommandQueue queue, CameraRenderState cameraState, CallbackInfo ci) { + if (EntityType.PLAYER != state.entityType || MolehuntClient.showNameTags() || !MolehuntClient.gameStarted()) return; ci.cancel(); } } \ No newline at end of file diff --git a/src/client/java/world/anhgelus/molehunt/client/mixin/NoSkin.java b/src/client/java/world/anhgelus/molehunt/client/mixin/NoSkin.java index 6638c1b..b6b67cc 100644 --- a/src/client/java/world/anhgelus/molehunt/client/mixin/NoSkin.java +++ b/src/client/java/world/anhgelus/molehunt/client/mixin/NoSkin.java @@ -1,7 +1,9 @@ package world.anhgelus.molehunt.client.mixin; import net.minecraft.client.network.AbstractClientPlayerEntity; -import net.minecraft.client.util.SkinTextures; +import net.minecraft.entity.player.PlayerSkinType; +import net.minecraft.entity.player.SkinTextures; +import net.minecraft.util.AssetInfo; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -12,15 +14,14 @@ import world.anhgelus.molehunt.client.MolehuntClient; @Mixin(AbstractClientPlayerEntity.class) public class NoSkin { - @Inject(at = @At("HEAD"), method = "getSkinTextures", cancellable = true) + @Inject(at = @At("HEAD"), method = "getSkin", cancellable = true) public void getSkin(CallbackInfoReturnable cir) { if (MolehuntClient.showSkins() || !MolehuntClient.gameStarted()) return; - cir.setReturnValue(new SkinTextures( - Identifier.of(Molehunt.MOD_ID, "textures/skin.png"), - null, - null, - null, - SkinTextures.Model.WIDE, true) - ); + cir.setReturnValue(SkinTextures.create( + new AssetInfo.TextureAssetInfo(Identifier.of(Molehunt.MOD_ID, "skin")), + null, + null, + PlayerSkinType.WIDE + )); } } -- cgit v1.2.3