From 20f8e59f2b65a3c3adbfeb7063cf552fa3bc1e46 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 2 Jan 2023 11:19:50 -0600 Subject: [PATCH] Remove deprecated ChunkWrapper position getters --- .../common/wrappers/chunk/ChunkWrapper.java | 24 ------------------- coreSubProjects | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) 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 c72ee6b2c..665874da5 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 @@ -20,10 +20,7 @@ package com.seibel.lod.common.wrappers.chunk; import com.seibel.lod.common.wrappers.block.BlockStateWrapper; -import com.seibel.lod.core.pos.DhBlockPos; import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.util.LevelPosUtil; -import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; @@ -41,7 +38,6 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; -import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.levelgen.Heightmap; import javax.annotation.Nullable; @@ -126,26 +122,6 @@ public class ChunkWrapper implements IChunkWrapper return chunk; } - @Override - public int getChunkPosX(){ - return chunk.getPos().x; - } - - @Override - public int getChunkPosZ(){ - return chunk.getPos().z; - } - - @Override - public int getRegionPosX(){ - return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, LodUtil.REGION_DETAIL_LEVEL); - } - - @Override - public int getRegionPosZ(){ - return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL); - } - @Override public int getMaxY(int x, int z) { return chunk.getHeight(Heightmap.Types.WORLD_SURFACE, Math.floorMod(x, 16), Math.floorMod(z, 16)); diff --git a/coreSubProjects b/coreSubProjects index c3c170d07..1a761aad4 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit c3c170d07a848302b4a2bd621590d0fda107f3ee +Subproject commit 1a761aad4c08601a7fa93623f7bfad5faf70c7b7