diff --git a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java b/common/src/main/java/com/seibel/lod/common/LodCommonMain.java index 2e9ea984b..eb9cd65de 100644 --- a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java +++ b/common/src/main/java/com/seibel/lod/common/LodCommonMain.java @@ -20,10 +20,9 @@ package com.seibel.lod.common; import com.seibel.lod.common.forge.LodForgeMethodCaller; -import com.seibel.lod.common.networking.NetworkReceiver; import com.seibel.lod.common.wrappers.DependencySetup; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.api.internal.a7.SharedApi; +import com.seibel.lod.core.api.internal.SharedApi; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.config.ConfigBase; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java index 7c1bf423a..3c5a7056f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java @@ -24,9 +24,9 @@ import com.seibel.lod.common.wrappers.minecraft.MinecraftDedicatedServerWrapper; import com.seibel.lod.core.wrapperInterfaces.config.IConfigWrapper; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper; -import com.seibel.lod.core.handlers.IReflectionHandler; -import com.seibel.lod.core.handlers.ReflectionHandler; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.IReflectionHandler; +import com.seibel.lod.core.ReflectionHandler; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java index 3be2c1182..fda8ae3ee 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java @@ -25,9 +25,9 @@ import java.util.function.Consumer; import com.mojang.math.Matrix4f; import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.objects.DHBlockPos; -import com.seibel.lod.core.objects.DHChunkPos; -import com.seibel.lod.core.objects.math.Mat4f; +import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.lod.core.pos.DhChunkPos; +import com.seibel.lod.core.util.math.Mat4f; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -69,10 +69,10 @@ public class McObjectConverter } } - public static BlockPos Convert(DHBlockPos wrappedPos) { + public static BlockPos Convert(DhBlockPos wrappedPos) { return new BlockPos(wrappedPos.x, wrappedPos.y, wrappedPos.z); } - public static ChunkPos Convert(DHChunkPos wrappedPos) { + public static ChunkPos Convert(DhChunkPos wrappedPos) { return new ChunkPos(wrappedPos.x, wrappedPos.z); } @@ -85,7 +85,7 @@ public class McObjectConverter return lodDirections[direction.ordinal()]; } public static void DebugCheckAllPackers() { - BiConsumer func = (x, z) -> DHChunkPos._DebugCheckPacker(x,z,ChunkPos.asLong(x,z)); + BiConsumer func = (x, z) -> DhChunkPos._DebugCheckPacker(x,z,ChunkPos.asLong(x,z)); func.accept(0,0); func.accept(12345,134); func.accept(-12345,-134); @@ -93,7 +93,7 @@ public class McObjectConverter func.accept(30000000/16,-30000000/16); func.accept(30000000/16,30000000/16); func.accept(-30000000/16,-30000000/16); - Consumer func2 = (p) -> DHBlockPos._DebugCheckPacker(p.getX(),p.getY(),p.getZ(),p.asLong()); + Consumer func2 = (p) -> DhBlockPos._DebugCheckPacker(p.getX(),p.getY(),p.getZ(),p.asLong()); func2.accept(new BlockPos(0,0,0)); func2.accept(new BlockPos(12345,134,123)); func2.accept(new BlockPos(-12345,-134,-80)); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java b/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java index f28ae5175..1e1d88b70 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java @@ -21,8 +21,8 @@ package com.seibel.lod.common.wrappers; import com.seibel.lod.common.wrappers.block.BlockStateWrapper; import com.seibel.lod.common.wrappers.block.BiomeWrapper; -import com.seibel.lod.core.a7.level.ILevel; -import com.seibel.lod.core.a7.level.IServerLevel; +import com.seibel.lod.core.level.ILevel; +import com.seibel.lod.core.level.IServerLevel; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockDetailMap.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockDetailMap.java index 5e6f0fa83..d13563282 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockDetailMap.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockDetailMap.java @@ -2,7 +2,7 @@ package com.seibel.lod.common.wrappers.block.cache; import com.seibel.lod.common.wrappers.block.BiomeWrapper; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.objects.DHBlockPos; +import com.seibel.lod.core.pos.DhBlockPos; import net.minecraft.world.level.block.state.BlockState; import java.util.concurrent.ConcurrentHashMap; @@ -13,13 +13,13 @@ public class ClientBlockDetailMap { private final ClientLevelWrapper level; public ClientBlockDetailMap(ClientLevelWrapper level) { this.level = level; } - public ClientBlockStateCache getBlockStateData(BlockState state, DHBlockPos pos) { //TODO: Allow a per pos unique setting - return blockCache.computeIfAbsent(state, (s) -> new ClientBlockStateCache(s, level, new DHBlockPos(0,0,0))); + public ClientBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos) { //TODO: Allow a per pos unique setting + return blockCache.computeIfAbsent(state, (s) -> new ClientBlockStateCache(s, level, new DhBlockPos(0,0,0))); } public void clear() { blockCache.clear(); } - public int getColor(BlockState state, BiomeWrapper biome, DHBlockPos pos) { + public int getColor(BlockState state, BiomeWrapper biome, DhBlockPos pos) { return getBlockStateData(state, pos).getAndResolveFaceColor(biome); } } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java index dc1869e8f..bbfe7530b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java @@ -2,9 +2,8 @@ package com.seibel.lod.common.wrappers.block.cache; import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.common.wrappers.block.*; -import com.seibel.lod.core.config.Config; import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.objects.DHBlockPos; +import com.seibel.lod.core.pos.DhBlockPos; import com.seibel.lod.core.util.ColorUtil; import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; import net.minecraft.client.Minecraft; @@ -12,7 +11,6 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FlowerBlock; @@ -40,7 +38,7 @@ public class ClientBlockStateCache { public final BlockState state; public final LevelReader level; public final BlockPos pos; - public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DHBlockPos samplingPos) { + public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DhBlockPos samplingPos) { state = blockState; level = (LevelReader) samplingLevel.unwrapLevel(); pos = McObjectConverter.Convert(samplingPos); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockDetailMap.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockDetailMap.java index 2848f2f8c..88193e38b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockDetailMap.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockDetailMap.java @@ -22,7 +22,7 @@ package com.seibel.lod.common.wrappers.block.cache; import java.util.concurrent.ConcurrentHashMap; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.objects.DHBlockPos; +import com.seibel.lod.core.pos.DhBlockPos; import net.minecraft.world.level.block.state.BlockState; @@ -33,8 +33,8 @@ public class ServerBlockDetailMap private final ServerLevelWrapper level; public ServerBlockDetailMap(ServerLevelWrapper level) { this.level = level; } - public ServerBlockStateCache getBlockStateData(BlockState state, DHBlockPos pos) { //TODO: Allow a per pos unique setting - return blockCache.computeIfAbsent(state, (s) -> new ServerBlockStateCache(s, level, new DHBlockPos(0,0,0))); + public ServerBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos) { //TODO: Allow a per pos unique setting + return blockCache.computeIfAbsent(state, (s) -> new ServerBlockStateCache(s, level, new DhBlockPos(0,0,0))); } public void clear() { blockCache.clear(); } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java index 426a50c43..487a435e6 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java @@ -2,7 +2,7 @@ package com.seibel.lod.common.wrappers.block.cache; import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.objects.DHBlockPos; +import com.seibel.lod.core.pos.DhBlockPos; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -21,7 +21,7 @@ public class ServerBlockStateCache { public final LevelReader level; public final BlockPos pos; - public ServerBlockStateCache(BlockState blockState, ILevelWrapper samplingLevel, DHBlockPos samplingPos) { + public ServerBlockStateCache(BlockState blockState, ILevelWrapper samplingLevel, DhBlockPos samplingPos) { state = blockState; level = (LevelReader) samplingLevel.unwrapLevel(); pos = McObjectConverter.Convert(samplingPos); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java index eb5e0d32f..d491a57e4 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java @@ -20,8 +20,8 @@ package com.seibel.lod.common.wrappers.chunk; import com.seibel.lod.common.wrappers.block.BlockStateWrapper; -import com.seibel.lod.core.objects.DHBlockPos; -import com.seibel.lod.core.objects.DHChunkPos; +import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.util.LevelPosUtil; import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; @@ -54,7 +54,7 @@ import javax.annotation.Nullable; public class ChunkWrapper implements IChunkWrapper { private final ChunkAccess chunk; - private final DHChunkPos chunkPos; + private final DhChunkPos chunkPos; private final LevelReader lightSource; private final ILevelWrapper wrappedLevel; @@ -64,7 +64,7 @@ public class ChunkWrapper implements IChunkWrapper this.chunk = chunk; this.lightSource = lightSource; this.wrappedLevel = wrappedLevel; - chunkPos = new DHChunkPos(chunk.getPos().x, chunk.getPos().z); + chunkPos = new DhChunkPos(chunk.getPos().x, chunk.getPos().z); } @Override @@ -100,7 +100,7 @@ public class ChunkWrapper implements IChunkWrapper @Override public IBiomeWrapper getBiome(int x, int y, int z) { - if (wrappedLevel != null) return wrappedLevel.getBiome(new DHBlockPos(x + getMinX(), y, z + getMinZ())); + if (wrappedLevel != null) return wrappedLevel.getBiome(new DhBlockPos(x + getMinX(), y, z + getMinZ())); #if PRE_MC_1_17_1 return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome( @@ -118,7 +118,7 @@ public class ChunkWrapper implements IChunkWrapper } @Override - public DHChunkPos getChunkPos() { + public DhChunkPos getChunkPos() { return chunkPos; } @@ -221,7 +221,7 @@ public class ChunkWrapper implements IChunkWrapper @Override public IBlockStateWrapper getBlockState(int x, int y, int z) { - if (wrappedLevel != null) return wrappedLevel.getBlockState(new DHBlockPos(x + getMinX(), y, z + getMinZ())); + if (wrappedLevel != null) return wrappedLevel.getBlockState(new DhBlockPos(x + getMinX(), y, z + getMinZ())); return BlockStateWrapper.fromBlockState(chunk.getBlockState(new BlockPos(x,y,z))); } } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java index 8be14eb17..b5271c7d4 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -22,46 +22,32 @@ package com.seibel.lod.common.wrappers.minecraft; import java.io.File; import java.lang.invoke.MethodHandles; import java.util.ArrayList; -import java.util.Objects; import com.mojang.blaze3d.platform.NativeImage; -import com.mojang.blaze3d.platform.Window; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.core.objects.DHBlockPos; -import com.seibel.lod.core.objects.DHChunkPos; -import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper; +import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.lod.core.pos.DhChunkPos; import net.minecraft.CrashReport; import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.resources.model.ModelManager; -import net.minecraft.client.server.IntegratedServer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; #if PRE_MC_1_19 import net.minecraft.network.chat.TextComponent; #endif import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.LightLayer; -import net.minecraft.world.level.dimension.DimensionType; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; @@ -170,21 +156,21 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra } @Override - public DHBlockPos getPlayerBlockPos() + public DhBlockPos getPlayerBlockPos() { BlockPos playerPos = getPlayer().blockPosition(); - return new DHBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ()); + return new DhBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ()); } @Override - public DHChunkPos getPlayerChunkPos() + public DhChunkPos getPlayerChunkPos() { #if PRE_MC_1_17_1 ChunkPos playerPos = new ChunkPos(getPlayer().blockPosition()); #else ChunkPos playerPos = getPlayer().chunkPosition(); #endif - return new DHChunkPos(playerPos.x, playerPos.z); + return new DhChunkPos(playerPos.x, playerPos.z); } public ModelManager getModelManager() diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java index 9fe5372cf..885c42570 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java @@ -1,9 +1,6 @@ package com.seibel.lod.common.wrappers.minecraft; -import com.seibel.lod.core.api.internal.a7.SharedApi; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.server.dedicated.DedicatedServer; import java.io.File; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index d689fe851..6923a65b4 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -28,18 +28,18 @@ import java.util.stream.Collectors; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.objects.DHChunkPos; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.common.wrappers.misc.LightMapWrapper; -import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorInjector; +import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper; import com.mojang.math.Vector3f; -import com.seibel.lod.core.objects.math.Mat4f; -import com.seibel.lod.core.objects.math.Vec3d; -import com.seibel.lod.core.objects.math.Vec3f; +import com.seibel.lod.core.util.math.Mat4f; +import com.seibel.lod.core.util.math.Vec3d; +import com.seibel.lod.core.util.math.Vec3f; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor; @@ -48,10 +48,8 @@ import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.common.wrappers.WrapperFactory; -import com.seibel.lod.core.objects.DHBlockPos; +import com.seibel.lod.core.pos.DhBlockPos; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.FogRenderer; @@ -103,11 +101,11 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper } @Override - public DHBlockPos getCameraBlockPosition() + public DhBlockPos getCameraBlockPosition() { Camera camera = MC.gameRenderer.getMainCamera(); BlockPos blockPos = camera.getBlockPosition(); - return new DHBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()); + return new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()); } @Override @@ -243,14 +241,14 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper public boolean usingBackupGetVanillaRenderedChunks = false; @Override - public HashSet getVanillaRenderedChunks() { + public HashSet getVanillaRenderedChunks() { ISodiumAccessor sodium = ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class); if (sodium != null) { return sodium.getNormalRenderedChunks(); } IOptifineAccessor optifine = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class); if (optifine != null) { - HashSet pos = optifine.getNormalRenderedChunks(); + HashSet pos = optifine.getNormalRenderedChunks(); if (pos == null) pos = getMaximumRenderedChunks(); return pos; @@ -266,7 +264,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper AABB chunkBoundingBox = #if PRE_MC_1_18_2 chunk.chunk.bb; #else chunk.chunk.getBoundingBox(); #endif - return new DHChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16), + return new DhChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16), Math.floorDiv((int) chunkBoundingBox.minZ, 16)); }).collect(Collectors.toCollection(HashSet::new))); } catch (LinkageError e) { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java index c99c8752b..0062d35b7 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java @@ -7,8 +7,8 @@ import com.seibel.lod.common.wrappers.block.cache.ClientBlockDetailMap; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.objects.DHBlockPos; -import com.seibel.lod.core.objects.DHChunkPos; +import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; @@ -63,7 +63,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper } @Override - public int computeBaseColor(DHBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockState) { + public int computeBaseColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockState) { return blockMap.getColor(((BlockStateWrapper)blockState).blockState, (BiomeWrapper)biome, pos); } @@ -117,7 +117,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper } @Override - public IChunkWrapper tryGetChunk(DHChunkPos pos) { + public IChunkWrapper tryGetChunk(DhChunkPos pos) { ChunkAccess chunk = level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false); if (chunk == null) return null; return new ChunkWrapper(chunk, level, this); @@ -130,12 +130,12 @@ public class ClientLevelWrapper implements IClientLevelWrapper } @Override - public IBlockStateWrapper getBlockState(DHBlockPos pos) { + public IBlockStateWrapper getBlockState(DhBlockPos pos) { return BlockStateWrapper.fromBlockState(level.getBlockState(McObjectConverter.Convert(pos))); } @Override - public IBiomeWrapper getBiome(DHBlockPos pos) { + public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(level.getBiome(McObjectConverter.Convert(pos))); } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java index 054437b99..cbdd78a85 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java @@ -28,8 +28,8 @@ import com.seibel.lod.common.wrappers.block.BlockStateWrapper; import com.seibel.lod.common.wrappers.block.cache.ServerBlockDetailMap; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.objects.DHBlockPos; -import com.seibel.lod.core.objects.DHChunkPos; +import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; @@ -149,7 +149,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper #endif } @Override - public IChunkWrapper tryGetChunk(DHChunkPos pos) { + public IChunkWrapper tryGetChunk(DhChunkPos pos) { ChunkAccess chunk = level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false); if (chunk == null) return null; return new ChunkWrapper(chunk, level, this); @@ -163,12 +163,12 @@ public class ServerLevelWrapper implements IServerLevelWrapper } @Override - public IBlockStateWrapper getBlockState(DHBlockPos pos) { + public IBlockStateWrapper getBlockState(DhBlockPos pos) { return BlockStateWrapper.fromBlockState(level.getBlockState(McObjectConverter.Convert(pos))); } @Override - public IBiomeWrapper getBiome(DHBlockPos pos) { + public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(level.getBiome(McObjectConverter.Convert(pos))); } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 211f9c0b4..9be851f54 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -22,17 +22,17 @@ package com.seibel.lod.common.wrappers.worldGeneration; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.a7.level.IServerLevel; +import com.seibel.lod.core.level.IServerLevel; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.enums.config.ELightGenerationMode; import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.logging.ConfigBasedSpamLogger; import com.seibel.lod.core.enums.config.EDistanceGenerationMode; -import com.seibel.lod.core.objects.DHChunkPos; -import com.seibel.lod.core.util.EventTimer; +import com.seibel.lod.core.pos.DhChunkPos; +import com.seibel.lod.core.util.objects.EventTimer; import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.util.gridList.ArrayGridList; -import com.seibel.lod.core.util.LodThreadFactory; +import com.seibel.lod.core.util.objects.LodThreadFactory; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper; @@ -529,7 +529,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv @Override public CompletableFuture generateChunks(int minX, int minZ, int genSize, Steps targetStep, double runTimeRatio, Consumer resultConsumer) { // TODO: Check event overlap via e.tooClose() - GenerationEvent e = GenerationEvent.startEvent(new DHChunkPos(minX, minZ), genSize, this, targetStep, runTimeRatio, resultConsumer); + GenerationEvent e = GenerationEvent.startEvent(new DhChunkPos(minX, minZ), genSize, this, targetStep, runTimeRatio, resultConsumer); events.add(e); return e.future; } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java index 033ab60ce..1eaef55d2 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java @@ -24,13 +24,12 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import com.seibel.lod.core.a7.util.UncheckedInterruptedException; +import com.seibel.lod.core.util.objects.UncheckedInterruptedException; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.enums.config.ELightGenerationMode; import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.objects.DHChunkPos; -import com.seibel.lod.core.util.EventTimer; -import com.seibel.lod.core.util.gridList.ArrayGridList; +import com.seibel.lod.core.pos.DhChunkPos; +import com.seibel.lod.core.util.objects.EventTimer; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps; @@ -43,7 +42,7 @@ public final class GenerationEvent private static int generationFutureDebugIDs = 0; final int id; final ThreadedParameters tParam; - final DHChunkPos minPos; + final DhChunkPos minPos; final int size; final Steps target; final ELightGenerationMode lightMode; @@ -54,8 +53,8 @@ public final class GenerationEvent public CompletableFuture future = null; final Consumer resultConsumer; - public GenerationEvent(DHChunkPos minPos, int size, BatchGenerationEnvironment generationGroup, - Steps target, double runTimeRatio, Consumer resultConsumer) { + public GenerationEvent(DhChunkPos minPos, int size, BatchGenerationEnvironment generationGroup, + Steps target, double runTimeRatio, Consumer resultConsumer) { inQueueTime = System.nanoTime(); this.id = generationFutureDebugIDs++; this.minPos = minPos; @@ -67,7 +66,7 @@ public final class GenerationEvent this.resultConsumer = resultConsumer; } - public static GenerationEvent startEvent(DHChunkPos minPos, int size, BatchGenerationEnvironment generationGroup, + public static GenerationEvent startEvent(DhChunkPos minPos, int size, BatchGenerationEnvironment generationGroup, Steps target, double runTimeRatio, Consumer resultConsumer) { if (size % 2 == 0) size += 1; // size must be odd for vanilla world gen region to work diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java index af700f5ce..07b147986 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java @@ -21,7 +21,7 @@ package com.seibel.lod.common.wrappers.worldGeneration; import com.mojang.datafixers.DataFixer; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.a7.level.IServerLevel; +import com.seibel.lod.core.level.IServerLevel; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java index 562ad247e..83170df85 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java @@ -19,7 +19,7 @@ package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; -import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorInjector; +import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor; import net.minecraft.world.level.BlockGetter; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java index 4e5c8a5c8..a345629ed 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java @@ -20,30 +20,20 @@ package com.seibel.lod.common.wrappers.worldGeneration.step; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.concurrent.CompletableFuture; -import com.google.common.collect.Sets; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; -import com.seibel.lod.core.a7.util.UncheckedInterruptedException; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.lod.core.util.objects.UncheckedInterruptedException; import net.minecraft.server.level.WorldGenRegion; -import net.minecraft.util.Mth; #if POST_MC_1_17_1 -import net.minecraft.world.level.LevelHeightAccessor; #endif #if PRE_MC_1_19 -import net.minecraft.world.level.StructureFeatureManager; #endif import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; -import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.chunk.ProtoChunk; -import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; -import net.minecraft.world.level.levelgen.NoiseSettings; #if POST_MC_1_18_1 import net.minecraft.world.level.levelgen.blending.Blender; #endif diff --git a/coreSubProjects b/coreSubProjects index d21e334e1..3f23ef960 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit d21e334e15c30d5b9ea641c53648a8bc085f28fc +Subproject commit 3f23ef960bac72eb33c996c13aa3d5ce8dd56d99 diff --git a/fabric/src/main/java/com/seibel/lod/FabricClientProxy.java b/fabric/src/main/java/com/seibel/lod/FabricClientProxy.java index 69063c82a..290cabac1 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/lod/FabricClientProxy.java @@ -21,7 +21,7 @@ package com.seibel.lod; import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.a7.ClientApi; +import com.seibel.lod.core.api.internal.ClientApi; import com.seibel.lod.core.config.Config; import com.mojang.blaze3d.platform.InputConstants; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; diff --git a/fabric/src/main/java/com/seibel/lod/FabricMain.java b/fabric/src/main/java/com/seibel/lod/FabricMain.java index 2703329fe..b74987cf2 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricMain.java +++ b/fabric/src/main/java/com/seibel/lod/FabricMain.java @@ -22,9 +22,8 @@ package com.seibel.lod; import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.handlers.dependencyInjection.DhApiEventInjector; -import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.modAccessor.*; import com.seibel.lod.wrappers.modAccessor.BCLibAccessor; diff --git a/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java b/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java index 22ebeef37..3012cb5e9 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java +++ b/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java @@ -5,8 +5,7 @@ import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.core.api.internal.a7.ServerApi; -import com.seibel.lod.core.config.Config; +import com.seibel.lod.core.api.internal.ServerApi; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents; @@ -20,7 +19,6 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.Level; import org.apache.logging.log4j.Logger; import java.util.function.Supplier; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientLevel.java b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientLevel.java index 0a27d2d00..1dcd189d4 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientLevel.java +++ b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientLevel.java @@ -21,8 +21,7 @@ package com.seibel.lod.mixins.client; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.api.internal.a7.ClientApi; +import com.seibel.lod.core.api.internal.ClientApi; import net.minecraft.client.multiplayer.ClientLevel; #if POST_MC_1_18_2 #endif diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientPacketListener.java b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientPacketListener.java index 9d749ebad..d4de0305f 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientPacketListener.java +++ b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientPacketListener.java @@ -1,7 +1,7 @@ package com.seibel.lod.mixins.client; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.a7.ClientApi; +import com.seibel.lod.core.api.internal.ClientApi; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientPacketListener; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java index 026b3877e..d209143e2 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java @@ -1,7 +1,6 @@ package com.seibel.lod.mixins.client; -import com.seibel.lod.core.api.internal.a7.ClientApi; -import com.seibel.lod.core.api.internal.a7.SharedApi; +import com.seibel.lod.core.api.internal.ClientApi; import net.minecraft.client.renderer.GameRenderer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java index 617af6eed..a1d09931d 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java @@ -21,12 +21,7 @@ package com.seibel.lod.mixins.client; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.core.config.Config; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.core.api.internal.a7.ClientApi; -import com.seibel.lod.core.objects.math.Mat4f; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java index 23e4d476d..d996ba178 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java @@ -3,9 +3,8 @@ package com.seibel.lod.mixins.client; import com.seibel.lod.common.wrappers.gui.UpdateModScreen; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.api.internal.a7.ClientApi; import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.jar.JarUtils; import com.seibel.lod.core.jar.installer.ModrinthGetter; import com.seibel.lod.core.jar.installer.WebDownloader; @@ -14,7 +13,6 @@ import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.client.main.GameConfig; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -22,7 +20,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.io.IOException; import java.nio.file.Files; import java.security.MessageDigest; import java.util.Objects; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkMap.java b/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkMap.java index 56b43d854..44aa27360 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkMap.java +++ b/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkMap.java @@ -2,7 +2,7 @@ package com.seibel.lod.mixins.server; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.api.internal.a7.ServerApi; +import com.seibel.lod.core.api.internal.ServerApi; import net.minecraft.server.level.ChunkMap; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.chunk.ChunkAccess; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java b/fabric/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java index 35845ed73..66ea5de84 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java +++ b/fabric/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java @@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.seibel.lod.core.util.DummyRunExecutorService; +import com.seibel.lod.core.util.objects.DummyRunExecutorService; import net.minecraft.Util; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/FabricDependencySetup.java b/fabric/src/main/java/com/seibel/lod/wrappers/FabricDependencySetup.java index 8c27987a1..f46acae49 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/FabricDependencySetup.java +++ b/fabric/src/main/java/com/seibel/lod/wrappers/FabricDependencySetup.java @@ -19,7 +19,7 @@ package com.seibel.lod.wrappers; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; import com.seibel.lod.wrappers.modAccessor.ModChecker; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java b/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java index ef3a70ee0..0fcd903f2 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java @@ -21,7 +21,7 @@ package com.seibel.lod.wrappers.modAccessor; import java.util.HashSet; -import com.seibel.lod.core.objects.DHChunkPos; +import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; public class OptifineAccessor implements IOptifineAccessor @@ -34,7 +34,7 @@ public class OptifineAccessor implements IOptifineAccessor } @Override - public HashSet getNormalRenderedChunks() + public HashSet getNormalRenderedChunks() { // TODO: Impl proper methods here return null; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/SodiumAccessor.java index 39a235d0f..8c112e48f 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/SodiumAccessor.java @@ -22,8 +22,8 @@ package com.seibel.lod.wrappers.modAccessor; import java.util.HashSet; import java.util.stream.Collectors; -import com.seibel.lod.core.objects.DHChunkPos; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.pos.DhChunkPos; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; @@ -53,7 +53,7 @@ public class SodiumAccessor implements ISodiumAccessor { #if POST_MC_1_17_1 @Override - public HashSet getNormalRenderedChunks() { + public HashSet getNormalRenderedChunks() { SodiumWorldRenderer renderer = SodiumWorldRenderer.instance(); LevelHeightAccessor height = Minecraft.getInstance().level; @@ -62,7 +62,7 @@ public class SodiumAccessor implements ISodiumAccessor { return renderer.getChunkTracker().getChunks(0b00).filter( (long l) -> { return true; - }).mapToObj(DHChunkPos::new).collect(Collectors.toCollection(HashSet::new)); + }).mapToObj(DhChunkPos::new).collect(Collectors.toCollection(HashSet::new)); #else // TODO: Maybe use a mixin to make this more efficient, and maybe ignore changes behind the camera return MC_RENDER.getMaximumRenderedChunks().stream().filter((DHChunkPos chunk) -> { diff --git a/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java b/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java index 82d552a09..daddca7b6 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java @@ -20,8 +20,7 @@ package com.seibel.lod; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.api.internal.a7.ClientApi; +import com.seibel.lod.core.api.internal.ClientApi; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; diff --git a/forge/src/main/java/com/seibel/lod/ForgeMain.java b/forge/src/main/java/com/seibel/lod/ForgeMain.java index b2100dcb2..54ad519b9 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/ForgeMain.java @@ -25,10 +25,9 @@ import com.seibel.lod.common.wrappers.DependencySetup; import com.seibel.lod.common.wrappers.gui.GetConfigScreen; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.handlers.ReflectionHandler; -import com.seibel.lod.core.handlers.dependencyInjection.DhApiEventInjector; -import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.ReflectionHandler; +import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import com.seibel.lod.wrappers.ForgeDependencySetup; diff --git a/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java b/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java index 94a670c24..0cb02b88f 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java +++ b/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java @@ -2,21 +2,17 @@ package com.seibel.lod; import com.seibel.lod.common.networking.Networking; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.core.api.internal.a7.ClientApi; -import com.seibel.lod.core.api.internal.a7.ServerApi; +import com.seibel.lod.core.api.internal.ServerApi; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.Level; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.server.ServerStartedEvent; import net.minecraftforge.event.server.ServerStoppingEvent; diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java b/forge/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java index 550217f31..8681ac4ea 100644 --- a/forge/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java +++ b/forge/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java @@ -1,7 +1,6 @@ package com.seibel.lod.mixins.client; -import com.seibel.lod.core.api.internal.a7.ClientApi; -import com.seibel.lod.core.api.internal.a7.SharedApi; +import com.seibel.lod.core.api.internal.ClientApi; import net.minecraft.client.renderer.GameRenderer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java index 757f13a24..9feec8638 100644 --- a/forge/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java @@ -23,10 +23,9 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.api.internal.a7.ClientApi; -import com.seibel.lod.core.objects.math.Mat4f; +import com.seibel.lod.core.api.internal.ClientApi; +import com.seibel.lod.core.util.math.Mat4f; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; diff --git a/forge/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java b/forge/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java index 8972ff3a2..035b23e55 100644 --- a/forge/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java +++ b/forge/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java @@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.seibel.lod.common.wrappers.DependencySetupDoneCheck; -import com.seibel.lod.core.util.DummyRunExecutorService; +import com.seibel.lod.core.util.objects.DummyRunExecutorService; import net.minecraft.Util; diff --git a/forge/src/main/java/com/seibel/lod/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/lod/wrappers/ForgeDependencySetup.java index 321cad7cd..e61500cb3 100644 --- a/forge/src/main/java/com/seibel/lod/wrappers/ForgeDependencySetup.java +++ b/forge/src/main/java/com/seibel/lod/wrappers/ForgeDependencySetup.java @@ -19,7 +19,7 @@ package com.seibel.lod.wrappers; -import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; +import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; import com.seibel.lod.wrappers.modAccessor.ModChecker; diff --git a/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java b/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java index 2ae4954a2..5175f00f1 100644 --- a/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java +++ b/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java @@ -21,7 +21,7 @@ package com.seibel.lod.wrappers.modAccessor; import java.util.HashSet; -import com.seibel.lod.core.objects.DHChunkPos; +import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; public class OptifineAccessor implements IOptifineAccessor @@ -34,7 +34,7 @@ public class OptifineAccessor implements IOptifineAccessor } @Override - public HashSet getNormalRenderedChunks() + public HashSet getNormalRenderedChunks() { // TODO: Impl proper methods here return null;