Initial Update to 1.21

- Update to Prerelease of 1.20.1
- Remove Forge support
- Various buildscript cleanup

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 }
 
 architectury {
@@ -16,10 +16,7 @@ subprojects {
 
 	dependencies {
 		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-
-		//if(!(project.name.contains("forge") && !project.name.contains("neoforge"))) {
-			mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-		//}
+		mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	}
 }
 
@@ -28,15 +25,17 @@ allprojects {
 	apply plugin: "architectury-plugin"
 	apply plugin: "maven-publish"
 
-	archivesBaseName = rootProject.archives_base_name
+	base {
+		archivesBaseName = rootProject.archives_base_name
+	}
 	version = rootProject.mod_version
 	group = rootProject.maven_group
 
 	repositories {}
 
 	tasks.withType(JavaCompile) {
 		options.encoding = "UTF-8"
-		options.release = 17
+		options.release = 21
 	}
 
 	java {

common/build.gradle

@@ -7,11 +7,7 @@ loom {
 }
 
 dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    // Remove the next line if you don't want to depend on the API
-    //modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 }
 
 publishing {
@@ -22,8 +18,5 @@ publishing {
         }
     }
 
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
+    repositories {}
 }

fabric/build.gradle

@@ -4,7 +4,9 @@ plugins {
 
 architectury {
     platformSetupLoomIde()
-    fabric()
+    fabric {
+        platformPackage = "fabric"
+    }
 }
 
 loom {
@@ -22,8 +24,6 @@ configurations {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    // Remove the next line if you don't want to depend on the API
-    //modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
@@ -75,8 +75,5 @@ publishing {
         }
     }
 
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
+    repositories {}
 }

fabric/src/main/java/io/wispforest/lmft/fabric/mixin/TagGroupLoaderMixin.java

@@ -26,7 +26,7 @@
 public class TagGroupLoaderMixin<T> {
 
     @Unique private static final Logger LOGGER = LogUtils.getLogger();
-    @Unique private static final ThreadLocal<Identifier> currentTagId = ThreadLocal.withInitial(() -> new Identifier("", ""));
+    @Unique private static final ThreadLocal<Identifier> currentTagId = ThreadLocal.withInitial(() -> Identifier.of("", ""));
 
     @Inject(method = "resolveAll(Lnet/minecraft/registry/tag/TagEntry$ValueGetter;Ljava/util/List;)Lcom/mojang/datafixers/util/Either;", at = @At(value = "INVOKE", target = "Ljava/util/List;isEmpty()Z"), locals = LocalCapture.CAPTURE_FAILHARD)
     private void preventTagsFromFailingToLoad(TagEntry.ValueGetter<T> valueGetter, List<TagGroupLoader.TrackedEntry> list, CallbackInfoReturnable<Either<Collection<TagGroupLoader.TrackedEntry>, Collection<T>>> cir, ImmutableSet.Builder builder, List<TagGroupLoader.TrackedEntry> list2){

fabric/src/main/resources/fabric.mod.json

@@ -28,6 +28,6 @@
   ],
   "depends": {
     "fabric": "*",
-    "minecraft": "~1.20"
+    "minecraft": "*"
   }
 }

gradle.properties

@@ -5,23 +5,17 @@ org.gradle.jvmargs=-Xmx2048M
 
 # General Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.4
-	yarn_mappings=1.20.4+build.1
-
-	architectury_version=8.1.79
+	minecraft_version=1.21-pre2
+	yarn_mappings=1.21-pre2+build.2
 
 # Mod Properties
 	mod_version = 1.0.4+1.20.4
 	maven_group = io.wispforest
 	archives_base_name = lmft
 
 # Fabric Dependencies
-	fabric_api_version=0.91.1+1.20.4
-	fabric_loader_version=0.15.0
+	fabric_api_version=0.99.4+1.21
+	fabric_loader_version=0.15.11
 
 # NeoForge Dependencies
 	neoforge_version=20.4.46-beta
-
-# Forge Dependencies
-	forge_version=1.20.4-49.0.3
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists