Update to mc 26.1.1

rubensworks · rubensworks · commit 427a949d62ef · 2026-04-07T11:30:37.000+02:00
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -23,11 +23,13 @@ mc-1.20:
   - 'Minecraft: 1.20'
 mc-1.21:
   - 'Minecraft: 1.21'
-mc-1.22:
-  - 'Minecraft: 1.22'
-mc-1.23:
-  - 'Minecraft: 1.23'
-mc-1.24:
-  - 'Minecraft: 1.24'
-mc-1.25:
-  - 'Minecraft: 1.25'
+mc-26:
+  - 'Minecraft: 26'
+mc-27:
+  - 'Minecraft: 27'
+mc-28:
+  - 'Minecraft: 28'
+mc-29:
+  - 'Minecraft: 29'
+mc-30:
+  - 'Minecraft: 30'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DEFAULT_JAVA_VERSION: 21
+  DEFAULT_JAVA_VERSION: 25
   DEFAULT_JAVA_DISTRIBUTION: 'microsoft'
 
 jobs:
@@ -17,14 +17,13 @@ jobs:
       fail-fast: false
       matrix:
         java:
-          - 21
-          - 22
-          - 23
+          - 25
+          - 26
         distribution:
           - 'adopt-hotspot'
           - 'oracle'
         include:
-          - java: 21
+          - java: 25
             distribution: 'microsoft'
     steps:
       - name: 'Checkout'
diff --git a/AGENTS.md b/AGENTS.md
@@ -21,6 +21,12 @@ Understanding this architecture is crucial when making changes:
 - **`loader-forge/`**: Forge-specific implementation and integration code (for older Minecraft versions).
 - **`loader-neoforge/`**: NeoForge-specific implementation and integration code (for newer Minecraft versions).
 
+For NeoForge, relevant jars can for example be found in the following locations:
+
+- Minecraft merged jar: `build/moddev/artifacts/minecraft-patched-26.1.1.1-beta-merged.jar`
+- NeoForge: `~/.gradle/caches/modules-2/files-2.1/net.neoforged/neoforge/26.1.1.1-beta/214ad5aa883deaf6d71298baf4232bb994305f36/neoforge-26.1.1.1-beta-universal.jar`
+- CyclopsCore source: `~/.m2/repository/org/cyclops/cyclopscore/cyclopscore-26.1.1-neoforge/1.25.5-DEV/cyclopscore-26.1.1-neoforge-1.25.5-DEV-sources.jar`
+
 ### Making Changes in Multi-loader Setups
 
 When adding features or fixing bugs:
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'net.neoforged.moddev' version '2.0.137'
+    id 'net.neoforged.moddev' version '2.0.141'
     id 'net.darkhax.curseforgegradle' version '1.1.28'
 	id 'com.github.kt3k.coveralls' version '2.12.0'
     id 'com.diffplug.spotless' version '6.25.0'
