remove dev from version number

Attempt to fix #950

.gitignore

@@ -27,6 +27,7 @@ Merged/
 buildAllJars/
 
 relocate_natives/.venv/
+relocate_natives/__pycache__/
 relocate_natives/apple-codesign/
 relocate_natives/cache/
 

.gitlab-ci.yml

@@ -44,28 +44,15 @@ build:
     - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
+    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./Merged/* . || true
   artifacts:
     name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
-      - Merged/*.jar
+      - ./*.jar
-      - quilt/build/libs/*.jar
-      - fabric/build/libs/*.jar
-      - forge/build/libs/*.jar
-      - neoforge/build/libs/*.jar
     exclude:
-      # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller
+      - ./*-all.jar
-      - fabric/build/libs/*-all.jar
+      - ./*-dev.jar
-      - fabric/build/libs/*-dev.jar
+      - ./*-sources.jar
-      - fabric/build/libs/*-sources.jar
-      - quilt/build/libs/*-all.jar
-      - quilt/build/libs/*-dev.jar
-      - quilt/build/libs/*-sources.jar
-      - forge/build/libs/*-all.jar
-      - forge/build/libs/*-dev.jar
-      - forge/build/libs/*-sources.jar
-      - neoforge/build/libs/*-all.jar
-      - neoforge/build/libs/*-dev.jar
-      - neoforge/build/libs/*-sources.jar
     expire_in: 14 days
     when: always
   extends: .build_java
@@ -80,15 +67,15 @@ api:
     # this also runs unit tests
     - ./gradlew api:build --gradle-user-home cache/;
     - ./gradlew api:addSourcesToCompiledJar --gradle-user-home cache/;
+    - cp ./coreSubProjects/api/build/libs/merged/* .
   artifacts:
-    name: "Api_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    name: "NightlyBuild_Api-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
-      - coreSubProjects/api/build/libs/merged/*.jar
+      - ./*.jar
-      # can be uncommented if we don't want a jar with the source code
-      # - coreSubProjects/api/build/libs/*.jar
     exclude:
-      - coreSubProjects/api/build/libs/merged/*-all.jar
+      - ./*-all.jar
-      - coreSubProjects/api/build/libs/merged/*-sources.jar
+      - ./*-dev.jar
+      - ./*-sources.jar
     expire_in: 1 day
     when: always
   extends: .build_java

build.gradle

@@ -78,7 +78,7 @@ forgix {
     String loaderHyphenSeparatedList = ((String)gradle.builds_for).replaceAll(",", "-");
     
     group = "com.seibel.distanthorizons"
-    mergedJarName = "DistantHorizons-${rootProject.versionStr}-${loaderHyphenSeparatedList}.jar"
+    mergedJarName = "DistantHorizons-${loaderHyphenSeparatedList}-${rootProject.versionStr}.jar"
 
     if (findProject(":forge"))
         forge {
@@ -111,10 +111,11 @@ class NativeTransformer implements Transformer {
     private final HashMap<String, byte[]> rewrittenFiles = new HashMap()
     private var nativeRelocator
 
+    public File rootDir
 
     NativeTransformer() {
         try {
-            int exitCode = Runtime.getRuntime().exec(new String[]{"python", "--version"}).waitFor();
+            int exitCode = Runtime.getRuntime().exec(new String[]{"python", "--version"}).waitFor()
             if (exitCode == 0) {
                 enabled = true
             }
@@ -131,6 +132,11 @@ class NativeTransformer implements Transformer {
         replacements.put(target, replacement)
     }
 
+    void before(Closure closure) {
+        if (enabled)
+            closure.run()
+    }
+
 
     @Override
     boolean canTransformResource(@Nonnull FileTreeElement element) {
@@ -145,7 +151,7 @@ class NativeTransformer implements Transformer {
         byte[] content = context.is.readAllBytes()
 
         if (nativeRelocator == null) {
-            nativeRelocator = new NativeRelocator()
+            nativeRelocator = new NativeRelocator(rootDir.toPath().resolve("relocate_natives"))
         }
 
         try {
@@ -388,13 +394,17 @@ subprojects { p ->
 
         // Sqlite Database
         // librariesLocation isn't used because it's too long for replacing paths in native libraries
-        relocate "org.xerial", "dh_sqlite.org.xerial"
+        // Allowing strings larger than the original string would require shifting the entire binary's contents
-        relocate "org.sqlite", "dh_sqlite", {
-            exclude "org/sqlite/native/**"
-        }
-        relocate "jdbc:sqlite", "jdbc:dh_sqlite"
-
         transform(NativeTransformer) {
+            rootDir = project.rootDir
+
+            before {
+                relocate "org.sqlite", "dh_sqlite", {
+                    exclude "org/sqlite/native/**"
+                }
+                relocate "jdbc:sqlite", "jdbc:dh_sqlite"
+            }
+
             relocateNative "org/sqlite", "dh_sqlite"
             relocateNative "org_sqlite", "dh_1sqlite"
         }

buildAll.bat

@@ -14,7 +14,7 @@ for %%f in (versionProperties\*) do (
 
     @rem Clean out the folders, build it, and merge it
     echo ==================== Cleaning workspace to build !version! ====================
-    call .\gradlew.bat clean -PmcVer="!version!"
+    call .\gradlew.bat clean
     echo ==================== Building !version! ====================
     call .\gradlew.bat build -PmcVer="!version!"
     echo ==================== Merging !version! ====================

buildSrc/src/main/java/NativeRelocator.java

@@ -6,24 +6,32 @@ import java.util.concurrent.CompletableFuture;
 
 class NativeRelocator
 {
-	private static final Path rootDirectory = Path.of(System.getProperty("user.dir"), "relocate_natives");
+	private final Path rootDirectory;
-	private static final Path cacheRoot = rootDirectory.resolve("cache");
+	private final Path cacheRoot;
 	
-	
+	/**
-	NativeRelocator() throws Exception
+	 * Initializes the NativeRelocator by preparing the environment if necessary.
+	 * Executes the appropriate preparation script based on the OS.
+	 *
+	 * @throws Exception if the preparation script fails or an unsupported OS is detected.
+	 */
+	NativeRelocator(Path rootDirectory) throws Exception
 	{
-		if (rootDirectory.resolve(".venv").toFile().exists())
+		this.rootDirectory = rootDirectory;
+		this.cacheRoot = this.rootDirectory.resolve("cache");
+		
+		if (this.rootDirectory.resolve(".venv").toFile().exists())
 		{
 			return;
 		}
 		
 		ProcessBuilder processBuilder = new ProcessBuilder();
-		processBuilder.directory(rootDirectory.toFile());
+		processBuilder.directory(this.rootDirectory.toFile());
 		
 		String os = System.getProperty("os.name").toLowerCase();
 		if (os.contains("win"))
 		{
-			processBuilder.command("powershell", "./prepare.ps1");
+			processBuilder.command("powershell", "-ExecutionPolicy", "Bypass", "./prepare.ps1");
 		}
 		else if (os.contains("nix") || os.contains("nux") || os.contains("mac"))
 		{
@@ -46,7 +54,12 @@ class NativeRelocator
 		}
 	}
 	
-	
+	/**
+	 * Reads and prints the output and error streams of a process asynchronously.
+	 *
+	 * @param process The process whose streams should be read.
+	 * @return A CompletableFuture that completes once all output has been processed.
+	 */
 	private static CompletableFuture<Void> readOutputStreams(Process process)
 	{
 		return CompletableFuture.runAsync(() -> {
@@ -79,6 +92,14 @@ class NativeRelocator
 		});
 	}
 	
+	/**
+	 * Replaces occurrences of a target string in a byte array, ensuring null termination.
+	 *
+	 * @param byteArray The byte array where replacements should occur.
+	 * @param target The string to replace.
+	 * @param replacement The replacement string (must not be longer than the target).
+	 * @throws IllegalArgumentException if the replacement is longer than the target.
+	 */
 	private void replaceInNullTerminatedStrings(byte[] byteArray, String target, String replacement)
 	{
 		if (target.length() < replacement.length())
@@ -117,15 +138,23 @@ class NativeRelocator
 		}
 	}
 	
+	/**
+	 * Runs an external script to fix a modified binary and returns the processed content.
+	 *
+	 * @param outputFilePath Path to store the processed binary.
+	 * @param content The original binary content.
+	 * @return The modified binary content.
+	 * @throws Exception if the process execution fails.
+	 */
 	public byte[] fixModifiedBinary(Path outputFilePath, byte[] content) throws Exception
 	{
 		ProcessBuilder processBuilder = new ProcessBuilder();
-		processBuilder.directory(rootDirectory.toFile());
+		processBuilder.directory(this.rootDirectory.toFile());
 		
 		processBuilder.command(
-				rootDirectory.resolve(".venv/Scripts").toFile().exists()
+				this.rootDirectory.resolve(".venv/Scripts").toFile().exists()
-						? rootDirectory.resolve(".venv/Scripts/python.exe").toString()
+						? this.rootDirectory.resolve(".venv/Scripts/python.exe").toString()
-						: rootDirectory.resolve(".venv/bin/python").toString(),
+						: this.rootDirectory.resolve(".venv/bin/python").toString(),
 				"./fix_modified_binary.py",
 				outputFilePath.toString()
 		);
@@ -147,9 +176,18 @@ class NativeRelocator
 		return Files.readAllBytes(outputFilePath);
 	}
 	
+	/**
+	 * Processes a binary file, applying string replacements and fixing modifications.
+	 *
+	 * @param outputPath The output file path relative to the cache directory.
+	 * @param content The binary content to process.
+	 * @param replacements A map of string replacements to apply.
+	 * @return The modified binary content.
+	 * @throws Exception if processing fails.
+	 */
 	public byte[] processBinary(String outputPath, byte[] content, Map<String, String> replacements) throws Exception
 	{
-		Path outputFilePath = cacheRoot.resolve(outputPath);
+		Path outputFilePath = this.cacheRoot.resolve(outputPath);
 		//noinspection ResultOfMethodCallIgnored
 		outputFilePath.getParent().toFile().mkdirs();
 		

common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java

@@ -20,8 +20,6 @@
 package com.seibel.distanthorizons.common.wrappers;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
-import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
 
 /**
  * @author James Seibel
@@ -38,32 +36,46 @@ public class VersionConstants implements IVersionConstants
 	}
 	
 	
-	@Override
-	public int getMinimumWorldHeight()
-	{
-		return 0;
-	}
-	
-	@Override
-	public int getWorldGenerationCountPerThread()
-	{
-		return 1;
-	}
-	
-	@Override
-	public boolean isVanillaRenderedChunkSquare()
-	{
-		return false;
-	}
-	
 	@Override
 	public String getMinecraftVersion()
 	{
-		#if MC_VER < MC_1_19_2
+		// these values are hard-coded to prevent an issue with Forge (specifically 1.18.2) where
-		return Minecraft.getInstance().getGame().getVersion().getId();
+		// it can't load client classes when running as a dedicated server,
+		// which was how we were dynamically accessing the MC version string
+		
+		#if MC_VER == MC_1_16_5
+			return "1.16.5";
+		
+		#elif MC_VER == MC_1_17_1
+			return "1.17.1";
+		
+		#elif MC_VER == MC_1_18_2
+			return "1.18.2";
+		
+		#elif MC_VER == MC_1_19_2
+			return "1.19.2";
+		#elif MC_VER == MC_1_19_4
+			return "1.19.4";
+		
+		#elif MC_VER == MC_1_20_1
+			return "1.20.1";
+		#elif MC_VER == MC_1_20_2
+			return "1.20.2";
+		#elif MC_VER == MC_1_20_4
+			return "1.20.4";
+		#elif MC_VER == MC_1_20_6
+			return "1.20.6";
+		
+		#elif MC_VER == MC_1_21_1
+			return "1.21.1";
+		#elif MC_VER == MC_1_21_3
+			return "1.21.3";
+		#elif MC_VER == MC_1_21_4
+			return "1.21_4";
 		#else
-		return SharedConstants.getCurrentVersion().getId();
+			ERROR MC version constant missing
 		#endif
+		
 	}
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -43,6 +43,8 @@ import java.util.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.jetbrains.annotations.Nullable;
+
 #if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 import net.minecraft.core.Registry;
 import net.minecraft.core.BlockPos;
@@ -90,6 +92,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	
 	// properties //
 	
+	@Nullable
 	public final BlockState blockState;
 	/** technically final, but since it requires a method call to generate it can't be marked as such */
 	private String serialString;
@@ -350,25 +353,42 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		}
 		
 		
+		// get block properties (default to the values used by air)
+		boolean canOcclude = false;
+		boolean propagatesSkyLightDown = true;
+		if (this.blockState != null)
+		{
+			canOcclude = this.blockState.canOcclude();
+			
+			#if MC_VER < MC_1_21_3
+			propagatesSkyLightDown = this.blockState.propagatesSkylightDown(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+			#else
+			propagatesSkyLightDown = this.blockState.propagatesSkylightDown();
+			#endif
+		}
+		
+		
+		
 		// this method isn't perfect, but works well enough for our use case
 		int opacity;
 		if (this.isAir())
 		{
 			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT;
 		}
-		else if (this.isLiquid() && !this.blockState.canOcclude())
+		else if (this.isLiquid() && !canOcclude)
 		{
 			// probably not a waterlogged block (which should block light entirely)
 			
 			// +1 to indicate that the block is translucent (in between transparent and opaque) 
 			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT + 1;
 		}
-		#if MC_VER < MC_1_21_3
+		else if (propagatesSkyLightDown && !canOcclude)
-		else if (this.blockState.propagatesSkylightDown(EmptyBlockGetter.INSTANCE, BlockPos.ZERO))
-		#else
-		else if (this.blockState.propagatesSkylightDown())
-		#endif
 		{
+			// probably glass or some other fully transparent block
+			
+			// !canOcclude is required to ignore stairs and slabs since
+			// propagateSkyLightDown is true for them, but they're solid and don't actually let light through
+			
 			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT;
 		}
 		else

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

@@ -278,14 +278,14 @@ public class ChunkWrapper implements IChunkWrapper
 					{
 						// is this block solid?
 						if (solidHeight == minInclusiveBuildHeight
-								&& block.isSolid())
+							&& block.isSolid())
 						{
 							solidHeight = y;
 						}
 						
 						// is this block light blocking?
 						if (lightBlockingHeight == minInclusiveBuildHeight
-								&& block.getOpacity() != LodUtil.BLOCK_FULLY_TRANSPARENT)
+							&& block.getOpacity() != LodUtil.BLOCK_FULLY_TRANSPARENT)
 						{
 							lightBlockingHeight = y;
 						}

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

@@ -214,17 +214,29 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public DhBlockPos getPlayerBlockPos()
 	{
-		BlockPos playerPos = this.getPlayer().blockPosition();
+		LocalPlayer player = this.getPlayer();
+		if (player == null)
+		{
+			return new DhBlockPos(0, 0, 0);	
+		}
+		
+		BlockPos playerPos = player.blockPosition();
 		return new DhBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ());
 	}
 	
 	@Override
 	public DhChunkPos getPlayerChunkPos()
 	{
+		LocalPlayer player = this.getPlayer();
+		if (player == null)
+		{
+			return new DhChunkPos(0, 0);
+		}
+		
         #if MC_VER < MC_1_17_1
-        ChunkPos playerPos = new ChunkPos(this.getPlayer().blockPosition());
+        ChunkPos playerPos = new ChunkPos(player.blockPosition());
         #else
-		ChunkPos playerPos = this.getPlayer().chunkPosition();
+		ChunkPos playerPos = player.chunkPosition();
         #endif
 		return new DhChunkPos(playerPos.x, playerPos.z);
 	}

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

