Merge branch 'master' into 1.17

.github/workflows/build-on-pr.yml

@@ -3,10 +3,7 @@
 
 name: Pull Request Builds
 
-on:
+on: [pull_request]
-  pull_request:
-    paths:
-    - "src/**"
 
 jobs:
   Build:
@@ -15,10 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 16
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: 16
     - name: Cache Gradle packages
       uses: actions/cache@v2
       with:

.github/workflows/devbuild.yml

@@ -3,10 +3,7 @@
 
 name: Development Builds
 
-on:
+on: [push]
-  push:
-    paths:
-    - "src/**"
 
 jobs:
   Build:
@@ -15,10 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 16
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: 16
     - name: Cache Gradle packages
       uses: actions/cache@v2
       with:

.github/workflows/publish-release.yml

@@ -65,10 +65,11 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ steps.getbranchinfo.outputs.branchname }}
-      - name: Set up JDK 1.8
+      - name: Set up JDK 16
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: 16
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -139,10 +140,11 @@ jobs:
     steps:
       - name: Checkout Carpet sources
         uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 16
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: 16
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -157,7 +159,7 @@ jobs:
           {
             "schemaVersion": 1,
             "id": "carpet",
-            "version": "1.4.11",
+            "version": "1.4.36",
             "entrypoints": {
               "server": [ "carpet.utils.CarpetRulePrinter" ],
               "preLaunch": [ "carpet.utils.CarpetRulePrinter" ]

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -18,7 +18,7 @@ dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	// modCompile "net.fabricmc:fabric:${project.fabric_version}"
@@ -31,14 +31,17 @@ dependencies {
 processResources {
 	inputs.property "version", project.version
 
-	from(sourceSets.main.resources.srcDirs) {
+	filesMatching("fabric.mod.json") {
-		include "fabric.mod.json"
+		expand "version": project.version
-		expand "version": project.mod_version
 	}
+	//from(sourceSets.main.resources.srcDirs) {
+	//	include "fabric.mod.json"
+	//	expand "version": project.mod_version
+	//}
 
-	from(sourceSets.main.resources.srcDirs) {
+	//from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
+	//	exclude "fabric.mod.json"
-	}
+	//}
 }
 
 
@@ -56,6 +59,9 @@ tasks.withType(JavaCompile).configureEach {
 	if (JavaVersion.current().isJava9Compatible()) {
 		 it.options.release = targetVersion
 	}
+
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
+	//it.options.release = 16
 }
 
 java {

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