Merge branch 'bleeding'

Author: TBlueF

.github/workflows/gradle.yml

@@ -9,10 +9,10 @@ jobs:
     - uses: actions/checkout@v2
       with: 
         submodules: recursive
-    - name: Set up JDK 1.8
+    - name: Set up JDK 1.16
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 16
     - name: Build with Gradle
       run: ./gradlew clean test build
     - uses: actions/upload-artifact@v2

BlueMapAPI

@@ -3,10 +3,10 @@ plugins {
 }
 
 dependencies {
-    compile 'com.mojang:brigadier:1.0.17'
-    
-    compile project(':BlueMapCore')
-    compile project(':BlueMapAPI')
+    api 'com.mojang:brigadier:1.0.17'
+
+    api project(':BlueMapCore')
+    api project(':BlueMapAPI')
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
 }
@@ -34,8 +34,8 @@ task buildWebapp(type: NpmTask) {
 task zipWebapp(type: Zip) {
     dependsOn 'buildWebapp'
     from fileTree('BlueMapVue/dist/')
-    archiveName 'webapp.zip'
-    destinationDir(file('src/main/resources/de/bluecolored/bluemap/'))
+    archiveFileName.set('webapp.zip')
+    destinationDirectory.set(file('src/main/resources/de/bluecolored/bluemap/'))
     outputs.upToDateWhen { false }
 }
 

BlueMapCommon/BlueMapVue

@@ -24,20 +24,18 @@
  */
 package de.bluecolored.bluemap.common;
 
-import com.flowpowered.math.vector.Vector2i;
 import de.bluecolored.bluemap.common.plugin.Plugin;
 import de.bluecolored.bluemap.common.plugin.serverinterface.ServerInterface;
+import de.bluecolored.bluemap.common.web.WebSettings;
 import de.bluecolored.bluemap.core.MinecraftVersion;
 import de.bluecolored.bluemap.core.config.*;
+import de.bluecolored.bluemap.core.debug.DebugDump;
 import de.bluecolored.bluemap.core.logger.Logger;
+import de.bluecolored.bluemap.core.map.BmMap;
+import de.bluecolored.bluemap.core.map.hires.RenderSettings;
 import de.bluecolored.bluemap.core.mca.MCAWorld;
-import de.bluecolored.bluemap.core.render.RenderSettings;
-import de.bluecolored.bluemap.core.render.TileRenderer;
-import de.bluecolored.bluemap.core.render.hires.HiresModelManager;
-import de.bluecolored.bluemap.core.render.lowres.LowresModelManager;
 import de.bluecolored.bluemap.core.resourcepack.ParseResourceException;
 import de.bluecolored.bluemap.core.resourcepack.ResourcePack;
-import de.bluecolored.bluemap.core.web.WebSettings;
 import de.bluecolored.bluemap.core.world.SlicedWorld;
 import de.bluecolored.bluemap.core.world.World;
 import org.apache.commons.io.FileUtils;
@@ -50,13 +48,14 @@
 /**
  * This is the attempt to generalize as many actions as possible to have CLI and Plugins run on the same general setup-code.
  */
+@DebugDump
 public class BlueMapService {
-	private MinecraftVersion minecraftVersion;
-	private File configFolder;
-	private ThrowingFunction<File, UUID, IOException> worldUUIDProvider;
-	private ThrowingFunction<UUID, String, IOException> worldNameProvider;
+	private final MinecraftVersion minecraftVersion;
+	private final File configFolder;
+	private final ThrowingFunction<File, UUID, IOException> worldUUIDProvider;
+	private final ThrowingFunction<UUID, String, IOException> worldNameProvider;
 
-	private ConfigManager configManager;
+	private final ConfigManager configManager;
 
 	private CoreConfig coreConfig;
 	private RenderConfig renderConfig;
@@ -65,7 +64,7 @@ public class BlueMapService {
 	private ResourcePack resourcePack;
 
 	private Map<UUID, World> worlds;
-	private Map<String, MapType> maps;
+	private Map<String, BmMap> maps;
 
 	public BlueMapService(MinecraftVersion minecraftVersion, File configFolder) {
 		this.minecraftVersion = minecraftVersion;
@@ -105,17 +104,17 @@ public synchronized void createOrUpdateWebApp(boolean force) throws IOException
 	public synchronized WebSettings updateWebAppSettings() throws IOException, InterruptedException {
 		WebSettings webSettings = new WebSettings(new File(getRenderConfig().getWebRoot(), "data" + File.separator + "settings.json"));
 		webSettings.set(getRenderConfig().isUseCookies(), "useCookies");
+		webSettings.set(getRenderConfig().isEnableFreeFlight(), "freeFlightEnabled");
 		webSettings.setAllMapsEnabled(false);
-		for (MapType map : getMaps().values()) {
+		for (BmMap map : getMaps().values()) {
 			webSettings.setMapEnabled(true, map.getId());
-			webSettings.setFrom(map.getTileRenderer(), map.getId());
-			webSettings.setFrom(map.getWorld(), map.getId());
+			webSettings.setFrom(map);
 		}
 		int ordinal = 0;
 		for (MapConfig map : getRenderConfig().getMapConfigs()) {
 			if (!getMaps().containsKey(map.getId())) continue; //don't add not loaded maps
 			webSettings.setOrdinal(ordinal++, map.getId());
-			webSettings.setFrom(map, map.getId());
+			webSettings.setFrom(map);
 		}
 		webSettings.save();
 
@@ -127,14 +126,17 @@ public synchronized Map<UUID, World> getWorlds() throws IOException, Interrupted
 		return worlds;
 	}
 
-	public synchronized Map<String, MapType> getMaps() throws IOException, InterruptedException {
+	public synchronized Map<String, BmMap> getMaps() throws IOException, InterruptedException {
 		if (maps == null) loadWorldsAndMaps();
 		return maps;
 	}
 
 	private synchronized void loadWorldsAndMaps() throws IOException, InterruptedException {
 		maps = new HashMap<>();
 		worlds = new HashMap<>();
+
+		ConfigManager configManager = getConfigManager();
+		configManager.loadResourceConfigs(configFolder, getResourcePack());
 
 		for (MapConfig mapConfig : getRenderConfig().getMapConfigs()) {
 			String id = mapConfig.getId();
@@ -154,18 +156,15 @@ private synchronized void loadWorldsAndMaps() throws IOException, InterruptedExc
 				continue;
 			}
 
-			ConfigManager configManager = getConfigManager();
-			configManager.loadResourceConfigs(configFolder, getResourcePack());
-			
 			World world = worlds.get(worldUUID);
 			if (world == null) {
 				try {
-					world = MCAWorld.load(worldFolder.toPath(), worldUUID, minecraftVersion, configManager.getBlockIdConfig(), configManager.getBlockPropertiesConfig(), configManager.getBiomeConfig(), worldNameProvider.apply(worldUUID), true);
+					world = MCAWorld.load(worldFolder.toPath(), worldUUID, minecraftVersion, configManager.getBlockIdConfig(), configManager.getBlockPropertiesConfig(), configManager.getBiomeConfig(), worldNameProvider.apply(worldUUID), mapConfig.isIgnoreMissingLightData());
 					worlds.put(worldUUID, world);
 				} catch (MissingResourcesException e) {
 					throw e; // rethrow this to stop loading and display resource-missing message
 				} catch (IOException e) {
-					Logger.global.logError("Failed to load map '" + id + "': Failed to read level.dat", e);
+					Logger.global.logError("Failed to load map '" + id + "'!", e);
 					continue;
 				}
 			}
@@ -179,28 +178,20 @@ private synchronized void loadWorldsAndMaps() throws IOException, InterruptedExc
 							world, 
 							mapConfig.getMin().min(mapConfig.getMin().sub(2, 2, 2)), // protect from int-overflow
 							mapConfig.getMax().max(mapConfig.getMax().add(2, 2, 2))  // protect from int-overflow
-							);
+					);
 				}
 			}
-			
-			HiresModelManager hiresModelManager = new HiresModelManager(
-					getRenderConfig().getWebRoot().toPath().resolve("data").resolve(id).resolve("hires"),
+
+			BmMap map = new BmMap(
+					id,
+					name,
+					world,
+					getRenderConfig().getWebRoot().toPath().resolve("data").resolve(id),
 					getResourcePack(),
-					mapConfig,
-					new Vector2i(mapConfig.getHiresTileSize(), mapConfig.getHiresTileSize())
-					);
-			
-			LowresModelManager lowresModelManager = new LowresModelManager(
-					getRenderConfig().getWebRoot().toPath().resolve("data").resolve(id).resolve("lowres"), 
-					new Vector2i(mapConfig.getLowresPointsPerLowresTile(), mapConfig.getLowresPointsPerLowresTile()),
-					new Vector2i(mapConfig.getLowresPointsPerHiresTile(), mapConfig.getLowresPointsPerHiresTile()),
-					mapConfig.useGzipCompression()
-					);
-			
-			TileRenderer tileRenderer = new TileRenderer(hiresModelManager, lowresModelManager);
-			
-			MapType mapType = new MapType(id, name, world, tileRenderer);
-			maps.put(id, mapType);
+					mapConfig
+			);
+
+			maps.put(id, map);
 		}
 
 		worlds = Collections.unmodifiableMap(worlds);
@@ -209,7 +200,7 @@ private synchronized void loadWorldsAndMaps() throws IOException, InterruptedExc
 
 	public synchronized ResourcePack getResourcePack() throws IOException, InterruptedException {
 		if (resourcePack == null) {
-			File defaultResourceFile = new File(getCoreConfig().getDataFolder(), "minecraft-client-" + minecraftVersion.getVersionString() + ".jar");
+			File defaultResourceFile = new File(getCoreConfig().getDataFolder(), "minecraft-client-" + minecraftVersion.getResource().getVersion().getVersionString() + ".jar");
 			File resourceExtensionsFile = new File(getCoreConfig().getDataFolder(), "resourceExtensions.zip");
 
 			File textureExportFile = new File(getRenderConfig().getWebRoot(), "data" + File.separator + "textures.json");
@@ -222,9 +213,9 @@ public synchronized ResourcePack getResourcePack() throws IOException, Interrupt
 
 					//download file
 					try {
-						Logger.global.logInfo("Downloading " + minecraftVersion.getClientDownloadUrl() + " to " + defaultResourceFile + " ...");
+						Logger.global.logInfo("Downloading " + minecraftVersion.getResource().getClientUrl() + " to " + defaultResourceFile + " ...");
 						FileUtils.forceMkdirParent(defaultResourceFile);
-						FileUtils.copyURLToFile(new URL(minecraftVersion.getClientDownloadUrl()), defaultResourceFile, 10000, 10000);
+						FileUtils.copyURLToFile(new URL(minecraftVersion.getResource().getClientUrl()), defaultResourceFile, 10000, 10000);
 					} catch (IOException e) {
 						throw new IOException("Failed to download resources!", e);
 					}
@@ -238,7 +229,7 @@ public synchronized ResourcePack getResourcePack() throws IOException, Interrupt
 
 			if (resourceExtensionsFile.exists()) FileUtils.forceDelete(resourceExtensionsFile);
 			FileUtils.forceMkdirParent(resourceExtensionsFile);
-			FileUtils.copyURLToFile(Plugin.class.getResource("/de/bluecolored/bluemap/" + minecraftVersion.getResourcePrefix() + "/resourceExtensions.zip"), resourceExtensionsFile, 10000, 10000);
+			FileUtils.copyURLToFile(Plugin.class.getResource("/de/bluecolored/bluemap/" + minecraftVersion.getResource().getResourcePrefix() + "/resourceExtensions.zip"), resourceExtensionsFile, 10000, 10000);
 
 			//find more resource packs
 			File[] resourcePacks = resourcePackFolder.listFiles();

BlueMapCommon/build.gradle

@@ -38,7 +38,7 @@ public InterruptableReentrantLock(boolean fair) {
 	}
 
 	/**
-	 * Aquires the lock and interrupts the currently holding thread if there is any.
+	 * Acquires the lock and interrupts the currently holding thread if there is any.
 	 */
 	public void interruptAndLock() {
 		while (!tryLock()) {