Changes for 1.17

build.gradle

@@ -2,28 +2,27 @@ import com.modrinth.minotaur.TaskModrinthUpload
 
 plugins {
 	id "java-library"
-	id "fabric-loom" version "0.5-SNAPSHOT"
+	id "fabric-loom" version "0.8-SNAPSHOT"
 	id "com.matthewprenger.cursegradle" version "1.4.0"
-	id "com.modrinth.minotaur" version "1.1.0"
+	id "com.modrinth.minotaur" version "1.2.1"
 }
 
 ext {
 	commonGradleBranch = "master"
-	minecraftVersion = "1.16.5"
-	yarnMappings = "1.16.5+build.1"
-	loaderVersion = "0.11.1"
-	fabricAPIVersion = "0.29.3+1.16"
-	modMenuVersion = "1.14.13+build.19"
-	clothConfigVersion = "4.8.3"
-	autoConfigVersion = "3.3.1"
-	autoConfigTOMLVersion = "autoconfig-3.x.x-fabric-SNAPSHOT"
+	minecraftVersion = "1.17"
+	yarnMappings = "1.17+build.10"
+	loaderVersion = "0.11.6"
+	fabricAPIVersion = "0.35.2+1.17"
+	modMenuVersion = "2.0.2"
+	clothConfigVersion = "5.0.34"
 }
 
-version = "2.0.6-fabric"
+version = "2.1.0-fabric"
 group = "com.therandomlabs.vanilladeathchest"
 archivesBaseName = "vanilladeathchest"
 
-apply from: "https://raw.githubusercontent.com/TheRandomLabs/Common-Gradle/${project.commonGradleBranch}/fabric.gradle"
+//apply from: "https://raw.githubusercontent.com/TheRandomLabs/Common-Gradle/${project.commonGradleBranch}/fabric.gradle"
+apply from: "fabric.gradle"
 
 if (project.hasProperty("curseForgeAPIKey")) {
 	curseforge {
@@ -33,9 +32,11 @@ if (project.hasProperty("curseForgeAPIKey")) {
 			id = "393000"
 
 			addGameVersion "Fabric"
+			addGameVersion "Java 16"
 			addGameVersion "Java 10"
 			addGameVersion "Java 9"
 			addGameVersion "Java 8"
+			addGameVersion "1.17"
 			addGameVersion "1.16.5"
 			addGameVersion "1.16.4"
 			addGameVersion "1.16.3"
@@ -83,6 +84,7 @@ if (project.hasProperty("modrinthToken")) {
 		changelog = new File("changelog.md").getText()
 		uploadFile = remapJar
 		releaseType = "alpha"
+		addGameVersion("1.17")
 		addGameVersion("1.16.5")
 		addGameVersion("1.16.4")
 		addGameVersion("1.16.3")

fabric.gradle

@@ -0,0 +1,139 @@
+def branch = project.findProperty("commonGradleBranch") ?: "master"
+def includeClothConfig = !project.hasProperty("includeClothConfig") || project.includeClothConfig
+def testMod = project.findProperty("testMod")
+
+ext {
+	useSpotBugs = false
+	testing = false
+	defaultCompileDependencies = false
+	includeLicense = false
+	buildSourcesJar = false
+	registerDefaultMavenPublication = false
+}
+
+apply from: "https://raw.githubusercontent.com/TheRandomLabs/Common-Gradle/$branch/build.gradle"
+
+if (testMod) {
+	sourceSets {
+		testmod {
+			compileClasspath += main.compileClasspath
+			runtimeClasspath += main.runtimeClasspath
+		}
+	}
+}
+
+repositories {
+	if (project.hasProperty("clothConfigVersion")) {
+		maven { url "https://maven.shedaniel.me/" }
+	}
+
+	if (project.hasProperty("autoConfigVersion")) {
+		maven {
+			url "https://dl.bintray.com/shedaniel/autoconfig1u"
+		}
+	}
+
+	if (project.hasProperty("autoConfigTOMLVersion")) {
+		maven {
+			url "https://jitpack.io"
+		}
+	}
+
+	if (project.hasProperty("modMenuVersion")) {
+		maven {
+			url "https://maven.terraformersmc.com/releases/"
+		}
+	}
+}
+
+dependencies {
+	minecraft "com.mojang:minecraft:${project.minecraftVersion}"
+	mappings "net.fabricmc:yarn:${project.yarnMappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loaderVersion}"
+
+	if (project.hasProperty("fabricAPIVersion")) {
+		modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabricAPIVersion}"
+	}
+
+	if (project.hasProperty("modMenuVersion")) {
+		modImplementation "com.terraformersmc:modmenu:${modMenuVersion}"
+	}
+
+	if (project.hasProperty("clothConfigVersion")) {
+		modApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothConfigVersion}") {
+			exclude(group: "net.fabricmc.fabric-api")
+		}
+
+		if (includeClothConfig) {
+			include "me.shedaniel.cloth:cloth-config-fabric:${project.clothConfigVersion}"
+		}
+	}
+
+	if (project.hasProperty("autoConfigVersion")) {
+		modImplementation("me.sargunvohra.mcmods:autoconfig1u:${project.autoConfigVersion}") {
+			exclude(module: "fabric-api")
+		}
+
+		if (includeClothConfig) {
+			include "me.sargunvohra.mcmods:autoconfig1u:${project.autoConfigVersion}"
+		}
+	}
+
+	if (project.hasProperty("autoConfigTOMLVersion")) {
+
+		modImplementation "com.github.TheRandomLabs:AutoConfig-TOML:${project.autoConfigTOMLVersion}"
+		include "com.github.TheRandomLabs:AutoConfig-TOML:${project.autoConfigTOMLVersion}"
+	}
+
+	if (testMod) {
+		afterEvaluate {
+			testmodImplementation(sourceSets.main.output)
+		}
+	}
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+java {
+	withSourcesJar()
+}
+
+jar {
+	from("LICENSE") {
+		rename {
+			"${it}_${project.archivesBaseName}"
+		}
+	}
+}
+
+if (testMod) {
+	runClient {
+		classpath(sourceSets.testmod.runtimeClasspath)
+	}
+
+	runServer {
+		classpath(sourceSets.testmod.runtimeClasspath)
+	}
+}
+
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
+			}
+
+			artifact javadocJar
+		}
+	}
+}

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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists