Merge remote-tracking branch 'origin/1.16' into 1.18

build.gradle

@@ -94,6 +94,7 @@ allprojects {
         maven {
             url 'https://maven.terraformersmc.com/releases'
         }
+        maven { url = "https://jitpack.io" }
     }
 }
 

common/build.gradle

@@ -10,6 +10,7 @@ dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}"))
 
     modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}") {
         transitive = false

fabric/build.gradle

@@ -31,6 +31,7 @@ configurations {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
+    include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${rootProject.mixinextras_version}")))
 
     modCompileOnly(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
     modCompileOnly(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }

forge/build.gradle

@@ -45,6 +45,8 @@ repositories {
 
 dependencies {
     forge "net.minecraftforge:forge:${rootProject.forge_version}"
+    implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}"))
+    implementation(include("com.github.llamalad7.mixinextras:mixinextras-forge:${rootProject.mixinextras_version}"))
     // Remove the next line if you don't want to depend on the API
     // modApi "me.shedaniel:architectury-forge:${rootProject.architectury_version}"
 

forge/src/main/resources/META-INF/mods.toml

@@ -40,7 +40,7 @@ modId = "forge" #mandatory
 # Does this dependency have to exist - if not, ordering below must be specified
 mandatory = true #mandatory
 # The version range of the dependency
-versionRange = "[40,)" #mandatory
+versionRange = "[40.2.4,)" #mandatory
 # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
 ordering = "NONE"
 # Side this dependency is applied on - BOTH, CLIENT or SERVER

gradle.properties

@@ -2,11 +2,12 @@
 org.gradle.jvmargs=-Xmx2G
 
 junit_version=5.10.0-M1
+mixinextras_version=0.2.0-beta.9
 
 mod_id=modernfix
 minecraft_version=1.18.2
 enabled_platforms=fabric,forge
-forge_version=1.18.2-40.2.1
+forge_version=1.18.2-40.2.4
 lazydfu_version=3544496
 parchment_version=2022.11.06
 refined_storage_version=4392829