Merge pull request #331 from FTBTeam/1.20.1/dev

1.20.1/dev

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2001.3.3]
+
+### Fixed
+* Do some extra client-side map init checks which should resolve some issues with clients switching server, using technologies like Velocity proxy
+* Possibly fixed an issue leading to hangs on server shutdown (hard to know for certain; the issue is difficult to reproduce)
+
 ## [2001.3.2]
 
 ### Added

common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java

@@ -60,14 +60,11 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public class FTBChunks {
 	public static final String MOD_ID = "ftbchunks";
 	public static final Logger LOGGER = LogManager.getLogger("FTB Chunks");
 	public static final Gson GSON = new GsonBuilder().disableHtmlEscaping().setLenient().create();
-	public static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor();
 
 	public static FTBChunks instance;
 

common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java

@@ -95,6 +95,8 @@
 import org.lwjgl.opengl.GL11;
 
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -103,6 +105,7 @@
 public enum FTBChunksClient {
 	INSTANCE;
 
+	public static final ExecutorService MAP_EXECUTOR = Executors.newSingleThreadExecutor();
 	private static final ResourceLocation BUTTON_ID_MAP = new ResourceLocation("ftbchunks:open_gui");
 	private static final ResourceLocation BUTTON_ID_CLAIM = new ResourceLocation("ftbchunks:open_claim_gui");
 
@@ -1089,7 +1092,7 @@ public void handlePacket(ClientboundLevelChunkWithLightPacket p) {
 
 	public void queueOrExecute(MapTask task) {
 		// Implement this config later
-		FTBChunks.EXECUTOR.execute(task);
+		MAP_EXECUTOR.execute(task);
 	}
 
 	public void handlePacket(ClientboundBlockUpdatePacket p) {

common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapDimension.java

@@ -4,6 +4,7 @@
 import dev.ftb.mods.ftbchunks.FTBChunks;
 import dev.ftb.mods.ftbchunks.api.FTBChunksAPI;
 import dev.ftb.mods.ftbchunks.client.ClientTaskQueue;
+import dev.ftb.mods.ftbchunks.client.FTBChunksClient;
 import dev.ftb.mods.ftblibrary.math.XZ;
 import it.unimi.dsi.fastutil.longs.Long2IntMap;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
@@ -169,7 +170,7 @@ public void runMapTask() throws Exception {
 		List<MapRegion> regionList = ImmutableList.copyOf(getRegions().values());
 
 		if (!waypoints.isEmpty() || !regionList.isEmpty()) {
-			FTBChunks.EXECUTOR.execute(() -> {
+			FTBChunksClient.MAP_EXECUTOR.execute(() -> {
 				try {
 					writeData(waypoints, regionList);
 				} catch (Exception ex) {

common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapManager.java

@@ -130,6 +130,10 @@ public static Optional<MapManager> getInstance() {
 	}
 
 	public static void startUp(UUID serverId) {
+		// Ensure if existing manager instance is cleaned up first
+		// Necessary if player is switching servers, e.g. with Velocity proxy or similar
+		shutdown();
+
 		Path dir = Platform.getGameFolder().resolve("local/ftbchunks/data/" + serverId);
 		if (Files.notExists(dir)) {
 			try {
@@ -234,7 +238,7 @@ public void runMapTask() throws Exception {
 				.map(key -> String.format("#%03X %s", key.getIntKey(), key.getValue().location()))
 				.collect(Collectors.toList());
 
-		FTBChunks.EXECUTOR.execute(() -> {
+		FTBChunksClient.MAP_EXECUTOR.execute(() -> {
 			try {
 				Files.write(directory.resolve("dimensions.txt"), dimensionsList);
 				Files.write(directory.resolve("block_map.txt"), blockColorIndexMapList);

common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapRegion.java

@@ -92,7 +92,7 @@ public MapRegionData getDataBlockingNoSync() {
 	public MapRegionData getData() {
 		if (data == null && !isLoadingData) {
 			isLoadingData = true;
-			FTBChunks.EXECUTOR.execute(this::getDataBlocking);
+			FTBChunksClient.MAP_EXECUTOR.execute(this::getDataBlocking);
 		}
 
 		if (data != null) {
@@ -115,7 +115,7 @@ public NativeImage getRenderedMapImage() {
 			updateRenderedMapImage = false;
 			mapImageLoaded = false;
 			renderingMapImage = true;
-			FTBChunks.EXECUTOR.execute(new RenderMapImageTask(this));
+			FTBChunksClient.MAP_EXECUTOR.execute(new RenderMapImageTask(this));
 		}
 
 		return renderedMapImage;

common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapRegionData.java

@@ -1,6 +1,7 @@
 package dev.ftb.mods.ftbchunks.client.map;
 
 import dev.ftb.mods.ftbchunks.FTBChunks;
+import dev.ftb.mods.ftbchunks.client.FTBChunksClient;
 import dev.ftb.mods.ftbchunks.util.HeightUtils;
 import dev.ftb.mods.ftblibrary.math.XZ;
 
@@ -160,7 +161,7 @@ public void write() throws IOException {
 			}
 		}
 
-		FTBChunks.EXECUTOR.execute(() -> {
+		FTBChunksClient.MAP_EXECUTOR.execute(() -> {
 			try {
 				writeData(chunkList, dataImage, foliageImage, grassImage, waterImage, blocksImage);
 			} catch (Exception ex) {

common/src/main/java/dev/ftb/mods/ftbchunks/core/mixin/UtilMixin.java

@@ -1,6 +1,7 @@
 package dev.ftb.mods.ftbchunks.core.mixin;
 
 import dev.ftb.mods.ftbchunks.FTBChunks;
+import dev.ftb.mods.ftbchunks.client.FTBChunksClient;
 import net.minecraft.Util;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,17 +15,17 @@ public abstract class UtilMixin {
 	@Inject(method = "shutdownExecutors", at = @At("RETURN"))
 	private static void shutdownExecutorsFTBC(CallbackInfo ci) {
 		FTBChunks.LOGGER.info("Shutting down map thread");
-		FTBChunks.EXECUTOR.shutdown();
+		FTBChunksClient.MAP_EXECUTOR.shutdown();
 
 		boolean b;
 		try {
-			b = FTBChunks.EXECUTOR.awaitTermination(3L, TimeUnit.SECONDS);
+			b = FTBChunksClient.MAP_EXECUTOR.awaitTermination(3L, TimeUnit.SECONDS);
 		} catch (InterruptedException var3) {
 			b = false;
 		}
 
 		if (!b) {
-			FTBChunks.EXECUTOR.shutdownNow();
+			FTBChunksClient.MAP_EXECUTOR.shutdownNow();
 		}
 	}
 }

common/src/main/resources/ftbchunks-common.mixins.json

@@ -6,12 +6,12 @@
 		"ArmorStandMixin",
 		"BiomeMixin",
 		"BlockStateMixin",
-		"ChunkMapMixin",
-		"UtilMixin"
+		"ChunkMapMixin"
 	],
 	"client": [
 		"ClientPacketListenerMixin",
-		"GuiMixin"
+		"GuiMixin",
+		"UtilMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

fabric/build.gradle

@@ -129,7 +129,7 @@ if (ENV.CURSEFORGE_KEY) {
 				requiredDependency 'ftb-teams-fabric'
 				optionalDependency 'ftb-ranks-fabric'
 			}
-			changelog = ENV.CHANGELOG  // expected to exist if ENV.CURSEFORGE_KEY does
+			changelog = createChangelog(project)
 			changelogType = 'markdown'
 		}
 	}

forge/build.gradle

@@ -118,7 +118,7 @@ if (ENV.CURSEFORGE_KEY) {
 				requiredDependency 'ftb-teams-forge'
 				optionalDependency 'ftb-ranks-forge'
 			}
-			changelog = ENV.CHANGELOG  // expected to exist if ENV.CURSEFORGE_KEY does
+			changelog = createChangelog(project)
 			changelogType = 'markdown'
 		}
 	}

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 mod_id=ftbchunks
 archives_base_name=ftb-chunks
 maven_group=dev.ftb.mods
-mod_version=2001.3.2
+mod_version=2001.3.3
 mod_author=FTB Team
 
 minecraft_version=1.20.1