@@ -180,7 +180,15 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 	/** @see GL32#glDeleteBuffers(int)  */
 	@Override
 	public void glDeleteBuffers(int buffer)
-	{ GlStateManager._glDeleteBuffers(buffer); }
+	{
+		GL32.glDeleteBuffers(buffer);
+		
+		// MC's implementation has a bug where it will throw:
+		// GL_INVALID_OPERATION in glBufferData(immutable)
+		// when attempting to delete Storage Buffers
+		// So we need to manually delete the buffers ourselves
+		//GlStateManager._glDeleteBuffers(buffer); 
+	}
 	
 	
 	// culling //

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java

@@ -21,8 +21,10 @@ package com.seibel.distanthorizons.common.wrappers.misc;
 
 import com.mojang.blaze3d.platform.NativeImage;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL32;
 
 import java.nio.ByteBuffer;
@@ -30,6 +32,7 @@ import java.nio.ByteBuffer;
 public class LightMapWrapper implements ILightMapWrapper
 {
 	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private int textureId = 0;
 	
@@ -59,7 +62,13 @@ public class LightMapWrapper implements ILightMapWrapper
 			GLMC.glBindTexture(this.textureId);
 		}
 		image.upload(0, 0, 0, false);
-		GLMC.glBindTexture(currentTexture);
+		
+		// getActiveTexture() may return textures that aren't valid and attempting to bind them will
+		// throw a GL error in MC 1.21.1
+		if (GL32.glIsTexture(currentTexture))
+		{
+			GLMC.glBindTexture(currentTexture);
+		}
 	}
 	private void createLightmap(NativeImage image)
 	{

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

@@ -28,72 +28,80 @@ import net.minecraft.world.level.dimension.DimensionType;
 
 /**
  * @author James Seibel
- * @version 2022-9-16
  */
 public class DimensionTypeWrapper implements IDimensionTypeWrapper
 {
-	private static final ConcurrentMap<DimensionType, DimensionTypeWrapper> dimensionTypeWrapperMap = new ConcurrentHashMap<>();
+	private static final ConcurrentMap<String, DimensionTypeWrapper> DIMENSION_WRAPPER_BY_NAME = new ConcurrentHashMap<>();
 	private final DimensionType dimensionType;
 	
-	public DimensionTypeWrapper(DimensionType dimensionType)
+	
-	{
+	
-		this.dimensionType = dimensionType;
+	//=============//
-	}
+	// Constructor //
+	//=============//
+	
+	public DimensionTypeWrapper(DimensionType dimensionType) { this.dimensionType = dimensionType; }
 	
 	public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
 	{
-		//first we check if the biome has already been wrapped
+		String dimName = getName(dimensionType);
-		if (dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
+		
+		// check if the dimension has already been wrapped
+		if (DIMENSION_WRAPPER_BY_NAME.containsKey(dimName) 
+			&& DIMENSION_WRAPPER_BY_NAME.get(dimName) != null)
 		{
-			return dimensionTypeWrapperMap.get(dimensionType);
+			return DIMENSION_WRAPPER_BY_NAME.get(dimName);
 		}
 		
 		
-		//if it hasn't been created yet, we create it and save it in the map
+		// create the missing wrapper
 		DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
-		dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
+		DIMENSION_WRAPPER_BY_NAME.put(dimName, dimensionTypeWrapper);
-		
-		//we return the newly created wrapper
 		return dimensionTypeWrapper;
 	}
 	
-	public static void clearMap()
+	public static void clearMap() { DIMENSION_WRAPPER_BY_NAME.clear(); }
-	{
-		dimensionTypeWrapperMap.clear();
-	}
 	
 	
-	private String getDimensionName()
+	
+	//=================//
+	// wrapper methods //
+	//=================//
+	
+	@Override
+	public String getName() { return getName(this.dimensionType); }
+	public static String getName(DimensionType dimensionType)
 	{
 		#if MC_VER <= MC_1_16_5
 		// effectsLocation() is marked as client only, so using the backing field directly
 		return dimensionType.effectsLocation.getPath();
 		#else
-		return this.dimensionType.effectsLocation().getPath();
+		return dimensionType.effectsLocation().getPath();
 		#endif
 	}
 	
 	@Override
-	public boolean hasCeiling()
+	public boolean hasCeiling() { return this.dimensionType.hasCeiling(); }
-	{
-		return this.dimensionType.hasCeiling();
-	}
 	
 	@Override
-	public boolean hasSkyLight()
+	public boolean hasSkyLight() { return this.dimensionType.hasSkyLight(); }
-	{
-		return this.dimensionType.hasSkyLight();
-	}
 	
 	@Override
-	public Object getWrappedMcObject()
+	public Object getWrappedMcObject() { return this.dimensionType; }
-	{
-		return this.dimensionType;
-	}
 	
 	// there's definitely a better way of doing this, but it should work well enough for now
 	@Override
-	public boolean isTheEnd() { return this.getDimensionName().equalsIgnoreCase("the_end"); }
+	public boolean isTheEnd() { return this.getName().equalsIgnoreCase("the_end"); }
+	
+	@Override
+	public double getCoordinateScale() { return this.dimensionType.coordinateScale(); }
+	
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
 	
 	@Override
 	public boolean equals(Object obj)
@@ -105,9 +113,10 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 		else
 		{
 			DimensionTypeWrapper other = (DimensionTypeWrapper) obj;
-			return other.getDimensionName().equals(this.getDimensionName());
+			return other.getName().equals(this.getName());
 		}
 	}
 	
 	
+	
 }

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

@@ -125,7 +125,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	 * pull chunks using their async method), or if there
 	 * was an issue with the sync pulling method.
 	 */
-	private boolean pullExistingChunkAsync = false;
+	private boolean pullExistingChunkUsingMcAsyncMethod = false;
 	
 	
 	
@@ -241,19 +241,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		
 		if (MOD_CHECKER.isModLoaded("c2me"))
 		{
-			EVENT_LOGGER.info("C2ME detected: DH's pre-existing chunk accessing will use async methods handled by C2ME.");
+			EVENT_LOGGER.info("C2ME detected: DH's pre-existing chunk accessing will use methods handled by C2ME.");
-			this.pullExistingChunkAsync = true;
+			this.pullExistingChunkUsingMcAsyncMethod = true;
 		}
 		
-		//IOWorker ioWorker = level.getChunkSource().chunkMap.worker;
-		//	
-		//	#if MC_VER <= MC_1_18_2
-		//	return CompletableFuture.completedFuture(ioWorker.load(chunkPos));
-		//	#else
-		//
-		//// storage will be null if C2ME is installed
-		//if (ioWorker.storage != null)
-		
 		this.params = new GlobalParameters(serverlevel);
 	}
 	
@@ -342,6 +333,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	// world generation //
 	//==================//
 	
+	// TODO this is already being run on a generator thread,
+	//  why are we passing in an executor?
 	/** @throws RejectedExecutionException if the given {@link Executor} is cancelled. */
 	public CompletableFuture<Void> generateLodFromListAsync(GenerationEvent genEvent, Executor executor) throws RejectedExecutionException, InterruptedException
 	{
@@ -385,10 +378,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				.map((chunkPos) -> this.createEmptyOrPreExistingChunkAsync(chunkPos.x, chunkPos.z, chunkSkyLightingByDhPos, chunkBlockLightingByDhPos, generatedChunkByDhPos))
 				.toArray(CompletableFuture[]::new);
 		
+		// join to prevent an issue where DH queues too many tasks or something(?)
+		// also allows file IO to run in parallel so no one thread is waiting on disk IO (this is only an issue when C2ME is present)
+		CompletableFuture.allOf(readFutures).join();
 		
 		// future chain for generation
-		return CompletableFuture.allOf(readFutures)
+		return CompletableFuture.runAsync(() -> 
-			.thenRunAsync(() -> 
 			{
 				// offset 1 chunk in both X and Z direction so we can generate an even number of chunks wide
 				// while still submitting an odd number width to MC's internal generators
@@ -592,6 +587,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				return newChunk;
 			});
 	}
+	// TODO FIXME this method can be called up to 25 times for the same chunk position, why?
 	private CompletableFuture<CompoundTag> getChunkNbtDataAsync(ChunkPos chunkPos)
 	{
 		ServerLevel level = this.params.level;
@@ -610,7 +606,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			#else
 			
 			// storage will be null if C2ME is installed
-			if (!this.pullExistingChunkAsync && ioWorker.storage != null)
+			if (!this.pullExistingChunkUsingMcAsyncMethod && ioWorker.storage != null)
 			{
 				try
 				{
@@ -624,7 +620,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					// ioWorker.storage
 					// but just in case
 					EVENT_LOGGER.error("Unexpected issue pulling pre-existing chunk ["+chunkPos+"], falling back to async chunk pulling. This may cause server-tick lag.", e);
-					this.pullExistingChunkAsync = true;
+					this.pullExistingChunkUsingMcAsyncMethod = true;
 					
 					// try again now using the async method
 					return this.getChunkNbtDataAsync(chunkPos);
@@ -633,32 +629,42 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			else
 			{
 				// log if we unexpectedly weren't able to run the sync chunk pulling
-				if (!this.pullExistingChunkAsync)
+				if (!this.pullExistingChunkUsingMcAsyncMethod)
 				{
 					// this shouldn't happen, but just in case
 					EVENT_LOGGER.info("Unable to pull pre-existing chunk using synchronous method. Falling back to async method. this may cause server-tick lag.");
-					this.pullExistingChunkAsync = true;
+					this.pullExistingChunkUsingMcAsyncMethod = true;
 				}
 				
+				//GET_CHUNK_COUNT_REF.incrementAndGet();
 				
 				// When running in vanilla MC on versions before 1.21.4,  
 				// DH would attempt to run loadAsync on this same thread via a threading mixin,
 				// to prevent causing lag on the server thread.
 				// However, if a mod like C2ME is installed this will run on a C2ME thread instead.
 				return ioWorker.loadAsync(chunkPos)
-					.thenApply(optional -> optional.orElse(null))
+						.thenApply(optional ->
-					.exceptionally((throwable) ->
-					{
-						// unwrap the CompletionException if necessary
-						Throwable actualThrowable = throwable;
-						while (actualThrowable instanceof CompletionException completionException)
 						{
-							actualThrowable = completionException.getCause();
+							// Debugging note:
-						}
+							// If there are reports of extreme memory use when C2ME is installed, that probably means
+							// this method is queuing a lot of tasks (1,000+), which causes C2ME to explode.
 							
-						LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
+							//GET_CHUNK_COUNT_REF.decrementAndGet();
-						return null;
+							//PREF_LOGGER.info("chunk getter count ["+F3Screen.NUMBER_FORMAT.format(GET_CHUNK_COUNT_REF.get())+"]");
-					});
+							return optional.orElse(null);
+						})
+						.exceptionally((throwable) ->
+						{
+							// unwrap the CompletionException if necessary
+							Throwable actualThrowable = throwable;
+							while (actualThrowable instanceof CompletionException completionException)
+							{
+								actualThrowable = completionException.getCause();
+							}
+							
+							LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
+							return null;
+						});
 			}
 			#endif
 		}

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java

@@ -76,15 +76,25 @@ public abstract class MixinMinecraft
 		
 		if (SelfUpdater.onStart() || DEBUG_ALWAYS_SHOW_UPDATER)
 		{
-			instance.setScreen(new UpdateModScreen(
+			try
-					new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
+			{
-					(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+				instance.setScreen(new UpdateModScreen(
-			));
+						new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
-		}
+						(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
-		else
+				));
-		{
+				return;
-			instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
+			}
+			catch (Exception e)
+			{
+				// info instead of error since this can be ignored and probably just means
+				// there isn't a new DH version available
+				LOGGER.info("Unable to show DH update screen, reason: ["+e.getMessage()+"].");
+			}
 		}
+		
+		// Sets the screen back to the vanilla screen as if nothing ever happened
+		// if not done the game will crash
+		instance.setScreen(guiScreen);
 	}
 	#endif
 	
@@ -124,14 +134,13 @@ public abstract class MixinMinecraft
 				{
 					try
 					{
-						
 						Minecraft.getInstance().setScreen(new UpdateModScreen(
 								// TODO: Change to runnable, instead of tittle screen
 								new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
 								versionId
 						));
 					}
-					catch (IllegalArgumentException e)
+					catch (Exception e)
 					{
 						// info instead of error since this can be ignored and probably just means
 						// there isn't a new DH version available

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinLevelTicks.java

@@ -1,55 +0,0 @@
-package com.seibel.distanthorizons.fabric.mixins.server;
-
-
-#if MC_VER < MC_1_21_3
-
-import net.minecraft.Util;
-import net.minecraft.world.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-
-/**
- * {@link MixinUtilBackgroundThread} was used for versions before 1.21.3
- * This is just a dummy class/mixin to make the compiler happy.
- *
- * @see MixinUtilBackgroundThread
- */
-//@Mixin(net.minecraft.minecraft.class) // TODO we should allow version specific mixins so we don't have to create dummy mixins that exist for all MC versions
-@Mixin(Util.class)
-public class MixinLevelTicks
-{
-	
-}
-#else
-
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
-
-import net.minecraft.world.ticks.LevelTicks;
-import net.minecraft.world.ticks.ScheduledTick;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(LevelTicks.class)
-public class MixinLevelTicks<T>
-{
-	// TODO put in a common location
-	private static boolean isWorldGenThread()
-	{ return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get(); }
-	
-	
-	
-	@Inject(method = "schedule", at = @At(value = "HEAD"), cancellable = true)
-	private void schedule(ScheduledTick<T> tick, CallbackInfo ci)
-	{
-		// In MC 1.21.4 an error check was added to log attempting to schedule ticks for unloaded chunks
-		// this caused a lot of unnecessary errors when generating sand (FallingBlock.class).
-		if (isWorldGenThread())
-		{
-			ci.cancel();
-		}
-	}
-	
-}
-#endif

fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestGenericWorldGenerator.java

@@ -105,43 +105,43 @@ public class TestGenericWorldGenerator implements IDhApiWorldGenerator
 			{
 				case 0:
 					blockResourceLocation = "minecraft:red_wool";
-					maxHeight = 60;
+					maxHeight = 20;
 					break;
 				case 1:
 					blockResourceLocation = "minecraft:orange_wool";
-					maxHeight = 70;
+					maxHeight = 30;
 					break;
 				case 2:
 					blockResourceLocation = "minecraft:yellow_wool";
-					maxHeight = 80;
+					maxHeight = 40;
 					break;
 				case 3:
 					blockResourceLocation = "minecraft:lime_wool";
-					maxHeight = 90;
+					maxHeight = 50;
 					break;
 				case 4:
 					blockResourceLocation = "minecraft:cyan_wool";
-					maxHeight = 100;
+					maxHeight = 60;
 					break;
 				case 5:
 					blockResourceLocation = "minecraft:blue_wool";
-					maxHeight = 100;
+					maxHeight = 70;
 					break;
 				case 6:
 					blockResourceLocation = "minecraft:magenta_wool";
-					maxHeight = 110;
+					maxHeight = 80;
 					break;
 				case 7:
 					blockResourceLocation = "minecraft:white_wool";
-					maxHeight = 120;
+					maxHeight = 90;
 					break;
 				case 8:
 					blockResourceLocation = "minecraft:gray_wool";
-					maxHeight = 120;
+					maxHeight = 100;
 					break;
 				default:
 					blockResourceLocation = "minecraft:black_wool";
-					maxHeight = 140;
+					maxHeight = 110;
 					break;
 			}
 			

fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java

@@ -25,7 +25,7 @@ public class TestWorldGenBindingEvent extends DhApiLevelLoadEvent
 			ServerLevel level = (ServerLevel) event.value.levelWrapper.getWrappedMcObject();
 			
 			// override the core DH world generator for this level
-			//IDhApiWorldGenerator exampleWorldGen = new TestChunkWorldGenerator(level);
+			//IDhApiWorldGenerator exampleWorldGen = new TestChunkWorldGenerator(level); // TODO biomes are broken for some reason
 			IDhApiWorldGenerator exampleWorldGen = new TestGenericWorldGenerator(event.value.levelWrapper);
 			DhApi.worldGenOverrides.registerWorldGeneratorOverride(event.value.levelWrapper, exampleWorldGen);
 		}

fabric/src/main/resources/DistantHorizons.fabric.mixins.json

@@ -8,8 +8,7 @@
     "server.MixinEntity",
     "server.MixinServerPlayer",
     "server.MixinTracingExecutor",
-    "server.MixinUtilBackgroundThread",
+    "server.MixinUtilBackgroundThread"
-    "server.MixinLevelTicks"
   ],
   "client": [
     "client.MixinClientLevel",

forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java

@@ -24,13 +24,16 @@ import com.seibel.distanthorizons.common.util.ProxyUtil;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.world.level.LevelAccessor;
@@ -52,6 +55,7 @@ import net.minecraft.world.level.chunk.ChunkAccess;
 
 import net.minecraftforge.common.MinecraftForge;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -90,7 +94,13 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	public void registerEvents()
 	{
 		MinecraftForge.EVENT_BUS.register(this);
-		ForgePluginPacketSender.setPacketHandler(ClientApi.INSTANCE::pluginMessageReceived);
+		
+		// handles singleplayer, LAN, and connecting to a server
+		ForgePluginPacketSender.setPacketHandler((IServerPlayerWrapper player, @NotNull AbstractNetworkMessage message) ->
+		{
+			ClientApi.INSTANCE.pluginMessageReceived(message);
+			ServerApi.INSTANCE.pluginMessageReceived(player, message);
+		});
 	}
 	
 	

forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java

@@ -78,10 +78,7 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 	// constructor //
 	//=============//
 	
-	public ForgeServerProxy(boolean isDedicated)
+	public ForgeServerProxy(boolean isDedicated) { this.isDedicated = isDedicated; }
-	{
-		this.isDedicated = isDedicated;
-	}
 	
 	
 	

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java

@@ -57,15 +57,25 @@ public class MixinMinecraft
 		
 		if (SelfUpdater.onStart())
 		{
-			instance.setScreen(new UpdateModScreen(
+			try
-					new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
+			{
-					(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+				instance.setScreen(new UpdateModScreen(
-			));
+						new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
-		}
+						(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
-		else
+				));
-		{
+				return;
-			instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
+			}
+			catch (Exception e)
+			{
+				// info instead of error since this can be ignored and probably just means
+				// there isn't a new DH version available
+				LOGGER.info("Unable to show DH update screen, reason: ["+e.getMessage()+"].");
+			}
 		}
+		
+		// Sets the screen back to the vanilla screen as if nothing ever happened
+		// if not done the game will crash
+		instance.setScreen(guiScreen);
 	}
 	#endif
 	
@@ -108,7 +118,7 @@ public class MixinMinecraft
 								versionId
 						));
 					}
-					catch (IllegalArgumentException e)
+					catch (Exception e)
 					{
 						// info instead of error since this can be ignored and probably just means
 						// there isn't a new DH version available

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.3.0-b-dev
+mod_version=2.3.1-b
 api_version=4.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java

@@ -26,7 +26,9 @@ import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.distanthorizons.coreapi.ModInfo;
@@ -51,6 +53,7 @@ import java.util.function.Consumer;
 import net.neoforged.neoforge.client.ConfigScreenHandler;
 #else
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+import org.jetbrains.annotations.NotNull;
 #endif
 
 /**
@@ -64,11 +67,16 @@ public class NeoforgeMain extends AbstractModInitializer
 {
 	public NeoforgeMain(IEventBus eventBus)
 	{
-		eventBus.addListener((FMLClientSetupEvent e) -> {
+		// handles singleplayer, LAN, and connecting to a server
+		eventBus.addListener((FMLClientSetupEvent e) -> 
+		{
 			this.onInitializeClient();
-			eventBus.addListener(this::registerNetworkingClient);
+			eventBus.addListener(this::registerNetworkingClientServer);
 		});
-		eventBus.addListener((FMLDedicatedServerSetupEvent e) -> {
+		
+		// handles dedicated servers
+		eventBus.addListener((FMLDedicatedServerSetupEvent e) -> 
+		{
 			this.onInitializeServer();
 			eventBus.addListener(this::registerNetworkingServer);
 		});
@@ -79,13 +87,22 @@ public class NeoforgeMain extends AbstractModInitializer
 	//============//
 	// networking //
 	//============//
-	public void registerNetworkingClient(RegisterPayloadHandlersEvent event)
+	
-	{ NeoforgePluginPacketSender.setPacketHandler(event, ClientApi.INSTANCE::pluginMessageReceived); }
+	public void registerNetworkingClientServer(RegisterPayloadHandlersEvent event)
+	{ 
+		NeoforgePluginPacketSender.setPacketHandler(event, (IServerPlayerWrapper player, @NotNull AbstractNetworkMessage message) -> 
+		{
+			ClientApi.INSTANCE.pluginMessageReceived(message);
+			ServerApi.INSTANCE.pluginMessageReceived(player, message);
+		}); 
+	}
 	public void registerNetworkingServer(RegisterPayloadHandlersEvent event)
 	{ NeoforgePluginPacketSender.setPacketHandler(event, ServerApi.INSTANCE::pluginMessageReceived); }
 	
 	
 	
+	
+	
 	@Override
 	protected IEventProxy createServerProxy(boolean isDedicated) { return new NeoforgeServerProxy(isDedicated); }
 	

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java

@@ -76,14 +76,13 @@ public class MixinMinecraft
 				{
 					try
 					{
-						
 						Minecraft.getInstance().setScreen(new UpdateModScreen(
 								// TODO: Change to runnable, instead of tittle screen
 								new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
 								versionId
 						));
 					}
-					catch (IllegalArgumentException e)
+					catch (Exception e)
 					{
 						// info instead of error since this can be ignored and probably just means
 						// there isn't a new DH version available

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinLevelTicks.java

@@ -1,53 +0,0 @@
-package com.seibel.distanthorizons.neoforge.mixins.server;
-
-
-#if MC_VER < MC_1_21_3
-
-import net.minecraft.Util;
-import org.spongepowered.asm.mixin.Mixin;
-
-/**
- * {@link MixinUtilBackgroundThread} was used for versions before 1.21.3
- * This is just a dummy class/mixin to make the compiler happy.
- *
- * @see MixinUtilBackgroundThread
- */
-@Mixin(Util.class) // TODO we should allow version specific mixins so we don't have to create dummy mixins that exist for all MC versions
-public class MixinLevelTicks<T>
-{
-	
-}
-#else
-
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
-
-import net.minecraft.world.ticks.LevelTicks;
-import net.minecraft.world.ticks.ScheduledTick;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(LevelTicks.class)
-public class MixinLevelTicks<T>
-{
-	// TODO put in a common location
-	private static boolean isWorldGenThread()
-	{ return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get(); }
-	
-	
-	
-	@Inject(method = "schedule", at = @At(value = "HEAD"), cancellable = true)
-	private void schedule(ScheduledTick<T> tick, CallbackInfo ci)
-	{
-		// In MC 1.21.4 an error check was added to log attempting to schedule ticks for unloaded chunks
-		// this caused a lot of unnecessary errors when generating sand (FallingBlock.class).
-		if (isWorldGenThread())
-		{
-			ci.cancel();
-		}
-	}
-	
-}
-#endif

neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json

@@ -8,8 +8,7 @@
     "server.MixinServerPlayer",
     "server.MixinTFChunkGenerator",
     "server.MixinTracingExecutor",
-    "server.MixinUtilBackgroundThread",
+    "server.MixinUtilBackgroundThread"
-    "server.MixinLevelTicks"
   ],
   "client": [
     "client.MixinClientPacketListener",

relocate_natives/fix_modified_binary.py

@@ -4,23 +4,28 @@ import subprocess
 import download_codesign
 from pathlib import Path
 
+# Parse the input binary & xit if binary is invalid
 output_path = sys.argv[1]
 binary = lief.parse(sys.stdin.buffer.read())
-
 if binary is None:
     exit(1)
 
+# Remove signature from Mac binaries
 if isinstance(binary, lief.MachO.Binary):
     binary.remove_signature()
 
+# Write the modified binary to the output path
 binary.write(output_path)
 
+# Sign Mac binaries (required to make them usable because apple)
 if isinstance(binary, lief.MachO.Binary):
     print(f"Signing {output_path}...")
 
+    # Check if the Apple code-signing files are available, if not, download them
     if not Path("./apple-codesign/COPYING").exists():
         download_codesign.download_and_unpack()
 
+    # Run the code-signing process
     sign_process = subprocess.Popen(["./apple-codesign/rcodesign", "sign", output_path], shell=False,
                                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     sign_process.wait()

versionProperties/1.21.1.properties

@@ -12,7 +12,7 @@ netty_version=4.1.97.Final
 
 # Fabric loader
 fabric_loader_version=0.16.9
-fabric_api_version=0.107.0+1.21.1
+fabric_api_version=0.115.0+1.21.1
     # Fabric mod versions
     modmenu_version=11.0.0-beta.1
     starlight_version_fabric=