From da82e38aa740e4f458feb00a818f59a9b9abf7d3 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 27 Dec 2025 18:51:14 -0500 Subject: [PATCH] Update to 26.1 snapshot 1 --- build.gradle.kts | 11 +++++------ gradle.properties | 7 ++++--- .../dynamic_resources/MixinBlockStateModelLoader.java | 4 ++-- .../SessionSearchTreesMixin.java | 2 +- src/main/resources/META-INF/neoforge.mods.toml | 10 +--------- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a40a0591..63400cb8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ neoForge { rootProject.properties["parchment_version"]?.let { parchmentVer -> parchment { - minecraftVersion = minecraft_version + minecraftVersion = rootProject.properties["parchment_mc_version"].toString() mappingsVersion = parchmentVer.toString() } } @@ -87,13 +87,11 @@ tasks.named("jar") { )) } -// We must force the Java 21 compiler to be used because our AP requires Java 21 - java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } - val curSourceCompatLevel = JavaVersion.VERSION_21 + val curSourceCompatLevel = JavaVersion.VERSION_25 sourceCompatibility = curSourceCompatLevel targetCompatibility = curSourceCompatLevel } @@ -139,7 +137,8 @@ dependencies { annotationProcessor(project(path = ":annotation-processor", configuration = "shadow")) val jei_version = rootProject.properties["jei_version"].toString() - compileOnly("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}") + val jei_minecraft_version = rootProject.properties["jei_minecraft_version"]?.toString() ?: minecraft_version + compileOnly("mezz.jei:jei-${jei_minecraft_version}-neoforge:${jei_version}") compileOnly("curse.maven:spark-361579:${rootProject.properties["spark_version"].toString()}") compileOnly("curse.maven:ctm-267602:${rootProject.properties["ctm_version"].toString()}") compileOnly("curse.maven:ldlib-626676:${rootProject.properties["ldlib_version"].toString()}") diff --git a/gradle.properties b/gradle.properties index 6f06cdda..534f20aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,19 +5,20 @@ junit_version=5.10.0-M1 mixinextras_version=0.4.1 mod_id=modernfix -minecraft_version=1.21.11 +minecraft_version=26.1 enabled_platforms=neoforge -forge_version=21.11.14-beta +forge_version=26.1.0.0-alpha.2+snapshot-1 parchment_version=2025.12.20 parchment_mc_version=1.21.11 refined_storage_version=4392788 jei_version=27.3.0.12 +jei_minecraft_version=1.21.11 rei_version=13.0.678 ctm_version=5587515 ldlib_version=5782845 kubejs_version=2101.7.1-build.181 rhino_version=2101.2.7-build.74 -supported_minecraft_versions=1.21.1 +supported_minecraft_versions=26.1 fabric_loader_version=0.16.10 fabric_api_version=0.102.1+1.21.1 diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MixinBlockStateModelLoader.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MixinBlockStateModelLoader.java index 6cb79cc4..ed4e3d4a 100644 --- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MixinBlockStateModelLoader.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MixinBlockStateModelLoader.java @@ -24,7 +24,7 @@ import java.util.function.Function; @ClientOnlyMixin public abstract class MixinBlockStateModelLoader { @Shadow - protected static BlockStateModelLoader.LoadedModels lambda$loadBlockStates$1(Map.Entry> entry, Function> locationToBlockStateMapper) { + protected static BlockStateModelLoader.LoadedModels lambda$loadBlockStates$2(Map.Entry> entry, Function> locationToBlockStateMapper) { throw new AssertionError(); } @@ -35,7 +35,7 @@ public abstract class MixinBlockStateModelLoader { @ModifyArg(method = "loadBlockStates", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;thenCompose(Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture;")) private static Function>, ? extends CompletionStage> skipAOTBlockStateLoad(Function>, ? extends CompletionStage>> original, @Local(ordinal = 0) Function> mapper) { return resourceMap -> CompletableFuture.completedFuture(DynamicModelSystem.createDynamicBlockStateLoadedModels(resourceMap, (id, resources) -> { - return lambda$loadBlockStates$1(Map.entry(id, resources), mapper); + return lambda$loadBlockStates$2(Map.entry(id, resources), mapper); })); } } diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java index 39a54ba8..3cb70e34 100644 --- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java @@ -22,7 +22,7 @@ public class SessionSearchTreesMixin { @Shadow private CompletableFuture> recipeSearch; private Supplier> mfix$deferredSearchTreeSupplier; - @ModifyArg(method = { "lambda$updateRecipes$9" }, at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;")) + @ModifyArg(method = { "lambda$updateRecipes$0" }, at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;")) private Supplier> mfix$deferProcessing(Supplier> supplier) { this.mfix$deferredSearchTreeSupplier = supplier; return SearchTree::empty; diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 59defa9c..2f56abf4 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -44,19 +44,11 @@ modId = "neoforge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified type = "required" #mandatory # The version range of the dependency -versionRange = "[21.0.111-beta,)" #mandatory +versionRange = "[26.0,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering = "NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER side = "BOTH" -# Here's another dependency -[[dependencies.modernfix]] -modId = "minecraft" -type = "required" -# This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange = "[1.21, 1.22)" -ordering = "NONE" -side = "BOTH" [[dependencies.modernfix]] modId = "jei" type = "optional"