Merge branch 'mc/1.13' into mc/1.12

Author: TBlueF

.github/workflows/gradle.yml

@@ -15,7 +15,3 @@ jobs:
       run: ./gradlew test
     - name: Build with Gradle
       run: ./gradlew build
-    - uses: actions/upload-artifact@v1
-      with:
-        name: artifact
-        path: build/libs/BlueMap.jar

BlueMapBukkit/build.gradle

@@ -13,3 +13,28 @@ dependencies {
     compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.5'
     compile project(':BlueMapCommon')
 }
+
+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'
+}
+
+processResources {
+	from(sourceSets.main.resources.srcDirs) {
+		include 'plugin.yml'
+		
+		expand (
+			version: project.version
+		)
+	}
+}

BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommandSource.java

@@ -26,7 +26,7 @@ public void sendMessage(Text text) {
 				return;
 			}
 
-			delegate.sendMessage(text.toFormattingCodedString('§'));
+			delegate.sendMessage(text.toPlainString());
 		});
 	}
 

BlueMapBukkit/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: BlueMap
 description: "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)"
 main: de.bluecolored.bluemap.bukkit.BukkitPlugin
-version: "0.5.1-mc1.12"
+version: ${version}
 author: "Blue (TBlueF / Lukas Rieger)"
 authors: [Blue (TBlueF / Lukas Rieger)]
 website: "https://github.com/BlueMap-Minecraft"

BlueMapCLI/build.gradle

@@ -2,3 +2,22 @@ dependencies {
 	compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
     compile project(':BlueMapCommon')
 }
+
+jar {
+	manifest {
+		attributes 'Main-Class' : "de.bluecolored.bluemap.cli.BlueMapCLI"
+	}
+}
+
+build.dependsOn shadowJar {
+	destinationDir = file '../build/release'
+	archiveFileName = "BlueMap-${version}-cli.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'
+}

BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java

@@ -25,7 +25,6 @@
 import de.bluecolored.bluemap.common.MapType;
 import de.bluecolored.bluemap.common.RenderManager;
 import de.bluecolored.bluemap.common.plugin.serverinterface.ServerInterface;
-import de.bluecolored.bluemap.core.BlueMap;
 import de.bluecolored.bluemap.core.config.ConfigManager;
 import de.bluecolored.bluemap.core.config.MainConfig;
 import de.bluecolored.bluemap.core.config.MainConfig.MapConfig;
@@ -48,7 +47,6 @@ public class Plugin {
 
 	public static final String PLUGIN_ID = "bluemap";
 	public static final String PLUGIN_NAME = "BlueMap";
-	public static final String PLUGIN_VERSION = BlueMap.VERSION;
 
 	private static Plugin instance;
 

BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/text/Text.java

@@ -49,7 +49,7 @@ public String toJSONString() {
 		if (hoverText != null) {
 			sb.append(quote("hoverEvent")).append(":{");
 			sb.append(quote("action")).append(":").append(quote("show_text")).append(',');
-			sb.append(quote("value")).append(":").append(quote(hoverText.toFormattingCodedString('§')));
+			sb.append(quote("value")).append(":").append(quote(hoverText.toFormattingCodedString('\u00a7')));
 			sb.append("},");
 		}
 
@@ -131,7 +131,7 @@ private String quote(String value) {
 	private String escape(String value) {
 		value = value.replace("\\", "\\\\");
 		value = value.replace("\"", "\\\"");
-		value = value.replace("§", "\\u00a7");
+		value = value.replace("\u00a7", "\\u00a7");
 		value = value.replace("\n", "\\n");
 		return value;
 	}

BlueMapCore/build.gradle

@@ -16,6 +16,16 @@ dependencies {
    testCompile 'junit:junit:4.12'
 }
 
+processResources {
+	from(sourceSets.main.resources.srcDirs) {
+		include 'core.json'
+		
+		expand (
+			version: project.version
+		)
+	}
+}
+
 node {
   version = '12.14.1'
   download = true

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java

@@ -1,7 +1,24 @@
 package de.bluecolored.bluemap.core;
 
+import java.io.IOException;
+
+import de.bluecolored.bluemap.core.logger.Logger;
+import ninja.leaping.configurate.gson.GsonConfigurationLoader;
+
 public class BlueMap {
 
-	public static final String VERSION = "0.5.1-mc1.12";
+	public static final String VERSION;
+	static {
+		String version = "DEV";
+		try {
+			version = GsonConfigurationLoader.builder().setURL(BlueMap.class.getResource("/core.json")).build().load().getNode("version").getString("DEV");
+		} catch (IOException ex) {
+			Logger.global.logError("Failed to load core.json from resources!", ex);
+		}
+		
+		if (version.equals("${version}")) version = "DEV";
+		
+		VERSION = version;
+	}
 
 }

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

@@ -31,8 +31,11 @@
 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 {
@@ -41,7 +44,7 @@ public class ChunkAnvil112 extends Chunk {
 
 	private boolean isGenerated;
 	private Section[] sections;
-	private byte[] biomes;
+	private int[] biomes;
 
 	@SuppressWarnings("unchecked")
 	public ChunkAnvil112(MCAWorld world, CompoundTag chunkTag) {
@@ -62,10 +65,21 @@ public ChunkAnvil112(MCAWorld world, CompoundTag chunkTag) {
 			sections[section.getSectionY()] = section;
 		}
 
-		biomes = levelData.getByteArray("Biomes");
+		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(); 
+		}
 
 		if (biomes == null || biomes.length == 0) {
-			biomes = new byte[2048];
+			biomes = new int[2048];
 		}
 	}