From 787310632b84d4ba093844d6aff538d921af067f Mon Sep 17 00:00:00 2001
From: Mark Rapson <git@lzstealth.com>
Date: Mon, 10 Aug 2026 23:14:04 +0100
Subject: [PATCH] Use 26.2 jar API directly

---
 .../copilot/renameable/RenderCatalogClient.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/client-renderer/src/client/java/dev/github/copilot/renameable/RenderCatalogClient.java b/build/client-renderer/src/client/java/dev/github/copilot/renameable/RenderCatalogClient.java
index 68634d8..0e22ce8 100644
--- a/build/client-renderer/src/client/java/dev/github/copilot/renameable/RenderCatalogClient.java
+++ b/build/client-renderer/src/client/java/dev/github/copilot/renameable/RenderCatalogClient.java
@@ -17,7 +17,7 @@ import com.google.gson.JsonParser;
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Screenshot;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -31,6 +31,7 @@ public final class RenderCatalogClient implements ClientModInitializer {
     private final List<RenderJob> jobs = new ArrayList<>();
     private Path outputDir;
     private int currentJobIndex;
+    private RenderScreen renderScreen;
 
     @Override
     public void onInitializeClient() {
@@ -53,7 +54,8 @@ public final class RenderCatalogClient implements ClientModInitializer {
         }
 
         Minecraft client = Minecraft.getInstance();
-        client.execute(() -> client.screen = new RenderScreen());
+        renderScreen = new RenderScreen();
+        client.execute(() -> client.setScreen(renderScreen));
     }
 
     private void loadJobs(Path manifestPath) throws IOException {
@@ -102,7 +104,7 @@ public final class RenderCatalogClient implements ClientModInitializer {
         String renderPath = renderPathElement.getAsString();
         String customName = customNameElement != null && customNameElement.isJsonPrimitive() ? customNameElement.getAsString() : null;
 
-        ItemStack stack = new ItemStack(BuiltInRegistries.ITEM.get(Identifier.withDefaultNamespace(itemId)));
+        ItemStack stack = new ItemStack(BuiltInRegistries.ITEM.getValue(Identifier.withDefaultNamespace(itemId)));
         if (stack.isEmpty()) {
             return;
         }
@@ -183,8 +185,7 @@ public final class RenderCatalogClient implements ClientModInitializer {
             return;
         }
 
-        Screen currentScreen = client.screen;
-        if (currentScreen instanceof RenderScreen renderScreen) {
+        if (renderScreen != null) {
             renderScreen.resetCaptureState();
         }
     }
@@ -216,7 +217,8 @@ public final class RenderCatalogClient implements ClientModInitializer {
         }
 
         @Override
-        public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
+            super.extractRenderState(context, mouseX, mouseY, delta);
             context.fill(0, 0, width, height, 0x00000000);
 
             if (currentJobIndex < jobs.size()) {