remove dev from version number

Attempt to fix #950

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

@@ -31,7 +31,7 @@ class NativeRelocator
 		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"))
 		{

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
@@ -41,11 +39,43 @@ public class VersionConstants implements IVersionConstants
 	@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/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)
 	{

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;
-	}
 	
 	
 	

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.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); }