feat: Port to 1.21.11

MisterCheezeCake · MisterCheezeCake · commit 3900282a0935 · 2026-01-16T14:13:15.000-05:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -63,8 +63,10 @@ dependencies {
     mappings(loom.layered {
         officialMojangMappings()
 		parchment("org.parchmentmc.data:parchment-${property("parchment_version")}@zip")
-        mappings("dev.lambdaurora:yalmm-mojbackward:${property("minecraft_version")}+build.${property("yalmm_version")}")
-		// ^ Disabled as of 1/11 due to causing issues with decomp
+		if (sc.current.parsed < "1.21.11") {
+			mappings("dev.lambdaurora:yalmm-mojbackward:${property("minecraft_version")}+build.${property("yalmm_version")}")
+		}
+
     })
 	modImplementation ("net.fabricmc:fabric-loader:${property("loader_version")}")
 	modImplementation ("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,7 +20,7 @@ stonecutter {
 	centralScript = "build.gradle.kts"
 
 	create(rootProject) {
-		versions("1.21.8", "1.21.10")
+		versions("1.21.8", "1.21.10", "1.21.11")
 		vcsVersion = "1.21.10"
 	}
 }
diff --git a/src/main/java/wtf/cheeze/sbt/hud/screen/ConstructableButton.java b/src/main/java/wtf/cheeze/sbt/hud/screen/ConstructableButton.java
@@ -24,7 +24,10 @@
 /**
  * This used to be a MatrixConsumingButton
  */
-public class ConstructableButton extends Button {
+public class ConstructableButton extends Button
+//?if >=1.21.11
+    .Plain
+{
     public ConstructableButton(Component message, OnPress onPress, int x, int y, int width, int height) {
         super(x, y, width, height, message, onPress, Button.DEFAULT_NARRATION);
     }
diff --git a/src/main/java/wtf/cheeze/sbt/hud/screen/TooltipButton.java b/src/main/java/wtf/cheeze/sbt/hud/screen/TooltipButton.java
@@ -26,7 +26,10 @@
 /**
  * Adapted from <a href="https://github.com/isXander/YetAnotherConfigLib/blob/d40736704c556f3e07fbe607c0dca21222c58e86/src/main/java/dev/isxander/yacl3/gui/TooltipButtonWidget.java">YACL</a>}
  */
-public class TooltipButton extends Button {
+public class TooltipButton extends Button
+        //?if >=1.21.11
+        .Plain
+{
     protected final Screen screen;
 
     public TooltipButton(Screen screen, int x, int y, int width, int height, Component message, Component tooltip, OnPress onPress) {
diff --git a/src/main/java/wtf/cheeze/sbt/mixin/features/MouseLockMixin.java b/src/main/java/wtf/cheeze/sbt/mixin/features/MouseLockMixin.java
@@ -26,7 +26,7 @@
 import wtf.cheeze.sbt.features.misc.MouseLock;
 
 @Mixin(MouseHandler.class)
-public abstract class MouseHandlerLockMixin {
+public abstract class MouseLockMixin {
     @WrapWithCondition(method = "turnPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;turn(DD)V"))
     private boolean sbt$allowMouseMove(LocalPlayer instance, double v, double v2) {
         return !MouseLock.locked;
diff --git a/src/main/java/wtf/cheeze/sbt/mixin/features/StatusEffectHiderMixin.java b/src/main/java/wtf/cheeze/sbt/mixin/features/StatusEffectHiderMixin.java
@@ -18,6 +18,7 @@
  */
 package wtf.cheeze.sbt.mixin.features;
 
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
@@ -29,8 +30,17 @@
 
 @Mixin(InventoryScreen.class)
 public abstract class StatusEffectHiderMixin {
-    @WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/inventory/EffectsInInventory;renderEffects(Lnet/minecraft/client/gui/GuiGraphics;II)V"))
+
+    @WrapWithCondition(method = "render", at = @At(value = "INVOKE", target =
+              //? if <1.21.11   {
+            /*"Lnet/minecraft/client/gui/screens/inventory/EffectsInInventory;renderEffects(Lnet/minecraft/client/gui/GuiGraphics;II)V" */
+            //? } else {
+            "Lnet/minecraft/client/gui/screens/inventory/EffectsInInventory;render(Lnet/minecraft/client/gui/GuiGraphics;II)V"
+            //?}
+    ))
     private boolean sbt$onDrawStatusEffects(EffectsInInventory instance, GuiGraphics guiGraphics, int mouseX, int mouseY) {
         return !SBTConfig.get().inventory.noRenderPotionHud || !SkyblockData.inSB;
     }
+
+
 }
diff --git a/src/main/java/wtf/cheeze/sbt/mixin/hooks/AbstractContainerScreenMixin.java b/src/main/java/wtf/cheeze/sbt/mixin/hooks/AbstractContainerScreenMixin.java
@@ -78,7 +78,11 @@ public abstract class AbstractContainerScreenMixin<T extends AbstractContainerMe
     }
 
     @Inject(method = "renderSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;renderItem(Lnet/minecraft/world/item/ItemStack;III)V"))
-    protected void sbt$beforeDrawItem(GuiGraphics guiGraphics, Slot slot, CallbackInfo ci) {
+    protected void sbt$beforeDrawItem(GuiGraphics guiGraphics, Slot slot,
+                                      //?if >=1.21.11
+                                      int i, int j,
+                                      CallbackInfo ci)
+    {
         DrawSlotEvents.BEFORE_ITEM.invoker().onDrawSlot(getTitle(), guiGraphics, slot);
     }
 
diff --git a/src/main/resources/skyblocktweaks.mixins.json b/src/main/resources/skyblocktweaks.mixins.json
@@ -6,7 +6,7 @@
     "accessors.BossHealthOverlayAccessor",
     "accessors.PlayerTabOverlayAccessor",
     "accessors.YACLScreenAccessor",
-    "features.MouseHandlerLockMixin",
+    "features.MouseLockMixin",
     "features.NoShadowActionBarMixin",
     "features.RecipeBookRedirectorMixin",
     "features.StatusEffectHiderMixin",
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("dev.kikugie.stonecutter")
 }
-stonecutter active "1.21.10" /* [SC] DO NOT EDIT */
+stonecutter active "1.21.11" /* [SC] DO NOT EDIT */
 
 
diff --git a/versions/1.21.11/gradle.properties b/versions/1.21.11/gradle.properties
@@ -0,0 +1,10 @@
+minecraft_version=1.21.11
+parchment_version=1.21.10:2025.10.12
+# yalmm_version=3
+fabric_version=0.141.1+1.21.11
+
+modapi_fabric_version=1.0.1+build.1+mc1.21
+modmenu_version=17.0.0-beta.2
+yacl_version=3.8.2+1.21.11-fabric
+rei_version=21.9.812
+support_range=1.21.11
diff --git a/versions/1.21.11/src/main/resources/skyblocktweaks.accesswidener b/versions/1.21.11/src/main/resources/skyblocktweaks.accesswidener
@@ -0,0 +1,21 @@
+accessWidener v2 named
+
+# Allowing certain screen methods to be accessed outside the screens for usage by the Popup system
+accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
+accessible method net/minecraft/client/gui/screens/Screen addWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
+accessible method net/minecraft/client/gui/screens/Screen removeWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)V
+accessible method net/minecraft/client/gui/screens/inventory/AbstractContainerScreen getHoveredSlot (DD)Lnet/minecraft/world/inventory/Slot;
+accessible field net/minecraft/client/gui/screens/Screen renderables Ljava/util/List;
+accessible field net/minecraft/client/gui/screens/inventory/AbstractContainerScreen leftPos I
+accessible field net/minecraft/client/gui/screens/inventory/AbstractContainerScreen topPos I
+
+# Allows us to check the inventory key binding code to prevent popups from closing from text field presses
+accessible field net/minecraft/client/KeyMapping key Lcom/mojang/blaze3d/platform/InputConstants$Key;
+
+# This field has a getter, but it's marked as deprecated, so this feels marginally safer
+accessible field net/minecraft/world/item/component/CustomData tag Lnet/minecraft/nbt/CompoundTag;
+
+accessible field net/minecraft/client/gui/GuiGraphics guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
+
+# For CompositionPopupScreen
+accessible field net/minecraft/client/gui/components/AbstractSelectionList children Ljava/util/List;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ stonecutter {`
`20`	`20`	`centralScript = "build.gradle.kts"`
`21`	`21`
`22`	`22`	`create(rootProject) {`
`23`		`- versions("1.21.8", "1.21.10")`
	`23`	`+ versions("1.21.8", "1.21.10", "1.21.11")`
`24`	`24`	`vcsVersion = "1.21.10"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,11 @@ public abstract class AbstractContainerScreenMixin<T extends AbstractContainerMe`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`@Inject(method = "renderSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;renderItem(Lnet/minecraft/world/item/ItemStack;III)V"))`
`81`		`- protected void sbt$beforeDrawItem(GuiGraphics guiGraphics, Slot slot, CallbackInfo ci) {`
	`81`	`+ protected void sbt$beforeDrawItem(GuiGraphics guiGraphics, Slot slot,`
	`82`	`+ //?if >=1.21.11`
	`83`	`+ int i, int j,`
	`84`	`+ CallbackInfo ci)`
	`85`	`+ {`
`82`	`86`	`DrawSlotEvents.BEFORE_ITEM.invoker().onDrawSlot(getTitle(), guiGraphics, slot);`
`83`	`87`	`}`
`84`	`88`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("dev.kikugie.stonecutter")`
`3`	`3`	`}`
`4`		`-stonecutter active "1.21.10" /* [SC] DO NOT EDIT */`
	`4`	`+stonecutter active "1.21.11" /* [SC] DO NOT EDIT */`
`5`	`5`
`6`	`6`