Skip to content
Draft

26.2 #549

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {

modstitch {
minecraftVersion = property("minecraftVersion")!!.toString()
modLoaderVersion = "0.18.6"
modLoaderVersion = "0.19.3"

metadata {
modVersion = providers.gradleProperty("modVersion")
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<WorldSelectionList.Entry> {

public WorldSelectionListMixin(Minecraft minecraft, int i, int j, int k, int l) {
super(minecraft, i, j, k, l);
}
Expand All @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
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;
import org.spongepowered.asm.mixin.Shadow;
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<clinit>", at = @At("MIXINEXTRAS:EXPRESSION"))
private static BlockBehaviour.Properties addCopperSound(BlockBehaviour.Properties settings) {
return settings.sound(SoundType.COPPER);
Expand Down
2 changes: 1 addition & 1 deletion src/main/templates/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"depends": {
"fabricloader": ">=0.18.6",
"minecraft": "~26.1",
"minecraft": "~26.2",
"java": ">=25",
"fabric-resource-loader-v0": "*"
},
Expand Down
Loading