Merge branch '1.20' into feat/entity_action_types/show_toast

# Conflicts:
#	src/main/java/io/github/apace100/apoli/mixin/ServerPlayerEntityMixin.java

build.gradle

@@ -1,16 +1,18 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+base {
+	archivesName = project.archives_base_name
+}
+
 repositories {
+	mavenLocal()
+	mavenCentral()
 	exclusiveContent {
 
 		forRepository {
@@ -55,7 +57,6 @@ repositories {
 	maven {
 		url "https://maven.terraformersmc.com/"
 	}
-	mavenLocal()
 }
 
 loom {
@@ -83,7 +84,6 @@ loom {
 dependencies {
 
 	implementation 'com.demonwav.mcdev:annotations:1.0'
-	include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixinextras_version}")))
 
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -148,25 +148,22 @@ java {
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${base.archivesName.get()}"}
 	}
 }
 
 // configure the maven publication
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-			artifact(sourcesJar) {
-				builtBy remapSourcesJar
-			}
+			from components.java
 		}
 	}
 

gradle.properties

@@ -3,22 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
     minecraft_version=1.20.2
-    yarn_mappings=1.20.2+build.1
-    loader_version=0.14.22
+    yarn_mappings=1.20.2+build.4
+    loader_version=0.15.3
 
 # Mod Properties
-    mod_version = 2.11.0
+    mod_version = 2.11.5
     maven_group = com.github.apace100
     archives_base_name = Apoli-1.20.2
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-    fabric_version=0.89.2+1.20.2
+    fabric_version=0.91.2+1.20.2
     cca_version=5.3.0
     pal_version=1.9.0
-    calio_version=a05e2f4
+    calio_version=1.13.0
     clothconfig_version=12.0.109
     modmenu_version=8.0.0
     aea_version=1.5.0+1.20.2
     rea_version=2.4.0
-    mixinextras_version=0.2.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists