Test build

.gitignore

@@ -26,11 +26,6 @@ Merged/
 # Folder created by the buildAll scripts
 buildAllJars/
 
-relocate_natives/.venv/
-relocate_natives/__pycache__/
-relocate_natives/apple-codesign/
-relocate_natives/cache/
-
 # file from notepad++
 *.bak
 

.gitlab-ci.yml

@@ -17,9 +17,6 @@ variables:
 # These can be extended so code is a bit less duplicated
 .build_java:
   #image: eclipse-temurin:17
-  before_script:
-    - apt-get update
-    - apt-get install python3 python3-pip python-is-python3 python3-venv -y --no-install-recommends
   cache:
     key: "gradleCache_$CI_JOB_NAME_SLUG"
     policy: pull-push
@@ -44,15 +41,28 @@ 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:
-      - ./*.jar
+      - Merged/*.jar
+      - quilt/build/libs/*.jar
+      - fabric/build/libs/*.jar
+      - forge/build/libs/*.jar
+      - neoforge/build/libs/*.jar
     exclude:
-      - ./*-all.jar
-      - ./*-dev.jar
-      - ./*-sources.jar
+      # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller
+      - fabric/build/libs/*-all.jar
+      - fabric/build/libs/*-dev.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
@@ -67,15 +77,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: "NightlyBuild_Api-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    name: "Api_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
-      - ./*.jar
+      - coreSubProjects/api/build/libs/merged/*.jar
+      # can be uncommented if we don't want a jar with the source code
+      # - coreSubProjects/api/build/libs/*.jar
     exclude:
-      - ./*-all.jar
-      - ./*-dev.jar
-      - ./*-sources.jar
+      - coreSubProjects/api/build/libs/merged/*-all.jar
+      - coreSubProjects/api/build/libs/merged/*-sources.jar
     expire_in: 1 day
     when: always
   extends: .build_java

.gitlab/issue_templates/Bug.md

@@ -6,13 +6,13 @@ Or click the checkbox once the issue has been created.
 -->
 
 1. [ ] Check the FAQ to see if your issue has already been reported and has a solution:
-    [Problems-and-solutions](https://gitlab.com/distant-horizons-team/distant-horizons/-/wikis/1-user-guide/1-frequently-asked-questions/2-problems-and-solutions/Problems-and-Solutions)
+    [Problems-and-solutions](https://gitlab.com/jeseibel/distant-horizons/-/wikis/2-frequently-asked-questions/2-problems-and-solutions/Problems-and-Solutions)
 
 2. [ ] Make sure you are not using any mods on the incompatible list:
-    [Mod support FAQ](https://gitlab.com/distant-horizons-team/distant-horizons/-/wikis/1-user-guide/1-frequently-asked-questions/4-mod-support/Mod-Support)
+    [Mod support FAQ](https://gitlab.com/jeseibel/distant-horizons/-/wikis/2-frequently-asked-questions/4-mod-support/Mod-Support)
 
 3. [ ] Check the existing issues to verify that your bug hasn't already been submitted: 
-    [Issues](https://gitlab.com/distant-horizons-team/distant-horizons/-/issues)
+    [Issues](https://gitlab.com/jeseibel/distant-horizons/-/issues/)
 
 4. [ ] Upload Minecraft's crash report and/or log. \
    Minecraft crash reports are located in: `.minecraft/crash-reports` \

.gitlab/issue_templates/FeatureRequest.md

@@ -1,4 +1,4 @@
-- [ ] Check the existing [feature requests](https://gitlab.com/distant-horizons-team/distant-horizons/-/issues?sort=updated_desc&state=opened&label_name%5B%5D=Feature) to verify that your feature hasn't already been suggested.
+- [ ] Check the existing [feature requests](https://gitlab.com/jeseibel/distant-horizons/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Feature) to verify that your feature hasn't already been suggested.
 
 1. **Describe the feature**:
 

.gitlab/issue_templates/ImprovementRequest.md

@@ -1,3 +1,3 @@
-1. Check the existing [improvement requests](https://gitlab.com/distant-horizons-team/distant-horizons/-/issues?sort=updated_desc&state=all&label_name%5B%5D=Improvement) to verify that your improvement hasn't already been suggested.
+1. Check the existing [improvement requests](https://gitlab.com/jeseibel/distant-horizons/-/issues/?sort=updated_desc&state=all&label_name%5B%5D=Improvement) to verify that your improvement hasn't already been suggested.
 
 2. **Describe the improvement**:

build.gradle

@@ -1,11 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
-import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
-import org.apache.tools.zip.ZipEntry
-
-import javax.annotation.Nonnull
-import org.apache.tools.zip.ZipOutputStream
-
-
 plugins {
     id "java"
 
@@ -78,7 +70,7 @@ forgix {
     String loaderHyphenSeparatedList = ((String)gradle.builds_for).replaceAll(",", "-");
     
     group = "com.seibel.distanthorizons"
-    mergedJarName = "DistantHorizons-${loaderHyphenSeparatedList}-${rootProject.versionStr}.jar"
+    mergedJarName = "DistantHorizons-${rootProject.versionStr}-${loaderHyphenSeparatedList}.jar"
 
     if (findProject(":forge"))
         forge {
@@ -104,83 +96,6 @@ forgix {
     removeDuplicate "com.seibel.distanthorizons"
 }
 
-
-class NativeTransformer implements Transformer {
-    private boolean enabled = false
-    private final HashMap<String, String> replacements = new HashMap()
-    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()
-            if (exitCode == 0) {
-                enabled = true
-            }
-        } catch (IOException e) {
-            println(e)
-        }
-    }
-
-    void relocateNative(String target, String replacement) {
-        if (replacement.length() > target.length()) {
-            throw new GradleException("Length of value \"${replacement}\" exceeds the length of \"${target}\": ${replacement.length()} > ${target.length()}")
-        }
-
-        replacements.put(target, replacement)
-    }
-
-    void before(Closure closure) {
-        if (enabled)
-            closure.run()
-    }
-
-
-    @Override
-    boolean canTransformResource(@Nonnull FileTreeElement element) {
-        return enabled && replacements.keySet().stream().anyMatch {
-            element.name.startsWith(it as String)
-        }
-    }
-
-    @Override
-    void transform(@Nonnull TransformerContext context) {
-        println("Transforming $context.path...")
-        byte[] content = context.is.readAllBytes()
-
-        if (nativeRelocator == null) {
-            nativeRelocator = new NativeRelocator(rootDir.toPath().resolve("relocate_natives"))
-        }
-
-        try {
-            Map.Entry<String, String> pathReplacement = replacements.entrySet().stream().filter {
-                context.path.startsWith(it.key as String)
-            }.findFirst().orElseThrow()
-
-            String path = context.path.replace(pathReplacement.key as String, pathReplacement.value as String)
-            content = nativeRelocator.processBinary(path, content, replacements)
-
-            rewrittenFiles.put(path, content)
-        }
-        catch (Throwable e) {
-            throw new GradleException("Failed to relocate", e)
-        }
-    }
-
-    @Override
-    boolean hasTransformedResource() { return !rewrittenFiles.isEmpty() }
-
-    @Override
-    void modifyOutputStream(@Nonnull ZipOutputStream os, boolean preserveFileTimestamps) {
-        for (Map.Entry<String, byte[]> rewrittenFile : rewrittenFiles.entrySet()) {
-            os.putNextEntry(new ZipEntry(rewrittenFile.key))
-            os.write(rewrittenFile.value)
-        }
-    }
-}
-
 subprojects { p ->
     // Does the same as "p == project(":common") || p == project(":fabric") || p == project(":quilt")  || p == project(":forge") || p == project("WhateverWeAddLaterOn")"
     // Useful later on so we dont have duplicated code
@@ -391,23 +306,26 @@ subprojects { p ->
         
         // Logging
         relocate "org.slf4j", "${librariesLocation}.slf4j"
-
-        // Sqlite Database
-        // 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
-        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"
-        }
+        
+//        // Sqlite Database
+//        // James can't determine how to relocate the library correctly so this is commented out
+//        relocate ("org.sqlite", "${librariesLocation}.sqlite") {
+//            exclude("org/sqlite/core/NativeDB/**")
+//
+//            exclude("org/sqlite/native/FreeBSD/**")
+//            exclude("org/sqlite/native/Linux-Android/**")
+//            exclude("org/sqlite/native/Linux-Musl/**")
+//            exclude("org/sqlite/native/Linux/arm/**")
+//            exclude("org/sqlite/native/Linux/aarch64/**")
+//            exclude("org/sqlite/native/Linux/armv6/**")
+//            exclude("org/sqlite/native/Linux/x86/**")
+//            exclude("org/sqlite/native/Linux/armv7/**")
+//            exclude("org/sqlite/native/Linux/ppc64/**")
+//            exclude("org/sqlite/native/Linux/riscv64/**")
+//            exclude("org/sqlite/native/Windows/armv7/**")
+//            exclude("org/sqlite/native/Windows/aarch64/**")
+//            exclude("org/sqlite/native/Windows/armv7/**")
+//        }
         
         
         // JOML

buildSrc/src/main/java/NativeRelocator.java

@@ -1,207 +0,0 @@
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-class NativeRelocator
-{
-	private final Path rootDirectory;
-	private final Path cacheRoot;
-	
-	/**
-	 * 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
-	{
-		this.rootDirectory = rootDirectory;
-		this.cacheRoot = this.rootDirectory.resolve("cache");
-		
-		if (this.rootDirectory.resolve(".venv").toFile().exists())
-		{
-			return;
-		}
-		
-		ProcessBuilder processBuilder = new ProcessBuilder();
-		processBuilder.directory(this.rootDirectory.toFile());
-		
-		String os = System.getProperty("os.name").toLowerCase();
-		if (os.contains("win"))
-		{
-			processBuilder.command("powershell", "./prepare.ps1");
-		}
-		else if (os.contains("nix") || os.contains("nux") || os.contains("mac"))
-		{
-			processBuilder.command("./prepare.sh");
-		}
-		else
-		{
-			throw new IllegalStateException("Unsupported operating system: " + os);
-		}
-		
-		Process process = processBuilder.start();
-		CompletableFuture<Void> outputFuture = readOutputStreams(process);
-		
-		int exitCode = process.waitFor();
-		outputFuture.get();
-		
-		if (exitCode != 0)
-		{
-			throw new Exception("Prepare failed: " + exitCode);
-		}
-	}
-	
-	/**
-	 * 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(() -> {
-			try
-			{
-				while (process.isAlive() || process.getInputStream().available() > 0 || process.getErrorStream().available() > 0)
-				{
-					if (process.getInputStream().available() > 0)
-					{
-						byte[] data = new byte[process.getInputStream().available()];
-						//noinspection ResultOfMethodCallIgnored
-						process.getInputStream().read(data);
-						System.out.write(data);
-					}
-					if (process.getErrorStream().available() > 0)
-					{
-						byte[] data = new byte[process.getErrorStream().available()];
-						//noinspection ResultOfMethodCallIgnored
-						process.getErrorStream().read(data);
-						System.err.write(data);
-					}
-					
-					//noinspection BusyWait
-					Thread.sleep(100);
-				}
-			}
-			catch (Throwable ignored)
-			{
-			}
-		});
-	}
-	
-	/**
-	 * 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())
-		{
-			throw new IllegalArgumentException("Replacement must be the same length or shorter than the target.");
-		}
-		
-		byte[] targetBytes = target.getBytes(StandardCharsets.US_ASCII);
-		byte[] replacementBytes = replacement.getBytes(StandardCharsets.US_ASCII);
-		
-		byte nullByte = 0;
-		
-		for (int endPos = 0; endPos < byteArray.length - targetBytes.length - 1; endPos++)
-		{
-			int startPos = endPos;
-			int targetPos = 0;
-			while (targetPos < targetBytes.length && byteArray[endPos] == targetBytes[targetPos])
-			{
-				targetPos++;
-				endPos++;
-			}
-			
-			if (targetPos == targetBytes.length)
-			{
-				System.arraycopy(replacementBytes, 0, byteArray, startPos, replacementBytes.length);
-				
-				startPos = startPos + replacementBytes.length;
-				while (byteArray[endPos] != nullByte)
-				{
-					byteArray[startPos] = byteArray[endPos];
-					endPos++;
-					startPos++;
-				}
-				byteArray[startPos] = nullByte;
-			}
-		}
-	}
-	
-	/**
-	 * 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(this.rootDirectory.toFile());
-		
-		processBuilder.command(
-				this.rootDirectory.resolve(".venv/Scripts").toFile().exists()
-						? this.rootDirectory.resolve(".venv/Scripts/python.exe").toString()
-						: this.rootDirectory.resolve(".venv/bin/python").toString(),
-				"./fix_modified_binary.py",
-				outputFilePath.toString()
-		);
-		
-		Process process = processBuilder.start();
-		CompletableFuture<Void> outputFuture = readOutputStreams(process);
-		
-		process.getOutputStream().write(content);
-		process.getOutputStream().close();
-		
-		int exitCode = process.waitFor();
-		outputFuture.get();
-		
-		if (exitCode != 0)
-		{
-			throw new Exception("Process failed: " + exitCode);
-		}
-		
-		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 = this.cacheRoot.resolve(outputPath);
-		//noinspection ResultOfMethodCallIgnored
-		outputFilePath.getParent().toFile().mkdirs();
-		
-		if (outputFilePath.toFile().exists())
-		{
-			return Files.readAllBytes(outputFilePath);
-		}
-		
-		for (Map.Entry<String, String> replacement : replacements.entrySet())
-		{
-			this.replaceInNullTerminatedStrings(content, replacement.getKey(), replacement.getValue());
-		}
-		
-		return this.fixModifiedBinary(outputFilePath, content);
-	}
-	
-}

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

@@ -38,6 +38,24 @@ 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()
 	{

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

@@ -43,8 +43,6 @@ 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;
@@ -92,7 +90,6 @@ 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;
@@ -353,42 +350,25 @@ 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() && !canOcclude)
+		else if (this.isLiquid() && !this.blockState.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;
 		}
-		else if (propagatesSkyLightDown && !canOcclude)
+		#if MC_VER < MC_1_21_3
+		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,29 +214,17 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public DhBlockPos getPlayerBlockPos()
 	{
-		LocalPlayer player = this.getPlayer();
-		if (player == null)
-		{
-			return new DhBlockPos(0, 0, 0);	
-		}
-		
-		BlockPos playerPos = player.blockPosition();
+		BlockPos playerPos = this.getPlayer().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(player.blockPosition());
+        ChunkPos playerPos = new ChunkPos(this.getPlayer().blockPosition());
         #else
-		ChunkPos playerPos = player.chunkPosition();
+		ChunkPos playerPos = this.getPlayer().chunkPosition();
         #endif
 		return new DhChunkPos(playerPos.x, playerPos.z);
 	}

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

@@ -28,80 +28,72 @@ import net.minecraft.world.level.dimension.DimensionType;
 
 /**
  * @author James Seibel
+ * @version 2022-9-16
  */
 public class DimensionTypeWrapper implements IDimensionTypeWrapper
 {
-	private static final ConcurrentMap<String, DimensionTypeWrapper> DIMENSION_WRAPPER_BY_NAME = new ConcurrentHashMap<>();
+	private static final ConcurrentMap<DimensionType, DimensionTypeWrapper> dimensionTypeWrapperMap = new ConcurrentHashMap<>();
 	private final DimensionType dimensionType;
 	
-	
-	
-	//=============//
-	// Constructor //
-	//=============//
-	
-	public DimensionTypeWrapper(DimensionType dimensionType) { this.dimensionType = dimensionType; }
+	public DimensionTypeWrapper(DimensionType dimensionType)
+	{
+		this.dimensionType = dimensionType;
+	}
 	
 	public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
 	{
-		String dimName = getName(dimensionType);
-		
-		// check if the dimension has already been wrapped
-		if (DIMENSION_WRAPPER_BY_NAME.containsKey(dimName) 
-			&& DIMENSION_WRAPPER_BY_NAME.get(dimName) != null)
+		//first we check if the biome has already been wrapped
+		if (dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
 		{
-			return DIMENSION_WRAPPER_BY_NAME.get(dimName);
+			return dimensionTypeWrapperMap.get(dimensionType);
 		}
 		
 		
-		// create the missing wrapper
+		//if it hasn't been created yet, we create it and save it in the map
 		DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
-		DIMENSION_WRAPPER_BY_NAME.put(dimName, dimensionTypeWrapper);
+		dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
+		
+		//we return the newly created wrapper
 		return dimensionTypeWrapper;
 	}
 	
-	public static void clearMap() { DIMENSION_WRAPPER_BY_NAME.clear(); }
+	public static void clearMap()
+	{
+		dimensionTypeWrapperMap.clear();
+	}
 	
 	
-	
-	//=================//
-	// wrapper methods //
-	//=================//
-	
-	@Override
-	public String getName() { return getName(this.dimensionType); }
-	public static String getName(DimensionType dimensionType)
+	private String getDimensionName()
 	{
 		#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 dimensionType.effectsLocation().getPath();
+		return this.dimensionType.effectsLocation().getPath();
 		#endif
 	}
 	
 	@Override
-	public boolean hasCeiling() { return this.dimensionType.hasCeiling(); }
+	public boolean hasCeiling()
+	{
+		return this.dimensionType.hasCeiling();
+	}
 	
 	@Override
-	public boolean hasSkyLight() { return this.dimensionType.hasSkyLight(); }
+	public boolean hasSkyLight()
+	{
+		return this.dimensionType.hasSkyLight();
+	}
 	
 	@Override
-	public Object getWrappedMcObject() { return this.dimensionType; }
+	public Object getWrappedMcObject()
+	{
+		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.getName().equalsIgnoreCase("the_end"); }
-	
-	@Override
-	public double getCoordinateScale() { return this.dimensionType.coordinateScale(); }
-	
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
+	public boolean isTheEnd() { return this.getDimensionName().equalsIgnoreCase("the_end"); }
 	
 	@Override
 	public boolean equals(Object obj)
@@ -113,10 +105,9 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 		else
 		{
 			DimensionTypeWrapper other = (DimensionTypeWrapper) obj;
-			return other.getName().equals(this.getName());
+			return other.getDimensionName().equals(this.getDimensionName());
 		}
 	}
 	
 	
-	
 }

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 pullExistingChunkUsingMcAsyncMethod = false;
+	private boolean pullExistingChunkAsync = false;
 	
 	
 	
