Update deps

.github/workflows/check.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: adoptopenjdk:16-jdk
+      image: eclipse-temurin:17-jdk
       options: --user root
     steps:
       - uses: actions/checkout@v2

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: adoptopenjdk:16-jdk
+      image: eclipse-temurin:17-jdk
       options: --user root
     steps:
       - run: apt update && apt install git -y

RebornCore/src/main/java/reborncore/client/ItemStackRenderer.java

@@ -89,7 +89,7 @@ public class ItemStackRenderer implements HudRenderCallback {
 			try {
 				Path path = FabricLoader.getInstance().getGameDir().resolve("item_renderer").resolve(identifier.getNamespace()).resolve(identifier.getPath() + ".png");
 				Files.createDirectories(path.getParent());
-				nativeImage.writeFile(path);
+				nativeImage.writeTo(path);
 			} catch (Exception e) {
 				e.printStackTrace();
 			}

build.gradle

@@ -12,7 +12,7 @@ plugins {
 	id 'eclipse'
 	id 'maven-publish'
 	id "org.cadixdev.licenser" version "0.6.1"
-	id "fabric-loom" version "0.9-SNAPSHOT"
+	id "fabric-loom" version "0.10-SNAPSHOT"
 	id "com.matthewprenger.cursegradle" version "1.4.0"
 	id "de.undercouch.download" version "4.1.1"
 }
@@ -62,14 +62,8 @@ repositories {
 	}
 }
 
-configurations {
-	shade
-	compile.extendsFrom shade
-}
-
 def ENV = System.getenv()
 
-
 license {
 	header file('HEADER')
 	include '**/*.java'
@@ -88,10 +82,6 @@ allprojects {
     sourceCompatibility = JavaVersion.VERSION_16
     targetCompatibility = JavaVersion.VERSION_16
 
-    configurations {
-        dev
-    }
-
     // Shared deps between TR and RC
     dependencies {
         minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -128,12 +118,7 @@ allprojects {
                 artifactId project.archivesBaseName  + "-" + getBranch()
                 version project.version
 
-                artifact(remapJar) {
+                from components.java
-                    builtBy remapJar
-                }
-                artifact(sourcesJar) {
-                    builtBy remapSourcesJar
-                }
             }
         }
         repositories {
@@ -161,7 +146,7 @@ sourceSets {
 
 // TechReborn specific dependencies
 dependencies {
-    api project(":RebornCore")
+    api project(path: ":RebornCore", configuration: "namedElements")
     include project(":RebornCore")
 
     optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
@@ -169,11 +154,11 @@ dependencies {
     disabledOptionalDependency "com.github.dexman545:autoswitch-api:${project.autoswitch_version}"
     disabledOptionalDependency "net.oskarstrom:DashLoader:${project.dashloader_version}"
 
-    gametestImplementation 'org.codehaus.groovy:groovy-all:3.0.8'
+    gametestImplementation 'org.apache.groovy:groovy:4.0.0-beta-2'
 }
 
 def optionalDependency(String dep) {
-	dependencies.modRuntime (dep) {
+	dependencies.modLocalRuntime (dep) {
 		exclude group: "net.fabricmc.fabric-api"
 		exclude module: "nbt-crafting"
 	}
@@ -214,7 +199,7 @@ test.dependsOn runGametest
 
 jar {
 	exclude "**/*.psd"
-	classifier = 'universal'
+    archiveClassifier = 'universal'
 
 	from { crowdin.getDidWork() ? fileTree('build/translations').matching{exclude "**/en_US.json"} : null}
 	dependsOn 'fixTranslations'
@@ -292,7 +277,7 @@ curseforge {
 		addGameVersion "1.17.1" // Also update in RebornCore/build.gradle
 		addGameVersion "Fabric"
 
-		mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))
+		mainArtifact remapJar
 		relations {
 			requiredDependency 'reborncore'
 		}

gradle.properties

@@ -7,13 +7,13 @@ org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
     minecraft_version=1.17.1
-    yarn_version=1.17.1+build.23:v2
+    yarn_version=1.17.1+build.63:v2
-    loader_version=0.11.6
+    loader_version=0.12.5
-    fapi_version=0.40.0+1.17
+    fapi_version=0.42.1+1.17
 
 # Dependencies
     energy_version=2.0.0-beta1
-    rei_version=6.0.267-alpha
+    rei_version=6.1.329
     trinkets_version=3.0.2
     autoswitch_version=-SNAPSHOT
     dashloader_version=2.0

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )