Merge branch 'mc/1.13' into mc/1.12

Author: TBlueF

BlueMapBukkit/build.gradle

@@ -11,22 +11,26 @@ repositories {
 dependencies {
     shadow "org.bukkit:bukkit:1.12.2-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 {

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil112.java

@@ -31,11 +31,8 @@
 import de.bluecolored.bluemap.core.world.Biome;
 import de.bluecolored.bluemap.core.world.BlockState;
 import de.bluecolored.bluemap.core.world.LightData;
-import net.querz.nbt.ByteArrayTag;
 import net.querz.nbt.CompoundTag;
-import net.querz.nbt.IntArrayTag;
 import net.querz.nbt.ListTag;
-import net.querz.nbt.Tag;
 import net.querz.nbt.mca.MCAUtil;
 
 public class ChunkAnvil112 extends Chunk {
@@ -44,7 +41,7 @@ public class ChunkAnvil112 extends Chunk {
 
 	private boolean isGenerated;
 	private Section[] sections;
-	private int[] biomes;
+	private byte[] biomes;
 
 	@SuppressWarnings("unchecked")
 	public ChunkAnvil112(MCAWorld world, CompoundTag chunkTag) {
@@ -65,21 +62,10 @@ public ChunkAnvil112(MCAWorld world, CompoundTag chunkTag) {
 			sections[section.getSectionY()] = section;
 		}
 
-		Tag<?> tag = levelData.get("Biomes"); //tag can be byte-array or int-array
-		if (tag instanceof ByteArrayTag) {
-			byte[] bs = ((ByteArrayTag) tag).getValue();
-			biomes = new int[bs.length];
-			
-			for (int i = 0; i < bs.length; i++) {
-				biomes[i] = bs[i] & 0xFF;
-			}
-		}
-		else if (tag instanceof IntArrayTag) {
-			biomes = ((IntArrayTag) tag).getValue(); 
-		}
+		biomes = levelData.getByteArray("Biomes");
 
 		if (biomes == null || biomes.length == 0) {
-			biomes = new int[2048];
+			biomes = new byte[2048];
 		}
 	}
 

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 {

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)!

build.gradle

@@ -28,7 +28,7 @@ allprojects {
 
 	apply plugin: 'java'
 	group = 'de.bluecolored.bluemap'
-  	version = '0.5.1-mc1.12'
+  	version = coreVersion + '-' + targetVersion
 }
 
 subprojects {

gradle.properties

@@ -1,2 +1,5 @@
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false
+
+coreVersion=0.5.1
+targetVersion=mc1.13