diff --git a/gradle.properties b/gradle.properties index d7e1f033..2e318f37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,13 +13,13 @@ mod_version = 0.24.999-snap # Required malilib version malilib_version = 0.20.999-snap -malilib_id = 428295dd17 +malilib_id = 95311a9ab4 # Minecraft, Fabric Loader and API and mappings versions minecraft_version_out = 24w39a minecraft_version = 24w39a -mappings_version = 24w39a+build.3 +mappings_version = 24w39a+build.5 fabric_loader_version = 0.16.5 mod_menu_version = 12.0.0-alpha.1 -# fabric_api_version = 0.105.0+1.21.2 +# fabric_api_version = 0.105.1+1.21.2 \ No newline at end of file diff --git a/src/main/java/fi/dy/masa/itemscroller/mixin/MixinAbstractInventoryScreen.java b/src/main/java/fi/dy/masa/itemscroller/mixin/MixinAbstractInventoryScreen.java deleted file mode 100644 index 3cca64d2..00000000 --- a/src/main/java/fi/dy/masa/itemscroller/mixin/MixinAbstractInventoryScreen.java +++ /dev/null @@ -1,21 +0,0 @@ -package fi.dy.masa.itemscroller.mixin; - -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.CallbackInfo; -import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen; -import fi.dy.masa.itemscroller.util.InputUtils; - -@Mixin(AbstractInventoryScreen.class) -public abstract class MixinAbstractInventoryScreen -{ - @Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true) - private void preventPotionEffectRendering(CallbackInfo ci) - { - if (InputUtils.isRecipeViewOpen()) - { - ci.cancel(); - } - } -} diff --git a/src/main/java/fi/dy/masa/itemscroller/mixin/MixinStatusEffectsDisplay.java b/src/main/java/fi/dy/masa/itemscroller/mixin/MixinStatusEffectsDisplay.java new file mode 100644 index 00000000..2d75cea2 --- /dev/null +++ b/src/main/java/fi/dy/masa/itemscroller/mixin/MixinStatusEffectsDisplay.java @@ -0,0 +1,22 @@ +package fi.dy.masa.itemscroller.mixin; + +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ingame.StatusEffectsDisplay; +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.CallbackInfo; +import fi.dy.masa.itemscroller.util.InputUtils; + +@Mixin(StatusEffectsDisplay.class) +public abstract class MixinStatusEffectsDisplay +{ + @Inject(method = "drawStatusEffects(Lnet/minecraft/client/gui/DrawContext;II)V", at = @At("HEAD"), cancellable = true) + private void preventPotionEffectRendering(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) + { + if (InputUtils.isRecipeViewOpen()) + { + ci.cancel(); + } + } +} diff --git a/src/main/resources/mixins.itemscroller.json b/src/main/resources/mixins.itemscroller.json index c3e53341..ef41142f 100644 --- a/src/main/resources/mixins.itemscroller.json +++ b/src/main/resources/mixins.itemscroller.json @@ -10,7 +10,6 @@ "IMixinRecipeBookWidget", "IMixinScreenWithHandler", "IMixinSlot", - "MixinAbstractInventoryScreen", "MixinAbstractCraftingRecipeBookWidget", "MixinClientPlayerInteractionManager", "MixinClientPlayNetworkHandler", @@ -19,7 +18,8 @@ "MixinMerchantScreen", "MixinMerchantScreenHandler", "MixinRecipeBookWidget", - "MixinScreen" + "MixinScreen", + "MixinStatusEffectsDisplay" ], "injectors": { "defaultRequire": 1