diff --git a/build.gradle b/build.gradle index a46000b5aa..ed66a0e036 100644 --- a/build.gradle +++ b/build.gradle @@ -343,7 +343,6 @@ project.publishing { if (project.hasProperty('mavendir')) { maven { url mavendir } } - mavenLocal() } } diff --git a/src/main/java/com/simibubi/create/foundation/mixin/client/HeavyBootsOnPlayerMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/client/HeavyBootsOnPlayerMixin.java index 03dfef36c1..a20daa98a1 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/client/HeavyBootsOnPlayerMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/client/HeavyBootsOnPlayerMixin.java @@ -2,13 +2,15 @@ package com.simibubi.create.foundation.mixin.client; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.mojang.authlib.GameProfile; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.client.player.LocalPlayer; +import net.minecraft.nbt.CompoundTag; @Mixin(LocalPlayer.class) public abstract class HeavyBootsOnPlayerMixin extends AbstractClientPlayer { @@ -16,8 +18,10 @@ public abstract class HeavyBootsOnPlayerMixin extends AbstractClientPlayer { super(level, profile); } - @ModifyReturnValue(method = "isUnderWater()Z", at = @At("RETURN")) - private boolean create$noSwimmingWithHeavyBootsOn(boolean original) { - return original || !getPersistentData().contains("HeavyBoots"); + @Inject(method = "isUnderWater()Z", at = @At("HEAD"), cancellable = true) + public void create$noSwimmingWithHeavyBootsOn(CallbackInfoReturnable cir) { + CompoundTag persistentData = getPersistentData(); + if (persistentData.contains("HeavyBoots")) + cir.setReturnValue(false); } }