diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java index e475dbc69..3066ddabf 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java @@ -137,41 +137,10 @@ public class McObjectConverter } } - public static BlockPos Convert(DhBlockPos wrappedPos) - { - return new BlockPos(wrappedPos.x, wrappedPos.y, wrappedPos.z); - } - public static ChunkPos Convert(DhChunkPos wrappedPos) - { - return new ChunkPos(wrappedPos.x, wrappedPos.z); - } + public static BlockPos Convert(DhBlockPos wrappedPos) { return new BlockPos(wrappedPos.getX(), wrappedPos.getY(), wrappedPos.getZ()); } + public static ChunkPos Convert(DhChunkPos wrappedPos) { return new ChunkPos(wrappedPos.x, wrappedPos.z); } - public static Direction Convert(EDhDirection lodDirection) - { - return directions[lodDirection.ordinal()]; - } - public static EDhDirection Convert(Direction direction) - { - return lodDirections[direction.ordinal()]; - } - public static void DebugCheckAllPackers() - { - BiConsumer func = (x, z) -> DhChunkPos._DebugCheckPacker(x, z, ChunkPos.asLong(x, z)); - func.accept(0, 0); - func.accept(12345, 134); - func.accept(-12345, -134); - func.accept(-30000000 / 16, 30000000 / 16); - func.accept(30000000 / 16, -30000000 / 16); - func.accept(30000000 / 16, 30000000 / 16); - func.accept(-30000000 / 16, -30000000 / 16); - Consumer func2 = (p) -> DhBlockPos._DebugCheckPacker(p.getX(), p.getY(), p.getZ(), p.asLong()); - func2.accept(new BlockPos(0, 0, 0)); - func2.accept(new BlockPos(12345, 134, 123)); - func2.accept(new BlockPos(-12345, -134, -80)); - func2.accept(new BlockPos(-30000000, 2047, 30000000)); - func2.accept(new BlockPos(30000000, -2048, -30000000)); - func2.accept(new BlockPos(30000000, 2047, 30000000)); - func2.accept(new BlockPos(-30000000, -2048, -30000000)); - } + public static Direction Convert(EDhDirection lodDirection) { return directions[lodDirection.ordinal()]; } + public static EDhDirection Convert(Direction direction) { return lodDirections[direction.ordinal()]; } } diff --git a/coreSubProjects b/coreSubProjects index ed39b6181..b1f154a0e 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit ed39b6181f3e291f917c0b68ab20358c89db2b34 +Subproject commit b1f154a0ea9eed1706dbac6ea5e52cf32e5c2119