port: migrate to Minecraft 26.2

Version bumps (gradle.properties, fabric.mod.json, neoforge.mods.toml,
build.gradle, CI workflow) and adaptation to 26.2 API breakages:

- Minecraft#setScreen(Screen) -> setScreenAndShow(Screen) (global rename)
- Minecraft#screen field removed -> Minecraft#gui.screen() (Gui refactor),
  including the one write site -> Minecraft#gui.setScreen(...)
- Minecraft#getToastManager() -> Minecraft#gui.toastManager()
- I18n.exists(String) removed -> Language.getInstance().has(String)
- net.minecraft.util.Tuple removed -> new api.common.util.Pair record
  (exposes getA/getB and getFirst/getSecond); swapped across all modules
- com.mojang.blaze3d.vertex.Tesselator removed; the single usage was dead
  code (consumers already commented out), so just removed the variable
- MultiBufferSource removal already handled in SpriteRenderer (dead code)
- GuiGraphicsExtractor$ScissorStack ctor -> ScreenRectangle arg
- Architectury 21 networking: migrate the Identifier + FriendlyByteBuf
  C2S/S2C packets to CustomPacketPayload + StreamCodec (new REIPackets),
  gating S2C payload type registration to Env.SERVER to avoid double
  registration on the client/integrated server
- neoforge: FluidStackHooksForge removed -> FluidStack.create(...)
- accessWidener: drop AbstractContainerScreen#draggingItem (removed in 26.2,
  unused)

Author: shedaniel

.github/workflows/curseforge.yml

@@ -27,6 +27,7 @@ on:
       - 1.21.9
       - 1.21.11
       - 26.1
+      - 26.2
 
 jobs:
   build:

api/src/main/java/me/shedaniel/rei/api/client/config/ConfigManager.java

@@ -63,7 +63,7 @@ static ConfigManager getInstance() {
      * @param parent the screen shown before
      */
     default void openConfigScreen(Screen parent) {
-        Minecraft.getInstance().setScreen(getConfigScreen(parent));
+        Minecraft.getInstance().setScreenAndShow(getConfigScreen(parent));
     }
 
     /**

api/src/main/java/me/shedaniel/rei/api/client/config/addon/ConfigAddon.java

@@ -50,7 +50,7 @@ public interface ConfigAddon {
 
     /**
      * Opens the config screen for this addon, given the parent screen.
-     * Do not call {@link net.minecraft.client.Minecraft#setScreen(Screen)} directly,
+     * Do not call {@link net.minecraft.client.Minecraft#setScreenAndShow(Screen)} directly,
      * and make sure to set the screen as the parent screen to exit the config screen.
      *
      * @param parent the parent screen

api/src/main/java/me/shedaniel/rei/api/client/gui/compat/GuiGraphics.java

@@ -3,6 +3,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.renderer.state.gui.GuiRenderState;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.FormattedCharSequence;
@@ -99,7 +100,7 @@ public void renderItemDecorations(Font font, ItemStack stack, int x, int y, Stri
     public void withFreshScissorStack(Runnable runnable) {
         GuiGraphicsExtractor.ScissorStack previous = this.scissorStack;
         try {
-            this.scissorStack = new GuiGraphicsExtractor.ScissorStack();
+            this.scissorStack = new GuiGraphicsExtractor.ScissorStack(ScreenRectangle.empty());
             runnable.run();
         } finally {
             this.scissorStack = previous;

api/src/main/java/me/shedaniel/rei/api/client/util/SpriteRenderer.java

@@ -30,7 +30,6 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import me.shedaniel.rei.api.client.gui.compat.GuiGraphics;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.rendertype.*;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -70,7 +69,6 @@ public static class RenderPass {
         private float nZ = 0;
         private TextureAtlasSprite sprite;
         private VertexConsumer consumer;
-        private MultiBufferSource consumers;
         private Matrix3x2fStack matrices;
         private Matrix4f model;
         private Matrix3f normal;
@@ -79,13 +77,6 @@ public static class RenderPass {
         private RenderPass() {
         }
 
-        public RenderPass setup(MultiBufferSource consumers, RenderType type) {
-            this.consumers = consumers;
-            this.setup(consumers.getBuffer(type), type);
-            
-            return this;
-        }
-        
         public RenderPass setup(VertexConsumer consumer, RenderType type) {
             this.consumer = consumer;
             this.matrices = new Matrix3x2fStack();
@@ -94,15 +85,6 @@ public RenderPass setup(VertexConsumer consumer, RenderType type) {
             return this;
         }
 
-        public RenderPass setup(MultiBufferSource consumers, GuiGraphics graphics, RenderType type) {
-            this.consumers = consumers;
-            this.consumer = consumers.getBuffer(type);
-            this.matrices = graphics.pose();
-            this.layer = type;
-            
-            return this;
-        }
-        
         public RenderPass position(Matrix4f model, float x1, float y1, float x2, float y2, float z1) {
             this.position(x1, y1, x2, y2, z1);
             this.model = model;

api/src/main/java/me/shedaniel/rei/api/common/util/Pair.java

@@ -0,0 +1,52 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.common.util;
+
+/**
+ * An immutable pair of values.
+ *
+ * <p>Introduced as a replacement for the removed
+ * {@code net.minecraft.util.Tuple} in Minecraft 26.2. It exposes both the
+ * old {@code Tuple} accessors ({@link #getA()} / {@link #getB()}) and the
+ * {@code com.mojang.datafixers.util.Pair} accessors
+ * ({@link #getFirst()} / {@link #getSecond()}) so call sites swapping away
+ * from either removed type need no accessor renames.
+ */
+public record Pair<A, B>(A first, B second) {
+    public A getA() {
+        return first;
+    }
+    
+    public B getB() {
+        return second;
+    }
+    
+    public A getFirst() {
+        return first;
+    }
+    
+    public B getSecond() {
+        return second;
+    }
+}

default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/recipebook/DefaultRecipeBookHandler.java

@@ -73,7 +73,7 @@ public Result handle(Context context) {
                     return Result.createFailed(Component.translatable("error.rei.transfer.too_small", h, w));
                 if (!context.isActuallyCrafting())
                     return Result.createSuccessful();
-                context.getMinecraft().setScreen(context.getContainerScreen());
+                context.getMinecraft().setScreenAndShow(context.getContainerScreen());
                 if (context.getContainerScreen() instanceof AbstractRecipeBookScreen<?> screen)
                     screen.recipeBookComponent.ghostSlots.clear();
                 context.getMinecraft().gameMode.handlePlaceRecipe(container.containerId, id, context.isStackedCrafting());
@@ -84,7 +84,7 @@ public Result handle(Context context) {
                 RecipeDisplayId id = defaultDisplay.recipeDisplayId().get();
                 if (!context.isActuallyCrafting())
                     return Result.createSuccessful();
-                context.getMinecraft().setScreen(context.getContainerScreen());
+                context.getMinecraft().setScreenAndShow(context.getContainerScreen());
                 if (context.getContainerScreen() instanceof AbstractRecipeBookScreen<?> screen)
                     screen.recipeBookComponent.ghostSlots.clear();
                 context.getMinecraft().gameMode.handlePlaceRecipe(container.containerId, id, context.isStackedCrafting());

fabric/build.gradle

@@ -123,7 +123,7 @@ unifiedPublishing {
     project {
         displayName = "[Fabric $rootProject.supported_version] v$project.version"
         releaseType = rootProject.unstable == "false" ? "release" : "alpha"
-        gameVersions = ["26.1", "26.1.1", "26.1.2"]
+        gameVersions = ["26.2"]
         gameLoaders = ["fabric"]
         changelog = rootProject.releaseChangelog
 

fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/ErrorDisplayerImpl.java

@@ -38,16 +38,16 @@ public class ErrorDisplayerImpl implements ErrorDisplayer.ErrorGuiInitializer {
     @Override
     public void registerGuiInit(UnaryOperator<Screen> consumer) {
         consumerList.add(screen -> {
-            if (screen != Minecraft.getInstance().screen) return;
+            if (screen != Minecraft.getInstance().gui.screen()) return;
             Screen screen1 = consumer.apply(screen);
             if (screen1 != null) {
                 Minecraft minecraft = Minecraft.getInstance();
                 try {
-                    if (minecraft.screen != null) minecraft.screen.removed();
+                    if (minecraft.gui.screen() != null) minecraft.gui.screen().removed();
                 } catch (Throwable ignored) {
                 }
-                minecraft.screen = null;
-                minecraft.setScreen(screen1);
+                minecraft.gui.setScreen(null);
+                minecraft.setScreenAndShow(screen1);
             }
         });
     }

fabric/src/main/java/me/shedaniel/rei/impl/client/gui/credits/fabric/CreditsScreenImpl.java

@@ -24,17 +24,17 @@
 package me.shedaniel.rei.impl.client.gui.credits.fabric;
 
 import com.google.common.collect.Lists;
+import me.shedaniel.rei.api.common.util.Pair;
 import me.shedaniel.rei.impl.client.gui.credits.CreditsScreen;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.metadata.CustomValue;
-import net.minecraft.util.Tuple;
 
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class CreditsScreenImpl {
-    public static void fillTranslators(Exception[] exception, List<Tuple<String, List<CreditsScreen.TranslatorEntry>>> translators) {
+    public static void fillTranslators(Exception[] exception, List<Pair<String, List<CreditsScreen.TranslatorEntry>>> translators) {
         FabricLoader.getInstance().getModContainer("roughlyenoughitems").ifPresent(rei -> {
             try {
                 if (rei.getMetadata().containsCustomValue("rei:translators")) {
@@ -56,10 +56,10 @@ public static void fillTranslators(Exception[] exception, List<Tuple<String, Lis
                                 .sorted(Comparator.comparing(CreditsScreen.TranslatorEntry::getName, String::compareToIgnoreCase))
                                 .collect(Collectors.toList())
                                 : Lists.newArrayList(new CreditsScreen.TranslatorEntry(value.getAsString()));
-                        translators.add(new Tuple<>(entry.getKey(), behind));
+                        translators.add(new Pair<>(entry.getKey(), behind));
                     });
                 }
-                translators.sort(Comparator.comparing(Tuple::getA, String::compareToIgnoreCase));
+                translators.sort(Comparator.comparing(Pair::getA, String::compareToIgnoreCase));
             } catch (Exception e) {
                 exception[0] = e;
                 e.printStackTrace();