remove dev from version number

build.gradle

@@ -372,18 +372,15 @@ subprojects { p ->
         // ZStd
         // librariesLocation isn't used because it's too long for replacing paths in native libraries
         // Allowing strings larger than the original string would require shifting the entire binary's contents
-        relocate "com.github.luben", "dhcomgithubluben", {
-            exclude "aix.ppc64/**"
-            exclude "darwin/**"
-            exclude "freebsd/**"
-            exclude "linux/**"
-            exclude "win/**"
-        }
+        relocate "com.github.luben", "dhcomgithubluben"
+        relocate "libzstd-jni", "libzstd-jni_dh"
+        relocate "zstd-jni", "zstd-jni_dh"
 
         transform(NativeTransformer) {
             rootDir = project.rootDir
 
-            matchFiles { it.contains("libzstd-jni") && !it.contains("ppc64") }
+            matchFiles { it.contains("libzstd-jni") && !it.contains("aix/ppc64") }
+            mapPaths { it.replace("libzstd-jni", "libzstd-jni_dh") }
 
             relocateNative "com/github/luben", "dhcomgithubluben"
             relocateNative "com_github_luben", "dhcomgithubluben"

common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java

@@ -614,15 +614,6 @@ public class ChunkWrapper implements IChunkWrapper
 	
 	
 	
-	//===============//
-	// other methods //
-	//===============//
-	
-	@Override
-	public boolean isStillValid() { return this.wrappedLevel.tryGetChunk(this.chunkPos) == this; }
-	
-	
-	
 	//================//
 	// base overrides //
 	//================//

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java

@@ -203,19 +203,13 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 			return;
 		}
 		
-		if (!GLProxy.hasInstance())
-		{
-			// rendering setup hasn't finished
-			return;
-		}
-		
         #if MC_VER < MC_1_19_2
 		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
         #elif MC_VER < MC_1_21_9
 		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
 		#else
 		
-		GLProxy.getInstance().queueRunningOnRenderThread(() -> 
+		GLProxy.queueRunningOnRenderThread(() -> 
 		{
 			player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
 		});
@@ -293,7 +287,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public void crashMinecraft(String errorMessage, Throwable exception)
 	{
-		LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
+		LOGGER.fatal(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
 		CrashReport report = new CrashReport(errorMessage, exception);
 		#if MC_VER < MC_1_20_4
 		Minecraft.crash(report);

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java

@@ -259,7 +259,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		#if MC_VER <= MC_1_21_10
 		return this.level.dimension().location().toString();
 		#else
-		return this.level.dimension().identifier().getPath();
+		return this.level.dimension().identifier().toString();
 		#endif
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java

@@ -49,6 +49,12 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
+#if MC_VER <= MC_1_21_10
+#else
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.server.level.ChunkHolder;
+#endif
+
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
@@ -187,7 +193,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		#if MC_VER <= MC_1_21_10
 		return this.level.dimension().location().toString();
 		#else
-		return this.level.dimension().identifier().getPath();
+		return this.level.dimension().identifier().toString();
 		#endif
 	}
 	
@@ -226,6 +232,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	@Override
 	public IChunkWrapper tryGetChunk(DhChunkPos pos)
 	{
+		#if MC_VER < MC_1_21_11
 		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
 		{
 			return null;
@@ -238,6 +245,24 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		}
 		
 		return new ChunkWrapper(chunk, this);
+		#else
+		
+		// directly hitting the chunkMap is required otherwise MC will run this on the main server thread,
+		// causing lag
+		ChunkHolder chunkHolder = this.level.getChunkSource().chunkMap.getVisibleChunkIfPresent(new ChunkPos(pos.getX(), pos.getZ()).toLong());
+		if (chunkHolder == null)
+		{
+			return null;
+		}
+		
+		ChunkAccess chunk = chunkHolder.getChunkIfPresent(ChunkStatus.FULL);
+		if (chunk == null)
+		{
+			return null;
+		}
+		
+		return new ChunkWrapper(chunk, this);
+		#endif
 	}
 	
 	@Override

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java

@@ -28,6 +28,7 @@ import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.chunkFileHandling.ChunkFileReader;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.*;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.GlobalWorldGenParams;
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.level.IDhServerLevel;
 import com.seibel.distanthorizons.core.config.Config;
@@ -37,6 +38,7 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.sql.dto.BeaconBeamDTO;
 import com.seibel.distanthorizons.core.util.ExceptionUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.TimerUtil;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
@@ -100,6 +102,15 @@ public final class BatchGenerationEnvironment implements IBatchGeneratorEnvironm
 	public static final long EXCEPTION_TIMER_RESET_TIME = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
 	public static final int EXCEPTION_COUNTER_TRIGGER = 20;
 	
+	/**
+	 * Used to revert the ignore logic in {@link SharedApi} so
+	 * that a given chunk pos can be handled again.
+	 * A timer is used so we don't have to inject into MC's code and it works sell enough
+	 * most of the time.
+	 * If a chunk does get through due the timeout not being long enough that isn't the end of the world.
+	 */
+	private static final int MS_TO_IGNORE_CHUNK_AFTER_COMPLETION = 5_000;
+	
 	
 	
 	private final IDhServerLevel dhServerLevel;
@@ -107,6 +118,8 @@ public final class BatchGenerationEnvironment implements IBatchGeneratorEnvironm
 	public final InternalServerGenerator internalServerGenerator;
 	public final ChunkFileReader chunkFileReader;
 	
+	private final Timer chunkSaveIgnoreTimer = TimerUtil.CreateTimer("ChunkSaveIgnoreTimer");
+	
 	
 	
 	public final LinkedBlockingQueue<GenerationEvent> generationEventQueue = new LinkedBlockingQueue<>();
@@ -575,6 +588,11 @@ public final class BatchGenerationEnvironment implements IBatchGeneratorEnvironm
 					ProtoChunk protoChunk = ((ProtoChunk) chunk);
 					protoChunk.setLightEngine(region.getLightEngine());
 				}
+				
+				// usually ignoring the chunk's position is unnecessary,
+				// but this improves performance if a chunk update event does sneak through 
+				SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.addPosToIgnore(chunkWrapper.getChunkPos());
+				
 			});
 			
 			
