21w19a

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [8-jdk, 11-jdk, 15-jdk]
+        java: [16-jdk]
     runs-on: ubuntu-20.04
     container:
       image: openjdk:${{ matrix.java }}

.github/workflows/release.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: openjdk:15-jdk
+      image: openjdk:16-jdk
       options: --user root
     steps:
       - uses: actions/checkout@v1

build.gradle

@@ -5,13 +5,13 @@ buildscript {
 }
 
 plugins {
-	id "java"
+	id "java-library"
 	id "eclipse"
 	id "idea"
 	id "maven-publish"
-	id "fabric-loom" version "0.5.43" apply false
-	id "net.minecrell.licenser" version "0.4.1"
-	id "org.ajoberstar.grgit" version "3.1.1"
+	id "fabric-loom" version "0.8.3" apply false
+	id "org.cadixdev.licenser" version "0.5.0"
+	id "org.ajoberstar.grgit" version "3.1.0"
 	id "com.matthewprenger.cursegradle" version "1.4.0"
 	id "com.modrinth.minotaur" version "1.1.0"
 }
@@ -20,9 +20,9 @@ def ENV = System.getenv()
 
 class Globals {
 	static def baseVersion = "0.34.3"
-	static def mcVersion = "21w18a"
-	static def yarnVersion = "+build.3"
-	static def loaderVersion = "0.10.5+build.213"
+	static def mcVersion = "21w19a"
+	static def yarnVersion = "+build.1"
+	static def loaderVersion = "0.11.3"
 	static def preRelease = true
 }
 
@@ -30,8 +30,6 @@ version = Globals.baseVersion + "+" + (ENV.GITHUB_RUN_NUMBER ? "" : "local-") +
 logger.lifecycle("Building Fabric: " + version)
 
 import org.apache.commons.codec.digest.DigestUtils
