From 4ab140889ca44ac8727c49bd1936e4b31a38afca Mon Sep 17 00:00:00 2001 From: AViewFromTheTop <87103914+AViewFromTheTop@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:59:31 -0400 Subject: [PATCH] there --- .../net/frozenblock/lib/cape/client/api/ClientCapeUtil.java | 2 +- .../net/frozenblock/lib/cape/mixin/client/CapeLayerMixin.java | 4 ++-- .../frozenblock/lib/cape/mixin/client/ElytraLayerMixin.java | 4 ++-- src/main/resources/frozenlib.accesswidener | 3 +++ .../java/net/frozenblock/lib/testmod/FrozenTestMain.java | 2 -- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/frozenblock/lib/cape/client/api/ClientCapeUtil.java b/src/main/java/net/frozenblock/lib/cape/client/api/ClientCapeUtil.java index 8de8f3c3f..23b157457 100644 --- a/src/main/java/net/frozenblock/lib/cape/client/api/ClientCapeUtil.java +++ b/src/main/java/net/frozenblock/lib/cape/client/api/ClientCapeUtil.java @@ -55,7 +55,7 @@ public void onResourceManagerReload(@NotNull ResourceManager resourceManager) { HttpTexture httpTexture = new HttpTexture( CAPE_CACHE_PATH.resolve(capeLocation.getNamespace()).resolve(capeLocation.getPath() + ".png").toFile(), textureURL, - DefaultPlayerSkin.getDefaultTexture(), + DefaultPlayerSkin.getDefaultSkin(), false, () -> completableFuture.complete(capeTextureLocation) ); diff --git a/src/main/java/net/frozenblock/lib/cape/mixin/client/CapeLayerMixin.java b/src/main/java/net/frozenblock/lib/cape/mixin/client/CapeLayerMixin.java index 7d58a3f5f..bf26cfff0 100644 --- a/src/main/java/net/frozenblock/lib/cape/mixin/client/CapeLayerMixin.java +++ b/src/main/java/net/frozenblock/lib/cape/mixin/client/CapeLayerMixin.java @@ -39,7 +39,7 @@ public class CapeLayerMixin { method = "render*", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/resources/PlayerSkin;capeTexture()Lnet/minecraft/resources/ResourceLocation;", + target = "Lnet/minecraft/client/player/AbstractClientPlayer;getCloakTextureLocation()Lnet/minecraft/resources/ResourceLocation;", ordinal = 0 ) ) @@ -62,7 +62,7 @@ public class CapeLayerMixin { method = "render*", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/resources/PlayerSkin;capeTexture()Lnet/minecraft/resources/ResourceLocation;", + target = "Lnet/minecraft/client/player/AbstractClientPlayer;getCloakTextureLocation()Lnet/minecraft/resources/ResourceLocation;", ordinal = 1 ) ) diff --git a/src/main/java/net/frozenblock/lib/cape/mixin/client/ElytraLayerMixin.java b/src/main/java/net/frozenblock/lib/cape/mixin/client/ElytraLayerMixin.java index f98cb0ce6..0f455cc94 100644 --- a/src/main/java/net/frozenblock/lib/cape/mixin/client/ElytraLayerMixin.java +++ b/src/main/java/net/frozenblock/lib/cape/mixin/client/ElytraLayerMixin.java @@ -39,7 +39,7 @@ public class ElytraLayerMixin { method = "render*", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/resources/PlayerSkin;capeTexture()Lnet/minecraft/resources/ResourceLocation;", + target = "Lnet/minecraft/client/player/AbstractClientPlayer;getCloakTextureLocation()Lnet/minecraft/resources/ResourceLocation;", ordinal = 0 ) ) @@ -62,7 +62,7 @@ public class ElytraLayerMixin { method = "render*", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/resources/PlayerSkin;capeTexture()Lnet/minecraft/resources/ResourceLocation;", + target = "Lnet/minecraft/client/player/AbstractClientPlayer;getCloakTextureLocation()Lnet/minecraft/resources/ResourceLocation;", ordinal = 1 ) ) diff --git a/src/main/resources/frozenlib.accesswidener b/src/main/resources/frozenlib.accesswidener index 16b03dae8..962dc00d3 100644 --- a/src/main/resources/frozenlib.accesswidener +++ b/src/main/resources/frozenlib.accesswidener @@ -230,3 +230,6 @@ transitive-accessible field net/minecraft/client/renderer/LevelRenderer cullingF # Client Level transitive-accessible class net/minecraft/client/multiplayer/ClientLevel$EntityCallbacks + +# Bruh +accessible field net/minecraft/server/network/ServerGamePacketListenerImpl connection Lnet/minecraft/network/Connection; diff --git a/src/testmod/java/net/frozenblock/lib/testmod/FrozenTestMain.java b/src/testmod/java/net/frozenblock/lib/testmod/FrozenTestMain.java index fdbb761b8..bf2e52ed0 100644 --- a/src/testmod/java/net/frozenblock/lib/testmod/FrozenTestMain.java +++ b/src/testmod/java/net/frozenblock/lib/testmod/FrozenTestMain.java @@ -58,8 +58,6 @@ public void onInitialize() { applyDataFixes(FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow()); LOGGER.info("The test toggle value is {}", TestConfig.get().testToggle); LOGGER.info("The test vec3 value is {}", TestConfig.get().typedVecList); - Holder sound = TestConfig.get().randomSound.value(); - LOGGER.info("The test soundevent value is {} and its ID is {}", sound, sound.unwrapKey().orElseThrow().location()); BlockScheduledTicks.TICKS.put(Blocks.DIAMOND_BLOCK, (state, world, pos, random) -> world.setBlock(pos, Blocks.BEDROCK.defaultBlockState(), 3));