From c9461ece8b8f42014cf261536539b66ed486c414 Mon Sep 17 00:00:00 2001
From: HypherionSA <hypherionmc@gmail.com>
Date: Sun, 19 Mar 2023 19:57:38 +0200
Subject: [PATCH] Fix module conflict with Simple Discord Link

---
 Fabric/build.gradle | 26 ++++++++++++++++++++++++--
 Forge/build.gradle  |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index dff6b50..4975711 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -2,10 +2,16 @@ plugins {
     id 'fabric-loom' version '0.12-SNAPSHOT'
     id 'maven-publish'
     id 'idea'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 archivesBaseName = "${mod_name}-fabric-${minecraft_version}"
 
+configurations {
+    shade
+    implementation.extendsFrom shade
+}
+
 dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
     mappings loom.officialMojangMappings()
@@ -13,8 +19,8 @@ dependencies {
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
     implementation project(":Common")
 
-    include "me.hypherionmc.moon-config:core:${moon_config}"
-    include "me.hypherionmc.moon-config:toml:${moon_config}"
+    shade "me.hypherionmc.moon-config:core:${moon_config}"
+    shade "me.hypherionmc.moon-config:toml:${moon_config}"
 
     modApi("com.terraformersmc:modmenu:${mod_menu_version}") {
         exclude(group: "net.fabricmc.fabric-api")
@@ -63,6 +69,21 @@ jar {
     }
 }
 
+shadowJar {
+    from sourceSets.main.output
+
+    configurations = [project.configurations.shade]
+    dependencies {
+        relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
+    }
+}
+
+remapJar {
+    dependsOn(shadowJar)
+    shouldRunAfter(shadowJar)
+    input.set shadowJar.archiveFile.get()
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
@@ -98,6 +119,7 @@ task delDevJar {
     doLast {
         def tree = fileTree('build/libs')
         tree.include '**/*-dev.jar'
+        tree.include '**/*-all.jar'
         tree.each { it.delete() }
     }
 }
diff --git a/Forge/build.gradle b/Forge/build.gradle
index 470f5b7..d4b79dc 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -105,7 +105,7 @@ shadowJar {
         include(dependency("me.hypherionmc.moon-config:core:${moon_config}"))
         include(dependency("me.hypherionmc.moon-config:toml:${moon_config}"))
 
-        //relocate 'me.hypherionmc.nightconfig', 'shadow.hypherionmc.nightconfig'
+        relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
     }
     classifier ''
 }