Organize core and forge files into separate packages

src/main/java/com/seibel/lod/core/api/ApiShared.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.api.lod;
+package com.seibel.lod.core.api;
 
 import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;

src/main/java/com/seibel/lod/core/api/ClientApi.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.api.lod;
+package com.seibel.lod.core.api;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/com/seibel/lod/core/api/EventApi.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.api.lod;
+package com.seibel.lod.core.api;
 
 import org.lwjgl.glfw.GLFW;
 

src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java

@@ -36,7 +36,7 @@ import org.lwjgl.opengl.GL30;
 import org.lwjgl.opengl.GL45;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.enums.config.GpuUploadMethod;
 import com.seibel.lod.core.enums.config.VanillaOverdraw;

src/main/java/com/seibel/lod/core/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java

@@ -21,7 +21,7 @@ package com.seibel.lod.core.builders.bufferBuilding.lodTemplates;
 
 import java.util.Map;
 
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.enums.rendering.DebugMode;
 import com.seibel.lod.core.objects.Box;

src/main/java/com/seibel/lod/core/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java

@@ -21,7 +21,7 @@ package com.seibel.lod.core.builders.bufferBuilding.lodTemplates;
 
 import java.util.Map;
 
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.enums.rendering.DebugMode;
 import com.seibel.lod.core.objects.Box;

src/main/java/com/seibel/lod/core/builders/worldGeneration/LodGenWorker.java

@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.core.enums.config.DistanceGenerationMode;
 import com.seibel.lod.core.objects.lod.LodDimension;

src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java

@@ -29,7 +29,7 @@ import java.util.concurrent.Executors;
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.config.DistanceGenerationMode;
 import com.seibel.lod.core.enums.config.VerticalQuality;
 import com.seibel.lod.core.objects.lod.LodDimension;

src/main/java/com/seibel/lod/core/objects/PosToRenderContainer.java

@@ -21,7 +21,7 @@ package com.seibel.lod.core.objects;
 
 import java.util.Arrays;
 
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.util.LevelPosUtil;
 import com.seibel.lod.core.util.LodUtil;
 

src/main/java/com/seibel/lod/core/objects/lod/LodWorld.java

