From f55c9bfb3390b1a308aaa065949ba5f1d4fc904e Mon Sep 17 00:00:00 2001 From: Forwolk Date: Thu, 2 Aug 2018 09:22:38 +0300 Subject: [PATCH] Serializers refactoring --- build.gradle | 2 +- .../mc/core/serialization/BlockDeserializer.java | 6 ------ .../mc/core/serialization/BlockSerializer.java | 6 ------ .../mc/core/serialization/ChunkDeserializer.java | 6 ------ .../mc/core/serialization/ChunkSerializer.java | 6 ------ .../BlockSerializerDeserializer.java | 6 +++--- .../ChunkSerializerDeserializer.java | 15 +++++++-------- .../generated_world/InMemoryCacheChunkLoader.java | 9 ++------- 8 files changed, 13 insertions(+), 43 deletions(-) delete mode 100644 core/src/main/java/mc/core/serialization/BlockDeserializer.java delete mode 100644 core/src/main/java/mc/core/serialization/BlockSerializer.java delete mode 100644 core/src/main/java/mc/core/serialization/ChunkDeserializer.java delete mode 100644 core/src/main/java/mc/core/serialization/ChunkSerializer.java diff --git a/build.gradle b/build.gradle index f9a8ef5..13d4052 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ subprojects { /* Components */ compile (group: 'org.projectlombok', name: 'lombok', version: '1.16.16') - compile 'com.flowpowered:flow-nbt:1.0.1-SNAPSHOT' //Named Binary Tags + compile 'com.flowpowered:flow-nbt:1.0.0' //Named Binary Tags } task copyDep(type: Copy) { diff --git a/core/src/main/java/mc/core/serialization/BlockDeserializer.java b/core/src/main/java/mc/core/serialization/BlockDeserializer.java deleted file mode 100644 index dfdbc89..0000000 --- a/core/src/main/java/mc/core/serialization/BlockDeserializer.java +++ /dev/null @@ -1,6 +0,0 @@ -package mc.core.serialization; - -import mc.core.block.Block; - -public interface BlockDeserializer extends Deserializer { -} diff --git a/core/src/main/java/mc/core/serialization/BlockSerializer.java b/core/src/main/java/mc/core/serialization/BlockSerializer.java deleted file mode 100644 index 1e5730d..0000000 --- a/core/src/main/java/mc/core/serialization/BlockSerializer.java +++ /dev/null @@ -1,6 +0,0 @@ -package mc.core.serialization; - -import mc.core.block.Block; - -public interface BlockSerializer extends Serializer { -} diff --git a/core/src/main/java/mc/core/serialization/ChunkDeserializer.java b/core/src/main/java/mc/core/serialization/ChunkDeserializer.java deleted file mode 100644 index edff066..0000000 --- a/core/src/main/java/mc/core/serialization/ChunkDeserializer.java +++ /dev/null @@ -1,6 +0,0 @@ -package mc.core.serialization; - -import mc.core.world.Chunk; - -public interface ChunkDeserializer extends Deserializer{ -} diff --git a/core/src/main/java/mc/core/serialization/ChunkSerializer.java b/core/src/main/java/mc/core/serialization/ChunkSerializer.java deleted file mode 100644 index 3614951..0000000 --- a/core/src/main/java/mc/core/serialization/ChunkSerializer.java +++ /dev/null @@ -1,6 +0,0 @@ -package mc.core.serialization; - -import mc.core.world.Chunk; - -public interface ChunkSerializer extends Serializer{ -} diff --git a/generated_world/src/main/java/mc/world/generated_world/BlockSerializerDeserializer.java b/generated_world/src/main/java/mc/world/generated_world/BlockSerializerDeserializer.java index 718a420..c8fe07c 100644 --- a/generated_world/src/main/java/mc/world/generated_world/BlockSerializerDeserializer.java +++ b/generated_world/src/main/java/mc/world/generated_world/BlockSerializerDeserializer.java @@ -3,14 +3,14 @@ package mc.world.generated_world; import mc.core.block.Block; import mc.core.block.BlockFactory; import mc.core.block.BlockType; -import mc.core.serialization.BlockDeserializer; -import mc.core.serialization.BlockSerializer; +import mc.core.serialization.Deserializer; +import mc.core.serialization.Serializer; import mc.core.world.Chunk; /** * Prototype */ -public class BlockSerializerDeserializer implements BlockSerializer, BlockDeserializer { +public class BlockSerializerDeserializer implements Serializer, Deserializer { private BlockFactory blockFactory; private Chunk chunk; diff --git a/generated_world/src/main/java/mc/world/generated_world/ChunkSerializerDeserializer.java b/generated_world/src/main/java/mc/world/generated_world/ChunkSerializerDeserializer.java index 1f2df79..a31e25d 100644 --- a/generated_world/src/main/java/mc/world/generated_world/ChunkSerializerDeserializer.java +++ b/generated_world/src/main/java/mc/world/generated_world/ChunkSerializerDeserializer.java @@ -1,16 +1,15 @@ package mc.world.generated_world; +import mc.core.block.Block; import mc.core.block.BlockFactory; -import mc.core.serialization.BlockDeserializer; -import mc.core.serialization.BlockSerializer; -import mc.core.serialization.ChunkSerializer; -import mc.core.serialization.ChunkDeserializer; +import mc.core.serialization.Deserializer; +import mc.core.serialization.Serializer; import mc.core.world.Chunk; -public class ChunkSerializerDeserializer implements ChunkSerializer, ChunkDeserializer { +public class ChunkSerializerDeserializer implements Serializer, Deserializer { - private BlockSerializer blockSerializer; - private BlockDeserializer blockDeserializer; + private Serializer blockSerializer; + private Deserializer blockDeserializer; @Override public Chunk deserialize(byte[] bytes) { @@ -19,7 +18,7 @@ public class ChunkSerializerDeserializer implements ChunkSerializer, ChunkDeseri @Override public byte[] serialize(Chunk chunk) { - BlockSerializer blockSerializer = new BlockSerializerDeserializer(new BlockFactory(), chunk); + Serializer blockSerializer = new BlockSerializerDeserializer(new BlockFactory(), chunk); int blocks = chunk.getModifiedBlocks().length; byte[] bytes = new byte[6 + 3 * blocks]; diff --git a/generated_world/src/main/java/mc/world/generated_world/InMemoryCacheChunkLoader.java b/generated_world/src/main/java/mc/world/generated_world/InMemoryCacheChunkLoader.java index 1cef35d..be00010 100644 --- a/generated_world/src/main/java/mc/world/generated_world/InMemoryCacheChunkLoader.java +++ b/generated_world/src/main/java/mc/world/generated_world/InMemoryCacheChunkLoader.java @@ -1,23 +1,18 @@ package mc.world.generated_world; import lombok.extern.slf4j.Slf4j; -import mc.core.serialization.ChunkDeserializer; -import mc.core.serialization.ChunkSerializer; import mc.core.serialization.Deserializer; import mc.core.serialization.Serializer; import mc.core.world.*; -import mc.world.generated_world.region.RegionImpl; import org.springframework.beans.factory.annotation.Autowired; import java.io.File; import java.io.FileOutputStream; -import java.io.FileWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.text.MessageFormat; import java.util.Optional; -import java.util.UUID; import static mc.world.generated_world.WorldConstants.*; @@ -30,9 +25,9 @@ public class InMemoryCacheChunkLoader implements ChunkLoader { private WorldGenerator worldGenerator; @Autowired - private ChunkDeserializer chunkDeserializer; + private Deserializer chunkDeserializer; @Autowired - private ChunkSerializer chunkSerializer; + private Serializer chunkSerializer; @Autowired private Serializer regionSerializer; @Autowired