diff --git a/generated_world/src/main/java/mc/world/generated_world/WorldConstants.java b/generated_world/src/main/java/mc/world/generated_world/WorldConstants.java index 5a59209..728a825 100644 --- a/generated_world/src/main/java/mc/world/generated_world/WorldConstants.java +++ b/generated_world/src/main/java/mc/world/generated_world/WorldConstants.java @@ -24,7 +24,6 @@ public final class WorldConstants { public static final double WORLD_TEMPERATURE_ZONE_SIZE = 2.99; public static final double WORLD_TEMPERATURE_HEIGHT_GRAD_SIZE = 1.1; - public static final int LANDFILL_GRASS_SURFACE_THIN = 5; public static final double WORLD_ROUGHNESS = 0.35; diff --git a/generated_world/src/main/java/mc/world/generated_world/InMemoryCacheChunkLoader.java b/generated_world/src/main/java/mc/world/generated_world/chunk/InMemoryCacheChunkLoader.java similarity index 99% rename from generated_world/src/main/java/mc/world/generated_world/InMemoryCacheChunkLoader.java rename to generated_world/src/main/java/mc/world/generated_world/chunk/InMemoryCacheChunkLoader.java index be00010..dc36e0e 100644 --- a/generated_world/src/main/java/mc/world/generated_world/InMemoryCacheChunkLoader.java +++ b/generated_world/src/main/java/mc/world/generated_world/chunk/InMemoryCacheChunkLoader.java @@ -1,4 +1,4 @@ -package mc.world.generated_world; +package mc.world.generated_world.chunk; import lombok.extern.slf4j.Slf4j; import mc.core.serialization.Deserializer; diff --git a/generated_world/src/main/java/mc/world/generated_world/SeedBasedWorldGenerator.java b/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java similarity index 99% rename from generated_world/src/main/java/mc/world/generated_world/SeedBasedWorldGenerator.java rename to generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java index 50dfec9..2a7ab64 100644 --- a/generated_world/src/main/java/mc/world/generated_world/SeedBasedWorldGenerator.java +++ b/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java @@ -1,4 +1,4 @@ -package mc.world.generated_world; +package mc.world.generated_world.generator; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -6,8 +6,9 @@ import mc.core.block.BlockFactory; import mc.core.block.BlockType; import mc.core.world.*; import mc.world.generated_world.region.RegionImpl; -import mc.world.generated_world.word.Temperature; -import mc.world.generated_world.word.Wetness; +import mc.world.generated_world.world.CubicWorld; +import mc.world.generated_world.world.Temperature; +import mc.world.generated_world.world.Wetness; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/generated_world/src/main/java/mc/world/generated_world/SeedRandomGenerator.java b/generated_world/src/main/java/mc/world/generated_world/generator/SeedRandomGenerator.java similarity index 93% rename from generated_world/src/main/java/mc/world/generated_world/SeedRandomGenerator.java rename to generated_world/src/main/java/mc/world/generated_world/generator/SeedRandomGenerator.java index b4af1ab..c2ff8e7 100644 --- a/generated_world/src/main/java/mc/world/generated_world/SeedRandomGenerator.java +++ b/generated_world/src/main/java/mc/world/generated_world/generator/SeedRandomGenerator.java @@ -1,4 +1,4 @@ -package mc.world.generated_world; +package mc.world.generated_world.generator; public final class SeedRandomGenerator { diff --git a/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java b/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java index 8d73364..0750ecd 100644 --- a/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java +++ b/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java @@ -5,7 +5,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import mc.core.serialization.Serializer; import mc.core.world.*; -import mc.world.generated_world.InMemoryCacheChunkLoader; +import mc.world.generated_world.chunk.InMemoryCacheChunkLoader; import mc.world.generated_world.chunk.ChunkImpl; import mc.world.generated_world.chunk.ChunkProxy; import org.springframework.beans.factory.annotation.Autowired; diff --git a/generated_world/src/main/java/mc/world/generated_world/BlockSerializerDeserializer.java b/generated_world/src/main/java/mc/world/generated_world/serialization/BlockSerializerDeserializer.java similarity index 96% rename from generated_world/src/main/java/mc/world/generated_world/BlockSerializerDeserializer.java rename to generated_world/src/main/java/mc/world/generated_world/serialization/BlockSerializerDeserializer.java index c8fe07c..a176afe 100644 --- a/generated_world/src/main/java/mc/world/generated_world/BlockSerializerDeserializer.java +++ b/generated_world/src/main/java/mc/world/generated_world/serialization/BlockSerializerDeserializer.java @@ -1,4 +1,4 @@ -package mc.world.generated_world; +package mc.world.generated_world.serialization; import mc.core.block.Block; import mc.core.block.BlockFactory; diff --git a/generated_world/src/main/java/mc/world/generated_world/ChunkSerializerDeserializer.java b/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkSerializerDeserializer.java similarity index 96% rename from generated_world/src/main/java/mc/world/generated_world/ChunkSerializerDeserializer.java rename to generated_world/src/main/java/mc/world/generated_world/serialization/ChunkSerializerDeserializer.java index a31e25d..b0b3feb 100644 --- a/generated_world/src/main/java/mc/world/generated_world/ChunkSerializerDeserializer.java +++ b/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkSerializerDeserializer.java @@ -1,4 +1,4 @@ -package mc.world.generated_world; +package mc.world.generated_world.serialization; import mc.core.block.Block; import mc.core.block.BlockFactory; diff --git a/generated_world/src/main/java/mc/world/generated_world/RegionSerializerDeserializer.java b/generated_world/src/main/java/mc/world/generated_world/serialization/RegionSerializerDeserializer.java similarity index 89% rename from generated_world/src/main/java/mc/world/generated_world/RegionSerializerDeserializer.java rename to generated_world/src/main/java/mc/world/generated_world/serialization/RegionSerializerDeserializer.java index f5a1218..11e8a53 100644 --- a/generated_world/src/main/java/mc/world/generated_world/RegionSerializerDeserializer.java +++ b/generated_world/src/main/java/mc/world/generated_world/serialization/RegionSerializerDeserializer.java @@ -1,4 +1,4 @@ -package mc.world.generated_world; +package mc.world.generated_world.serialization; import mc.core.serialization.Deserializer; import mc.core.serialization.Serializer; diff --git a/generated_world/src/main/java/mc/world/generated_world/CubicWorld.java b/generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java similarity index 95% rename from generated_world/src/main/java/mc/world/generated_world/CubicWorld.java rename to generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java index 2d785aa..8442528 100644 --- a/generated_world/src/main/java/mc/world/generated_world/CubicWorld.java +++ b/generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java @@ -1,9 +1,10 @@ -package mc.world.generated_world; +package mc.world.generated_world.world; import com.flowpowered.nbt.Tag; import lombok.Getter; import mc.core.Location; import mc.core.world.*; +import mc.world.generated_world.chunk.InMemoryCacheChunkLoader; import java.util.HashMap; import java.util.Map; diff --git a/generated_world/src/main/java/mc/world/generated_world/word/Temperature.java b/generated_world/src/main/java/mc/world/generated_world/world/Temperature.java similarity index 66% rename from generated_world/src/main/java/mc/world/generated_world/word/Temperature.java rename to generated_world/src/main/java/mc/world/generated_world/world/Temperature.java index 1c2cb80..52b48c3 100644 --- a/generated_world/src/main/java/mc/world/generated_world/word/Temperature.java +++ b/generated_world/src/main/java/mc/world/generated_world/world/Temperature.java @@ -1,4 +1,4 @@ -package mc.world.generated_world.word; +package mc.world.generated_world.world; public enum Temperature { FROST, diff --git a/generated_world/src/main/java/mc/world/generated_world/word/Wetness.java b/generated_world/src/main/java/mc/world/generated_world/world/Wetness.java similarity index 69% rename from generated_world/src/main/java/mc/world/generated_world/word/Wetness.java rename to generated_world/src/main/java/mc/world/generated_world/world/Wetness.java index 79a872b..a1ed1ce 100644 --- a/generated_world/src/main/java/mc/world/generated_world/word/Wetness.java +++ b/generated_world/src/main/java/mc/world/generated_world/world/Wetness.java @@ -1,4 +1,4 @@ -package mc.world.generated_world.word; +package mc.world.generated_world.world; public enum Wetness { DRIEST, diff --git a/generated_world/src/test/java/mc/world/generated_world/SeedRandomGeneratorTest.java b/generated_world/src/test/java/mc/world/generated_world/SeedRandomGeneratorTest.java index 4b4b2a7..a99a251 100644 --- a/generated_world/src/test/java/mc/world/generated_world/SeedRandomGeneratorTest.java +++ b/generated_world/src/test/java/mc/world/generated_world/SeedRandomGeneratorTest.java @@ -1,5 +1,6 @@ package mc.world.generated_world; +import mc.world.generated_world.generator.SeedRandomGenerator; import org.junit.Test; import javax.imageio.ImageIO;