feat(1.20.1): Include Kuma API as JiJ

TwelveIterationMods · Jun 3, 2024 · 1109f53 · 1109f53
1 parent 23ae134
commit 1109f53
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,26 +38,69 @@ subprojects {
         mavenCentral()
 
         maven {
-            url "https://www.cursemaven.com"
-
+            url = "https://www.cursemaven.com"
             content {
                 includeGroup 'curse.maven'
             }
         }
 
-        maven { url "https://maven.twelveiterations.com/repository/maven-public/" }
+        maven {
+            url = "https://maven.twelveiterations.com/repository/maven-public/"
+            content {
+                includeGroup "net.blay09.mods"
+            }
+        }
 
-        // For Cloth Config and REI
-        maven { url "https://maven.shedaniel.me/" }
+        maven {
+            url = "https://maven.shedaniel.me/"
+            content {
+                includeGroup "me.shedaniel"
+                includeGroup "me.shedaniel.cloth"
+                includeGroup "dev.architectury"
+            }
+        }
 
-        // For JEI
-        maven { url "https://dvs1.progwml6.com/files/maven/" }
+        maven {
+            url = "https://maven.blamejared.com"
+            content {
+                includeGroup "mezz.jei"
+            }
+        }
 
-        // For WTHIT
-        maven { url "https://maven.bai.lol" }
+        maven {
+            url = "https://maven.bai.lol"
+            content {
+                includeGroup "mcp.mobius.waila"
+            }
+        }
 
-        // For ModMenu
-        maven { url "https://maven.terraformersmc.com/releases/" }
+        maven {
+            url = "https://maven.terraformersmc.com/releases"
+            content {
+                includeGroup "com.terraformersmc"
+            }
+        }
+
+        maven {
+            url = "https://jm.gserv.me/repository/maven-public/"
+            content {
+                includeGroup "info.journeymap"
+            }
+        }
+
+        maven {
+            url = 'https://jitpack.io'
+            content {
+                includeGroup "com.github.BlueMap-Minecraft"
+            }
+        }
+
+        maven {
+            url = "https://repo.mikeprimm.com/"
+            content {
+                includeGroup "us.dynmap"
+            }
+        }
     }
 
     tasks.withType(JavaCompile).configureEach {
@@ -70,4 +113,11 @@ subprojects {
             failOnError false
         }
     }
+
+    configurations.all {
+        resolutionStrategy {
+            cacheChangingModulesFor 60, 'seconds'
+            cacheDynamicVersionsFor 60, 'seconds'
+        }
+    }
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'maven-publish'
     id 'idea'
     id 'net.darkhax.curseforgegradle' version '1.0.14'
@@ -119,7 +119,7 @@ task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
 
     apiToken = project.findProperty("curseforge.api_key") ?: System.getenv("CURSEFORGE_TOKEN") ?: "none"
 
-    def mainFile = upload(curseforge_fabric_project_id, file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))
+    def mainFile = upload(curseforge_fabric_project_id, file("${project.buildDir}/libs/${archivesBaseName}-${version}-all.jar"))
     mainFile.changelog = rootProject.file('CHANGELOG.md').text
     mainFile.addRequirement("fabric-api")
     project.minecraft_versions.split(',').toList().each { mainFile.addGameVersion(it) }
@@ -131,12 +131,13 @@ modrinth {
     projectId = project.modrinth_fabric_project_id
     versionType = project.modrinth_release_type
     versionNumber = project.version + "+fabric-" + project.minecraft_version
-    uploadFile = remapJar
+    uploadFile = jar.outputs.getFiles().asPath.replace(".jar", "-all.jar")
     changelog = rootProject.file("CHANGELOG.md").text
     gameVersions = project.minecraft_versions.split(',').toList()
     syncBodyFrom = rootProject.file("modrinth.md").text
     loaders = ['fabric']
     dependencies {
         required.project "fabric-api"
     }
-}
+}
+tasks.modrinth.dependsOn(build)
diff --git a/fabric/dependencies.gradle b/fabric/dependencies.gradle
@@ -8,6 +8,8 @@ repositories {
 }
 
 dependencies {
+    include modApi("net.blay09.mods:kuma-api-fabric:[20.1.0,20.2.0)")
+
     modCompileOnly "me.shedaniel.cloth:cloth-config-fabric:11.0.99"
     modCompileOnly "com.terraformersmc:modmenu:$modmenu_version"
 

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -22,6 +22,9 @@ group = mod_group
 archivesBaseName = "${mod_id}-forge-${minecraft_version}"
 version = mod_version
 
+jarJar.enable()
+build.dependsOn tasks.jarJar
+
 minecraft {
     mappings channel: 'official', version: minecraft_version
 

diff --git a/forge/dependencies.gradle b/forge/dependencies.gradle
@@ -1,2 +1,5 @@
 dependencies {
+    jarJar(group: "net.blay09.mods", name: "kuma-api-forge", version: "[20.1.0,20.2.0)") {
+        transitive = false
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/shared/dependencies.gradle b/shared/dependencies.gradle
@@ -1,2 +1,3 @@
 dependencies {
+    compileOnly "net.blay09.mods:kuma-api-common:[20.1.0,20.2.0)"
 }