wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename/rearrange the wrapper packages

Browse Source
This commit is contained in:
James Seibel
2021-11-13 21:49:46 -06:00
parent 02b4378235
commit 34c2049445
35 changed files with 83 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/builders/bufferBuilding/LodBufferBuilderFactory.java
+2 -2
View File
@@ -58,8 +58,8 @@ import com.seibel.lod.util.LodThreadFactory;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.util.ThreadMapUtil;
import com.seibel.lod.wrappers.MinecraftWrapper;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
/**
* This object creates the buffers that are
src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java
+1 -2
View File
@@ -25,8 +25,7 @@ import com.seibel.lod.enums.rendering.DebugMode;
import com.seibel.lod.objects.Box;
import com.seibel.lod.objects.opengl.LodBufferBuilder;
import com.seibel.lod.util.ColorUtil;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.enums.LodDirection;
/**
src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java
+1 -2
View File
@@ -27,8 +27,7 @@ import com.seibel.lod.objects.opengl.LodBufferBuilder;
import com.seibel.lod.util.ColorUtil;
import com.seibel.lod.util.DataPointUtil;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.enums.LodDirection;
/**
src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java
+1 -2
View File
@@ -25,8 +25,7 @@ import com.seibel.lod.enums.rendering.DebugMode;
import com.seibel.lod.lodApi.ClientApi;
import com.seibel.lod.objects.Box;
import com.seibel.lod.objects.opengl.LodBufferBuilder;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.enums.LodDirection;
/**
src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java
+1 -2
View File
@@ -25,8 +25,7 @@ import com.seibel.lod.enums.rendering.DebugMode;
import com.seibel.lod.lodApi.ClientApi;
import com.seibel.lod.objects.Box;
import com.seibel.lod.objects.opengl.LodBufferBuilder;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.enums.LodDirection;
/**
src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java
+8 -8
View File
@@ -36,14 +36,14 @@ import com.seibel.lod.util.LodThreadFactory;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.util.ThreadMapUtil;
import com.seibel.lod.wrappers.MinecraftWrapper;
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.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
import com.seibel.lod.wrappers.World.BiomeWrapper;
import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
import com.seibel.lod.wrappers.World.WorldWrapper;
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.chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkWrapper;
import com.seibel.lod.wrappers.world.BiomeWrapper;
import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
/**
* This object is in charge of creating Lod related objects.
src/main/java/com/seibel/lod/builders/worldGeneration/LodGenWorker.java
+3 -3
View File
@@ -29,9 +29,9 @@ import com.seibel.lod.enums.config.DistanceGenerationMode;
import com.seibel.lod.lodApi.ClientApi;
import com.seibel.lod.objects.lod.LodDimension;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.WorldGeneratorWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.World.WorldWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
import com.seibel.lod.wrappers.worldGeneration.WorldGeneratorWrapper;
import net.minecraftforge.common.WorldWorkerManager.IWorker;
src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java
+3 -2
View File
@@ -36,13 +36,14 @@ import com.seibel.lod.util.LevelPosUtil;
import com.seibel.lod.util.LodThreadFactory;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.MinecraftWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.World.WorldWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
import net.minecraftforge.common.WorldWorkerManager;
/**
* A singleton that handles all long distance LOD world generation.
* @author Leonardo Amato
* @author James Seibel
* @version 9-25-2021
*/
src/main/java/com/seibel/lod/lodApi/EventApi.java
+3 -3
View File
@@ -32,9 +32,9 @@ import com.seibel.lod.util.DetailDistanceUtil;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.util.ThreadMapUtil;
import com.seibel.lod.wrappers.MinecraftWrapper;
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.wrappers.chunk.ChunkWrapper;
import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
/**
* This holds the methods that should be called
src/main/java/com/seibel/lod/objects/Box.java
+1 -1
View File
@@ -31,7 +31,7 @@ import com.seibel.lod.util.ColorUtil;
import com.seibel.lod.util.DataPointUtil;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.MinecraftWrapper;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
/**
* Similar to Minecraft's AxisAlignedBoundingBox.
src/main/java/com/seibel/lod/objects/lod/LodDimension.java
+2 -2
View File
@@ -37,8 +37,8 @@ import com.seibel.lod.util.LevelPosUtil;
import com.seibel.lod.util.LodThreadFactory;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.MinecraftWrapper;
import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
import com.seibel.lod.wrappers.World.WorldWrapper;
import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
import net.minecraft.util.math.ChunkPos;
src/main/java/com/seibel/lod/objects/lod/LodWorld.java
+1 -1
View File
@@ -23,7 +23,7 @@ import java.util.Hashtable;
import java.util.Map;
import com.seibel.lod.lodApi.ClientApi;
import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
/**
* This stores all LODs for a given world.
src/main/java/com/seibel/lod/objects/lod/RegionPos.java
+2 -2
View File
@@ -20,8 +20,8 @@
package com.seibel.lod.objects.lod;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
/**
* This object is similar to ChunkPos or BlockPos.
src/main/java/com/seibel/lod/proxy/ClientProxy.java
+3 -3
View File
@@ -20,9 +20,9 @@
package com.seibel.lod.proxy;
import com.seibel.lod.lodApi.EventApi;
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.wrappers.chunk.ChunkWrapper;
import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.event.TickEvent;
src/main/java/com/seibel/lod/render/LodRenderer.java
+2 -2
View File
@@ -48,8 +48,8 @@ import com.seibel.lod.util.LevelPosUtil;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.McObjectConverter;
import com.seibel.lod.wrappers.MinecraftWrapper;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.client.renderer.GameRenderer;
src/main/java/com/seibel/lod/render/RenderUtil.java
+2 -2
View File
@@ -21,8 +21,8 @@ package com.seibel.lod.render;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.MinecraftWrapper;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3f;
src/main/java/com/seibel/lod/util/LodUtil.java
+4 -4
View File
@@ -33,10 +33,10 @@ import com.seibel.lod.objects.lod.RegionPos;
import com.seibel.lod.objects.opengl.DefaultLodVertexFormats;
import com.seibel.lod.objects.opengl.LodVertexFormat;
import com.seibel.lod.wrappers.MinecraftWrapper;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
import com.seibel.lod.wrappers.World.WorldWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.renderer.WorldRenderer;
src/main/java/com/seibel/lod/wrappers/MinecraftWrapper.java
+4 -4
View File
@@ -27,10 +27,10 @@ import com.seibel.lod.ModInfo;
import com.seibel.lod.enums.LodDirection;
import com.seibel.lod.lodApi.ClientApi;
import com.seibel.lod.util.LodUtil;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.World.DimensionTypeWrapper;
import com.seibel.lod.wrappers.World.WorldWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.world.DimensionTypeWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
import net.minecraft.client.GameSettings;
import net.minecraft.client.MainWindow;
src/main/java/com/seibel/lod/wrappers/Vertex/BufferBuilderWrapper.java
-5
View File
@@ -1,5 +0,0 @@
package com.seibel.lod.wrappers.Vertex;
public class BufferBuilderWrapper
{
}
src/main/java/com/seibel/lod/wrappers/Vertex/VertexBufferWrapper.java
-5
View File
@@ -1,5 +0,0 @@
package com.seibel.lod.wrappers.Vertex;
public class VertexBufferWrapper
{
}
src/main/java/com/seibel/lod/wrappers/Block/BlockColorWrapper.java → src/main/java/com/seibel/lod/wrappers/block/BlockColorWrapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.wrappers.Block;
package com.seibel.lod.wrappers.block;
import java.util.List;
import java.util.Objects;
src/main/java/com/seibel/lod/wrappers/Block/BlockPosWrapper.java → src/main/java/com/seibel/lod/wrappers/block/BlockPosWrapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.wrappers.Block;
package com.seibel.lod.wrappers.block;
import com.seibel.lod.enums.LodDirection;
import net.minecraft.util.math.BlockPos;
src/main/java/com/seibel/lod/wrappers/Block/BlockShapeWrapper.java → src/main/java/com/seibel/lod/wrappers/block/BlockShapeWrapper.java
+3 -2
View File
@@ -1,7 +1,6 @@
package com.seibel.lod.wrappers.Block;
package com.seibel.lod.wrappers.block;
import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.SixWayBlock;
@@ -14,6 +13,8 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import com.seibel.lod.wrappers.chunk.ChunkWrapper;
//This class wraps the minecraft Block class
public class BlockShapeWrapper
src/main/java/com/seibel/lod/wrappers/Chunk/ChunkGenerator.java → src/main/java/com/seibel/lod/wrappers/chunk/ChunkGenerator.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.wrappers.Chunk;
package com.seibel.lod.wrappers.chunk;
//This class will contain all methods usefull to generate the fake ChunkWrapper
src/main/java/com/seibel/lod/wrappers/Chunk/ChunkPosWrapper.java → src/main/java/com/seibel/lod/wrappers/chunk/ChunkPosWrapper.java
+3 -3
View File
@@ -1,12 +1,12 @@
package com.seibel.lod.wrappers.Chunk;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
package com.seibel.lod.wrappers.chunk;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import java.util.Objects;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
//This class wraps the minecraft ChunkPos class
public class ChunkPosWrapper
src/main/java/com/seibel/lod/wrappers/Chunk/ChunkWrapper.java → src/main/java/com/seibel/lod/wrappers/chunk/ChunkWrapper.java
+6 -5
View File
@@ -1,10 +1,11 @@
package com.seibel.lod.wrappers.Chunk;
package com.seibel.lod.wrappers.chunk;
import com.seibel.lod.util.LodUtil;
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.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 net.minecraft.block.BlockState;
import net.minecraft.block.ILiquidContainer;
import net.minecraft.block.IWaterLoggable;
src/main/java/com/seibel/lod/wrappers/openGl/BufferBuilderWrapper.java
+5
View File
@@ -0,0 +1,5 @@
package com.seibel.lod.wrappers.openGl;
public class BufferBuilderWrapper
{
}
src/main/java/com/seibel/lod/wrappers/openGl/VertexBufferWrapper.java
+5
View File
@@ -0,0 +1,5 @@
package com.seibel.lod.wrappers.openGl;
public class VertexBufferWrapper
{
}
src/main/java/com/seibel/lod/wrappers/World/BiomeColorWrapper.java → src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapper.java
+2 -2
View File
@@ -17,9 +17,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.wrappers.World;
package com.seibel.lod.wrappers.world;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import net.minecraft.world.biome.BiomeColors;
src/main/java/com/seibel/lod/wrappers/World/BiomeWrapper.java → src/main/java/com/seibel/lod/wrappers/world/BiomeWrapper.java
+3 -2
View File
@@ -1,7 +1,8 @@
package com.seibel.lod.wrappers.World;
package com.seibel.lod.wrappers.world;
import com.seibel.lod.util.ColorUtil;
import com.seibel.lod.wrappers.Block.BlockColorWrapper;
import com.seibel.lod.wrappers.block.BlockColorWrapper;
import net.minecraft.block.Blocks;
import net.minecraft.world.biome.Biome;
src/main/java/com/seibel/lod/wrappers/World/DimensionTypeWrapper.java → src/main/java/com/seibel/lod/wrappers/world/DimensionTypeWrapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.wrappers.World;
package com.seibel.lod.wrappers.world;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
src/main/java/com/seibel/lod/wrappers/World/WorldLightWrapper.java → src/main/java/com/seibel/lod/wrappers/world/WorldLightWrapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.wrappers.World;
package com.seibel.lod.wrappers.world;
//We will use this class to get all the light information from the game like skylight, blocklight and light emission;
src/main/java/com/seibel/lod/wrappers/World/WorldWrapper.java → src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java
+2 -2
View File
@@ -1,11 +1,11 @@
package com.seibel.lod.wrappers.World;
package com.seibel.lod.wrappers.world;
import java.io.File;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import com.seibel.lod.enums.WorldType;
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
import com.seibel.lod.wrappers.block.BlockPosWrapper;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.world.IWorld;
src/main/java/com/seibel/lod/builders/worldGeneration/LodServerWorld.java → src/main/java/com/seibel/lod/wrappers/worldGeneration/LodServerWorld.java
+1 -1
View File
@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.builders.worldGeneration;
package com.seibel.lod.wrappers.worldGeneration;
import java.util.HashMap;
import java.util.List;
src/main/java/com/seibel/lod/wrappers/WorldGeneratorWrapper.java → src/main/java/com/seibel/lod/wrappers/worldGeneration/WorldGeneratorWrapper.java
+4 -5
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.wrappers;
package com.seibel.lod.wrappers.worldGeneration;
import java.util.ConcurrentModificationException;
import java.util.HashSet;
@@ -9,14 +9,13 @@ import java.util.function.Supplier;
import com.seibel.lod.builders.lodBuilding.LodBuilder;
import com.seibel.lod.builders.lodBuilding.LodBuilderConfig;
import com.seibel.lod.builders.worldGeneration.LodServerWorld;
import com.seibel.lod.config.LodConfig;
import com.seibel.lod.enums.config.DistanceGenerationMode;
import com.seibel.lod.objects.lod.LodDimension;
import com.seibel.lod.util.LodUtil;
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.wrappers.chunk.ChunkPosWrapper;
import com.seibel.lod.wrappers.chunk.ChunkWrapper;
import com.seibel.lod.wrappers.world.WorldWrapper;
import net.minecraft.util.palette.UpgradeData;
import net.minecraft.util.registry.Registry;