@@ -132,20 +132,20 @@ dependencies {
 
     // Add something like 'cyclopscore_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local CyclopsCore version.
     if(secrets.cyclopscore_version_local) {
-        implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${secrets.cyclopscore_version_local}:deobf"
+        implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${secrets.cyclopscore_version_local}"
     } else {
-        implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${project.cyclopscore_version}:deobf"
+        implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${project.cyclopscore_version}"
     }
 	
     // Add something like 'integrateddynamics_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local Integrated Tunnels Compat version.
     if(secrets.integrateddynamics_version_local) {
-        implementation "org.cyclops.integrateddynamics:integrateddynamics-${project.minecraft_version}-neoforge:${secrets.integrateddynamics_version_local}:deobf"
+        implementation "org.cyclops.integrateddynamics:integrateddynamics-${project.minecraft_version}-neoforge:${secrets.integrateddynamics_version_local}"
     } else {
-        implementation "org.cyclops.integrateddynamics:integrateddynamics-${project.minecraft_version}-neoforge:${project.integrateddynamics_version}:deobf"
+        implementation "org.cyclops.integrateddynamics:integrateddynamics-${project.minecraft_version}-neoforge:${project.integrateddynamics_version}"
     }
 
     if(secrets.commoncapabilities_version_local) {
-        implementation "org.cyclops.commoncapabilities:commoncapabilities-${project.minecraft_version}-neoforge:${secrets.commoncapabilities_version_local}:deobf"
+        implementation "org.cyclops.commoncapabilities:commoncapabilities-${project.minecraft_version}-neoforge:${secrets.commoncapabilities_version_local}"
     } else {
         implementation("org.cyclops.commoncapabilities:commoncapabilities-${project.minecraft_version}-neoforge:${project.commoncapabilities_version}") { // https://dl.bintray.com/cyclopsmc/dev/org/cyclops/commoncapabilities/CommonCapabilities/
             transitive = false
@@ -174,11 +174,6 @@ test {
 neoForge {
     version = "${neoforge_version}"
 
-    parchment {
-        mappingsVersion = "${parchment_version}"
-        minecraftVersion = "${parchment_minecraft_version}"
-    }
-
     // Automatically enable neoforge AccessTransformers if the file exists
     def at = file('src/main/resources/META-INF/accesstransformer.cfg')
     if (at.exists()) {
@@ -233,23 +228,6 @@ jar {
     }
 }
 
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    archiveClassifier.set('deobf')
-    manifest {
-        attributes([
-                "Specification-Title": "${project.name}",
-                "Specification-Vendor": "rubensworks",
-                "Specification-Version": "${project.mod_version}",
-                "Implementation-Title": "${project.name}",
-                "Implementation-Version": "${project.mod_version}",
-                "Implementation-Vendor" :"rubensworks",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-                "Multi-Release": "true", // Required for shadowing GraalVM: https://www.graalvm.org/latest/reference-manual/embed-languages/#uber-jar-file-creation
-        ])
-    }
-}
-
 task sourcesJar(type: Jar) {
     duplicatesStrategy(DuplicatesStrategy.FAIL)
     archiveClassifier.set('sources')
@@ -290,7 +268,6 @@ jar {
 
 artifacts {
     archives shadowJar
-    archives deobfJar
     archives sourcesJar
     archives javadocJar
 }
@@ -384,8 +361,8 @@ publishing {
 
     publications { PublicationContainer publicationContainer ->
         publicationContainer.register("maven", MavenPublication) { MavenPublication publication ->
-            publication.artifacts = [shadowJar, javadocJar, deobfJar, sourcesJar]
-            publication.artifactId = project.archivesBaseName.toLowerCase() // GH can't handle uppercase...
+            publication.artifacts = [shadowJar, javadocJar, sourcesJar]
+            publication.artifactId = project.base.archivesName.get().toLowerCase() // GH can't handle uppercase...
         }
     }
 }
@@ -413,7 +390,7 @@ jacocoTestReport {
 // Also measure coverage for game tests
 jacocoTestReport.dependsOn test, runGameTestServer
 jacoco {
-    toolVersion = "0.8.12"
+    toolVersion = "0.8.14"
     applyTo runGameTestServer
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 # Project
 mod_version=1.0.9
 group=org.cyclops.integratedscripting
-java_version=21
+java_version=25
 
 # Common
-minecraft_version=1.21.11
+minecraft_version=26.1.1
 mod_name=IntegratedScripting
 mod_author=rubensworks (aka kroeser)
 mod_id=integratedscripting
@@ -15,13 +15,11 @@ display_url=https://www.curseforge.com/minecraft/mc-mods/integrated-scripting
 description=Create scripts for handling operations in Integrated Dynamics.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
-parchment_version=2025.10.12
-parchment_minecraft_version=1.21.10
 curseforge_project_id=889785
 modrinth_project_id=uDJkuFRe
 
 # NeoForge
-neoforge_version=21.11.10-beta
+neoforge_version=26.1.1.1-beta
 neoforge_loader_version_range=[4,)
 neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/integrated-scripting.json
 
@@ -32,6 +30,6 @@ org.gradle.caching=true
 
 # Dependencies
 graal_version=25.0.1
-cyclopscore_version=1.25.5-871
-integrateddynamics_version=1.24.1-1652
-commoncapabilities_version=2.9.7-303
+cyclopscore_version=1.25.5-974
+integrateddynamics_version=1.24.1-1707
+commoncapabilities_version=2.9.7-335
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-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetDialog.java b/src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetDialog.java
@@ -1,7 +1,7 @@
 package org.cyclops.integratedscripting.client.gui.component.input;
 
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -48,7 +48,7 @@ public WidgetDialog(Font font, int x, int y, Screen parent,
         this.buttonCancel = new ButtonText(x + WIDTH - 50 - 50, y + HEIGHT - 15 - 5, 50, 15, cancel, cancel, cancelCallback, true);
     }
 
-    protected void drawBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    protected void drawBackground(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
         // Gray-out background
         guiGraphics.fill(0, 0, parent.width, parent.height, IModHelpers.get().getBaseHelpers().RGBAToInt(50, 50, 50, 100));
 
@@ -57,15 +57,15 @@ protected void drawBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, f
     }
 
     @Override
-    protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    public void extractWidgetRenderState(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
         drawBackground(guiGraphics, mouseX, mouseY, partialTicks);
 
-        this.buttonConfirm.render(guiGraphics, mouseX, mouseY, partialTicks);
-        this.buttonCancel.render(guiGraphics, mouseX, mouseY, partialTicks);
+        this.buttonConfirm.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
+        this.buttonCancel.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
 
-        guiGraphics.drawCenteredString(font, title, this.getX() + this.width / 2, this.getY() + 4, ARGB.opaque(16777215));
+        guiGraphics.centeredText(font, title, this.getX() + this.width / 2, this.getY() + 4, ARGB.opaque(16777215));
         FormattedCharSequence formattedcharsequence = message.getVisualOrderText();
-        guiGraphics.drawString(font, message, (this.getX() + this.width / 2 - font.width(formattedcharsequence) / 2), (this.getY() + 25), ARGB.opaque(4210752), false);
+        guiGraphics.text(font, message, (this.getX() + this.width / 2 - font.width(formattedcharsequence) / 2), (this.getY() + 25), ARGB.opaque(4210752), false);
     }
 
     @Override
diff --git a/src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetTextArea.java b/src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetTextArea.java
@@ -7,7 +7,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.StringSplitter;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.components.MultilineTextField;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -94,10 +94,10 @@ public int getTotalRows() {
                 }
 
                 @Override
-                public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+                public void extractWidgetRenderState(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
                     // Only show scrollbar if needed
                     if (this.needsScrollBars()) {
-                        super.renderWidget(guiGraphics, mouseX, mouseY, partialTicks);
+                        super.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
                     }
                 }
             };
@@ -431,7 +431,7 @@ private void keyEnd(KeyEvent event) {
     }
 
     @Override
-    public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    public void extractWidgetRenderState(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
         // Determine lines to show
         DisplayCache displayCache = this.getDisplayCache();
         List<LineInfo> lines = Arrays.asList(displayCache.lines);
@@ -440,7 +440,7 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
         // Draw lines
         int lastLineNumber = -1;
         for(LineInfo line : lines) {
-            guiGraphics.drawString(this.font, line.asComponent, line.x, line.y - offsetY, ARGB.opaque(-16777216), false);
+            guiGraphics.text(this.font, line.asComponent, line.x, line.y - offsetY, ARGB.opaque(-16777216), false);
             // Draw line number
             if (this.showLineNumbers && lastLineNumber != line.lineNumber) {
                 IModHelpers.get().getRenderHelpers().drawScaledString(
@@ -466,23 +466,23 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
 
         // Render scrollbar
         if (this.scrollBar != null) {
-            this.scrollBar.render(guiGraphics, getX(), getY(), partialTicks);
+            this.scrollBar.extractRenderState(guiGraphics, getX(), getY(), partialTicks);
         }
     }
 
-    private void renderCursor(GuiGraphics guiGraphics, Pos2i pos, boolean cursorAtEnd) {
+    private void renderCursor(GuiGraphicsExtractor guiGraphics, Pos2i pos, boolean cursorAtEnd) {
         if (this.isFocused() && this.frameTick / 6 % 2 == 0) {
             pos = this.convertLocalToScreen(pos);
             if (!cursorAtEnd) {
                 guiGraphics.fill(pos.x, pos.y - 1, pos.x + 1, pos.y + 9, -16777216);
             } else {
-                guiGraphics.drawString(this.font, "_", pos.x, pos.y, ARGB.opaque(0));
+                guiGraphics.text(this.font, "_", pos.x, pos.y, ARGB.opaque(0), false);
             }
         }
 
     }
 
-    private void renderHighlight(GuiGraphics guiGraphics, Rect2i[] highlightAreas) {
+    private void renderHighlight(GuiGraphicsExtractor guiGraphics, Rect2i[] highlightAreas) {
         for (Rect2i rect2i : highlightAreas) {
             int i = rect2i.getX();
             int j = rect2i.getY();
diff --git a/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenScriptingDrive.java b/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenScriptingDrive.java
@@ -1,6 +1,6 @@
 package org.cyclops.integratedscripting.client.gui.container;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.ARGB;
@@ -30,8 +30,8 @@ protected int getBaseYSize() {
     }
 
     @Override
-    protected void renderLabels(GuiGraphics guiGraphics, int x, int y) {
+    protected void extractLabels(GuiGraphicsExtractor guiGraphics, int x, int y) {
         // super.drawGuiContainerForegroundLayer(matrixStack, x, y);
-        guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, ARGB.opaque(4210752), false);
+        guiGraphics.text(this.font, this.title, this.titleLabelX, this.titleLabelY, ARGB.opaque(4210752), false);
     }
 }
diff --git a/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenTerminalScripting.java b/src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenTerminalScripting.java
@@ -6,7 +6,8 @@
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.client.input.KeyEvent;
 import net.minecraft.client.input.MouseButtonEvent;
@@ -191,10 +192,10 @@ protected int getErrorY() {
     }
 
     @Override
-    protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) {
-        super.renderBg(guiGraphics, partialTicks, mouseX, mouseY);
-        fieldDisk.render(guiGraphics, mouseX, mouseY, partialTicks);
-        scrollBar.render(guiGraphics, mouseX, mouseY, partialTicks);
+    public void extractBackground(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
+        super.extractBackground(guiGraphics, mouseX, mouseY, partialTicks);
+        fieldDisk.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
+        scrollBar.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
 
         if (!this.getMenu().getAvailableDisks().isEmpty()) {
             this.renderScriptPaths(guiGraphics, mouseX, mouseY, partialTicks);
@@ -231,7 +232,7 @@ protected List<Path> getVisibleScriptPaths() {
         return Collections.emptyList();
     }
 
-    protected void renderScriptPaths(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    protected void renderScriptPaths(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
         List<Path> paths = getVisibleScriptPaths();
         int i = 0;
         for (Path path : paths) {
@@ -301,11 +302,11 @@ protected Path getHoveredScriptPath(double mouseX, double mouseY) {
     }
 
     @Override
-    protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-        super.renderLabels(guiGraphics, mouseX, mouseY);
+    protected void extractLabels(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY) {
+        super.extractLabels(guiGraphics, mouseX, mouseY);
 
         // Draw disk label
-        guiGraphics.drawString(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedscripting.disk") + ":", 8, 6, ARGB.opaque(16777215));
+        guiGraphics.text(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedscripting.disk") + ":", 8, 6, ARGB.opaque(16777215));
 
         displayErrors.drawForeground(guiGraphics, getMenu().getReadErrors(), getErrorX(), getErrorY(), mouseX, mouseY, this, this.leftPos, this.topPos);
     }
diff --git a/src/main/java/org/cyclops/integratedscripting/part/PartTypeTerminalScripting.java b/src/main/java/org/cyclops/integratedscripting/part/PartTypeTerminalScripting.java
@@ -53,7 +53,7 @@ public PartTypeTerminalScripting(String name) {
     @Override
     public InteractionResult onPartActivated(PartStateEmpty<PartTypeTerminalScripting> partState, BlockPos pos, Level world, Player player, InteractionHand hand, ItemStack heldItem, BlockHitResult hit) {
         if (isUpdate(partState) && !partState.isEnabled()) {
-            player.displayClientMessage(Component.translatable(L10NValues.PART_ERROR_LOWENERGY), true);
+            player.sendOverlayMessage(Component.translatable(L10NValues.PART_ERROR_LOWENERGY));
             return InteractionResult.FAIL;
         }
         return super.onPartActivated(partState, pos, world, player, hand, heldItem, hit);
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
@@ -0,0 +1,2 @@
+# Screens
+public-f net.minecraft.client.gui.screens.inventory.AbstractContainerScreen imageHeight
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
diff --git a/src/test/java/org/cyclops/integratedscripting/evaluate/translation/BenchmarkValueTranslators.java b/src/test/java/org/cyclops/integratedscripting/evaluate/translation/BenchmarkValueTranslators.java
diff --git a/src/test/java/org/cyclops/integratedscripting/evaluate/translation/ModBaseMocked.java b/src/test/java/org/cyclops/integratedscripting/evaluate/translation/ModBaseMocked.java
diff --git a/src/test/java/org/cyclops/integratedscripting/evaluate/translation/ValueTranslatorsJavaScriptTests.java b/src/test/java/org/cyclops/integratedscripting/evaluate/translation/ValueTranslatorsJavaScriptTests.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package org.cyclops.integratedscripting.client.gui.container;`
`2`	`2`
`3`		`-import net.minecraft.client.gui.GuiGraphics;`
	`3`	`+import net.minecraft.client.gui.GuiGraphicsExtractor;`
`4`	`4`	`import net.minecraft.network.chat.Component;`
`5`	`5`	`import net.minecraft.resources.Identifier;`
`6`	`6`	`import net.minecraft.util.ARGB;`
`@@ -30,8 +30,8 @@ protected int getBaseYSize() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
`33`		`- protected void renderLabels(GuiGraphics guiGraphics, int x, int y) {`
	`33`	`+ protected void extractLabels(GuiGraphicsExtractor guiGraphics, int x, int y) {`
`34`	`34`	`// super.drawGuiContainerForegroundLayer(matrixStack, x, y);`
`35`		`- guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, ARGB.opaque(4210752), false);`
	`35`	`+ guiGraphics.text(this.font, this.title, this.titleLabelX, this.titleLabelY, ARGB.opaque(4210752), false);`
`36`	`36`	`}`
`37`	`37`	`}`