remove dev from version number

The previous versions appeared to be out of date, causing linker errors

build.gradle

@@ -5,6 +5,9 @@ import org.apache.tools.zip.ZipEntry
 import javax.annotation.Nonnull
 import org.apache.tools.zip.ZipOutputStream
 
+import java.util.function.Function
+import java.util.function.Predicate
+
 
 plugins {
     id "java"
@@ -73,12 +76,23 @@ writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex)
 rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm")
 
 class NativeTransformer implements Transformer {
+    private Predicate<String> fileMatcher
+    private Function<String, String> filePathMapper
+
     private final HashMap<String, String> replacements = new HashMap()
     private final HashMap<String, byte[]> rewrittenFiles = new HashMap()
     private var nativeRelocator
 
     public File rootDir
 
+    void matchFiles(Predicate<String> matcher) {
+        fileMatcher = matcher
+    }
+
+    void mapPaths(Function<String, String> mapper) {
+        filePathMapper = mapper
+    }
+
     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()}")
@@ -89,9 +103,7 @@ class NativeTransformer implements Transformer {
 
     @Override
     boolean canTransformResource(@Nonnull FileTreeElement element) {
-        return replacements.keySet().stream().anyMatch {
-            element.name.startsWith(it as String)
-        }
+        return fileMatcher.test(element.name)
     }
 
     @Override
@@ -103,11 +115,9 @@ class NativeTransformer implements Transformer {
         }
 
         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)
+            String path = filePathMapper != null
+                ? filePathMapper.apply(context.path)
+                : context.path
             content = nativeRelocator.processBinary(path, content, replacements)
 
             rewrittenFiles.put(path, content)
@@ -351,9 +361,30 @@ subprojects { p ->
 
         transform(NativeTransformer) {
             rootDir = project.rootDir
+
+            matchFiles { it.startsWith("org/sqlite") }
+            mapPaths { it.replace("org/sqlite", "dh_sqlite") }
+
             relocateNative "org/sqlite", "dh_sqlite"
             relocateNative "org_sqlite", "dh_1sqlite"
         }
+
+        // ZStd
+        // librariesLocation isn't used because it's too long for replacing paths in native libraries
+        // Allowing strings larger than the original string would require shifting the entire binary's contents
+        relocate "com.github.luben", "dhcomgithubluben"
+        relocate "libzstd-jni", "libzstd-jni_dh"
+        relocate "zstd-jni", "zstd-jni_dh"
+
+        transform(NativeTransformer) {
+            rootDir = project.rootDir
+
+            matchFiles { it.contains("libzstd-jni") && !it.contains("aix/ppc64") }
+            mapPaths { it.replace("libzstd-jni", "libzstd-jni_dh") }
+
+            relocateNative "com/github/luben", "dhcomgithubluben"
+            relocateNative "com_github_luben", "dhcomgithubluben"
+        }
         
         
         // JOML

common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java

@@ -166,6 +166,10 @@ public abstract class AbstractModInitializer
 			//noinspection unchecked
 			ModAccessorInjector.INSTANCE.bind((Class<? extends IModAccessor>) accessorClass, accessorConstructor.get());
 		}
+		else
+		{
+			LOGGER.debug("Skipping mod compatibility accessor for: ["+modId+"]");
+		}
 	}
 	
 	private void initConfig()

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

@@ -293,7 +293,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public void crashMinecraft(String errorMessage, Throwable exception)
 	{
-		LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
+		LOGGER.fatal(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
 		CrashReport report = new CrashReport(errorMessage, exception);
 		#if MC_VER < MC_1_20_4
 		Minecraft.crash(report);

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

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

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

@@ -187,7 +187,9 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		#if MC_VER <= MC_1_21_10
 		return this.level.dimension().location().toString();
 		#else
-		return this.level.dimension().identifier().getPath();
+		String namespace = this.level.dimension().identifier().getNamespace();
+		String path = this.level.dimension().identifier().getPath();
+		return namespace + "@@" + path;
 		#endif
 	}
 	

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

@@ -113,14 +113,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		
 		
 		
-		//=============//
-		// tick events //
-		//=============//
-		
-		ClientTickEvents.START_CLIENT_TICK.register((client) -> { ClientApi.INSTANCE.clientTickEvent(); });
-		
-		
-		
 		//==============//
 		// chunk events //
 		//==============//

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

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

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

@@ -107,21 +107,6 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	
 	
 	
-	//=============//
-	// tick events //
-	//=============//
-	
-	@SubscribeEvent
-	public void clientTickEvent(TickEvent.ClientTickEvent event)
-	{
-		if (event.phase == TickEvent.Phase.START)
-		{
-			ClientApi.INSTANCE.clientTickEvent();
-		}
-	}
-	
-	
-	
 	//==============//
 	// world events //
 	//==============//

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

@@ -22,17 +22,16 @@ package com.seibel.distanthorizons.forge;
 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
-import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 
 import com.seibel.distanthorizons.forge.wrappers.modAccessor.ModChecker;
 import com.seibel.distanthorizons.forge.wrappers.modAccessor.OptifineAccessor;
+import com.seibel.distanthorizons.forge.wrappers.modAccessor.OculusAccessor;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
@@ -104,6 +103,7 @@ public class ForgeMain extends AbstractModInitializer
 	protected void initializeModCompat()
 	{
 		this.tryCreateModCompatAccessor("optifine", IOptifineAccessor.class, OptifineAccessor::new);
+		this.tryCreateModCompatAccessor("oculus", IIrisAccessor.class, OculusAccessor::new);
 		
 		#if MC_VER < MC_1_17_1
 		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,

forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OculusAccessor.java

@@ -0,0 +1,57 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.forge.wrappers.modAccessor;
+
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
+
+public class OculusAccessor implements IIrisAccessor
+{
+	protected static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	
+	public OculusAccessor()
+	{
+		LOGGER.warn("Partial Oculus support enabled. Some DH features may be disabled or behave strangely, use Iris instead if possible.");
+	}
+	
+	
+	
+	@Override
+	public String getModName()
+	{
+		return "oculus";
+	}
+	
+	@Override
+	public boolean isShaderPackInUse()
+	{
+		// assume shaders are always active
+		return true;
+	}
+	
+	@Override
+	public boolean isRenderingShadowPass()
+	{
+		return false;
+	}
+	
+}

gradle.properties

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

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

@@ -73,29 +73,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	
 	
 	
-	//=============//
-	// tick events //
-	//=============//
-	
-	#if MC_VER < MC_1_20_6
-	@SubscribeEvent
-	public void clientTickEvent(TickEvent.ClientTickEvent event)
-	{
-		if (event.phase == TickEvent.Phase.START)
-		{
-			ClientApi.INSTANCE.clientTickEvent();
-		}
-	}
-	#else
-	@SubscribeEvent
-	public void clientTickEvent(ClientTickEvent.Pre event)
-	{
-		ClientApi.INSTANCE.clientTickEvent();
-	}
-	#endif
-	
-	
-	
 	//==============//
 	// world events //
 	//==============//

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

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

relocate_natives/README.md

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