bump 26.1 target to 26.1-snapshot-5

isXander · isXander · commit 34d667f1131b · 2026-02-03T13:00:25.000Z
diff --git a/buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts b/buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts
@@ -30,7 +30,6 @@ modstitch.apply {
         modAuthor = "isXander"
         prop("modDescription") { modDescription = it }
 
-        prop("packFormat") { replacementProperties.put("pack_format", it) }
         prop("githubProject") { replacementProperties.put("github", it) }
         prop("meta.mcDep") { replacementProperties.put("mc", it) }
         prop("meta.loaderDep") { replacementProperties.put("loaderVersion", it) }
diff --git a/src/main/java/dev/isxander/controlify/api/guide/ContainerFacts.java b/src/main/java/dev/isxander/controlify/api/guide/ContainerFacts.java
@@ -53,8 +53,11 @@ private ContainerFacts() {}
     /** When the user is currently selecting an item from within the bundle they're hovering */
     public static final Fact<ContainerCtx> SELECTED_BUNDLE_SLOT = register(
             CUtil.rl("selected_bundle_slot")
-            //? if >=1.21.2
-            ,ctx -> ctx.hoveredSlot() != null && BundleItem.hasSelectedItem(ctx.hoveredSlot().getItem())
+            //? if >=26.1 {
+            ,ctx -> ctx.hoveredSlot() != null && BundleItem.getSelectedItem(ctx.hoveredSlot().getItem()) != null
+            //?} elif >=1.21.2 {
+            /*,ctx -> ctx.hoveredSlot() != null && BundleItem.hasSelectedItem(ctx.hoveredSlot().getItem())
+            *///?}
     );
 
     private static Fact<ContainerCtx> register(Identifier id, FactProvider<ContainerCtx> provider) {
diff --git a/src/main/java/dev/isxander/controlify/mixins/feature/patches/keymessages/DemoIntroScreenMixin.java b/src/main/java/dev/isxander/controlify/mixins/feature/patches/keymessages/DemoIntroScreenMixin.java
@@ -1,13 +1,15 @@
 package dev.isxander.controlify.mixins.feature.patches.keymessages;
 
-import com.llamalad7.mixinextras.expression.Definition;
+import org.spongepowered.asm.mixin.Mixin;
+
+//? if <26.1 {
+/*import com.llamalad7.mixinextras.expression.Definition;
 import com.llamalad7.mixinextras.expression.Expression;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import dev.isxander.controlify.bindings.ControlifyBindings;
 import dev.isxander.controlify.font.BindingFontHelper;
 import net.minecraft.client.gui.screens.DemoIntroScreen;
 import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(DemoIntroScreen.class)
@@ -60,3 +62,10 @@ private Component useInventoryGlyph(Component original) {
         return BindingFontHelper.bindingWithActiveFallback(ControlifyBindings.INVENTORY.bindId(), original);
     }
 }
+*///?} else {
+import net.minecraft.client.Minecraft;
+
+@Mixin(Minecraft.class)
+public class DemoIntroScreenMixin {
+}
+//?}
diff --git a/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/BundleItemSlotControllerAction.java b/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/BundleItemSlotControllerAction.java
@@ -32,7 +32,11 @@ public static boolean onControllerInput(
             if (right) offsetX++;
 
             if (offsetX != 0 || offsetY != 0) {
-                int currentIndex = BundleItem.getSelectedItem(stack);
+                //? if >=26.1 {
+                int currentIndex = BundleItem.getSelectedItemIndex(stack);
+                //?} else {
+                /*int currentIndex = BundleItem.getSelectedItem(stack);
+                *///?}
 
                 if (currentIndex == -1) {
                     consumer.accept(stack, hoveredSlotIndex, 0);
diff --git a/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/PauseScreenProcessor.java b/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/PauseScreenProcessor.java
@@ -27,7 +27,7 @@ protected void handleButtons(ControllerEntity controller) {
         super.handleButtons(controller);
 
         if (ControlifyBindings.GUI_ABSTRACT_ACTION_1.on(controller).justPressed()) {
-            minecraft.setScreen(new OptionsScreen(screen, minecraft.options));
+            minecraft.setScreen(new OptionsScreen(screen, minecraft.options /*? if >=26.1 >>*/,true ));
         }
         if (ControlifyBindings.GUI_ABSTRACT_ACTION_2.on(controller).justPressed()) {
             screen.setFocused(disconnectButtonSupplier.get());
diff --git a/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/TitleScreenProcessor.java b/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/TitleScreenProcessor.java
@@ -27,7 +27,7 @@ protected void handleButtons(ControllerEntity controller) {
 
         if (ControlifyBindings.GUI_ABSTRACT_ACTION_1.on(controller).justPressed()) {
             if (getWidget("menu.options").isPresent()) {
-                minecraft.setScreen(new OptionsScreen(screen, minecraft.options));
+                minecraft.setScreen(new OptionsScreen(screen, minecraft.options /*? if >=26.1 >>*/,false ));
                 playClackSound();
             }
         }
diff --git a/versions/1.21.1-fabric/gradle.properties b/versions/1.21.1-fabric/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=fabric-loom-remap
 
 mcVersion=1.21.1
-packFormat=34
 
 parchment.version=2024.11.17
 
diff --git a/versions/1.21.1-neoforge/gradle.properties b/versions/1.21.1-neoforge/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=moddevgradle
 
 mcVersion=1.21.1
-packFormat=34
 
 parchment.version=2024.11.17
 
diff --git a/versions/1.21.10-fabric/gradle.properties b/versions/1.21.10-fabric/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=fabric-loom-remap
 
 mcVersion=1.21.10
-packFormat=69.0
 
 parchment.minecraft=1.21.10
 parchment.version=2025.10.12
diff --git a/versions/1.21.10-neoforge/gradle.properties b/versions/1.21.10-neoforge/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=moddevgradle
 
 mcVersion=1.21.10
-packFormat=69.0
 
 parchment.minecraft=1.21.10
 parchment.version=2025.10.12
diff --git a/versions/1.21.11-fabric/gradle.properties b/versions/1.21.11-fabric/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=fabric-loom-remap
 
 mcVersion=1.21.11
-packFormat=69.0
 
 parchment.minecraft=1.21.10
 parchment.version=2025.10.12
diff --git a/versions/1.21.11-neoforge/gradle.properties b/versions/1.21.11-neoforge/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=moddevgradle
 
 mcVersion=1.21.11
-packFormat=69.0
 
 parchment.minecraft=1.21.10
 parchment.version=2025.10.12
diff --git a/versions/1.21.3-fabric/gradle.properties b/versions/1.21.3-fabric/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=fabric-loom-remap
 
 mcVersion=1.21.3
-packFormat=42
 
 parchment.version=2024.12.07
 
diff --git a/versions/1.21.3-neoforge/gradle.properties b/versions/1.21.3-neoforge/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=moddevgradle
 
 mcVersion=1.21.3
-packFormat=42
 
 parchment.version=2024.12.07
 
diff --git a/versions/1.21.4-fabric/gradle.properties b/versions/1.21.4-fabric/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=fabric-loom-remap
 
 mcVersion=1.21.4
-packFormat=46
 
 parchment.version=2024.12.29
 
diff --git a/versions/1.21.4-neoforge/gradle.properties b/versions/1.21.4-neoforge/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=moddevgradle
 
 mcVersion=1.21.4
-packFormat=46
 
 parchment.version=2024.12.29
 
diff --git a/versions/1.21.5-fabric/gradle.properties b/versions/1.21.5-fabric/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=fabric-loom-remap
 
 mcVersion=1.21.5
-packFormat=55
 
 parchment.version=2024.12.29
 # parchment doesn't offer snapshot versions
diff --git a/versions/1.21.5-neoforge/gradle.properties b/versions/1.21.5-neoforge/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=moddevgradle
 
 mcVersion=1.21.5
-packFormat=55
 
 parchment.version=2025.04.19
 parchment.minecraft=1.21.5
diff --git a/versions/1.21.8-fabric/gradle.properties b/versions/1.21.8-fabric/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=fabric-loom-remap
 
 mcVersion=1.21.8
-packFormat=64
 
 parchment.version=2025.07.20
 
diff --git a/versions/1.21.8-neoforge/gradle.properties b/versions/1.21.8-neoforge/gradle.properties
@@ -1,7 +1,6 @@
 modstitch.platform=moddevgradle
 
 mcVersion=1.21.8
-packFormat=64
 
 parchment.version=2025.07.20
 
diff --git a/versions/26.1-fabric/gradle.properties b/versions/26.1-fabric/gradle.properties
@@ -1,9 +1,8 @@
 modstitch.platform=fabric-loom
 
-mcVersion=26.1-snapshot-2
-packFormat=69.0
+mcVersion=26.1-snapshot-5
 
-deps.fabricApi=0.141.2+26.1
+deps.fabricApi=0.143.1+26.1
 deps.yacl=3.8.2+26.1.0-fabric
 deps.modMenu=18.0.0-alpha.3
 deps.modMenu.noRuntime=true
@@ -14,7 +13,7 @@ deps.modMenu.noRuntime=true
 #deps.fancyMenu=3.7.2-1.21.10-fabric
 
 meta.mcDep=^26.1-
-meta.fapiDep=>=0.139.4
+meta.fapiDep=>=0.143.1
 
-pub.modrinthMC=26.1-snapshot-2
+pub.modrinthMC=26.1-snapshot-5
 pub.curseMC=26.1-snapshot

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected void handleButtons(ControllerEntity controller) {`
`27`	`27`	`super.handleButtons(controller);`
`28`	`28`
`29`	`29`	`if (ControlifyBindings.GUI_ABSTRACT_ACTION_1.on(controller).justPressed()) {`
`30`		`- minecraft.setScreen(new OptionsScreen(screen, minecraft.options));`
	`30`	`+ minecraft.setScreen(new OptionsScreen(screen, minecraft.options /? if >=26.1 >>/,true ));`
`31`	`31`	`}`
`32`	`32`	`if (ControlifyBindings.GUI_ABSTRACT_ACTION_2.on(controller).justPressed()) {`
`33`	`33`	`screen.setFocused(disconnectButtonSupplier.get());`