Revert "Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons into serverside"

This reverts commit 692b304898, reversing
changes made to 0ca93e311c.

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

@@ -31,11 +31,11 @@ import com.seibel.distanthorizons.core.api.internal.SharedApi;
 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.threading.ThreadPoolUtil;
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
 import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -57,7 +57,6 @@ import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import java.nio.FloatBuffer;
 #endif
 import java.util.HashSet;
-import java.util.concurrent.ThreadPoolExecutor;
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.InteractionResult;
@@ -126,7 +125,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		});
 		
 		// (kinda) block break event
-		// Since fabric doesn't have a client-side break-block API event, this is the next best thing
 		AttackBlockCallback.EVENT.register((player, level, interactionHand, blockPos, direction) ->
 		{
 			// if we have access to the server, use the chunk save event instead 
@@ -134,27 +132,18 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			{
 				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(blockPos.getX(), blockPos.getZ()))
 				{
-					// executor to prevent locking up the render/event thread
-					// if the getChunk() takes longer than expected 
-					// (which can be caused by certain mods) 
-					ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
-					if (executor != null)
+					// Since fabric doesn't have a client-side break-block API event, this is the next best thing
+					ChunkAccess chunk = level.getChunk(blockPos);
+					if (chunk != null)
 					{
-						executor.execute(() ->
-						{
-							ChunkAccess chunk = level.getChunk(blockPos);
-							if (chunk != null)
-							{
-								//LOGGER.trace("attack block at blockPos: " + blockPos);
-								
-								IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
-								SharedApi.INSTANCE.chunkBlockChangedEvent(
-										new ChunkWrapper(chunk, level, wrappedLevel),
-										wrappedLevel
-								);
-							}
-						});
-					}
+						//LOGGER.trace("attack block at blockPos: " + blockPos);
+						
+						IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
+						SharedApi.INSTANCE.chunkBlockChangedEvent(
+								new ChunkWrapper(chunk, level, wrappedLevel),
+								wrappedLevel
+						);
+					}	
 				}
 			}
 			
@@ -163,37 +152,27 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		});
 		
 		// (kinda) block place event
-		// Since fabric doesn't have a client-side place-block API event, this is the next best thing
 		UseBlockCallback.EVENT.register((player, level, hand, hitResult) -> 
 		{
 			// if we have access to the server, use the chunk save event instead 
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				if (hitResult.getType() == HitResult.Type.BLOCK
-						&& !hitResult.isInside())
+				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(hitResult.getBlockPos().getX(), hitResult.getBlockPos().getZ()))
 				{
-					if (SharedApi.isChunkAtBlockPosAlreadyUpdating(hitResult.getBlockPos().getX(), hitResult.getBlockPos().getZ()))
+					// Since fabric doesn't have a client-side place-block API event, this is the next best thing
+					if (hitResult.getType() == HitResult.Type.BLOCK
+							&& !hitResult.isInside())
 					{
-						// executor to prevent locking up the render/event thread
-						// if the getChunk() takes longer than expected 
-						// (which can be caused by certain mods) 
-						ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
-						if (executor != null)
+						ChunkAccess chunk = level.getChunk(hitResult.getBlockPos());
+						if (chunk != null)
 						{
-							executor.execute(() ->
-							{
-								ChunkAccess chunk = level.getChunk(hitResult.getBlockPos());
-								if (chunk != null)
-								{
-									//LOGGER.trace("use block at blockPos: " + hitResult.getBlockPos());
-									
-									IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
-									SharedApi.INSTANCE.chunkBlockChangedEvent(
-											new ChunkWrapper(chunk, level, wrappedLevel),
-											wrappedLevel
-									);
-								}
-							});
+							//LOGGER.trace("use block at blockPos: " + hitResult.getBlockPos());
+							
+							IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
+							SharedApi.INSTANCE.chunkBlockChangedEvent(
+									new ChunkWrapper(chunk, level, wrappedLevel),
+									wrappedLevel
+							);
 						}
 					}
 				}

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

@@ -22,7 +22,6 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 import com.mojang.blaze3d.vertex.PoseStack;
 #if MC_VER < MC_1_19_4
 import com.mojang.math.Matrix4f;
-import org.lwjgl.opengl.GL32;
 #else
 import org.joml.Matrix4f;
 #endif
@@ -30,17 +29,23 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import com.seibel.distanthorizons.core.config.Config;
+import net.minecraft.client.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import org.lwjgl.opengl.GL15;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -94,7 +99,7 @@ public class MixinLevelRenderer
 		#if MC_VER == MC_1_16_5
 	    // get the matrices from the OpenGL fixed pipeline
 	    float[] mcProjMatrixRaw = new float[16];
-	    GL32.glGetFloatv(GL32.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
+	    GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
 	    Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
 	    mcProjectionMatrix.transpose();
 	    
@@ -105,14 +110,13 @@ public class MixinLevelRenderer
 		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
 		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#else
-	    // MC combined the model view and projection matricies
+	    // get the matrices directly from MC
 	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
 	    Mat4f mcProjectionMatrix = new Mat4f();
 	    mcProjectionMatrix.setIdentity();
 		#endif
 	    
-	    if (renderType.equals(RenderType.translucent())) 
-		{
+	    if (renderType.equals(RenderType.translucent())) {
 		    ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level),
 				    mcModelViewMatrix,
 				    mcProjectionMatrix,

fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;