Skip to content

Commit 3bd8b1b

Browse files
26.2
1 parent e6d2181 commit 3bd8b1b

12 files changed

Lines changed: 25 additions & 26 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins {
1515

1616
modstitch {
1717
minecraftVersion = property("minecraftVersion")!!.toString()
18-
modLoaderVersion = "0.18.6"
18+
modLoaderVersion = "0.19.3"
1919

2020
metadata {
2121
modVersion = providers.gradleProperty("modVersion")

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub.curseforgeSlug=debugify
1111
githubProject=isXander/Debugify
1212

1313
# Libraries
14-
minecraftVersion=26.1.2
15-
fabricApiVersion=0.145.4+26.1.2
16-
yaclVersion=3.9.2+26.1-fabric
17-
modMenuVersion=18.0.0-alpha.8
14+
minecraftVersion=26.2
15+
fabricApiVersion=0.152.2+26.2
16+
yaclVersion=3.9.4+26.2-fabric
17+
modMenuVersion=20.0.0-beta.3

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class NoYACLScreen extends AlertScreen {
1414
public NoYACLScreen(Screen parent) {
1515
super(
16-
() -> Minecraft.getInstance().setScreen(parent),
16+
() -> Minecraft.getInstance().gui.setScreen(parent),
1717
Component.translatable("debugify.no_yacl.title").withStyle(ChatFormatting.BOLD),
1818
Component.translatable("debugify.no_yacl.description",
1919
Component.literal("YetAnotherConfigLib").withStyle(style -> style

src/client/java/dev/isxander/debugify/client/mixins/basic/mc118740/GuiMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import dev.isxander.debugify.client.helpers.mc118740.LocalPlayerDuck;
66
import dev.isxander.debugify.fixes.BugFix;
77
import dev.isxander.debugify.fixes.FixCategory;
8-
import net.minecraft.client.gui.Gui;
8+
import net.minecraft.client.gui.Hud;
99
import net.minecraft.client.player.LocalPlayer;
1010
import org.spongepowered.asm.mixin.Mixin;
1111
import org.spongepowered.asm.mixin.injection.At;
@@ -18,7 +18,7 @@
1818
* @author Moulberry
1919
*/
2020
@BugFix(id = "MC-118740", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = "moulberrystweaks", description = "Performing any right-click action silently resets the attack cooldown")
21-
@Mixin(Gui.class)
21+
@Mixin(Hud.class)
2222
public class GuiMixin {
2323
/**
2424
* This fixes both:

src/client/java/dev/isxander/debugify/client/mixins/basic/mc127970/ItemInHandRendererMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@Mixin(ItemInHandRenderer.class)
1515
public class ItemInHandRendererMixin {
1616
@ModifyExpressionValue(
17-
method = "renderArmWithItem",
17+
method = "submitArmWithItem",
1818
at = @At(
1919
value = "INVOKE",
2020
target = "Lnet/minecraft/client/player/AbstractClientPlayer;isAutoSpinAttack()Z"

src/client/java/dev/isxander/debugify/client/mixins/basic/mc215531/GuiMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import dev.isxander.debugify.fixes.BugFix;
44
import dev.isxander.debugify.fixes.FixCategory;
55
import net.minecraft.client.Minecraft;
6-
import net.minecraft.client.gui.Gui;
76
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
7+
import net.minecraft.client.gui.Hud;
88
import org.spongepowered.asm.mixin.Final;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.Shadow;
1111
import org.spongepowered.asm.mixin.injection.At;
1212

1313
@BugFix(id = "MC-215531", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, description = "The carved pumpkin overlay is rendered in spectator mode")
14-
@Mixin(Gui.class)
14+
@Mixin(Hud.class)
1515
public class GuiMixin {
1616
@Shadow @Final private Minecraft minecraft;
1717

src/client/java/dev/isxander/debugify/client/mixins/basic/mc251068/WorldSelectionListMixin.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
import dev.isxander.debugify.fixes.BugFix;
55
import dev.isxander.debugify.fixes.FixCategory;
66
import net.minecraft.client.Minecraft;
7+
import net.minecraft.client.gui.Gui;
78
import net.minecraft.client.gui.components.ObjectSelectionList;
89
import net.minecraft.client.gui.screens.ConfirmScreen;
910
import net.minecraft.client.gui.screens.ProgressScreen;
1011
import net.minecraft.client.gui.screens.Screen;
1112
import net.minecraft.client.gui.screens.worldselection.WorldSelectionList;
12-
import org.spongepowered.asm.mixin.Final;
1313
import org.spongepowered.asm.mixin.Mixin;
14-
import org.spongepowered.asm.mixin.Shadow;
1514
import org.spongepowered.asm.mixin.injection.At;
1615

1716
@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")
1817
@Mixin(WorldSelectionList.class)
1918
public abstract class WorldSelectionListMixin extends ObjectSelectionList<WorldSelectionList.Entry> {
20-
2119
public WorldSelectionListMixin(Minecraft minecraft, int i, int j, int k, int l) {
2220
super(minecraft, i, j, k, l);
2321
}
@@ -26,10 +24,10 @@ public WorldSelectionListMixin(Minecraft minecraft, int i, int j, int k, int l)
2624
method = "returnToScreen",
2725
at = @At(
2826
value = "INVOKE",
29-
target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V"
27+
target = "Lnet/minecraft/client/gui/Gui;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V"
3028
)
3129
)
32-
private boolean dontShowEmptyWorldList(Minecraft instance, Screen screen) {
33-
return (this.minecraft.screen instanceof ProgressScreen || this.minecraft.screen instanceof ConfirmScreen);
30+
private boolean dontShowEmptyWorldList(Gui instance, Screen screen) {
31+
return (instance.screen() instanceof ProgressScreen || instance.screen() instanceof ConfirmScreen);
3432
}
3533
}

src/client/java/dev/isxander/debugify/client/mixins/basic/mc268420/GuiMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
import dev.isxander.debugify.fixes.BugFix;
66
import dev.isxander.debugify.fixes.FixCategory;
77
import net.minecraft.client.Minecraft;
8-
import net.minecraft.client.gui.Gui;
98
import net.minecraft.client.gui.GuiGraphicsExtractor;
9+
import net.minecraft.client.gui.Hud;
1010
import net.minecraft.resources.Identifier;
1111
import org.spongepowered.asm.mixin.Final;
1212
import org.spongepowered.asm.mixin.Mixin;
1313
import org.spongepowered.asm.mixin.Shadow;
1414
import org.spongepowered.asm.mixin.injection.At;
1515

1616
@BugFix(id = "MC-268420", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, description = "Cooldown indicator flashes when switching items with high attack speed attribute")
17-
@Mixin(Gui.class)
17+
@Mixin(Hud.class)
1818
public class GuiMixin {
1919
@Shadow
2020
@Final

src/client/java/dev/isxander/debugify/client/mixins/basic/mc79545/ExperienceBarRendererMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
44
import dev.isxander.debugify.fixes.BugFix;
55
import dev.isxander.debugify.fixes.FixCategory;
6-
import net.minecraft.client.gui.contextualbar.ExperienceBarRenderer;
6+
import net.minecraft.client.gui.contextualbar.ExperienceBar;
77
import net.minecraft.util.Mth;
88
import org.spongepowered.asm.mixin.Mixin;
99
import org.spongepowered.asm.mixin.injection.At;
1010

1111
@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")
12-
@Mixin(ExperienceBarRenderer.class)
12+
@Mixin(ExperienceBar.class)
1313
public class ExperienceBarRendererMixin {
1414
/**
1515
* In some cases, this value can wrap-around to negative values

0 commit comments

Comments
 (0)