@@ -241,10 +241,19 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		
 		if (MOD_CHECKER.isModLoaded("c2me"))
 		{
-			EVENT_LOGGER.info("C2ME detected: DH's pre-existing chunk accessing will use methods handled by C2ME.");
-			this.pullExistingChunkUsingMcAsyncMethod = true;
+			EVENT_LOGGER.info("C2ME detected: DH's pre-existing chunk accessing will use async methods handled by C2ME.");
+			this.pullExistingChunkAsync = 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);
 	}
 	
@@ -333,8 +342,6 @@ 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
 	{
@@ -378,12 +385,10 @@ 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.runAsync(() -> 
+		return CompletableFuture.allOf(readFutures)
+			.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
@@ -587,7 +592,6 @@ 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;
@@ -606,7 +610,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			#else
 			
 			// storage will be null if C2ME is installed
-			if (!this.pullExistingChunkUsingMcAsyncMethod && ioWorker.storage != null)
+			if (!this.pullExistingChunkAsync && ioWorker.storage != null)
 			{
 				try
 				{
@@ -620,7 +624,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.pullExistingChunkUsingMcAsyncMethod = true;
+					this.pullExistingChunkAsync = true;
 					
 					// try again now using the async method
 					return this.getChunkNbtDataAsync(chunkPos);
@@ -629,42 +633,32 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			else
 			{
 				// log if we unexpectedly weren't able to run the sync chunk pulling
-				if (!this.pullExistingChunkUsingMcAsyncMethod)
+				if (!this.pullExistingChunkAsync)
 				{
 					// 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.pullExistingChunkUsingMcAsyncMethod = true;
+					this.pullExistingChunkAsync = 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 ->
+					.thenApply(optional -> optional.orElse(null))
+					.exceptionally((throwable) ->
+					{
+						// unwrap the CompletionException if necessary
+						Throwable actualThrowable = throwable;
+						while (actualThrowable instanceof CompletionException completionException)
 						{
-							// 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.
-							
-							//GET_CHUNK_COUNT_REF.decrementAndGet();
-							//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;
-						});
+							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,25 +76,15 @@ public abstract class MixinMinecraft
 		
 		if (SelfUpdater.onStart() || DEBUG_ALWAYS_SHOW_UPDATER)
 		{
-			try
-			{
-				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"))
-				));
-				return;
-			}
-			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()+"].");
-			}
+			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
+		{
+			instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
 		}
-		
-		// Sets the screen back to the vanilla screen as if nothing ever happened
-		// if not done the game will crash
-		instance.setScreen(guiScreen);
 	}
 	#endif
 	
@@ -134,13 +124,14 @@ 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 (Exception e)
+					catch (IllegalArgumentException 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

@@ -0,0 +1,55 @@
+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

@@ -46,8 +46,8 @@ public class TestGenericWorldGenerator implements IDhApiWorldGenerator
 	public byte getSmallestDataDetailLevel() { return (byte) (EDhApiDetailLevel.BLOCK.detailLevel); }
 	@Override
 	public byte getLargestDataDetailLevel() 
-	{ return (byte) (EDhApiDetailLevel.BLOCK.detailLevel + 12); }
-	//{ return (byte) (EDhApiDetailLevel.BLOCK.detailLevel); }
+	//{ return (byte) (EDhApiDetailLevel.BLOCK.detailLevel + 12); }
+	{ return (byte) (EDhApiDetailLevel.BLOCK.detailLevel); }
 	
 	
 	@Override
@@ -105,43 +105,43 @@ public class TestGenericWorldGenerator implements IDhApiWorldGenerator
 			{
 				case 0:
 					blockResourceLocation = "minecraft:red_wool";
-					maxHeight = 20;
+					maxHeight = 60;
 					break;
 				case 1:
 					blockResourceLocation = "minecraft:orange_wool";
-					maxHeight = 30;
+					maxHeight = 70;
 					break;
 				case 2:
 					blockResourceLocation = "minecraft:yellow_wool";
-					maxHeight = 40;
+					maxHeight = 80;
 					break;
 				case 3:
 					blockResourceLocation = "minecraft:lime_wool";
-					maxHeight = 50;
+					maxHeight = 90;
 					break;
 				case 4:
 					blockResourceLocation = "minecraft:cyan_wool";
-					maxHeight = 60;
+					maxHeight = 100;
 					break;
 				case 5:
 					blockResourceLocation = "minecraft:blue_wool";
-					maxHeight = 70;
+					maxHeight = 100;
 					break;
 				case 6:
 					blockResourceLocation = "minecraft:magenta_wool";
-					maxHeight = 80;
+					maxHeight = 110;
 					break;
 				case 7:
 					blockResourceLocation = "minecraft:white_wool";
-					maxHeight = 90;
+					maxHeight = 120;
 					break;
 				case 8:
 					blockResourceLocation = "minecraft:gray_wool";
-					maxHeight = 100;
+					maxHeight = 120;
 					break;
 				default:
 					blockResourceLocation = "minecraft:black_wool";
-					maxHeight = 110;
+					maxHeight = 140;
 					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); // TODO biomes are broken for some reason
+			//IDhApiWorldGenerator exampleWorldGen = new TestChunkWorldGenerator(level);
 			IDhApiWorldGenerator exampleWorldGen = new TestGenericWorldGenerator(event.value.levelWrapper);
 			DhApi.worldGenOverrides.registerWorldGeneratorOverride(event.value.levelWrapper, exampleWorldGen);
 		}

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

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

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

@@ -57,25 +57,15 @@ public class MixinMinecraft
 		
 		if (SelfUpdater.onStart())
 		{
-			try
-			{
-				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"))
-				));
-				return;
-			}
-			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()+"].");
-			}
+			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
+		{
+			instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
 		}
