Port to Minecraft 26.1

.github/workflows/1.21.11_pr.yml → .github/workflows/26.1_pr.yml

@@ -1,4 +1,4 @@
-name: Build PR snapshot (1.21.11)
+name: Build PR snapshot (26.1)
 
 on:
   pull_request:
@@ -19,24 +19,6 @@ jobs:
           fetch-depth: 0
 
       - uses: gradle/actions/wrapper-validation@v5
-  license:
-    name: "Verify License integrity"
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
-        with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-
-      - name: Verify license using Licenser
-        run: ./gradlew licenseCheck
-
   build:
     name: "Build"
     runs-on: ubuntu-20.04
@@ -45,10 +27,10 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
 
       - name: Setup Gradle

.github/workflows/1.21.11_push.yml → .github/workflows/26.1_push.yml

@@ -1,4 +1,4 @@
-name: Build and Release (1.21.11)
+name: Build and Release (26.1)
 
 on:
   push:
@@ -25,10 +25,10 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
 
       - name: Validate Gradle Wrapper
@@ -37,9 +37,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
 
-      - name: Verify license using Licenser
-        run: ./gradlew licenseCheck
-
       - name: Build with Gradle
         run: ./gradlew build --stacktrace --no-daemon
 
@@ -61,13 +58,13 @@ jobs:
             !**/*-transformProduction*.jar
             !**/testmod*/
 
-      - name: Release to Maven and CurseForge
-        if: |
-          !contains(github.event.head_commit.message, '[norelease]') && 
-          github.event.inputs.norelease != 'true'
-        env:
-          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
-          CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: |
-          ./gradlew publish publishUnified --stacktrace --no-daemon
+#      - name: Release to Maven and CurseForge
+#        if: |
+#          !contains(github.event.head_commit.message, '[norelease]') &&
+#          github.event.inputs.norelease != 'true'
+#        env:
+#          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+#          CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
+#          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+#        run: |
+#          ./gradlew publish publishUnified --stacktrace --no-daemon

.gitignore

@@ -5,6 +5,7 @@ run/
 out/
 *.iml
 .gradle/
+.gradle-user/
 output/
 bin/
 libs/
@@ -16,4 +17,4 @@ libs/
 classes/
 
 .vscode/
-logs/
+logs/

META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Implementation-Version: 1.14.10001
+

build.gradle

