port to 26.1

Author: isXander

buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts

@@ -13,6 +13,7 @@ plugins {
 
 modstitch.apply {
     minecraftVersion = mcVersion
+    javaVersion = 25
 
     parchment {
         propMap("parchment.version") { mappingsVersion = it }
@@ -51,7 +52,6 @@ modstitch.apply {
 
     moddevgradle {
         propMap("deps.neoForge") { neoForgeVersion = it }
-        propMap("deps.forge") { forgeVersion = it }
 
         defaultRuns()
     }
@@ -64,6 +64,9 @@ repositories {
     strictMaven("https://maven.quiltmc.org/repository/release") {
         includeGroupAndSubgroups("org.quiltmc")
     }
+    strictMaven("https://maven.nucleoid.xyz/releases") {
+        includeGroupAndSubgroups("eu.pb4")
+    }
     maven("https://maven.isxander.dev/releases")
 }
 
@@ -114,59 +117,11 @@ stonecutter.apply {
         put("simple_voice_chat", isPropDefined("deps.simpleVoiceChat"))
         put("reeses_sodium_options", isPropDefined("deps.reesesSodiumOptions"))
         put("fancy_menu", isPropDefined("deps.fancyMenu"))
-
-        put("unobf", modstitch.isUnobfuscated)
-        put("intermediary_lambdas", modstitch.isUnobfuscated.map { !it && !modstitch.isModDevGradle })
     }
 
     dependencies {
         put("fapi", prop("deps.fabricApi") ?: "0.0.0")
     }
-
-    replacements {
-        fun ReplacementContainer.replaceClass(direction: Boolean, from: String, to: String) {
-            val fromPackage = from.substringBeforeLast('.')
-            val toPackage = to.substringBeforeLast('.')
-
-            if (fromPackage != toPackage) {
-                string(direction) {
-                    replace(from, to)
-                }
-            }
-
-            val fromName = from.substringAfterLast('.')
-            val toName = to.substringAfterLast('.')
-            if (fromName != toName) {
-                regex(direction) {
-                    replace(
-                        "(?<![a-zA-Z0-9\$_])$fromName(?![a-zA-Z0-9\$_])" to toName,
-                        "(?<![a-zA-Z0-9\$_])$toName(?![a-zA-Z0-9\$_])" to fromName
-                    )
-                }
-            }
-        }
-
-        replaceClass(
-            current.parsed >= "1.21.11",
-            "net.minecraft.Util",
-            "net.minecraft.util.Util"
-        )
-        replaceClass(
-            current.parsed >= "1.21.11",
-            "net.minecraft.resources.ResourceLocation",
-            "net.minecraft.resources.Identifier"
-        )
-        replaceClass(
-            current.parsed >= "26.1",
-            "net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl",
-            "net.fabricmc.fabric.impl.client.keymapping.KeyMappingRegistryImpl"
-        )
-        replaceClass(
-            current.parsed >= "26.1",
-            "net.fabricmc.fabric.api.networking.v1.PacketByteBufs",
-            "net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs"
-        )
-    }
 }
 
 tasks.named<ProcessResources>("generateModMetadata") {

docs/developers/screen-operation-api.mdx

@@ -76,7 +76,7 @@ public class MyAmazingScreenProcessor extends ScreenProcessor<MyAmazingScreen> {
     }
 
     @Override
-    protected void render(Controller<?, ?> controller, GuiGraphics graphics, float tickDelta, Optional<VirtualMouseHandler> vmouse) {
+    protected void render(Controller<?, ?> controller, GuiGraphicsExtractor graphics, float tickDelta, Optional<VirtualMouseHandler> vmouse) {
         // called after the screen has rendered.
     }
 

modstitch.ct

@@ -1,10 +1,10 @@
 package dev.isxander.controlify.api.bind;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 
 @FunctionalInterface
 public interface RadialIcon {
     RadialIcon EMPTY = (graphics, x, y, tickDelta) -> {};
 
-    void draw(GuiGraphics graphics, int x, int y, float tickDelta);
+    void draw(GuiGraphicsExtractor graphics, int x, int y, float tickDelta);
 }

src/main/java/dev/isxander/controlify/api/bind/RadialIcon.java

@@ -1,10 +1,10 @@
 package dev.isxander.controlify.api.guide;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Renderable;
 
 public interface RenderableGuideDomain<T extends FactCtx> extends GuideDomainRegistry<T> {
-    void render(GuiGraphics graphics, boolean bottomAligned, boolean textContrast);
+    void render(GuiGraphicsExtractor graphics, boolean bottomAligned, boolean textContrast);
 
     Renderable renderable(boolean bottomAligned, boolean textContrast);
 }

src/main/java/dev/isxander/controlify/api/guide/RenderableGuideDomain.java

@@ -1,13 +1,11 @@
 package dev.isxander.controlify.bindings;
 
 import dev.isxander.controlify.api.bind.RadialIcon;
-import dev.isxander.controlify.utils.render.Blit;
 import dev.isxander.controlify.utils.CUtil;
-import dev.isxander.controlify.utils.render.CGuiPose;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
@@ -60,43 +58,34 @@ private static void addItems(Map<Identifier, RadialIcon> map) {
             ResourceKey<Item> key = entry.getKey();
             ItemStack stack = entry.getValue().getDefaultInstance();
 
-            map.put(key./*? if >=1.21.11 {*/identifier/*?} else {*//*location*//*?}*/().withPrefix("item/"), (graphics, x, y, tickDelta) -> {
-                graphics.renderItem(stack, x, y);
+            map.put(key.identifier().withPrefix("item/"), (graphics, x, y, a) -> {
+                graphics.item(stack, x, y);
             });
         });
     }
 
     private static void addPotionEffects(Map<Identifier, RadialIcon> map) {
-        //? if <1.21.6
-        /*var mobEffectTextureManager = minecraft.getMobEffectTextures();*/
-
         BuiltInRegistries.MOB_EFFECT.entrySet().forEach(entry -> {
             ResourceKey<MobEffect> key = entry.getKey();
 
             Holder<MobEffect> effect = BuiltInRegistries.MOB_EFFECT.wrapAsHolder(entry.getValue());
 
-            boolean render = true;
-            //? if >=1.21.6 {
             Identifier sprite = Gui.getMobEffectSprite(effect);
-            //?} else {
-            /*TextureAtlasSprite sprite = mobEffectTextureManager.get(effect);
-
-            if (sprite == null || sprite.atlasLocation() == null) {
-                render = false;
-            }
-            *///?}
 
-            if (render) {
-                map.put(key./*? if >=1.21.11 {*/identifier/*?} else {*//*location*//*?}*/().withPrefix("effect/"), (graphics, x, y, tickDelta) -> {
-                    var pose = CGuiPose.ofPush(graphics);
-                    pose.translate(x, y);
-                    pose.scale(0.88f, 0.88f);
+            map.put(key.identifier().withPrefix("effect/"), (graphics, x, y, a) -> {
+                var pose = graphics.pose().pushMatrix();
+                pose.translate(x, y);
+                pose.scale(0.88f, 0.88f);
 
-                    Blit.sprite(graphics, sprite, 0, 0, 18, 18 /*? if <1.21.6 >>*//*,-1*/ );
+                graphics.blitSprite(
+                        RenderPipelines.GUI_TEXTURED,
+                        sprite,
+                        0, 0,
+                        18, 18
+                );
 
-                    pose.pop();
-                });
-            }
+                pose.popMatrix();
+            });
         });
     }
 
@@ -106,11 +95,18 @@ private static Map<Identifier, RadialIcon> registerIcons() {
 
         map.put(EMPTY, (graphics, x, y, tickDelta) -> {});
         map.put(modLoaderIcon, (graphics, x, y, tickDelta) -> {
-            var pose = CGuiPose.ofPush(graphics);
+            var pose = graphics.pose().pushMatrix();
             pose.translate(x, y);
             pose.scale(0.5f, 0.5f);
-            Blit.tex(graphics, modLoaderIcon, 0, 0, 0, 0, 32, 32, 32, 32);
-            pose.pop();
+            graphics.blit(
+                    RenderPipelines.GUI_TEXTURED,
+                    modLoaderIcon,
+                    0, 0,
+                    0, 0,
+                    32, 32,
+                    32, 32
+            );
+            pose.popMatrix();
         });
         addItems(map);
         addPotionEffects(map);

src/main/java/dev/isxander/controlify/bindings/RadialIcons.java

@@ -19,15 +19,15 @@ public class ControlifyCompat {
 
     public static void init() {
         //? if simple_voice_chat {
-        /*try {
+        try {
             wrapCompatCall(
                     SIMPLE_VOICE_CHAT,
                     dev.isxander.controlify.compatibility.simplevoicechat.SimpleVoiceChatCompat::init
             );
         } catch (NoClassDefFoundError e) {
             disabledMods.add(SIMPLE_VOICE_CHAT);
         }
-        *///?}
+        //?}
 
         //? if fancy_menu {
         /*try {

src/main/java/dev/isxander/controlify/compatibility/ControlifyCompat.java

@@ -1,5 +1,5 @@
 //? if simple_voice_chat {
-/*package dev.isxander.controlify.compatibility.simplevoicechat;
+package dev.isxander.controlify.compatibility.simplevoicechat;
 
 import de.maxhenkel.voicechat.voice.client.ClientManager;
 import de.maxhenkel.voicechat.voice.client.KeyEvents;
@@ -8,8 +8,8 @@
 import dev.isxander.controlify.api.bind.InputBindingSupplier;
 import dev.isxander.controlify.compatibility.simplevoicechat.mixins.KeyEventsAccessor;
 import dev.isxander.controlify.controller.ControllerEntity;
-import dev.isxander.controlify.utils.render.Blit;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
@@ -105,8 +105,8 @@ private static void checkConnected() {
 
     private static Identifier registerIcon16x(Identifier location) {
         ControlifyBindApi.get().registerRadialIcon(location, ((graphics, x, y, tickDelta) ->
-                Blit.tex(graphics, location, x, y, 0f, 0f, 16, 16, 16, 16)));
+                graphics.blit(RenderPipelines.GUI_TEXTURED, location, x, y, 0, 0, 16, 16, 16, 16)));
         return location;
     }
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/simplevoicechat/SimpleVoiceChatCompat.java

@@ -1,5 +1,5 @@
 //? if simple_voice_chat {
-/*package dev.isxander.controlify.compatibility.simplevoicechat.mixins;
+package dev.isxander.controlify.compatibility.simplevoicechat.mixins;
 
 import de.maxhenkel.voicechat.voice.client.KeyEvents;
 import org.spongepowered.asm.mixin.Mixin;
@@ -10,4 +10,4 @@ public interface KeyEventsAccessor {
     @Invoker
     boolean invokeCheckConnected();
 }
-*///?}
+//?}

src/main/java/dev/isxander/controlify/compatibility/simplevoicechat/mixins/KeyEventsAccessor.java

@@ -1,5 +1,5 @@
 //? if simple_voice_chat {
-/*package dev.isxander.controlify.compatibility.simplevoicechat.mixins;
+package dev.isxander.controlify.compatibility.simplevoicechat.mixins;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import de.maxhenkel.voicechat.voice.client.PTTKeyHandler;
@@ -40,4 +40,4 @@ private boolean isControllerWhisperDown(boolean keyDown) {
         return keyDown || SimpleVoiceChatCompat.isWhisperDown();
     }
 }
-*///?}
+//?}