From c906be8bc39bb77eebd1d1864f3f47b9f5bee75f Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 12 Aug 2018 12:58:13 +0300 Subject: [PATCH] move class ChunkSection --- core/src/main/java/mc/core/serialization/IChunkReader.java | 2 +- core/src/main/java/mc/core/world/Region.java | 1 + core/src/main/java/mc/core/world/World.java | 1 + core/src/main/java/mc/core/world/chunk/Chunk.java | 1 - core/src/main/java/mc/core/world/chunk/ChunkLoader.java | 2 -- .../main/java/mc/core/world/{ => chunk}/ChunkSection.java | 5 ++++- core/src/test/java/mc/core/EntityLocationTest.java | 2 +- flat_world/src/main/java/mc/world/flat/FlatWorld.java | 1 + .../src/main/java/mc/world/flat/SimpleChunkSection.java | 2 +- .../main/java/mc/world/generated_world/chunk/ChunkImpl.java | 2 +- .../mc/world/generated_world/chunk/ChunkSectionImpl.java | 2 +- .../mc/world/generated_world/chunk/ChunkSectionProxy.java | 2 +- .../generated_world/chunk/InMemoryCacheChunkLoader.java | 2 +- .../generated_world/generator/SeedBasedWorldGenerator.java | 1 + .../java/mc/world/generated_world/region/RegionImpl.java | 1 + .../serialization/BlockSerializerDeserializer.java | 2 +- .../mc/world/generated_world/serialization/ChunkReader.java | 3 +-- .../world/generated_world/serialization/ChunkSerializer.java | 2 +- .../main/java/mc/world/generated_world/world/CubicWorld.java | 1 + .../core/network/proto_1_12_2/packets/ChunkDataPacket.java | 2 +- 20 files changed, 21 insertions(+), 16 deletions(-) rename core/src/main/java/mc/core/world/{ => chunk}/ChunkSection.java (90%) diff --git a/core/src/main/java/mc/core/serialization/IChunkReader.java b/core/src/main/java/mc/core/serialization/IChunkReader.java index a332385..386f2ff 100644 --- a/core/src/main/java/mc/core/serialization/IChunkReader.java +++ b/core/src/main/java/mc/core/serialization/IChunkReader.java @@ -1,6 +1,6 @@ package mc.core.serialization; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; import java.io.IOException; diff --git a/core/src/main/java/mc/core/world/Region.java b/core/src/main/java/mc/core/world/Region.java index def5584..970aace 100644 --- a/core/src/main/java/mc/core/world/Region.java +++ b/core/src/main/java/mc/core/world/Region.java @@ -3,6 +3,7 @@ package mc.core.world; import mc.core.serialization.IRegionReaderWriter; import mc.core.serialization.Serializer; import mc.core.world.chunk.Chunk; +import mc.core.world.chunk.ChunkSection; import java.io.IOException; import java.io.Serializable; diff --git a/core/src/main/java/mc/core/world/World.java b/core/src/main/java/mc/core/world/World.java index 482dfb8..e112aed 100644 --- a/core/src/main/java/mc/core/world/World.java +++ b/core/src/main/java/mc/core/world/World.java @@ -6,6 +6,7 @@ package mc.core.world; import mc.core.EntityLocation; import mc.core.nbt.Taggable; +import mc.core.world.chunk.ChunkSection; import java.io.Serializable; import java.util.UUID; diff --git a/core/src/main/java/mc/core/world/chunk/Chunk.java b/core/src/main/java/mc/core/world/chunk/Chunk.java index 9196607..2a03406 100644 --- a/core/src/main/java/mc/core/world/chunk/Chunk.java +++ b/core/src/main/java/mc/core/world/chunk/Chunk.java @@ -1,6 +1,5 @@ package mc.core.world.chunk; -import mc.core.world.ChunkSection; import mc.core.world.Region; import mc.core.world.World; diff --git a/core/src/main/java/mc/core/world/chunk/ChunkLoader.java b/core/src/main/java/mc/core/world/chunk/ChunkLoader.java index 473bb47..0462773 100644 --- a/core/src/main/java/mc/core/world/chunk/ChunkLoader.java +++ b/core/src/main/java/mc/core/world/chunk/ChunkLoader.java @@ -1,7 +1,5 @@ package mc.core.world.chunk; -import mc.core.world.ChunkSection; - import java.util.Optional; public interface ChunkLoader { diff --git a/core/src/main/java/mc/core/world/ChunkSection.java b/core/src/main/java/mc/core/world/chunk/ChunkSection.java similarity index 90% rename from core/src/main/java/mc/core/world/ChunkSection.java rename to core/src/main/java/mc/core/world/chunk/ChunkSection.java index 8a0e13f..a70169e 100644 --- a/core/src/main/java/mc/core/world/ChunkSection.java +++ b/core/src/main/java/mc/core/world/chunk/ChunkSection.java @@ -2,8 +2,11 @@ * DmitriyMX * 2018-04-15 */ -package mc.core.world; +package mc.core.world.chunk; +import mc.core.world.Biome; +import mc.core.world.Region; +import mc.core.world.World; import mc.core.world.block.Block; import java.io.Serializable; diff --git a/core/src/test/java/mc/core/EntityLocationTest.java b/core/src/test/java/mc/core/EntityLocationTest.java index 11727d4..f366759 100644 --- a/core/src/test/java/mc/core/EntityLocationTest.java +++ b/core/src/test/java/mc/core/EntityLocationTest.java @@ -1,7 +1,7 @@ package mc.core; import com.flowpowered.nbt.Tag; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.IWorldType; import mc.core.world.Region; import mc.core.world.World; diff --git a/flat_world/src/main/java/mc/world/flat/FlatWorld.java b/flat_world/src/main/java/mc/world/flat/FlatWorld.java index 29c2839..069a2b3 100644 --- a/flat_world/src/main/java/mc/world/flat/FlatWorld.java +++ b/flat_world/src/main/java/mc/world/flat/FlatWorld.java @@ -9,6 +9,7 @@ import lombok.Getter; import lombok.Setter; import mc.core.EntityLocation; import mc.core.world.*; +import mc.core.world.chunk.ChunkSection; import java.util.UUID; import java.util.stream.Stream; diff --git a/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java b/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java index f8e5234..fee4045 100644 --- a/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java +++ b/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java @@ -5,7 +5,7 @@ package mc.world.flat; import mc.core.world.Biome; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; import mc.core.world.World; import mc.core.world.block.Block; diff --git a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java index 7bb26a0..27baadc 100644 --- a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java +++ b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java @@ -2,7 +2,7 @@ package mc.world.generated_world.chunk; import lombok.Getter; import mc.core.exception.ResourceUnloadedException; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; import mc.core.world.World; import mc.core.world.chunk.Chunk; diff --git a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionImpl.java b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionImpl.java index e1e3fc3..ab10c71 100644 --- a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionImpl.java +++ b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionImpl.java @@ -3,7 +3,7 @@ package mc.world.generated_world.chunk; import lombok.Getter; import mc.core.exception.ResourceUnloadedException; import mc.core.world.Biome; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; import mc.core.world.World; import mc.core.world.block.Block; diff --git a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionProxy.java b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionProxy.java index 5b4c58e..0aa6513 100644 --- a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionProxy.java +++ b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkSectionProxy.java @@ -1,6 +1,6 @@ package mc.world.generated_world.chunk; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; import mc.core.world.World; import mc.core.world.block.Block; diff --git a/generated_world/src/main/java/mc/world/generated_world/chunk/InMemoryCacheChunkLoader.java b/generated_world/src/main/java/mc/world/generated_world/chunk/InMemoryCacheChunkLoader.java index ebc350b..ac6d323 100644 --- a/generated_world/src/main/java/mc/world/generated_world/chunk/InMemoryCacheChunkLoader.java +++ b/generated_world/src/main/java/mc/world/generated_world/chunk/InMemoryCacheChunkLoader.java @@ -3,8 +3,8 @@ package mc.world.generated_world.chunk; import lombok.extern.slf4j.Slf4j; import mc.core.serialization.Serializer; import mc.core.world.*; -import mc.core.world.chunk.Chunk; import mc.core.world.chunk.ChunkLoader; +import mc.core.world.chunk.ChunkSection; import mc.world.generated_world.serialization.ChunkReader; import mc.world.generated_world.serialization.RegionReaderWriter; import org.springframework.beans.factory.annotation.Autowired; diff --git a/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java b/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java index 11a83d1..5da096f 100644 --- a/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java +++ b/generated_world/src/main/java/mc/world/generated_world/generator/SeedBasedWorldGenerator.java @@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j; import mc.core.world.block.BlockFactory; import mc.core.world.block.BlockType; import mc.core.world.*; +import mc.core.world.chunk.ChunkSection; import mc.world.generated_world.region.RegionImpl; import mc.world.generated_world.world.CubicWorld; import mc.world.generated_world.world.Temperature; 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 66abe5d..09c98ea 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 @@ -8,6 +8,7 @@ import mc.core.serialization.Serializer; import mc.core.world.*; import mc.core.world.chunk.Chunk; import mc.core.world.chunk.ChunkLoader; +import mc.core.world.chunk.ChunkSection; import mc.world.generated_world.chunk.ChunkSectionProxy; import mc.world.generated_world.chunk.InMemoryCacheChunkLoader; import mc.world.generated_world.chunk.ChunkImpl; diff --git a/generated_world/src/main/java/mc/world/generated_world/serialization/BlockSerializerDeserializer.java b/generated_world/src/main/java/mc/world/generated_world/serialization/BlockSerializerDeserializer.java index 5291a23..8d05e93 100644 --- a/generated_world/src/main/java/mc/world/generated_world/serialization/BlockSerializerDeserializer.java +++ b/generated_world/src/main/java/mc/world/generated_world/serialization/BlockSerializerDeserializer.java @@ -5,7 +5,7 @@ import mc.core.world.block.BlockFactory; import mc.core.world.block.BlockType; import mc.core.serialization.Deserializer; import mc.core.serialization.Serializer; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; /** * Prototype diff --git a/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkReader.java b/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkReader.java index f6e44cb..4672954 100644 --- a/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkReader.java +++ b/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkReader.java @@ -1,10 +1,9 @@ package mc.world.generated_world.serialization; -import mc.core.Location; import mc.core.world.block.Block; import mc.core.serialization.Deserializer; import mc.core.serialization.IChunkReader; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.Region; import mc.world.generated_world.chunk.ChunkSectionImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkSerializer.java b/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkSerializer.java index 46fdede..c636a5a 100644 --- a/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkSerializer.java +++ b/generated_world/src/main/java/mc/world/generated_world/serialization/ChunkSerializer.java @@ -5,7 +5,7 @@ import mc.core.world.block.Block; import mc.core.world.block.BlockFactory; import mc.core.world.block.BlockType; import mc.core.serialization.Serializer; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import org.springframework.beans.factory.annotation.Autowired; import java.io.ByteArrayOutputStream; diff --git a/generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java b/generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java index f4c2f3a..f33eade 100644 --- a/generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java +++ b/generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java @@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j; import mc.core.Direction; import mc.core.EntityLocation; import mc.core.world.*; +import mc.core.world.chunk.ChunkSection; import mc.world.generated_world.serialization.RegionReaderWriter; import org.springframework.beans.factory.annotation.Autowired; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java index d700abf..818932c 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream; -import mc.core.world.ChunkSection; +import mc.core.world.chunk.ChunkSection; import mc.core.world.block.Block; import java.util.ArrayList;