port to 26.2

Author: isXander

src/main/java/dev/isxander/controlify/compatibility/sodium/mixins/VideoSettingsScreenMixin.java

@@ -21,9 +21,15 @@
 
 @Mixin(VideoSettingsScreen.class)
 public abstract class VideoSettingsScreenMixin extends Screen implements ScreenProcessorProvider, SodiumScreenOperations {
-    @Shadow private FlatButtonWidget applyButton;
+    //? if >=26.2 {
+    @Shadow private net.caffeinemc.mods.sodium.client.gui.widgets.KeyBoundButtonWidget applyButton;
+    @Shadow private net.caffeinemc.mods.sodium.client.gui.widgets.KeyBoundButtonWidget closeButton;
+    @Shadow private net.caffeinemc.mods.sodium.client.gui.widgets.KeyBoundButtonWidget undoButton;
+    //?} else {
+    /*@Shadow private FlatButtonWidget applyButton;
     @Shadow private FlatButtonWidget closeButton;
     @Shadow private FlatButtonWidget undoButton;
+    *///?}
     @Shadow private OptionListWidget optionList;
 
     @Unique private Page controlify$currentPage = null;

src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java

@@ -146,7 +146,8 @@ protected void handleKeybinds() {
                     minecraft.gameRenderer.checkEntityPostEffect(minecraft.options.getCameraType().isFirstPerson() ? minecraft.getCameraEntity() : null);
                 }
 
-                minecraft.levelRenderer.needsUpdate();
+                //? if <26.2
+                //minecraft.levelRenderer.needsUpdate();
             }
         }
         if (ControlifyBindings.TOGGLE_HUD_VISIBILITY.on(controller).justPressed()) {
@@ -192,7 +193,11 @@ protected void handleKeybinds() {
 
             Screenshot.grab(
                     this.minecraft.gameDirectory,
-                    this.minecraft.getMainRenderTarget(),
+                    //? if >=26.2 {
+                    this.minecraft.gameRenderer.mainRenderTarget(),
+                    //?} else {
+                    /*this.minecraft.getMainRenderTarget(),
+                    *///?}
                     component -> this.minecraft.execute(() -> {
                         //? if >=26.2 {
                         this.minecraft.gui.hud.getChat()

src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/TabNavigationBarMixin.java

@@ -23,7 +23,11 @@
 public class TabNavigationBarMixin {
     @Shadow @Final private ImmutableList<TabButton> tabButtons;
 
-    @Inject(method = "extractRenderState", at = @At("RETURN"))
+    //? if >=26.2 {
+    @Inject(method = "extractWidgetRenderState", at = @At("RETURN"))
+    //?} else {
+    /*@Inject(method = "extractRenderState", at = @At("RETURN"))
+    *///?}
     private void renderControllerButtonOverlay(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (Controlify.instance().currentInputMode().isController()) {
             Controlify.instance().getCurrentController().ifPresent(c -> {

src/main/java/dev/isxander/controlify/mixins/feature/screenop/impl/sign/SignEditScreenMixin.java

@@ -24,12 +24,14 @@ private float modifySignY(float original) {
     }
 
 
-    @Definition(id = "sign", method = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;sign(Lnet/minecraft/client/model/Model$Simple;FLnet/minecraft/world/level/block/state/properties/WoodType;IIII)V")
+    //? if <26.2 {
+    /*@Definition(id = "sign", method = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;sign(Lnet/minecraft/client/model/Model$Simple;FLnet/minecraft/world/level/block/state/properties/WoodType;IIII)V")
     @Expression("?.sign(?, ?, ?, ?, @(66), ?, @(168))")
     @ModifyExpressionValue(method = "extractSignBackground", at = @At("MIXINEXTRAS:EXPRESSION"))
     private int modifySignRenderY(int original) {
         return (int) (original - calculateOverlap());
     }
+    *///?}
 
 
     @Unique

src/main/java/dev/isxander/controlify/reacharound/ReachAroundHandler.java

@@ -5,6 +5,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 
 public class ReachAroundHandler {
     public static HitResult getReachAroundHitResult(Entity entity, HitResult hitResult) {
@@ -27,7 +28,7 @@ public static HitResult getReachAroundHitResult(Entity entity, HitResult hitResu
 
         // this allows all interaction with blocks, such as opening containers, ringing bells, etc.
         // this is consistent with bedrock edition behaviour, tested
-        return new BlockHitResult(supportingBlockPos.getCenter(), entity.getDirection(), supportingBlockPos, false);
+        return new BlockHitResult(Vec3.atCenterOf(supportingBlockPos), entity.getDirection(), supportingBlockPos, false);
     }
 
     private static boolean canReachAround(Entity cameraEntity) {

src/main/java/dev/isxander/controlify/reacharound/ReachAroundMode.java

@@ -12,7 +12,13 @@
 
 public enum ReachAroundMode implements NameableEnum, StringRepresentable {
     OFF((minecraft, controlify) -> false),
-    SINGLEPLAYER_ONLY((minecraft, controlify) -> minecraft.isSingleplayer()),
+    SINGLEPLAYER_ONLY((minecraft, controlify) ->
+            //? if >=26.2 {
+            minecraft.hasSingleplayerServer()
+            //?} else {
+            /*minecraft.isSingleplayer()
+            *///?}
+    ),
     SINGLEPLAYER_AND_LAN((minecraft, controlify) -> minecraft.isLocalServer()),
     EVERYWHERE((minecraft, controlify) -> true);
 

src/main/java/dev/isxander/controlify/utils/DebugOverlayHelper.java

@@ -31,7 +31,11 @@ public static void toggleProfilerOverlay() {
     }
 
     public static void reloadChunks() {
-        mc.levelRenderer.allChanged();
+        //? if >=26.2 {
+        mc.levelExtractor.allChanged();
+        //?} else {
+        /*mc.levelRenderer.allChanged();
+        *///?}
         debugFeedbackTranslated("debug.reload_chunks.message");
     }
 

versions/26.2-fabric/gradle.properties

@@ -1,20 +1,17 @@
 modstitch.platform=fabric-loom
 
-mcVersion=26.2-snapshot-2
+mcVersion=26.2
 
-deps.fabricApi=0.145.5+26.2
-deps.yacl=3.9.3+26.2-fabric
-deps.modMenu=18.0.0-alpha.7
-deps.modMenu.noRuntime=true
-deps.sodium=0.8.9+mc26.1.1
-deps.sodium.noRuntime=true
-deps.iris=1.10.9+26.1-fabric
-deps.iris.noRuntime=true
-deps.simpleVoiceChat=fabric-2.6.15+26.2-snapshot-2
+deps.fabricApi=0.152.1+26.2
+deps.yacl=3.9.4+26.2-fabric
+deps.modMenu=20.0.0-beta.2
+deps.sodium=0.9.0+mc26.2
+deps.iris=1.11.0+26.2-fabric
+deps.simpleVoiceChat=fabric-2.6.18+26.2
 deps.fancyMenu=3.8.6-26.1.1-fabric
 deps.fancyMenu.noRuntime=true
 
-meta.mcDep=~26.2-alpha.2
-meta.fapiDep=>=0.145.5
+meta.mcDep=~26.2
+meta.fapiDep=>=0.152.1
 
 pub.stableMC=26.2

versions/26.2-neoforge/gradle.properties

@@ -0,0 +1,17 @@
+modstitch.platform=moddevgradle
+
+mcVersion=26.2
+
+deps.neoForge=26.2.0.0-beta
+deps.yacl=3.9.4+26.2-neoforge
+deps.sodium=0.9.0+mc26.2
+deps.iris=1.10.9+26.1-neoforge
+deps.iris.noRuntime=true
+deps.simpleVoiceChat=neoforge-2.6.18+26.2
+deps.fancyMenu=3.8.6-26.1.1-neoforge
+deps.fancyMenu.noRuntime=true
+
+meta.mcDep=[26.2,26.3)
+meta.loaderDep=[26.2,26.3)
+
+pub.stableMC=26.2

versions/versions.json

@@ -3,7 +3,7 @@
   "branches": {
     "": [
       "26.1-fabric:26.1", "26.1-neoforge:26.1",
-      "26.2-fabric:26.2"
+      "26.2-fabric:26.2", "26.2-neoforge:26.2"
     ]
   }
 }