@@ -684,6 +702,24 @@ public final class BatchGenerationEnvironment implements IBatchGeneratorEnvironm
 					this.dhServerLevel.updateBeaconBeamsForChunkPos(centerChunkWrapper.getChunkPos(), activeBeamList);
 				}
 			}
+			
+			
+			for (int i = 0; i < iChunkWrapperList.size(); i++)
+			{
+				ChunkWrapper chunkWrapper = (ChunkWrapper) iChunkWrapperList.get(i);
+				if (chunkWrapper == null)
+				{
+					continue;
+				}
+				
+				// give MC a few seconds to save the chunk before
+				// we can process update events there again
+				this.chunkSaveIgnoreTimer.schedule(new TimerTask()
+				{
+					@Override
+					public void run() { SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.removePosToIgnore(chunkWrapper.getChunkPos()); }
+				}, MS_TO_IGNORE_CHUNK_AFTER_COMPLETION);
+			}
 		}
 	}
 	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, int border) { return new ArrayGridList<>(total, border, total.gridSize - border); }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/InternalServerGenerator.java

@@ -51,7 +51,7 @@ public class InternalServerGenerator
 	
 	/**
 	 * Used to revert the ignore logic in {@link SharedApi} so
-	 * that given chunk pos can be handled again.
+	 * that a given chunk pos can be handled again.
 	 * A timer is used so we don't have to inject into MC's code and it works sell enough
 	 * most of the time.
 	 * If a chunk does get through due the timeout not being long enough that isn't the end of the world.

common/src/main/resources/1_21_11.distanthorizons.accesswidener

@@ -24,6 +24,9 @@ accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/
 accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
 accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
+# getting existing chunks outside the main thread
+accessible method net/minecraft/server/level/ChunkMap getVisibleChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+
 # lod generation from save file
 accessible field net/minecraft/world/level/chunk/storage/SimpleRegionStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;
 accessible field net/minecraft/world/level/chunk/storage/IOWorker storage Lnet/minecraft/world/level/chunk/storage/RegionFileStorage;

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java

@@ -25,6 +25,7 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.NativeDialogUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.*;
@@ -38,7 +39,6 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 #if MC_VER >= MC_1_19_2
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@@ -103,7 +103,7 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 				String indiumMissingMessage = ModInfo.READABLE_NAME + " needs Indium to work with Sodium.\nPlease download Indium from https://modrinth.com/mod/indium";
 				LOGGER.fatal(indiumMissingMessage);
 				
-				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, indiumMissingMessage, "ok", "error", false);
+				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, indiumMissingMessage, "ok", "error");
 				
 				IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 				String errorMessage = "loading Distant Horizons. Distant Horizons requires Indium in order to run with Sodium.";

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.4.1-b
+mod_version=2.4.3-b
 api_version=5.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/IrisAccessor.java

@@ -33,9 +33,9 @@ public class IrisAccessor implements IIrisAccessor
 {
 	public IrisAccessor()
 	{
-		#if MC_VER == MC_1_21_11
-		throw new UnsupportedOperationException("Iris isn't supported on this version of DH. When this version of DH was created Iris wasn't available for Neoforge yet.");
-		#endif
+		//#if MC_VER == MC_1_21_11
+		//throw new UnsupportedOperationException("Iris isn't supported on this version of DH. When this version of DH was created Iris wasn't available for Neoforge yet.");
+		//#endif
 	}
 	
 	

relocate_natives/README.md

@@ -12,15 +12,29 @@ How to add a library's natives:
 Example:
 
 ```groovy
+// Relocate the namespace (Java side)
 relocate "org.sqlite", "dh_sqlite", {
+    // (Specific to SQLite's relocation)
+    // Make sure that native paths are not changed before steps below
     exclude "org/sqlite/native/**"
 }
+// Shadow also replaces strings inside the Java code
+// See the library's source code to find strings used to call into the native code
+// This also includes native library paths, if you use mapPaths {} below they will likely need adjustment as well
+relocate "jdbc:sqlite", "jdbc:dh_sqlite"
 
 transform(NativeTransformer) {
     // NativeTransformer configuration
     rootDir = project.rootDir
 
+    // Match native libraries
+    matchFiles { it.startsWith("org/sqlite") }
+    // Replace paths with ones that won't overlap with other mods
+    // Libraries are the ones choosing the path to use for natives; check the source code to see which paths are acceptable.
+    mapPaths { it.replace("org/sqlite", "dh_sqlite") }
+
     // Replace native strings, e.g. used in calls back to Java
+    // They must be of the same length or shorter!
     relocateNative "org/sqlite", "dh_sqlite"
     // Rename native methods used when calling from Java
     relocateNative "org_sqlite", "dh_1sqlite"