Update to MC 26.1.1

Author: rubensworks

.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'

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'microsoft'
-          java-version: 21
+          java-version: 25
       - name: 'Setup Gradle'
         uses: gradle/actions/setup-gradle@v4
         with:

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:

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'
@@ -138,31 +138,31 @@ dependencies {
 
     // Add something like 'cyclopscore_version_local=0.1.0-DEV' to your gradle.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 gradle.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}:deobf") { // https://dl.bintray.com/cyclopsmc/dev/org/cyclops/commoncapabilities/CommonCapabilities/
+        implementation("org.cyclops.commoncapabilities:commoncapabilities-${project.minecraft_version}-neoforge:${project.commoncapabilities_version}") { // https://dl.bintray.com/cyclopsmc/dev/org/cyclops/commoncapabilities/CommonCapabilities/
             transitive = false
         }
     }
 /**/
     // Add something like 'integrateddynamics_version_local=0.1.0-DEV' to your gradle.properties if you want to use a custom local Integrated Tunnels Compat version.
     if(secrets.integratedtunnels_version_local) {
-        implementation "org.cyclops.integratedtunnels:integratedtunnels-${project.minecraft_version}-neoforge:${secrets.integratedtunnels_version_local}:deobf"
+        implementation "org.cyclops.integratedtunnels:integratedtunnels-${project.minecraft_version}-neoforge:${secrets.integratedtunnels_version_local}"
     } else {
-        implementation "org.cyclops.integratedtunnels:integratedtunnels-${project.minecraft_version}-neoforge:${project.integratedtunnels_version}:deobf"
+        implementation "org.cyclops.integratedtunnels:integratedtunnels-${project.minecraft_version}-neoforge:${project.integratedtunnels_version}"
     }
 
     modLib "com.google.re2j:re2j:1.1"
@@ -178,11 +178,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()) {
@@ -243,23 +238,6 @@ javadoc {
     options.addStringOption('Xdoclint:accessibility,html,reference,syntax', '-quiet')
 }
 
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    archiveClassifier.set('deobf')
-    manifest {
-        attributes([
-                "FMLAT": "accesstransformer.cfg",
-                "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")
-        ])
-    }
-}
-
 task sourcesJar(type: Jar) {
     duplicatesStrategy(DuplicatesStrategy.FAIL)
     archiveClassifier.set('sources')
@@ -273,7 +251,6 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 artifacts {
-    archives deobfJar
     archives sourcesJar
     archives javadocJar
 }
@@ -369,8 +346,8 @@ publishing {
 
     publications { PublicationContainer publicationContainer ->
         publicationContainer.register("maven", MavenPublication) { MavenPublication publication ->
-            publication.artifacts = [jar, javadocJar, deobfJar, sourcesJar]
-            publication.artifactId = project.archivesBaseName.toLowerCase() // GH can't handle uppercase...
+            publication.artifacts = [jar, javadocJar, sourcesJar]
+            publication.artifactId = project.base.archivesName.get().toLowerCase() // GH can't handle uppercase...
         }
     }
 }
@@ -398,7 +375,7 @@ jacocoTestReport {
 // Also measure coverage for game tests
 jacocoTestReport.dependsOn test, runGameTestServer
 jacoco {
-    toolVersion = "0.8.12"
+    toolVersion = "0.8.14"
     applyTo runGameTestServer
 }
 

gradle.properties

@@ -1,10 +1,10 @@
 # Project
 mod_version=1.1.13
 group=org.cyclops.integratedcrafting
-java_version=21
+java_version=25
 
 # Common
-minecraft_version=1.21.11
+minecraft_version=26.1.1
 mod_name=IntegratedCrafting
 mod_author=rubensworks (aka kroeser)
 mod_id=integratedcrafting
@@ -15,13 +15,11 @@ display_url=https://www.curseforge.com/minecraft/mc-mods/integrated-crafting
 description=Craft stuff in Integrated Dynamics networks.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
-parchment_version=2025.10.12
-parchment_minecraft_version=1.21.10
 curseforge_project_id=287357
 modrinth_project_id=qwpACdla
 
 # 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-crafting.json
 
@@ -31,7 +29,7 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Dependencies
-cyclopscore_version=1.25.5-871
-integrateddynamics_version=1.24.1-1652
-commoncapabilities_version=2.9.7-303
-integratedtunnels_version=1.8.30-534
+cyclopscore_version=1.25.5-974
+integrateddynamics_version=1.24.1-1707
+commoncapabilities_version=2.9.7-335
+integratedtunnels_version=1.8.30-611

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

src/main/java/org/cyclops/integratedcrafting/client/gui/ContainerScreenPartInterfaceCrafting.java

@@ -1,6 +1,6 @@
 package org.cyclops.integratedcrafting.client.gui;
 
-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;
@@ -52,8 +52,8 @@ protected int getBaseYSize() {
     }
 
     @Override
-    protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) {
-        super.renderBg(guiGraphics, partialTicks, mouseX, mouseY);
+    public void extractBackground(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
+        super.extractBackground(guiGraphics, mouseX, mouseY, partialTicks);
 
         int y = topPos + 42;
         for (int i = 0; i < getMenu().getContainerInventory().getContainerSize(); i++) {
@@ -66,9 +66,9 @@ protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX,
     }
 
     @Override
-    protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) {
+    protected void extractLabels(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY) {
         // super.drawGuiContainerForegroundLayer(matrixStack, mouseX, mouseY);
-        guiGraphics.drawString(font, this.title, this.titleLabelX, this.titleLabelY, ARGB.opaque(4210752), false);
+        guiGraphics.text(font, this.title, this.titleLabelX, this.titleLabelY, ARGB.opaque(4210752), false);
 
         int y = 42;
         for (int i = 0; i < getMenu().getContainerInventory().getContainerSize(); i++) {

src/main/java/org/cyclops/integratedcrafting/client/gui/ContainerScreenPartInterfaceCraftingSettings.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.client.input.KeyEvent;
 import net.minecraft.client.input.MouseButtonEvent;
@@ -178,24 +178,24 @@ public boolean mouseClicked(MouseButtonEvent mouse, boolean isDoubleClick) {
     }
 
     @Override
-    protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) {
-        super.renderBg(guiGraphics, partialTicks, mouseX, mouseY);
+    public void extractBackground(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
+        super.extractBackground(guiGraphics, mouseX, mouseY, partialTicks);
 
-        guiGraphics.drawString(font, IModHelpers.get().getL10NHelpers().localize("gui.integrateddynamics.partsettings.side"), leftPos + 8, topPos + 12, IModHelpers.get().getBaseHelpers().RGBAToInt(0, 0, 0, 255), false);
-        ingredientComponentSideSelector.render(guiGraphics, mouseX, mouseY, partialTicks);
-        dropdownFieldSide.render(guiGraphics, mouseX, mouseY, partialTicks);
+        guiGraphics.text(font, IModHelpers.get().getL10NHelpers().localize("gui.integrateddynamics.partsettings.side"), leftPos + 8, topPos + 12, IModHelpers.get().getBaseHelpers().RGBAToInt(0, 0, 0, 255), false);
+        ingredientComponentSideSelector.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
+        dropdownFieldSide.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
 
-        guiGraphics.drawString(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedcrafting.partsettings.channel.interface"),
+        guiGraphics.text(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedcrafting.partsettings.channel.interface"),
                 leftPos + 8, topPos + 137, ARGB.opaque(0), false);
-        numberFieldChannelInterfaceCrafting.render(guiGraphics, mouseX, mouseY, partialTicks);
+        numberFieldChannelInterfaceCrafting.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
 
-        guiGraphics.drawString(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedcrafting.partsettings.craftingcheckdisabled"),
+        guiGraphics.text(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedcrafting.partsettings.craftingcheckdisabled"),
                 leftPos + 8, topPos + 152, ARGB.opaque(0), false);
-        checkboxFieldDisabledCraftingCheck.render(guiGraphics, mouseX, mouseY, partialTicks);
+        checkboxFieldDisabledCraftingCheck.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
 
-        guiGraphics.drawString(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedcrafting.partsettings.blockingmode"),
+        guiGraphics.text(font, IModHelpers.get().getL10NHelpers().localize("gui.integratedcrafting.partsettings.blockingmode"),
                 leftPos + 8, topPos + 162, ARGB.opaque(0), false);
-        checkboxFieldBlockingMode.render(guiGraphics, mouseX, mouseY, partialTicks);
+        checkboxFieldBlockingMode.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
     }
 
     @Override

src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java

@@ -69,7 +69,7 @@ public boolean craft(Function<IngredientComponent<?, ?>, PartPos> targetGetter,
                 })
                 .map(recipeHolder -> {
                     CraftingRecipe craftingRecipe = recipeHolder.value();
-                    ItemStack result = craftingRecipe.assemble(gridInput, level.registryAccess());
+                    ItemStack result = craftingRecipe.assemble(gridInput);
 
                     if (result.isEmpty()) {
                         return false;

src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideSmithingTable.java

@@ -45,7 +45,7 @@ public boolean craft(Function<IngredientComponent<?, ?>, PartPos> targetGetter,
         return IModHelpers.get().getCraftingHelpers().findRecipe(RecipeType.SMITHING, smithingRecipeInput, level)
                 .map(recipeHolder -> {
                     SmithingRecipe smithingRecipe = recipeHolder.value();
-                    ItemStack result = smithingRecipe.assemble(smithingRecipeInput, level.registryAccess());
+                    ItemStack result = smithingRecipe.assemble(smithingRecipeInput);
 
                     if (result.isEmpty()) {
                         return false;