From e5722c19a9d01099f27bc2dd894c97c2048dfec4 Mon Sep 17 00:00:00 2001 From: tom lee Date: Sun, 6 Feb 2022 22:55:06 +0800 Subject: [PATCH] Update core and impl the changing Region Size --- .../seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java | 6 ++++-- .../com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java | 6 ++++-- core | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java index 65c982d28..5dfa67f7a 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java @@ -2,6 +2,8 @@ package com.seibel.lod.common.wrappers.chunk; import java.util.Objects; +import com.seibel.lod.core.util.LevelPosUtil; +import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper; import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper; import com.seibel.lod.common.wrappers.block.BlockPosWrapper; @@ -83,13 +85,13 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper @Override public int getRegionX() { - return chunkPos.getRegionX(); + return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.x, LodUtil.REGION_DETAIL_LEVEL); } @Override public int getRegionZ() { - return chunkPos.getRegionZ(); + return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL); } @Override diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java index 9d774ed7c..8941cfe58 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java @@ -1,5 +1,7 @@ package com.seibel.lod.common.wrappers.chunk; +import com.seibel.lod.core.util.LevelPosUtil; +import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorWrapper; import com.seibel.lod.core.wrapperInterfaces.block.IBlockShapeWrapper; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; @@ -108,12 +110,12 @@ public class ChunkWrapper implements IChunkWrapper @Override public int getRegionPosX(){ - return chunk.getPos().getRegionX(); + return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, LodUtil.REGION_DETAIL_LEVEL); } @Override public int getRegionPosZ(){ - return chunk.getPos().getRegionZ(); + return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL); } @Override diff --git a/core b/core index bb8df761b..8860e46d9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bb8df761bbd7eef735e70f59e9f6b0cb4fa76fa6 +Subproject commit 8860e46d9bd3d6a8ce2702cc69c5788f9395efff