Merge branch 'Fabricators-of-Create:fabric/1.20' into fabric/1.20

build.gradle

@@ -1,9 +1,8 @@
 //file:noinspection GroovyAssignabilityCheck
 //file:noinspection GroovyAccessibility
 plugins {
-    id "fabric-loom" version "1.0.+"
-    id "io.github.juuxel.loom-quiltflower" version "1.+" // Quiltflower, a better decompiler
-    id "io.freefair.lombok" version "6.1.0-m3"
+    id "fabric-loom" version "1.6.+"
+    id "io.freefair.lombok" version "8.6"
     id "maven-publish"
 }
 
@@ -25,12 +24,6 @@ repositories {
     maven { url = "https://maven.quiltmc.org/repository/release" }
     maven { url = "https://repo.maven.apache.org/maven2" }
     maven { url = "https://mvn.devos.one/snapshots" }
-    maven {
-        url = "https://jitpack.io"
-        content {
-            includeGroup("com.github.llamalad7.mixinextras")
-        }
-    }
 }
 
 dependencies {
@@ -46,8 +39,8 @@ dependencies {
     modApi(include("io.github.fabricators_of_create.Porting-Lib:tags:${project.porting_lib_version}")) { exclude(group: "io.vram") }
     modApi(include("io.github.fabricators_of_create.Porting-Lib:model_generators:${project.porting_lib_version}")) { exclude(group: "io.vram") }
     modApi(include("io.github.fabricators_of_create.Porting-Lib:data:${project.porting_lib_version}")) { exclude(group: "io.vram") }
-    implementation(include("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}"))
-    annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")
+    implementation(include("io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}"))
+    annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}")
 
     compileOnly("org.projectlombok:lombok:1.18.22")
 
@@ -110,7 +103,6 @@ loom {
 
 lombok {
     version = "1.18.20"
-    config["lombok.addJavaxGeneratedAnnotation"] = "true"
 }
 
 delombok {
@@ -121,7 +113,7 @@ delombok {
 }
 
 task sourceJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
+    archiveClassifier = "sources"
     from sourceSets.main.delombokTask
     exclude "com.tterrag.registrate.test.*"
 }

gradle.properties

@@ -3,10 +3,10 @@ org.gradle.jvmargs = -Xmx1G
 # filled in at build
 mod_version = 1.3.<patch>
 minecraft_version = 1.20.1
-loader_version = 0.14.21
+loader_version = 0.14.25
 fabric_version = 0.86.0+1.20.1
 porting_lib_version = 2.1.1090+1.20
-mixin_extras_version = 0.2.0-beta.6
+mixin_extras_version = 0.3.6
 
 # Mappings
 # https://lambdaurora.dev/tools/import_quilt.html

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Thu Jan 14 16:44:51 EST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-4-bin.zip