Cleanup

2026-04-25 20:27:24 +02:00
parent 390dda94c6
commit 29042e2ced
10 changed files with 5 additions and 78 deletions
@@ -661,14 +661,15 @@ public class ChunkWrapper implements IChunkWrapper
 	@Override
 	public String toString() { return this.chunk.getClass().getSimpleName() + this.chunk.getPos(); }
 	
-	//@Override
+	//@Override 
 	//public int hashCode()
 	//{
 	//	if (this.blockBiomeHashCode == 0)
 	//	{
 	//		this.blockBiomeHashCode = this.getBlockBiomeHashCode();
 	//	}
-	//
+	//	
 	//	return this.blockBiomeHashCode;
 	//}
+	
 }
@@ -45,7 +45,6 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.profiling.ProfilerFiller;
@@ -485,22 +485,6 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		return this.dimMinHeight;
 	}
 	
-	public IChunkWrapper tryGetChunk(DhChunkPos pos)
-	{
-		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
-		{
-			return null;
-		}
-		
-		ChunkAccess chunk = this.level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
-		if (chunk == null)
-		{
-			return null;
-		}
-		
-		return new ChunkWrapper(chunk, this);
-	}
-	
 	@Override
 	public ClientLevel getWrappedMcObject() { return this.level; }
 	
@@ -49,12 +49,6 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif

-#if MC_VER <= MC_1_21_10
-#else
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.server.level.ChunkHolder;
-#endif
-
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;

@@ -229,46 +223,6 @@ public class ServerLevelWrapper implements IServerLevelWrapper
        #endif
 	}
 	
-	public IChunkWrapper tryGetChunk(DhChunkPos pos)
-	{
-		#if MC_VER < MC_1_21_11
-		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
-		{
-			return null;
-		}
-		
-		ChunkAccess chunk = this.level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.FULL, false);
-		if (chunk == null)
-		{
-			return null;
-		}
-		
-		return new ChunkWrapper(chunk, this);
-		#else
-		
-		// directly hitting the chunkMap is required otherwise MC will run this on the main server thread,
-		#if MC_VER <= MC_1_21_11
-		var cPos = new ChunkPos(pos.getX(), pos.getZ()).toLong();
-		#else
-		var cPos = new ChunkPos(pos.getX(), pos.getZ()).pack();
-		#endif
-		// causing lag
-		ChunkHolder chunkHolder = this.level.getChunkSource().chunkMap.getVisibleChunkIfPresent(cPos);
-		if (chunkHolder == null)
-		{
-			return null;
-		}
-		
-		ChunkAccess chunk = chunkHolder.getChunkIfPresent(ChunkStatus.FULL);
-		if (chunk == null)
-		{
-			return null;
-		}
-		
-		return new ChunkWrapper(chunk, this);
-		#endif
-	}
-	
 	@Override
 	public ServerLevel getWrappedMcObject() { return this.level; }
 	
@@ -21,7 +21,6 @@ package com.seibel.distanthorizons.fabric;

 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
-import com.seibel.distanthorizons.common.wrappers.modAccessor.ImmersivePortalsAccessorCommon;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -10,7 +10,6 @@ import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 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.common.AbstractPluginPacketSender;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -75,6 +75,7 @@ import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapp
 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.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;

 import net.minecraft.client.multiplayer.ClientLevel;
@@ -3,8 +3,6 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.common.commonMixins.DhUpdateScreenBase;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-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.core.jar.installer.GitlabGetter;
@@ -30,14 +30,12 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;

 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.world.level.LevelAccessor;

 import net.minecraft.client.multiplayer.ClientLevel;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.event.level.LevelEvent;

 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -52,13 +50,7 @@ import net.neoforged.neoforge.client.event.InputEvent;
 import net.neoforged.bus.api.SubscribeEvent;
 import org.lwjgl.opengl.GL32;

-#if MC_VER < MC_1_20_6
-import net.neoforged.neoforge.event.TickEvent;
-#else
-import net.neoforged.neoforge.client.event.ClientTickEvent;
-
 import java.util.concurrent.AbstractExecutorService;
-#endif


 public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy