From 0c9cb275134d00e559e0869e469adec7ba4fe475 Mon Sep 17 00:00:00 2001 From: Sunekaer Date: Thu, 3 Aug 2023 21:23:34 +0200 Subject: [PATCH] fixed deps --- build.gradle | 17 +++++++++++++---- common/build.gradle | 6 ++++-- .../com/sunekaer/sdrp/discord/RPClient.java | 1 - fabric/build.gradle | 10 +++++----- forge/build.gradle | 12 ++++++------ 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 09ee7c6..6715fdb 100644 --- a/build.gradle +++ b/build.gradle @@ -17,10 +17,7 @@ subprojects { dependencies { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" - // The following line declares the mojmap mappings, you may use other mappings as well mappings loom.officialMojangMappings() - // The following line declares the yarn mappings you may select this one as well. - // mappings "net.fabricmc:yarn:1.19+build.2:v2" } } @@ -45,7 +42,7 @@ allprojects { } maven { url 'https://jitpack.io' content { - includeGroup "com.github.cbyrneee" + includeGroup "com.github.jagrosh" } } maven { @@ -100,11 +97,17 @@ publishMods { from(curseForgeOptions, fabricOptions) requires { slug = "fabric-api" + slug = "cloth-config" + slug = "architectury-api" } } curseforge("curseforgeForge") { from(curseForgeOptions, forgeOptions) + requires { + slug = "cloth-config" + slug = "architectury-api" + } } if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) { @@ -112,11 +115,17 @@ publishMods { from(modrinthOptions, fabricOptions) requires { slug = "fabric-api" + slug = "cloth-config" + slug = "architectury-api" } } modrinth("modrinthForge") { from(modrinthOptions, forgeOptions) + requires { + slug = "cloth-config" + slug = "architectury-api" + } } } } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 855b0a3..d20d60f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -16,8 +16,10 @@ repositories { dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" - implementation('com.github.cbyrneee:DiscordIPC:e18542f600ee48b1eb8cbb255380bba0128dc87e') - shadowCommon('com.github.cbyrneee:DiscordIPC:e18542f600ee48b1eb8cbb255380bba0128dc87e') + implementation 'com.google.code.findbugs:jsr305:3.0.2' + + implementation('com.github.jagrosh:DiscordIPC:a8d6631cc9') + shadowCommon('com.github.jagrosh:DiscordIPC:a8d6631cc9') modApi("me.shedaniel.cloth:cloth-config:${rootProject.cloth_config_version}") diff --git a/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java b/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java index 2fdd59f..9728921 100644 --- a/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java +++ b/common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java @@ -54,7 +54,6 @@ private void connectClient() { this.client = new IPCClient(SDRP.config.clientId); this.client.setListener(new IPCListener() { - @Override public void onReady(IPCClient client, User user) { LOGGER.info("Discord client ready"); diff --git a/fabric/build.gradle b/fabric/build.gradle index 4ecd619..397bf5d 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -35,8 +35,8 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") - implementation 'com.github.cbyrneee:DiscordIPC:e18542f600ee48b1eb8cbb255380bba0128dc87e' - shadowCommon 'com.github.cbyrneee:DiscordIPC:e18542f600ee48b1eb8cbb255380bba0128dc87e' + implementation 'com.github.jagrosh:DiscordIPC:a8d6631cc9' + shadowCommon 'com.github.jagrosh:DiscordIPC:a8d6631cc9' common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } @@ -57,7 +57,7 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + setArchiveClassifier("dev-shadow") } remapJar { @@ -65,11 +65,11 @@ remapJar { input.set shadowJar.archiveFile dependsOn shadowJar archiveBaseName.set "${rootProject.archives_base_name}-${project.name}" - classifier null + setArchiveClassifier(null) } jar { - classifier "dev" + setArchiveClassifier("dev") } sourcesJar { diff --git a/forge/build.gradle b/forge/build.gradle index 03dd891..5826245 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -31,9 +31,9 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") - implementation 'com.github.cbyrneee:DiscordIPC:e18542f600ee48b1eb8cbb255380bba0128dc87e' - forgeRuntimeLibrary 'com.github.cbyrneee:DiscordIPC:e18542f600ee48b1eb8cbb255380bba0128dc87e' - shadowCommon('com.github.cbyrneee:DiscordIPC:e18542f600ee48b1eb8cbb255380bba0128dc87e') + implementation 'com.github.jagrosh:DiscordIPC:a8d6631cc9' + forgeRuntimeLibrary 'com.github.jagrosh:DiscordIPC:a8d6631cc9' + shadowCommon('com.github.jagrosh:DiscordIPC:a8d6631cc9') common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } @@ -55,18 +55,18 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + setArchiveClassifier("dev-shadow") } remapJar { input.set shadowJar.archiveFile dependsOn shadowJar archiveBaseName.set "${rootProject.archives_base_name}-${project.name}" - classifier null + setArchiveClassifier(null) } jar { - classifier "dev" + setArchiveClassifier("dev") } sourcesJar {