-import net.fabricmc.loom.task.RunClientTask
-import net.fabricmc.loom.task.RunServerTask
 
 def getSubprojectVersion(project, version) {
 	if (grgit == null) {
@@ -66,7 +64,7 @@ def moduleDependencies(project, List<String> depNames) {
 	def deps = depNames.iterator().collect { project.dependencies.project(path: ":$it", configuration: 'dev') }
 	project.dependencies {
 		deps.each {
-			compile it
+			api it
 		}
 	}
 	project.publishing {
@@ -88,19 +86,14 @@ def moduleDependencies(project, List<String> depNames) {
 }
 
 allprojects {
+	apply plugin: "java-library"
 	apply plugin: "checkstyle"
 	apply plugin: "maven-publish"
 	apply plugin: "fabric-loom"
-	apply plugin: "net.minecrell.licenser"
+	apply plugin: "org.cadixdev.licenser"
 
 	tasks.withType(JavaCompile).configureEach {
-		def targetVersion = 8
-		if (JavaVersion.current().isJava9Compatible()) {
-			it.options.release = targetVersion
-		} else {
-			sourceCompatibility = JavaVersion.toVersion(targetVersion)
-			targetCompatibility = JavaVersion.toVersion(targetVersion)
-		}
+		it.options.release = 16
 	}
 
 	group = "net.fabricmc.fabric-api"
@@ -112,21 +105,27 @@ allprojects {
 		}
 	}
 
-	task runTestmodClient(type: RunClientTask) {
-		classpath sourceSets.testmod.runtimeClasspath
-	}
-
-	task runTestmodServer(type: RunServerTask) {
-		classpath sourceSets.testmod.runtimeClasspath
+	loom {
+		runs {
+			testmodClient {
+				client()
+				ideConfigGenerated project.rootProject == project
+				name = "Testmod Client"
+				source sourceSets.testmod
+			}
+			testmodServer {
+				server()
+				ideConfigGenerated project.rootProject == project
+				name = "Testmod Server"
+				source sourceSets.testmod
+			}
+		}
 	}
 
 	dependencies {
 		minecraft "com.mojang:minecraft:$Globals.mcVersion"
 		mappings "net.fabricmc:yarn:${Globals.mcVersion}${Globals.yarnVersion}:v2"
-		modCompile "net.fabricmc:fabric-loader:${Globals.loaderVersion}"
-
-		// TODO remove when updating to loom 0.7
-		annotationProcessor "net.fabricmc:fabric-mixin-compile-extensions:0.4.3"
+		modApi "net.fabricmc:fabric-loader:${Globals.loaderVersion}"
 	}
 
 	configurations {
@@ -142,30 +141,25 @@ allprojects {
 	}
 
 	jar {
-		classifier = "dev"
+		archiveClassifier = "dev"
 	}
 
 	afterEvaluate {
 		remapJar {
-			input = file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar")
+			input = file("${project.buildDir}/libs/$archivesBaseName-$version-dev.jar")
 			archiveName = "${archivesBaseName}-${version}.jar"
 		}
 
 		artifacts {
-			dev file: file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar"), type: "jar", builtBy: jar
+			dev file: file("${project.buildDir}/libs/$archivesBaseName-$version-dev.jar"), type: "jar", builtBy: jar
 		}
 
 		processResources {
 			inputs.property "version", project.version
 
-			from(sourceSets.main.resources.srcDirs) {
-				include "fabric.mod.json"
+			filesMatching("fabric.mod.json") {
 				expand "version": project.version
 			}
-
-			from(sourceSets.main.resources.srcDirs) {
-				exclude "fabric.mod.json"
-			}
 		}
 
 		license {
@@ -183,6 +177,11 @@ allprojects {
 		configFile = rootProject.file("checkstyle.xml")
 		toolVersion = "8.31"
 	}
+
+	tasks.withType(AbstractArchiveTask) {
+		preserveFileTimestamps = false
+		reproducibleFileOrder = true
+	}
 }
 
 // Apply auxiliary buildscripts to submodules
@@ -226,17 +225,18 @@ task javadocJar(type: Jar) {
 build.dependsOn javadocJar
 
 // Runs a dedicated headless server with all test mods that closes once complete.
-task runAutoTestServer(type: RunServerTask) {
-	project.subprojects {
-		classpath it.sourceSets.testmod.runtimeClasspath
+loom {
+	runs {
+		autoTestServer {
+			inherit testmodServer
+			vmArg "-Dfabric.autoTest"
+		}
 	}
-	jvmArgs "-Dfabric.autoTest"
-	args "--nogui"
 }
 
 subprojects {
 	dependencies {
-		testmodCompile sourceSets.main.output
+		testmodImplementation sourceSets.main.output
 	}
 
 	task remapMavenJar(type: Copy, dependsOn: remapJar) {
@@ -330,10 +330,10 @@ sourceSets {
 dependencies {
 	afterEvaluate {
 		subprojects.each {
-			compile project(path: ":${it.name}", configuration: "dev")
+			api project(path: ":${it.name}", configuration: "dev")
 			include project("${it.name}:")
 
-			testmodCompile project("${it.name}:").sourceSets.testmod.output
+			testmodImplementation project("${it.name}:").sourceSets.testmod.output
 		}
 	}
 }

fabric-api-base/build.gradle

@@ -2,6 +2,6 @@ archivesBaseName = "fabric-api-base"
 version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
-	testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
 }

fabric-api-lookup-api-v1/build.gradle

@@ -7,5 +7,5 @@ moduleDependencies(project, [
 ])
 
 dependencies {
-	testmodCompile project(path: ':fabric-object-builder-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-object-builder-api-v1', configuration: 'dev')
 }

fabric-api-lookup-api-v1/src/main/resources/fabric-api-lookup-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.lookup",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "BlockEntityTypeAccessor",
     "ServerWorldMixin"

fabric-biome-api-v1/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-biome-api-v1"
-version = getSubprojectVersion(project, "3.1.8")
+version = getSubprojectVersion(project, "3.1.9")
 
 minecraft {
     accessWidener = file("src/main/resources/fabric-biome-api-v1.accesswidener")

fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinMultiNoiseBiomeSource.java

@@ -38,7 +38,7 @@ import net.fabricmc.fabric.impl.biome.InternalBiomeData;
 @Mixin(MultiNoiseBiomeSource.Preset.class)
 public class MixinMultiNoiseBiomeSource {
 	// NOTE: This is a lambda-function in the NETHER preset field initializer
-	@ModifyArgs(method = "method_31088", at = @At(value = "INVOKE", target = "net/minecraft/world/biome/source/MultiNoiseBiomeSource.<init> (JLjava/util/List;Ljava/util/Optional;Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource$1;)V"))
+	@ModifyArgs(method = "method_31088", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/source/MultiNoiseBiomeSource;<init>(JLjava/util/List;Ljava/util/Optional;)V"))
 	private static void appendNetherBiomes(Args args, MultiNoiseBiomeSource.Preset preset, Registry<Biome> registry, Long seed) {
 		List<Pair<Biome.MixedNoisePoint, Supplier<Biome>>> biomes = new ArrayList<>(args.get(1));
 

fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/VanillaLayeredBiomeSourceAccessor.java

@@ -19,6 +19,7 @@ package net.fabricmc.fabric.mixin.biome;
 import java.util.List;
 
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import net.minecraft.util.registry.RegistryKey;
@@ -36,6 +37,7 @@ public interface VanillaLayeredBiomeSourceAccessor {
 	}
 
 	@Accessor
+	@Mutable
 	static void setBIOMES(List<RegistryKey<Biome>> biomes) {
 		throw new AssertionError("mixin");
 	}

fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.biome",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "modification.BiomeAccessor",
     "modification.BiomeEffectsAccessor",

fabric-blockrenderlayer-v1/src/main/resources/fabric-blockrenderlayer-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.blockrenderlayer",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinBlockRenderLayer"
   ],

fabric-command-api-v1/build.gradle

@@ -2,7 +2,7 @@ archivesBaseName = "fabric-command-api-v1"
 version = getSubprojectVersion(project, "1.1.1")
 
 dependencies {
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
 }
 
 moduleDependencies(project, [

fabric-command-api-v1/src/main/resources/fabric-command-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.command",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "CommandManagerMixin",
     "HelpCommandAccessor"

fabric-containers-v0/src/main/resources/fabric-containers-v0.accurate.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": false,
   "package": "net.fabricmc.fabric.mixin.container",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MixinServerPlayerEntity"
   ],

fabric-containers-v0/src/main/resources/fabric-containers-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": false,
   "package": "net.fabricmc.fabric.mixin.container",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "ServerPlayerEntityAccessor"
   ],

fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.content.registry",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MixinAbstractFurnaceBlockEntity",
     "MixinFireBlock"

fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.crash.report.info",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MixinCrashReport"
   ],

fabric-dimensions-v1/build.gradle

@@ -2,9 +2,9 @@ archivesBaseName = "fabric-dimensions-v1"
 version = getSubprojectVersion(project, "2.0.10")
 
 dependencies {
-	testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-resource-loader-v0', configuration: 'dev')
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-resource-loader-v0', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
 }
 
 moduleDependencies(project, [

fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.dimension",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "EntityMixin",
     "ServerBugfixMixin"

fabric-entity-events-v1/build.gradle

@@ -6,5 +6,5 @@ moduleDependencies(project, [
 ])
 
 dependencies {
-	testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')
 }

fabric-entity-events-v1/src/main/resources/fabric-entity-events-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.entity.event",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "EntityMixin",
     "LivingEntityMixin",

fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.event.interaction",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MixinServerPlayerEntity",
     "MixinServerPlayerInteractionManager",

fabric-game-rule-api-v1/build.gradle

@@ -6,7 +6,7 @@ minecraft {
 }
 
 dependencies {
-	testmodCompile project(path: ':fabric-api-base', configuration: 'dev')
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-resource-loader-v0', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-api-base', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-resource-loader-v0', configuration: 'dev')
 }

fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.gamerule",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "BooleanRuleAccessor",
     "GameRuleCommandAccessor",

fabric-item-api-v1/src/main/resources/fabric-item-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.item",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "ItemStackMixin",
     "ItemMixin",

fabric-item-groups-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-item-groups-v0"
-version = getSubprojectVersion(project, "0.2.7")
+version = getSubprojectVersion(project, "0.2.8")
 
 moduleDependencies(project, [
 		'fabric-api-base',

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java

@@ -120,8 +120,8 @@ public abstract class MixinCreativePlayerInventoryGui extends AbstractInventoryS
 	private void init(CallbackInfo info) {
 		fabric_updateSelection();
 
-		int xpos = field_2776 + 116;
-		int ypos = field_2800 - 10;
+		int xpos = x + 116;
+		int ypos = y - 10;
 
 		addButton(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos + 11, ypos, FabricCreativeGuiComponents.Type.NEXT, this));
 		addButton(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos, ypos, FabricCreativeGuiComponents.Type.PREVIOUS, this));

fabric-item-groups-v0/src/main/resources/fabric-item-groups-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.item.group",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MixinItemGroup"
   ],

fabric-key-binding-api-v1/build.gradle

@@ -2,7 +2,7 @@ archivesBaseName = "fabric-key-binding-api-v1"
 version = getSubprojectVersion(project, "1.0.4")
 
 dependencies {
-	testmodCompile project(path: ':fabric-api-base', configuration: 'dev')
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-resource-loader-v0', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-api-base', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-resource-loader-v0', configuration: 'dev')
 }

fabric-key-binding-api-v1/src/main/resources/fabric-key-binding-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.keybinding",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "KeyBindingAccessor",
     "KeyCodeAccessor",

fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.event.lifecycle",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MinecraftServerMixin",
     "ServerWorldEntityLoaderMixin",

fabric-loot-tables-v1/src/main/resources/fabric-loot-tables-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.loot.table",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "LootPoolBuilderHooks",
     "LootPoolEntryTypesAccessor",

fabric-models-v0/build.gradle

@@ -6,6 +6,6 @@ moduleDependencies(project, [
 ])
 
 dependencies {
-	testmodCompile project(path: ':fabric-renderer-registries-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-resource-loader-v0', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-renderer-registries-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-resource-loader-v0', configuration: 'dev')
 }

fabric-models-v0/src/main/resources/fabric-models-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.model",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinBakedModelManager",
     "MixinModelLoader"

fabric-networking-api-v1/build.gradle

@@ -6,7 +6,7 @@ moduleDependencies(project, [
 ])
 
 dependencies {
-	testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-key-binding-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-key-binding-api-v1', configuration: 'dev')
 }

fabric-networking-api-v1/src/main/resources/fabric-networking-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.networking",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "ClientConnectionMixin",
     "EntityTrackerEntryMixin",

fabric-networking-blockentity-v0/src/main/resources/fabric-networking-blockentity-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.networking.blockentity",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MixinBlockEntity"
   ],

fabric-object-builder-api-v1/build.gradle

@@ -2,7 +2,7 @@ archivesBaseName = "fabric-object-builder-api-v1"
 version = getSubprojectVersion(project, "1.10.7")
 
 dependencies {
-	testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')
 }
 
 moduleDependencies(project, [

fabric-object-builder-api-v1/src/main/resources/fabric-object-builder-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.object.builder",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "AbstractBlockAccessor",
     "AbstractBlockSettingsAccessor",

fabric-object-builders-v0/src/main/resources/fabric-object-builders-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.object.builder",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "OldMixinBlock",
     "OldMixinItem"

fabric-particles-v1/src/main/resources/fabric-particles-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.particle",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinParticleManager",
     "ParticleManagerAccessor",

fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.registry.sync",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "AccessorLevelStorageSession",
     "AccessorRegistry",

fabric-renderer-api-v1/build.gradle

@@ -6,9 +6,9 @@ moduleDependencies(project, [
 ])
 
 dependencies {
-	testmodCompile project(path: ':fabric-blockrenderlayer-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-models-v0', configuration: 'dev')
-	testmodCompile project(path: ':fabric-networking-blockentity-v0', configuration: 'dev')
-	testmodCompile project(path: ':fabric-object-builder-api-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-rendering-data-attachment-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-blockrenderlayer-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-models-v0', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-networking-blockentity-v0', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-object-builder-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-rendering-data-attachment-v1', configuration: 'dev')
 }

fabric-renderer-api-v1/src/main/resources/fabric-renderer-api-v1.debughud.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": false,
   "package": "net.fabricmc.fabric.mixin.renderer",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "client.MixinDebugHud"
   ],

fabric-renderer-api-v1/src/main/resources/fabric-renderer-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.renderer",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "client.MixinBakedModel",
     "client.MixinSpriteAtlasTexture"

fabric-renderer-api-v1/src/testmod/resources/fabric-renderer-api-v1-testmod.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.test.renderer.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "WorldMixin"
   ],

fabric-renderer-indigo/src/main/resources/fabric-renderer-indigo.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.indigo.renderer",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "plugin": "net.fabricmc.fabric.impl.client.indigo.IndigoMixinConfigPlugin",
   "mixins": [
   ],

fabric-renderer-registries-v1/build.gradle

@@ -2,7 +2,7 @@ archivesBaseName = "fabric-renderer-registries-v1"
 version = getSubprojectVersion(project, "3.2.0")
 
 dependencies {
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
 }
 
 moduleDependencies(project, [

fabric-renderer-registries-v1/src/main/resources/fabric-renderer-registries-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.renderer.registry",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "EntityModelLayersAccessor",
     "EntityModelsMixin",

fabric-rendering-data-attachment-v1/src/main/resources/fabric-rendering-data-attachment-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.rendering.data.attachment",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "MixinBlockEntity",
     "MixinViewableWorld"

fabric-rendering-fluids-v1/src/main/resources/fabric-rendering-fluids-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.rendering.fluid",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinFluidRenderer"
   ],

fabric-rendering-v1/src/main/resources/fabric-rendering-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.rendering",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinBlockColorMap",
     "MixinBuiltinModelItemRenderer",

fabric-resource-loader-v0/build.gradle

@@ -2,6 +2,6 @@ archivesBaseName = "fabric-resource-loader-v0"
 version = getSubprojectVersion(project, "0.4.6")
 
 dependencies {
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-api-base', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-api-base', configuration: 'dev')
 }

fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.resource.loader",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "FileResourcePackProviderAccessor",
     "DefaultResourcePackMixin",

fabric-screen-api-v1/src/main/resources/fabric-screen-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.screen",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "GameRendererMixin",
     "MinecraftClientMixin",

fabric-screen-handler-api-v1/build.gradle

@@ -6,7 +6,7 @@ minecraft {
 }
 
 dependencies {
-	testmodCompile(project(path: ':fabric-object-builder-api-v1', configuration: 'dev'))
+	testmodImplementation(project(path: ':fabric-object-builder-api-v1', configuration: 'dev'))
 	testmodRuntimeOnly(project(path: ':fabric-resource-loader-v0', configuration: 'dev'))
 }
 

fabric-screen-handler-api-v1/src/main/resources/fabric-screen-handler-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.screenhandler",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "ServerPlayerEntityMixin"
   ],

fabric-structure-api-v1/src/main/resources/fabric-structure-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.structure",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "BiomeAccessor",
     "ChunkSerializerMixin",

fabric-structure-api-v1/src/testmod/resources/fabric-structure-api-v1-testmod.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.test.structure.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "ChunkSerializerMixin",
     "MixinDefaultBiomeCreator"

fabric-tag-extensions-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-tag-extensions-v0"
-version = getSubprojectVersion(project, "1.1.3")
+version = getSubprojectVersion(project, "1.1.4")
 
 moduleDependencies(project, [
 		'fabric-api-base',

fabric-tag-extensions-v0/src/main/java/net/fabricmc/fabric/mixin/tag/extension/MixinObjectBuilder.java

@@ -20,13 +20,12 @@ import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import net.minecraft.data.server.AbstractTagProvider;
 import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
 
 import net.fabricmc.fabric.api.tag.FabricDataGeneratorTagBuilder;
 
-@Mixin(AbstractTagProvider.ObjectBuilder.class)
+@Mixin(targets = "net.minecraft.data.server.AbstractTagProvider$ObjectBuilder")
 public class MixinObjectBuilder<T> implements FabricDataGeneratorTagBuilder<T> {
 	@Shadow
 	@Final private Tag.Builder field_23960;

fabric-tag-extensions-v0/src/main/resources/fabric-tag-extensions-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.tag.extension",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "AccessorFluidTags",
     "MixinObjectBuilder",

fabric-textures-v0/src/main/resources/fabric-textures-v0.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.client.texture",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinSpriteAtlasTexture"
   ],

fabric-tool-attribute-api-v1/build.gradle

@@ -2,9 +2,9 @@ archivesBaseName = "fabric-tool-attribute-api-v1"
 version = getSubprojectVersion(project, "1.2.10")
 
 dependencies {
-	testmodCompile project(path: ':fabric-object-builder-api-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
-	testmodCompile project(path: ':fabric-resource-loader-v0', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-object-builder-api-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-lifecycle-events-v1', configuration: 'dev')
+	testmodImplementation project(path: ':fabric-resource-loader-v0', configuration: 'dev')
 }
 
 moduleDependencies(project, [

fabric-tool-attribute-api-v1/src/main/resources/fabric-tool-attribute-api-v1.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.fabricmc.fabric.mixin.tool.attribute",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "BambooBlockMixin",
     "LivingEntityMixin",

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/resources/fabric.mod.json

@@ -16,8 +16,9 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.8.9",
-    "minecraft": "~1.17-alpha.21.17.a"
+    "fabricloader": ">=0.11.3",
+    "java": ">=16",
+    "minecraft": "~1.17-alpha.21.19.a"
   },
   "description": "Core API module providing key hooks and intercompatibility features."
 }