-		
-		// Sets the screen back to the vanilla screen as if nothing ever happened
-		// if not done the game will crash
-		instance.setScreen(guiScreen);
 	}
 	#endif
 	
@@ -118,7 +108,7 @@ public class MixinMinecraft
 								versionId
 						));
 					}
-					catch (Exception e)
+					catch (IllegalArgumentException 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
+mod_version=2.3.0-b-dev
 api_version=4.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons

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

@@ -76,13 +76,14 @@ 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 (Exception e)
+					catch (IllegalArgumentException 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

@@ -0,0 +1,53 @@
+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,7 +8,8 @@
     "server.MixinServerPlayer",
     "server.MixinTFChunkGenerator",
     "server.MixinTracingExecutor",
-    "server.MixinUtilBackgroundThread"
+    "server.MixinUtilBackgroundThread",
+    "server.MixinLevelTicks"
   ],
   "client": [
     "client.MixinClientPacketListener",

relocate_natives/download_codesign.py

@@ -1,110 +0,0 @@
-import os
-import platform
-import requests
-import tarfile
-import zipfile
-from pathlib import Path
-
-
-def get_platform_specific_filename():
-    system = platform.system()
-    machine = platform.machine()
-
-    if system == "Darwin":
-        if machine == "arm64":
-            return "apple-codesign-*-aarch64-apple-darwin.tar.gz"
-        else:
-            return "apple-codesign-*-x86_64-apple-darwin.tar.gz"
-    elif system == "Linux":
-        if machine == "aarch64":
-            return "apple-codesign-*-aarch64-unknown-linux-musl.tar.gz"
-        else:
-            return "apple-codesign-*-x86_64-unknown-linux-musl.tar.gz"
-    elif system == "Windows":
-        if machine.endswith("64"):
-            return "apple-codesign-*-x86_64-pc-windows-msvc.zip"
-        else:
-            return "apple-codesign-*-i686-pc-windows-msvc.zip"
-    else:
-        raise Exception(f"Unsupported platform: {system} {machine}")
-
-
-def download_and_unpack():
-    dest_dir = Path("./apple-codesign")
-
-    repo_url = "https://api.github.com/repos/indygreg/apple-platform-rs/releases/latest"
-    dest_dir.mkdir(exist_ok=True)
-
-    # Fetch the latest release info from GitHub
-    print("Fetching latest release information...")
-    response = requests.get(repo_url)
-    response.raise_for_status()
-    release_data = response.json()
-
-    # Ensure release data has assets
-    if "assets" not in release_data:
-        raise Exception("Release data does not contain assets.")
-
-    # Determine the correct asset
-    platform_filename = get_platform_specific_filename()
-    asset = next((asset for asset in release_data["assets"] if asset["name"].startswith("apple-codesign-") and asset["name"].endswith(platform_filename.split("*")[-1])), None)
-
-    if not asset:
-        raise Exception(f"No matching asset found for platform: {platform_filename}")
-
-    # Download the archive
-    print(f"Downloading {asset['name']}...")
-    download_url = asset["browser_download_url"]
-    archive_path = dest_dir / asset["name"]
-
-    with requests.get(download_url, stream=True) as r:
-        r.raise_for_status()
-        with open(archive_path, "wb") as f:
-            for chunk in r.iter_content(chunk_size=8192):
-                f.write(chunk)
-
-    print(f"Downloaded to {archive_path}")
-
-    # Extract the archive
-    print("Extracting archive...")
-    temp_extract_dir = dest_dir / "temp_extract"
-    temp_extract_dir.mkdir(parents=True, exist_ok=True)
-
-    if archive_path.suffix == ".zip":
-        with zipfile.ZipFile(archive_path, "r") as zip_ref:
-            zip_ref.extractall(temp_extract_dir)
-    elif archive_path.suffixes[-2:] == [".tar", ".gz"]:
-        with tarfile.open(archive_path, "r:gz") as tar_ref:
-            tar_ref.extractall(temp_extract_dir)
-    else:
-        raise Exception(f"Unknown archive format: {archive_path}")
-
-    # Move contents of the root directory inside the archive to dest_dir
-    root_dir = next(temp_extract_dir.iterdir())  # Assuming only one root directory
-    for item in root_dir.iterdir():
-        target_path = dest_dir / item.name
-        if target_path.exists():
-            if target_path.is_dir():
-                os.rmdir(target_path)
-            else:
-                os.remove(target_path)
-        item.rename(target_path)
-
-    # Clean up temporary directories
-    for item in temp_extract_dir.iterdir():
-        if item.is_dir():
-            os.rmdir(item)
-    temp_extract_dir.rmdir()
-
-    print(f"Extracted to {dest_dir}")
-
-    # Clean up the archive
-    os.remove(archive_path)
-    print(f"Removed archive {archive_path}")
-
-
-if __name__ == "__main__":
-    try:
-        download_and_unpack()
-    except Exception as e:
-        print(f"Error: {e}")

relocate_natives/fix_modified_binary.py

@@ -1,31 +0,0 @@
-import sys
-import lief
-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()

relocate_natives/prepare.ps1

@@ -1,5 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-python -m venv .venv
-.\.venv\Scripts\activate
-pip install -r requirements.txt

relocate_natives/prepare.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-python -m venv .venv
-. ./.venv/bin/activate
-pip install -r requirements.txt

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.115.0+1.21.1
+fabric_api_version=0.107.0+1.21.1
     # Fabric mod versions
     modmenu_version=11.0.0-beta.1
     starlight_version_fabric=