From 5d5f489b1eb36f5915d7bca9f22ad2b150160d4f Mon Sep 17 00:00:00 2001
From: "Blue (Lukas Rieger)" <blue@bluecolored.de>
Date: Mon, 6 Apr 2020 16:54:11 +0200
Subject: [PATCH] Correct build setups for Sponge and Bukkit implementations

---
 BlueMapBukkit/build.gradle | 24 ++++++++++++++----------
 BlueMapSponge/build.gradle | 23 +++++++++++++++--------
 README.md                  |  4 ++--
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/BlueMapBukkit/build.gradle b/BlueMapBukkit/build.gradle
index 8a60c1b2..db4da2ab 100644
--- a/BlueMapBukkit/build.gradle
+++ b/BlueMapBukkit/build.gradle
@@ -11,22 +11,26 @@ repositories {
 dependencies {
     shadow "org.bukkit:bukkit:1.14.4-R0.1-SNAPSHOT"
     compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.5'
-    compile project(':BlueMapCommon')
+    
+    compile (project(':BlueMapCommon')) {
+    	//exclude dependencies provided by bukkit
+		exclude group: 'com.google.guava', module: 'guava'
+		exclude group: 'com.google.code.gson', module: 'gson'
+		exclude group: 'org.yaml', module: 'snakeyaml'
+    }
 }
 
 build.dependsOn shadowJar {
 	destinationDir = file '../build/release'
 	archiveFileName = "BlueMap-${version}-bukkit.jar"
 	
-	relocate 'com.google', 'de.bluecolored.bluemap.google'
-	relocate 'com.flowpowered', 'de.bluecolored.bluemap.flowpowered'
-	relocate 'com.typesafe', 'de.bluecolored.bluemap.typesafe'
-	relocate 'net.querz', 'de.bluecolored.bluemap.querz'
-	relocate 'ninja', 'de.bluecolored.bluemap.ninja'
-	relocate 'org.apache', 'de.bluecolored.bluemap.apache'
-	relocate 'org.yaml', 'de.bluecolored.bluemap.yaml'
-	
-	relocate 'org.bstats.bukkit', 'de.bluecolored.bluemap.bstats.bukkit'
+	relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math'
+	relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config'
+	relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt'
+	relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate'
+	relocate 'org.apache.commons.io', 'de.bluecolored.shadow.apache.commons.io'
+	relocate 'org.apache.commons.lang3', 'de.bluecolored.shadow.apache.commons.lang3'
+	relocate 'org.bstats.bukkit', 'de.bluecolored.shadow.bstats.bukkit'
 }
 
 processResources {
diff --git a/BlueMapSponge/build.gradle b/BlueMapSponge/build.gradle
index b057d7c1..7ac04e65 100644
--- a/BlueMapSponge/build.gradle
+++ b/BlueMapSponge/build.gradle
@@ -1,20 +1,27 @@
 dependencies {
     shadow "org.spongepowered:spongeapi:7.1.0-SNAPSHOT"
     compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5'
-    compile project(':BlueMapCommon')
+    
+    compile (project(':BlueMapCommon')) {
+    	//exclude dependencies provided by sponge
+		exclude group: 'com.google.guava', module: 'guava'
+		exclude group: 'com.google.code.gson', module: 'gson'
+		exclude group: 'org.apache.commons', module: 'commons-lang3'
+		exclude group: 'com.flowpowered', module: 'flow-math'
+		exclude group: 'ninja.leaping.configurate', module: 'configurate-hocon'
+		exclude group: 'ninja.leaping.configurate', module: 'configurate-gson'
+		exclude group: 'ninja.leaping.configurate', module: 'configurate-yaml'
+	}
 }
 
 build.dependsOn shadowJar {
 	destinationDir = file '../build/release'
 	archiveFileName = "BlueMap-${version}-sponge.jar"
 	
-	relocate 'com.google', 'de.bluecolored.bluemap.google'
-	relocate 'com.flowpowered', 'de.bluecolored.bluemap.flowpowered'
-	relocate 'com.typesafe', 'de.bluecolored.bluemap.typesafe'
-	relocate 'net.querz', 'de.bluecolored.bluemap.querz'
-	relocate 'ninja', 'de.bluecolored.bluemap.ninja'
-	relocate 'org.apache', 'de.bluecolored.bluemap.apache'
-	relocate 'org.yaml', 'de.bluecolored.bluemap.yaml'
+	relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt'
+	relocate 'org.apache.commons.io', 'de.bluecolored.shadow.apache.commons.io'
+	
+	minimize()
 }
 
 processResources {
diff --git a/README.md b/README.md
index 7cca2543..39316a6d 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ If you have a question, help others using BlueMap or get the latest news and inf
 If you have git installed, simply use the command `git clone https://github.com/BlueMap-Minecraft/BlueMap.git` to clone BlueMap.
 
 ### Build
-In order to build BlueMap you simply need to run the `./gradlew build` command in BlueMap's root directory.
-You can find the compiled JAR file in `./build/libs`.
+In order to build BlueMap you simply need to run the `./gradlew clean build` command in BlueMap's root directory.
+You can find the compiled JAR files in `./build/release`.
 
 ### Issues / Suggestions
 You found a bug, have another issue or a suggestion? Please create an issue [here](https://github.com/BlueMap-Minecraft/BlueMap/issues)!