@@ -22,7 +22,7 @@ package com.seibel.lod.core.objects.lod;
 import java.util.Hashtable;
 import java.util.Map;
 
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.wrapperAdapters.world.IDimensionTypeWrapper;
 
 /**

src/main/java/com/seibel/lod/core/render/GlProxy.java

@@ -30,8 +30,8 @@ import org.lwjgl.opengl.GL30;
 import org.lwjgl.opengl.GLCapabilities;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.seibel.lod.api.lod.ClientApi;
 import com.seibel.lod.core.ModInfo;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.rendering.GlProxyContext;
 import com.seibel.lod.core.render.shader.LodShader;
 import com.seibel.lod.core.render.shader.LodShaderProgram;

src/main/java/com/seibel/lod/core/render/LodRenderer.java

@@ -26,7 +26,7 @@ import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 import org.lwjgl.opengl.NVFogDistance;
 
-import com.seibel.lod.api.lod.ApiShared;
+import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory;
 import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory.VertexBuffersAndOffset;
 import com.seibel.lod.core.enums.rendering.DebugMode;
@@ -52,7 +52,7 @@ import com.seibel.lod.core.wrapperAdapters.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperAdapters.handlers.IReflectionHandler;
 import com.seibel.lod.core.wrapperAdapters.minecraft.IMinecraftWrapper;
 import com.seibel.lod.core.wrapperAdapters.minecraft.IProfilerWrapper;
-import com.seibel.lod.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper;
 
 /**
  * This is where all the magic happens. <br>

src/main/java/com/seibel/lod/core/render/RenderUtil.java

@@ -23,7 +23,7 @@ import com.seibel.lod.core.objects.math.Vec3f;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper;
 
 /**
  * This holds miscellaneous helper code

src/main/java/com/seibel/lod/core/render/shader/LodShader.java

@@ -27,7 +27,7 @@ import java.io.InputStreamReader;
 
 import org.lwjgl.opengl.GL20;
 
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 
 /**
  * This object holds a OpenGL reference to a shader

src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java

@@ -24,7 +24,7 @@ import com.seibel.lod.core.enums.config.HorizontalQuality;
 import com.seibel.lod.core.enums.config.HorizontalResolution;
 import com.seibel.lod.core.wrapperAdapters.SingletonHandler;
 import com.seibel.lod.core.wrapperAdapters.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper;
 
 /**
  * 

src/main/java/com/seibel/lod/core/util/LodUtil.java

@@ -39,7 +39,7 @@ import com.seibel.lod.core.wrapperAdapters.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperAdapters.minecraft.IMinecraftWrapper;
 import com.seibel.lod.core.wrapperAdapters.world.IDimensionTypeWrapper;
 import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper;
-import com.seibel.lod.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper;
 
 /**
  * This class holds methods and constants that may be used in multiple places.

src/main/java/com/seibel/lod/core/wrapperAdapters/chunk/IChunkWrapper.java

@@ -3,7 +3,7 @@ package com.seibel.lod.core.wrapperAdapters.chunk;
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.block.IBlockColorWrapper;
 import com.seibel.lod.core.wrapperAdapters.block.IBlockShapeWrapper;
-import com.seibel.lod.wrappers.world.BiomeWrapper;
+import com.seibel.lod.forge.wrappers.world.BiomeWrapper;
 
 /**
  * 

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

@@ -17,13 +17,13 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.api.forge;
+package com.seibel.lod.forge;
 
-import com.seibel.lod.api.lod.EventApi;
+import com.seibel.lod.core.api.EventApi;
 import com.seibel.lod.core.wrapperAdapters.chunk.IChunkWrapper;
-import com.seibel.lod.wrappers.chunk.ChunkWrapper;
-import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.world.WorldWrapper;
+import com.seibel.lod.forge.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.forge.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.forge.wrappers.world.WorldWrapper;
 
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.event.TickEvent;

src/main/java/com/seibel/lod/forge/ForgeConfig.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.api.forge;
+package com.seibel.lod.forge;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

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

@@ -17,10 +17,10 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.api.forge;
+package com.seibel.lod.forge;
 
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.wrappers.DependencySetup;
+import com.seibel.lod.forge.wrappers.DependencySetup;
 
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;

src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.mixin;
+package com.seibel.lod.forge.mixins;
 
 import org.lwjgl.opengl.GL15;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,9 +26,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.seibel.lod.api.lod.ClientApi;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.objects.math.Mat4f;
-import com.seibel.lod.wrappers.McObjectConverter;
+import com.seibel.lod.forge.wrappers.McObjectConverter;
 
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.WorldRenderer;

src/main/java/com/seibel/lod/forge/wrappers/DependencySetup.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.forge.wrappers;
 
 import com.seibel.lod.core.handlers.ReflectionHandler;
 import com.seibel.lod.core.wrapperAdapters.IWrapperFactory;
@@ -8,10 +8,10 @@ import com.seibel.lod.core.wrapperAdapters.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperAdapters.handlers.IReflectionHandler;
 import com.seibel.lod.core.wrapperAdapters.minecraft.IMinecraftRenderWrapper;
 import com.seibel.lod.core.wrapperAdapters.minecraft.IMinecraftWrapper;
-import com.seibel.lod.wrappers.block.BlockColorSingletonWrapper;
-import com.seibel.lod.wrappers.config.LodConfigWrapperSingleton;
-import com.seibel.lod.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.lod.wrappers.minecraft.MinecraftWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockColorSingletonWrapper;
+import com.seibel.lod.forge.wrappers.config.LodConfigWrapperSingleton;
+import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.lod.forge.wrappers.minecraft.MinecraftWrapper;
 
 /**
  * Binds all necessary dependencies so we

src/main/java/com/seibel/lod/forge/wrappers/McObjectConverter.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.wrappers;
+package com.seibel.lod.forge.wrappers;
 
 import java.nio.FloatBuffer;
 

src/main/java/com/seibel/lod/forge/wrappers/WrapperFactory.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.forge.wrappers;
 
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.core.objects.lod.LodDimension;
@@ -7,9 +7,9 @@ import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperAdapters.worldGeneration.AbstractWorldGeneratorWrapper;
-import com.seibel.lod.wrappers.block.BlockPosWrapper;
-import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.worldGeneration.WorldGeneratorWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.forge.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.forge.wrappers.worldGeneration.WorldGeneratorWrapper;
 
 /**
  * This handles creating abstract wrapper objects.

src/main/java/com/seibel/lod/forge/wrappers/WrapperUtil.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers;
+package com.seibel.lod.forge.wrappers;
 
 import net.minecraft.world.gen.Heightmap;
 

src/main/java/com/seibel/lod/forge/wrappers/block/BlockColorSingletonWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.block;
+package com.seibel.lod.forge.wrappers.block;
 
 import com.seibel.lod.core.wrapperAdapters.block.IBlockColorSingletonWrapper;
 import com.seibel.lod.core.wrapperAdapters.block.IBlockColorWrapper;

src/main/java/com/seibel/lod/forge/wrappers/block/BlockColorWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.block;
+package com.seibel.lod.forge.wrappers.block;
 
 import java.util.List;
 import java.util.Objects;
@@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import com.seibel.lod.core.util.ColorUtil;
 import com.seibel.lod.core.wrapperAdapters.block.IBlockColorWrapper;
-import com.seibel.lod.wrappers.minecraft.MinecraftWrapper;
+import com.seibel.lod.forge.wrappers.minecraft.MinecraftWrapper;
 
 import net.minecraft.block.AbstractPlantBlock;
 import net.minecraft.block.AbstractTopPlantBlock;

src/main/java/com/seibel/lod/forge/wrappers/block/BlockPosWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.block;
+package com.seibel.lod.forge.wrappers.block;
 
 import java.util.Objects;
 

src/main/java/com/seibel/lod/forge/wrappers/block/BlockShapeWrapper.java

@@ -1,5 +1,5 @@
 
-package com.seibel.lod.wrappers.block;
+package com.seibel.lod.forge.wrappers.block;
 
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentMap;
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.block.IBlockShapeWrapper;
 import com.seibel.lod.core.wrapperAdapters.chunk.IChunkWrapper;
-import com.seibel.lod.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.forge.wrappers.chunk.ChunkWrapper;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;

src/main/java/com/seibel/lod/forge/wrappers/chunk/ChunkPosWrapper.java

@@ -1,10 +1,10 @@
-package com.seibel.lod.wrappers.chunk;
+package com.seibel.lod.forge.wrappers.chunk;
 
 import java.util.Objects;
 
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockPosWrapper;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;

src/main/java/com/seibel/lod/forge/wrappers/chunk/ChunkWrapper.java

@@ -1,14 +1,14 @@
-package com.seibel.lod.wrappers.chunk;
+package com.seibel.lod.forge.wrappers.chunk;
 
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.block.IBlockColorWrapper;
 import com.seibel.lod.core.wrapperAdapters.block.IBlockShapeWrapper;
 import com.seibel.lod.core.wrapperAdapters.chunk.IChunkWrapper;
-import com.seibel.lod.wrappers.WrapperUtil;
-import com.seibel.lod.wrappers.block.BlockColorWrapper;
-import com.seibel.lod.wrappers.block.BlockPosWrapper;
-import com.seibel.lod.wrappers.block.BlockShapeWrapper;
-import com.seibel.lod.wrappers.world.BiomeWrapper;
+import com.seibel.lod.forge.wrappers.WrapperUtil;
+import com.seibel.lod.forge.wrappers.block.BlockColorWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockShapeWrapper;
+import com.seibel.lod.forge.wrappers.world.BiomeWrapper;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ILiquidContainer;

src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java

@@ -1,6 +1,5 @@
-package com.seibel.lod.wrappers.config;
+package com.seibel.lod.forge.wrappers.config;
 
-import com.seibel.lod.api.forge.ForgeConfig;
 import com.seibel.lod.core.enums.config.BlocksToAvoid;
 import com.seibel.lod.core.enums.config.BufferRebuildTimes;
 import com.seibel.lod.core.enums.config.DistanceGenerationMode;
@@ -16,6 +15,7 @@ import com.seibel.lod.core.enums.rendering.DebugMode;
 import com.seibel.lod.core.enums.rendering.FogDistance;
 import com.seibel.lod.core.enums.rendering.FogDrawOverride;
 import com.seibel.lod.core.wrapperAdapters.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.forge.ForgeConfig;
 
 /**
  * This holds the config defaults and setters/getters

src/main/java/com/seibel/lod/forge/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.minecraft;
+package com.seibel.lod.forge.wrappers.minecraft;
 
 import java.util.HashSet;
 
@@ -8,9 +8,9 @@ import com.seibel.lod.core.objects.math.Vec3f;
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.minecraft.IMinecraftRenderWrapper;
-import com.seibel.lod.wrappers.McObjectConverter;
-import com.seibel.lod.wrappers.block.BlockPosWrapper;
-import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.forge.wrappers.McObjectConverter;
+import com.seibel.lod.forge.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.forge.wrappers.chunk.ChunkPosWrapper;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ActiveRenderInfo;

src/main/java/com/seibel/lod/forge/wrappers/minecraft/MinecraftWrapper.java

@@ -17,14 +17,14 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.wrappers.minecraft;
+package com.seibel.lod.forge.wrappers.minecraft;
 
 import java.awt.Color;
 import java.io.File;
 import java.util.ArrayList;
 
-import com.seibel.lod.api.lod.ClientApi;
 import com.seibel.lod.core.ModInfo;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.wrapperAdapters.minecraft.IMinecraftWrapper;
@@ -32,12 +32,12 @@ import com.seibel.lod.core.wrapperAdapters.minecraft.IProfilerWrapper;
 import com.seibel.lod.core.wrapperAdapters.misc.ILightMapWrapper;
 import com.seibel.lod.core.wrapperAdapters.world.IDimensionTypeWrapper;
 import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper;
-import com.seibel.lod.wrappers.McObjectConverter;
-import com.seibel.lod.wrappers.block.BlockPosWrapper;
-import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.misc.LightMapWrapper;
-import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
-import com.seibel.lod.wrappers.world.WorldWrapper;
+import com.seibel.lod.forge.wrappers.McObjectConverter;
+import com.seibel.lod.forge.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.forge.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.forge.wrappers.misc.LightMapWrapper;
+import com.seibel.lod.forge.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.forge.wrappers.world.WorldWrapper;
 
 import net.minecraft.client.GameSettings;
 import net.minecraft.client.MainWindow;

src/main/java/com/seibel/lod/forge/wrappers/minecraft/ProfilerWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.minecraft;
+package com.seibel.lod.forge.wrappers.minecraft;
 
 import com.seibel.lod.core.wrapperAdapters.minecraft.IProfilerWrapper;
 

src/main/java/com/seibel/lod/forge/wrappers/misc/LightMapWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.misc;
+package com.seibel.lod.forge.wrappers.misc;
 
 import com.seibel.lod.core.wrapperAdapters.misc.ILightMapWrapper;
 

src/main/java/com/seibel/lod/forge/wrappers/world/BiomeColorWrapperSingleton.java

@@ -17,12 +17,12 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.wrappers.world;
+package com.seibel.lod.forge.wrappers.world;
 
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.world.IBiomeColorWrapperSingleton;
 import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper;
-import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockPosWrapper;
 
 import net.minecraft.world.biome.BiomeColors;
 

src/main/java/com/seibel/lod/forge/wrappers/world/BiomeWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.world;
+package com.seibel.lod.forge.wrappers.world;
 
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -6,8 +6,8 @@ import java.util.concurrent.ConcurrentMap;
 
 import com.seibel.lod.core.util.ColorUtil;
 import com.seibel.lod.core.wrapperAdapters.world.IBiomeWrapper;
-import com.seibel.lod.wrappers.block.BlockColorSingletonWrapper;
-import com.seibel.lod.wrappers.block.BlockColorWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockColorSingletonWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockColorWrapper;
 
 import net.minecraft.block.Blocks;
 import net.minecraft.world.biome.Biome;

src/main/java/com/seibel/lod/forge/wrappers/world/DimensionTypeWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.world;
+package com.seibel.lod.forge.wrappers.world;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.world;
+package com.seibel.lod.forge.wrappers.world;
 
 import java.io.File;
 import java.util.concurrent.ConcurrentHashMap;
@@ -7,7 +7,7 @@ import java.util.concurrent.ConcurrentMap;
 import com.seibel.lod.core.enums.WorldType;
 import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper;
-import com.seibel.lod.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.forge.wrappers.block.BlockPosWrapper;
 
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.world.IWorld;

src/main/java/com/seibel/lod/forge/wrappers/worldGeneration/LodServerWorld.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.wrappers.worldGeneration;
+package com.seibel.lod.forge.wrappers.worldGeneration;
 
 import java.util.HashMap;
 import java.util.List;
@@ -26,7 +26,7 @@ import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.wrappers.WrapperUtil;
+import com.seibel.lod.forge.wrappers.WrapperUtil;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

src/main/java/com/seibel/lod/forge/wrappers/worldGeneration/WorldGeneratorWrapper.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.worldGeneration;
+package com.seibel.lod.forge.wrappers.worldGeneration;
 
 import java.util.ConcurrentModificationException;
 import java.util.HashSet;
@@ -17,10 +17,10 @@ import com.seibel.lod.core.wrapperAdapters.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperAdapters.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperAdapters.worldGeneration.AbstractWorldGeneratorWrapper;
-import com.seibel.lod.wrappers.WrapperUtil;
-import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
-import com.seibel.lod.wrappers.chunk.ChunkWrapper;
-import com.seibel.lod.wrappers.world.WorldWrapper;
+import com.seibel.lod.forge.wrappers.WrapperUtil;
+import com.seibel.lod.forge.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.forge.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.forge.wrappers.world.WorldWrapper;
 
 import net.minecraft.util.palette.UpgradeData;
 import net.minecraft.util.registry.Registry;