@@ -4,13 +4,24 @@ buildscript {
     configurations.classpath {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
+
+    repositories {
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://maven.architectury.dev/" }
+        maven { url "https://maven.shedaniel.me/" }
+        maven { url "https://maven.minecraftforge.net/" }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    dependencies {
+        classpath files("$rootDir/gradle/architectury-loom-1.14.10001.jar")
+        classpath "dev.architectury:architectury-loom:1.14.473"
+    }
 }
 
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
-    id "org.cadixdev.licenser" version "0.6.1"
-    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
+    id "architectury-plugin" version "3.5-SNAPSHOT"
     id "maven-publish"
 }
 
@@ -19,18 +30,14 @@ architectury {
 }
 
 subprojects {
-    apply plugin: "dev.architectury.loom"
-
-    loom {
-        silentMojangMappingsLicense()
-    }
+    apply plugin: "dev.architectury.loom-no-remap"
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}"
-        mappings loom.officialMojangMappings()
     }
 
     repositories {
+        maven { url "https://maven.minecraftforge.net/" }
         maven { url "https://maven.neoforged.net/releases/" }
         if (rootProject.neoforge_pr != "") {
             maven {
@@ -46,7 +53,6 @@ subprojects {
 allprojects {
     apply plugin: "java"
     apply plugin: "architectury-plugin"
-    apply plugin: "org.cadixdev.licenser"
 
     ext {
         isSnapshot = System.getenv("PR_NUM") != null
@@ -56,17 +62,27 @@ allprojects {
 
     if (!ext.isSnapshot) {
         version = rootProject.base_version + "." + runNumber + rootProject.version_suffix
-        archivesBaseName = rootProject.archives_base_name
+        ext.archivesBaseName = rootProject.archives_base_name
     } else {
         version = rootProject.base_version + "-PR." + System.getenv("PR_NUM") + "." + runNumber
-        archivesBaseName = rootProject.archives_base_name_snapshot
+        ext.archivesBaseName = rootProject.archives_base_name_snapshot
+    }
+
+    base {
+        archivesName = project.ext.archivesBaseName
     }
 
     group = rootProject.maven_group
 
-    tasks.withType(JavaCompile) {
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(25)
+        }
+    }
+
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
-        options.release = 21
+        options.release = 25
     }
 
     javadoc {
@@ -75,20 +91,6 @@ allprojects {
         failOnError = false
     }
 
-    license {
-        header = rootProject.file("HEADER")
-
-        ext {
-            name = "architectury"
-            year = "2020, 2021, 2022"
-        }
-
-        include "**/*.java"
-        exclude "**/NbtType.java"
-
-        ignoreFailures = true
-    }
-
     ext {
         releaseChangelog = {
             def dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm")
@@ -122,6 +124,3 @@ allprojects {
         withSourcesJar()
     }
 }
-
-task licenseFormatAll
-subprojects { p -> licenseFormatAll.dependsOn("${p.path}:licenseFormat") }

common/build.gradle

@@ -5,7 +5,8 @@ loom {
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations
     // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    compileOnly "net.fabricmc:sponge-mixin:0.16.5+mixin.0.8.7"
 }
 
 architectury {
@@ -14,6 +15,12 @@ architectury {
     }
 }
 
+tasks.withType(JavaCompile).configureEach {
+    // Architectury's transformer currently fails on Java 25 class files, but it only consumes the common jar.
+    // Keep the shared code on Java 21 bytecode so transformProductionFabric can finish.
+    options.release = 21
+}
+
 /**
  * The following code to generate the access widener is based on the following pull request by Juuxel;
  * https://github.com/Juuxel/

common/src/main/java/dev/architectury/core/fluid/ArchitecturyFluidAttributes.java

@@ -20,13 +20,13 @@
 package dev.architectury.core.fluid;
 
 import dev.architectury.fluid.FluidStack;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Rarity;
-import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.material.Fluid;

common/src/main/java/dev/architectury/core/fluid/SimpleArchitecturyFluidAttributes.java

@@ -23,13 +23,14 @@
 import dev.architectury.fluid.FluidStack;
 import dev.architectury.registry.registries.RegistrySupplier;
 import net.minecraft.util.Util;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.Identifier;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Rarity;
-import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.material.Fluid;
@@ -67,7 +68,7 @@ public class SimpleArchitecturyFluidAttributes implements ArchitecturyFluidAttri
     private SoundEvent fillSound = SoundEvents.BUCKET_FILL;
     @Nullable
     private SoundEvent emptySound = SoundEvents.BUCKET_EMPTY;
-    private final Supplier<String> defaultTranslationKey = Suppliers.memoize(() -> Util.makeDescriptionId("fluid", getSourceFluid().arch$registryName()));
+    private final Supplier<String> defaultTranslationKey = Suppliers.memoize(() -> Util.makeDescriptionId("fluid", BuiltInRegistries.FLUID.getKey(getSourceFluid())));
 
     public static SimpleArchitecturyFluidAttributes ofSupplier(Supplier<? extends Supplier<? extends Fluid>> flowingFluid, Supplier<? extends Supplier<? extends Fluid>> sourceFluid) {
         return of(() -> flowingFluid.get().get(), () -> sourceFluid.get().get());

common/src/main/java/dev/architectury/event/EventFactory.java

@@ -202,19 +202,19 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
     @ExpectPlatform
     @ApiStatus.Internal
     public static <T> Event<Consumer<T>> attachToForge(Event<Consumer<T>> event) {
-        throw new AssertionError();
+        return event;
     }
 
     @ExpectPlatform
     @ApiStatus.Internal
     public static <T> Event<EventActor<T>> attachToForgeEventActor(Event<EventActor<T>> event) {
-        throw new AssertionError();
+        return event;
     }
 
     @ExpectPlatform
     @ApiStatus.Internal
     public static <T> Event<EventActor<T>> attachToForgeEventActorCancellable(Event<EventActor<T>> event) {
-        throw new AssertionError();
+        return event;
     }
 
     private static class EventImpl<T> implements Event<T> {

common/src/main/java/dev/architectury/event/EventHandler.java

@@ -19,6 +19,7 @@
 
 package dev.architectury.event;
 
+import dev.architectury.injectables.ExpectPlatformFallback;
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import dev.architectury.platform.Platform;
 import dev.architectury.utils.Env;
@@ -41,16 +42,16 @@ public static void init() {
 
     @ExpectPlatform
     private static void registerClient() {
-        throw new AssertionError();
+        ExpectPlatformFallback.run("dev.architectury.event.fabric.EventHandlerImpl", "registerClient", new Class[0]);
     }
 
     @ExpectPlatform
     private static void registerCommon() {
-        throw new AssertionError();
+        ExpectPlatformFallback.run("dev.architectury.event.fabric.EventHandlerImpl", "registerCommon", new Class[0]);
     }
 
     @ExpectPlatform
     private static void registerServer() {
-        throw new AssertionError();
+        ExpectPlatformFallback.run("dev.architectury.event.fabric.EventHandlerImpl", "registerServer", new Class[0]);
     }
 }