Merge branch 'mc/1.13' into mc/1.12

BlueMap-Minecraft · Mar 29, 2020 · 0ffd46c · 0ffd46c
2 parents 533d5e8 + de8031e
commit 0ffd46c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/BlueMapBukkit/src/main/resources/plugin.yml b/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.0-mc1.12"
+version: "0.5.1-mc1.12"
 author: "Blue (TBlueF / Lukas Rieger)"
 authors: [Blue (TBlueF / Lukas Rieger)]
 website: "https://github.com/BlueMap-Minecraft"

diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/RenderManager.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/RenderManager.java
@@ -66,7 +66,10 @@ public void addRenderTask(RenderTask task) {
 	}
 
 	public RenderTicket createTicket(MapType mapType, Vector2i tile) {
-		RenderTicket ticket = new RenderTicket(mapType, tile);
+		return createTicket(new RenderTicket(mapType, tile));
+	}
+
+	private RenderTicket createTicket(RenderTicket ticket) {
 		synchronized (renderTickets) {
 			if (renderTicketMap.putIfAbsent(ticket, ticket) == null) {
 				renderTickets.add(ticket);
@@ -138,7 +141,12 @@ private void renderThread() {
 				try {
 					ticket.render();
 				} catch (IOException e) {
-					Logger.global.logError("Failed to render tile " + ticket.getTile() + " of map '" + ticket.getMapType().getId() + "'!", e);
+					if (ticket.getRenderAttempts() < 3) {
+						Logger.global.logDebug("Failed to render tile " + ticket.getTile() + " of map '" + ticket.getMapType().getId() + "', rescheduling for " + (ticket.getRenderAttempts() + 1) + ". attempt..");
+						createTicket(ticket); //this might be a temporary issue, so we reschedule ticket for another attempt
+					} else {
+						Logger.global.logError("Failed to render tile " + ticket.getTile() + " of map '" + ticket.getMapType().getId() + "'!", e);
+					}
 				}
 			} else {
 				try {

diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/RenderTicket.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/RenderTicket.java
@@ -10,15 +10,20 @@ public class RenderTicket {
 	private final MapType map;
 	private final Vector2i tile;
 
+	private int renderAttempts;
 	private boolean finished;
 
 	public RenderTicket(MapType map, Vector2i tile) {
 		this.map = map;
 		this.tile = tile;
+
+		this.renderAttempts = 0;
 		this.finished = false;
 	}
 
 	public synchronized void render() throws IOException {
+		renderAttempts++;
+
 		if (!finished) {
 			map.renderTile(tile);
 
@@ -34,6 +39,10 @@ public Vector2i getTile() {
 		return tile;
 	}
 
+	public int getRenderAttempts() {
+		return renderAttempts;
+	}
+
 	public boolean isFinished() {
 		return finished;
 	}

diff --git a/BlueMapCommon/src/main/resources/mcmod.info b/BlueMapCommon/src/main/resources/mcmod.info
@@ -2,7 +2,7 @@
     {
         "modid": "bluemap",
         "name": "BlueMap",
-        "version": "0.5.0-mc1.12",
+        "version": "0.5.1-mc1.12",
         "description": "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
         "url": "https://github.com/BlueMap-Minecraft",
         "authorList": [

diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java
@@ -2,6 +2,6 @@
 
 public class BlueMap {
 
-	public static final String VERSION = "0.5.0-mc1.12";
+	public static final String VERSION = "0.5.1-mc1.12";
 
 }
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java
@@ -217,7 +217,7 @@ public Chunk getChunk(Vector2i chunkPos) throws IOException {
 	private Chunk loadChunk(Vector2i chunkPos) throws IOException {
 		Vector2i regionPos = chunkToRegion(chunkPos);
 		Path regionPath = getMCAFilePath(regionPos);
-
+				
 		try (RandomAccessFile raf = new RandomAccessFile(regionPath.toFile(), "r")) {
 
 			int xzChunk = Math.floorMod(chunkPos.getY(), 32) * 32 + Math.floorMod(chunkPos.getX(), 32);
@@ -248,9 +248,6 @@ private Chunk loadChunk(Vector2i chunkPos) throws IOException {
 			} else {
 				throw new IOException("invalid data tag: " + (tag == null ? "null" : tag.getClass().getName()));
 			}
-
-		} catch (FileNotFoundException ex) {
-			return Chunk.empty(this, chunkPos);
 		}
 	}