From 3bd8b1ba56107e5d15151cd5b3d0841e3fd1886f Mon Sep 17 00:00:00 2001 From: MicrocontrollersDev Date: Sun, 21 Jun 2026 15:04:45 -0700 Subject: [PATCH] 26.2 --- build.gradle.kts | 2 +- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../dev/isxander/debugify/client/gui/NoYACLScreen.java | 2 +- .../client/mixins/basic/mc118740/GuiMixin.java | 4 ++-- .../mixins/basic/mc127970/ItemInHandRendererMixin.java | 2 +- .../client/mixins/basic/mc215531/GuiMixin.java | 4 ++-- .../mixins/basic/mc251068/WorldSelectionListMixin.java | 10 ++++------ .../client/mixins/basic/mc268420/GuiMixin.java | 4 ++-- .../basic/mc79545/ExperienceBarRendererMixin.java | 4 ++-- .../debugify/mixins/basic/mc223153/BlocksMixin.java | 7 ++++--- src/main/templates/fabric.mod.json | 2 +- 12 files changed, 25 insertions(+), 26 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6ff1dbf..f4943033 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ plugins { modstitch { minecraftVersion = property("minecraftVersion")!!.toString() - modLoaderVersion = "0.18.6" + modLoaderVersion = "0.19.3" metadata { modVersion = providers.gradleProperty("modVersion") diff --git a/gradle.properties b/gradle.properties index cfa9b7b7..3138a2ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ pub.curseforgeSlug=debugify githubProject=isXander/Debugify # Libraries -minecraftVersion=26.1.2 -fabricApiVersion=0.145.4+26.1.2 -yaclVersion=3.9.2+26.1-fabric -modMenuVersion=18.0.0-alpha.8 +minecraftVersion=26.2 +fabricApiVersion=0.152.2+26.2 +yaclVersion=3.9.4+26.2-fabric +modMenuVersion=20.0.0-beta.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2b..5dd3c012 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java b/src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java index 9f41bdd2..8a2c2c0b 100644 --- a/src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java +++ b/src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java @@ -13,7 +13,7 @@ public class NoYACLScreen extends AlertScreen { public NoYACLScreen(Screen parent) { super( - () -> Minecraft.getInstance().setScreen(parent), + () -> Minecraft.getInstance().gui.setScreen(parent), Component.translatable("debugify.no_yacl.title").withStyle(ChatFormatting.BOLD), Component.translatable("debugify.no_yacl.description", Component.literal("YetAnotherConfigLib").withStyle(style -> style diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc118740/GuiMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc118740/GuiMixin.java index 9a515f94..687bc1d1 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc118740/GuiMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc118740/GuiMixin.java @@ -5,7 +5,7 @@ import dev.isxander.debugify.client.helpers.mc118740.LocalPlayerDuck; import dev.isxander.debugify.fixes.BugFix; import dev.isxander.debugify.fixes.FixCategory; -import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.Hud; import net.minecraft.client.player.LocalPlayer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -18,7 +18,7 @@ * @author Moulberry */ @BugFix(id = "MC-118740", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = "moulberrystweaks", description = "Performing any right-click action silently resets the attack cooldown") -@Mixin(Gui.class) +@Mixin(Hud.class) public class GuiMixin { /** * This fixes both: diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc127970/ItemInHandRendererMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc127970/ItemInHandRendererMixin.java index de9e64c8..29d5bd1f 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc127970/ItemInHandRendererMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc127970/ItemInHandRendererMixin.java @@ -14,7 +14,7 @@ @Mixin(ItemInHandRenderer.class) public class ItemInHandRendererMixin { @ModifyExpressionValue( - method = "renderArmWithItem", + method = "submitArmWithItem", at = @At( value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;isAutoSpinAttack()Z" diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc215531/GuiMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc215531/GuiMixin.java index 0832f157..8b7aa90e 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc215531/GuiMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc215531/GuiMixin.java @@ -3,15 +3,15 @@ import dev.isxander.debugify.fixes.BugFix; import dev.isxander.debugify.fixes.FixCategory; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import net.minecraft.client.gui.Hud; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @BugFix(id = "MC-215531", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, description = "The carved pumpkin overlay is rendered in spectator mode") -@Mixin(Gui.class) +@Mixin(Hud.class) public class GuiMixin { @Shadow @Final private Minecraft minecraft; diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc251068/WorldSelectionListMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc251068/WorldSelectionListMixin.java index 023bed7a..7bd1fb80 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc251068/WorldSelectionListMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc251068/WorldSelectionListMixin.java @@ -4,20 +4,18 @@ import dev.isxander.debugify.fixes.BugFix; import dev.isxander.debugify.fixes.FixCategory; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.components.ObjectSelectionList; import net.minecraft.client.gui.screens.ConfirmScreen; import net.minecraft.client.gui.screens.ProgressScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.worldselection.WorldSelectionList; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @BugFix(id = "MC-251068", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, description = "If you delete your only world, then you are no longer automatically thrown into the menu of creating a new world") @Mixin(WorldSelectionList.class) public abstract class WorldSelectionListMixin extends ObjectSelectionList { - public WorldSelectionListMixin(Minecraft minecraft, int i, int j, int k, int l) { super(minecraft, i, j, k, l); } @@ -26,10 +24,10 @@ public WorldSelectionListMixin(Minecraft minecraft, int i, int j, int k, int l) method = "returnToScreen", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V" + target = "Lnet/minecraft/client/gui/Gui;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V" ) ) - private boolean dontShowEmptyWorldList(Minecraft instance, Screen screen) { - return (this.minecraft.screen instanceof ProgressScreen || this.minecraft.screen instanceof ConfirmScreen); + private boolean dontShowEmptyWorldList(Gui instance, Screen screen) { + return (instance.screen() instanceof ProgressScreen || instance.screen() instanceof ConfirmScreen); } } diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc268420/GuiMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc268420/GuiMixin.java index 80babf14..0e103bb7 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc268420/GuiMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc268420/GuiMixin.java @@ -5,8 +5,8 @@ import dev.isxander.debugify.fixes.BugFix; import dev.isxander.debugify.fixes.FixCategory; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiGraphicsExtractor; +import net.minecraft.client.gui.Hud; import net.minecraft.resources.Identifier; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.At; @BugFix(id = "MC-268420", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, description = "Cooldown indicator flashes when switching items with high attack speed attribute") -@Mixin(Gui.class) +@Mixin(Hud.class) public class GuiMixin { @Shadow @Final diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc79545/ExperienceBarRendererMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc79545/ExperienceBarRendererMixin.java index 0300c211..7e5a4d6b 100644 --- a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc79545/ExperienceBarRendererMixin.java +++ b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc79545/ExperienceBarRendererMixin.java @@ -3,13 +3,13 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import dev.isxander.debugify.fixes.BugFix; import dev.isxander.debugify.fixes.FixCategory; -import net.minecraft.client.gui.contextualbar.ExperienceBarRenderer; +import net.minecraft.client.gui.contextualbar.ExperienceBar; import net.minecraft.util.Mth; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @BugFix(id = "MC-79545", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, description = "The experience bar disappears when too many levels are given to the player") -@Mixin(ExperienceBarRenderer.class) +@Mixin(ExperienceBar.class) public class ExperienceBarRendererMixin { /** * In some cases, this value can wrap-around to negative values diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc223153/BlocksMixin.java b/src/main/java/dev/isxander/debugify/mixins/basic/mc223153/BlocksMixin.java index 2628bf4c..a2193dc3 100644 --- a/src/main/java/dev/isxander/debugify/mixins/basic/mc223153/BlocksMixin.java +++ b/src/main/java/dev/isxander/debugify/mixins/basic/mc223153/BlocksMixin.java @@ -14,9 +14,10 @@ @BugFix(id = "MC-223153", category = FixCategory.BASIC, env = BugFix.Env.SERVER, description = "Block of Raw Copper uses stone sounds instead of copper sounds") @Mixin(Blocks.class) public class BlocksMixin { - - @Definition(id = "register", method = "Lnet/minecraft/world/level/block/Blocks;register(Ljava/lang/String;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block;") - @Expression("register('raw_copper_block', ?)") + // TODO: i cant figure out what to do + @Definition(id = "register", method = "Lnet/minecraft/world/level/block/Blocks;register(Lnet/minecraft/core/registries/BlockItemIds;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block;") + @Definition(id = "RAW_COPPER_BLOCK", field = "Lnet/minecraft/references/BlockItemIds;RAW_COPPER_BLOCK:Lnet/minecraft/references/BlockItemId;") + @Expression("register(RAW_COPPER_BLOCK, ?)") @ModifyArg(method = "", at = @At("MIXINEXTRAS:EXPRESSION")) private static BlockBehaviour.Properties addCopperSound(BlockBehaviour.Properties settings) { return settings.sound(SoundType.COPPER); diff --git a/src/main/templates/fabric.mod.json b/src/main/templates/fabric.mod.json index 0c5d577c..4dd34cff 100644 --- a/src/main/templates/fabric.mod.json +++ b/src/main/templates/fabric.mod.json @@ -28,7 +28,7 @@ }, "depends": { "fabricloader": ">=0.18.6", - "minecraft": "~26.1", + "minecraft": "~26.2", "java": ">=25", "fabric-resource-loader-v0": "*" },