okx-code · Astralchroma · Jun 11, 2026
diff --git a/build.gradle b/build.gradle
@@ -8,17 +8,14 @@ plugins {
 
 dependencies {
     minecraft(libs.minecraft)
-    mappings(loom.layered() {
-        officialMojangMappings()
-    })
 
-    modImplementation(libs.fabricLoader)
-    modImplementation(libs.fabricApi)
+    implementation(libs.fabricLoader)
+    implementation(libs.fabricApi)
 
-    modImplementation(libs.owoLib)
+    implementation(libs.owoLib)
     include(libs.owoSentinel)
 
-    modImplementation(libs.modMenu)
+    implementation(libs.modMenu)
 
     implementation(libs.sqlite)
     include(libs.sqlite)
@@ -57,7 +54,7 @@ repositories {
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = "UTF-8"
-    options.release = 21
+    options.release = 25
 }
 
 java {
@@ -100,8 +97,12 @@ tasks.register("cleanJar", Delete) {
 
 tasks.register("copyJar", Copy) {
     dependsOn cleanJar
-    from remapJar
+    from jar
     into "dist"
 }
 
 build.dependsOn copyJar
+
+loom {
+    accessWidenerPath = file("src/main/resources/civmodern.classtweaker")
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-minecraft = "1.21.11"
+minecraft = "26.1.2"
 # https://fabricmc.net/versions.html
-fabricLoom = "1.15-SNAPSHOT"
-fabricLoader = "0.18.4"
-fabricApi = "0.141.3+1.21.11"
+fabricLoom = "1.16-SNAPSHOT"
+fabricLoader = "0.19.3"
+fabricApi = "0.151.0+26.1.2"
 # https://modrinth.com/mod/owo-lib/versions?l=fabric
-owo = "0.13.0+1.21.11"
+owo = "0.13.0+26.1"
 # https://modrinth.com/mod/modmenu/versions?l=fabric
-modMenu = "JWQVh32x"
+modMenu = "p7gjPPpV"
 # https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc
 sqlite = "3.49.1.0"
 # https://mvnrepository.com/artifact/com.github.luben/zstd-jni
@@ -24,6 +24,6 @@ sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
 zstd = { group = "com.github.luben", name = "zstd-jni", version.ref = "zstd" }
 
 [plugins]
-fabricLoom = { id = "fabric-loom", version.ref = "fabricLoom" }
+fabricLoom = { id = "net.fabricmc.fabric-loom", version.ref = "fabricLoom" }
 # https://github.com/GradleUp/shadow/releases
 #shadow = { id = "com.gradleup.shadow", version = "7.1.2" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/sh/okx/civmodern/common/AbstractCivModernMod.java b/src/main/java/sh/okx/civmodern/common/AbstractCivModernMod.java
@@ -15,7 +15,7 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import net.fabricmc.fabric.api.client.rendering.v1.SpecialGuiElementRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.PictureInPictureRendererRegistry;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
@@ -118,7 +118,7 @@ public AbstractCivModernMod() {
     }
 
     public final void init() {
-        SpecialGuiElementRegistry.register(ctx -> new BlitRenderer(ctx.vertexConsumers()));
+        PictureInPictureRendererRegistry.register(ctx -> new BlitRenderer(ctx.bufferSource()));
         CivModernPipelines.register();
 
         registerKeyBinding(this.configBinding);

diff --git a/src/main/java/sh/okx/civmodern/common/events/CommandRegistration.java b/src/main/java/sh/okx/civmodern/common/events/CommandRegistration.java
@@ -1,7 +1,6 @@
 package sh.okx.civmodern.common.events;
 
 import com.mojang.brigadier.CommandDispatcher;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.multiplayer.ClientSuggestionProvider;
 import net.minecraft.commands.CommandBuildContext;
 import org.jetbrains.annotations.NotNull;

diff --git a/src/main/java/sh/okx/civmodern/common/events/PostRenderGameOverlayEvent.java b/src/main/java/sh/okx/civmodern/common/events/PostRenderGameOverlayEvent.java
@@ -1,11 +1,11 @@
 package sh.okx.civmodern.common.events;
 
 import java.util.Objects;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import org.jetbrains.annotations.NotNull;
 
 public record PostRenderGameOverlayEvent(
-    @NotNull GuiGraphics guiGraphics,
+    @NotNull GuiGraphicsExtractor guiGraphics,
     float deltaTick
 ) {
     public PostRenderGameOverlayEvent {

diff --git a/src/main/java/sh/okx/civmodern/common/gui/screen/ItemsConfigScreen.java b/src/main/java/sh/okx/civmodern/common/gui/screen/ItemsConfigScreen.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 import java.util.Objects;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.input.MouseButtonEvent;
@@ -154,16 +154,16 @@ protected void init() {
     }
 
     @Override
-    public void render(
-        final @NotNull GuiGraphics guiGraphics,
+    public void extractRenderState(
+        final @NotNull GuiGraphicsExtractor guiGraphics,
         final int mouseX,
         final int mouseY,
         final float delta
     ) {
-        super.render(guiGraphics, mouseX, mouseY, delta);
+        super.extractRenderState(guiGraphics, mouseX, mouseY, delta);
 
-        guiGraphics.renderItem(ITEM, this.itemX, this.itemY);
-        guiGraphics.renderItemDecorations(this.font, ITEM, this.itemX, this.itemY);
+        guiGraphics.item(ITEM, this.itemX, this.itemY);
+        guiGraphics.itemDecorations(this.font, ITEM, this.itemX, this.itemY);
 
         if (isCursorOverItem(mouseX, mouseY)) {
 //            guiGraphics.renderTooltip(this.font, ITEM, mouseX, mouseY);

diff --git a/src/main/java/sh/okx/civmodern/common/gui/screen/MapConfigScreen.java b/src/main/java/sh/okx/civmodern/common/gui/screen/MapConfigScreen.java
@@ -1,15 +1,14 @@
 package sh.okx.civmodern.common.gui.screen;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
-import org.jetbrains.annotations.NotNull;
 import sh.okx.civmodern.common.CivMapConfig;
 import sh.okx.civmodern.common.ColourProvider;
 import sh.okx.civmodern.common.gui.DoubleValue;
@@ -140,7 +139,8 @@ private HsbColourPicker addColourPicker(String title, int x, int y, int defaultC
         widget.setValue("#" + String.format("%06X", colourGet.get()));
         widget.setMaxLength(7);
         Pattern pattern = Pattern.compile("^(#[0-9A-F]{0,6})?$", Pattern.CASE_INSENSITIVE);
-        widget.setFilter(string -> pattern.matcher(string).matches());
+        // TODO: Mojang removed this, couldn't figure out what to do instead, spent more time then I cared to on this
+        // widget.setFilter(string -> pattern.matcher(string).matches());
         widget.setResponder(val -> {
             if (val.length() == 7) {
                 int rgb = Integer.parseInt(val.substring(1), 16);
@@ -191,12 +191,12 @@ public void mouseMoved(double d, double e) {
     }
 
     @Override
-    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-        graphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 0xffffffff);
+    public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
+        graphics.centeredText(this.font, this.title, this.width / 2, 15, 0xffffffff);
 
         // Don't call super since we don't want the dark or blurred background to obscure changes to the radar
         for (final Renderable renderable : ((ScreenAccessor) (Object) this).civmodern$getRenderables()) {
-            renderable.render(graphics, mouseX, mouseY, delta);
+            renderable.extractRenderState(graphics, mouseX, mouseY, delta);
         }
     }
 }
diff --git a/src/main/java/sh/okx/civmodern/common/gui/screen/RadarConfigScreen.java b/src/main/java/sh/okx/civmodern/common/gui/screen/RadarConfigScreen.java
@@ -6,7 +6,7 @@
 import java.util.function.IntConsumer;
 import java.util.function.IntSupplier;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.Tooltip;
@@ -454,15 +454,15 @@ public void mouseMoved(
     }
 
     @Override
-    public void render(
-        final @NotNull GuiGraphics guiGraphics,
+    public void extractRenderState(
+        final @NotNull GuiGraphicsExtractor guiGraphics,
         final int mouseX,
         final int mouseY,
         final float partialTick
     ) {
         // Don't call super since we don't want the dark or blurred background to obscure changes to the radar
         for (final Renderable renderable : ((ScreenAccessor) (Object) this).civmodern$getRenderables()) {
-            renderable.render(guiGraphics, mouseX, mouseY, partialTick);
+            renderable.extractRenderState(guiGraphics, mouseX, mouseY, partialTick);
         }
     }
 

diff --git a/src/main/java/sh/okx/civmodern/common/gui/widget/ColourTextEditBox.java b/src/main/java/sh/okx/civmodern/common/gui/widget/ColourTextEditBox.java
@@ -42,7 +42,8 @@ public ColourTextEditBox(
         super(font, x, y, width, height, Component.empty());
         setColourFromInt(colourGetter.getAsInt());
         setMaxLength(7);
-        setFilter((string) -> HEX_COLOUR_REGEX.matcher(string).matches());
+        // TODO: Mojang removed this, couldn't figure out what to do instead, spent more time then I cared to on this
+        // setFilter((string) -> HEX_COLOUR_REGEX.matcher(string).matches());
         setResponder((val) -> {
             if (val.length() <= 1) {
                 return;

diff --git a/src/main/java/sh/okx/civmodern/common/gui/widget/HsbColourPicker.java b/src/main/java/sh/okx/civmodern/common/gui/widget/HsbColourPicker.java
@@ -9,11 +9,11 @@
 import com.mojang.blaze3d.textures.GpuTextureView;
 import com.mojang.blaze3d.textures.TextureFormat;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.render.TextureSetup;
-import net.minecraft.client.gui.render.state.BlitRenderState;
+import net.minecraft.client.renderer.state.gui.BlitRenderState;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
@@ -71,7 +71,7 @@ public void setRVisible(boolean rvisible) {
     }
 
     @Override
-    public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    public void extractWidgetRenderState(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
         if (!rvisible) {
             return;
         }
@@ -92,7 +92,7 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
 
             guiGraphics.pose().translate(this.getX(), this.renderY + height);
             guiGraphics.guiRenderState
-                .submitGuiElement(
+                .addBlitToCurrentLayer(
                     new BlitRenderState(
                         RenderPipelines.GUI_TEXTURED,
                         TextureSetup.singleTexture(this.saturationBrightnessTextureView, this.sampler),
@@ -101,7 +101,7 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
                 );
 
             guiGraphics.guiRenderState
-                .submitGuiElement(
+                .addBlitToCurrentLayer(
                     new BlitRenderState(
                         RenderPipelines.GUI_TEXTURED,
                         TextureSetup.singleTexture(this.hueSelectorTextureView, this.sampler),

diff --git a/src/main/java/sh/okx/civmodern/common/gui/widget/ImageButton.java b/src/main/java/sh/okx/civmodern/common/gui/widget/ImageButton.java
@@ -1,6 +1,6 @@
 package sh.okx.civmodern.common.gui.widget;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.input.MouseButtonEvent;
@@ -24,7 +24,7 @@ public void setImage(Identifier image) {
     }
 
     @Override
-    public void renderWidget(GuiGraphics guiGraphics, int i, int j, float f) {
+    public void extractWidgetRenderState(GuiGraphicsExtractor guiGraphics, int i, int j, float f) {
         int k = this.isHoveredOrFocused() ? 1 : 0;
         guiGraphics.blit(RenderPipelines.GUI_TEXTURED,  image, this.getX(), this.getY(), 0, k * 20, this.width, this.height, 20, 40, -1);
     }