Merge remote-tracking branch 'origin/1.20' into 1.21.1

Author: embeddedt

buildSrc/src/main/groovy/modernfix.common-conventions.gradle

@@ -84,11 +84,12 @@ repositories {
     exclusiveContent {
         forRepository {
             maven {
-                url = 'https://maven.saps.dev/minecraft'
+                url = 'https://maven.latvian.dev/releases'
             }
         }
         filter {
             includeGroup "dev.latvian.mods"
+            includeGroup "dev.latvian.apps"
         }
     }
     exclusiveContent {

common/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${rootProject.mixinextras_version}"))
 
-    modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}") {
+    modCompileOnly("dev.latvian.mods:kubejs-neoforge:${kubejs_version}") {
         transitive = false
     }
     modApi("dev.latvian.mods:rhino:${rhino_version}") {

gradle.properties

@@ -15,8 +15,8 @@ jei_version=19.0.0.9
 rei_version=13.0.678
 ctm_version=1.21-1.2.0+2
 ldlib_version=5782845
-kubejs_version=1902.6.0-build.142
-rhino_version=1902.2.2-build.268
+kubejs_version=2101.7.1-build.181
+rhino_version=2101.2.7-build.74
 supported_minecraft_versions=1.21.1
 
 fabric_loader_version=0.16.10

neoforge/build.gradle

@@ -52,7 +52,9 @@ dependencies {
 
     modCompileOnly("curse.maven:jeresources-240630:3951643")
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}") { transitive false }
-    modCompileOnly("dev.latvian.mods:kubejs-forge:${kubejs_version}")
+    modCompileOnly("dev.latvian.mods:kubejs-neoforge:${kubejs_version}") {
+        transitive = false
+    }
     //modRuntimeOnly("curse.maven:ferritecore-429235:4441949")
     modCompileOnly("team.chisel.ctm:CTM:${ctm_version}")
     modCompileOnly("curse.maven:ldlib-626676:${ldlib_version}")