From 964f5feb4bee7140c265b8c271706336424209f3 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 1 Apr 2024 20:21:56 -0500 Subject: [PATCH] Remove unused data source properties --- .../core/dataObjects/fullData/sources/FullDataSourceV1.java | 5 ----- .../core/dataObjects/fullData/sources/FullDataSourceV2.java | 3 --- .../core/dataObjects/render/ColumnRenderSource.java | 5 ----- .../com/seibel/distanthorizons/core/file/IDataSource.java | 3 --- 4 files changed, 16 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV1.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV1.java index c33b0ac13..1505e4566 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV1.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV1.java @@ -124,11 +124,6 @@ public class FullDataSourceV1 implements IDataSource @Override public byte getDataDetailLevel() { return (byte) (this.sectionPos.getDetailLevel() - SECTION_SIZE_OFFSET); } - @Override - public byte getDataFormatVersion() { return DATA_FORMAT_VERSION; } - - public EDhApiWorldGenerationStep getWorldGenStep() { return this.worldGenStep; } - public boolean isEmpty() { return this.isEmpty; } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java index 1dc4f7fa5..058bf13db 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java @@ -869,9 +869,6 @@ public class FullDataSourceV2 implements IDataSource @Override public byte getDataDetailLevel() { return (byte) (this.pos.getDetailLevel() - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); } - @Override - public byte getDataFormatVersion() { return DATA_FORMAT_VERSION; } - public EDhApiWorldGenerationStep getWorldGenStepAtRelativePos(int relX, int relZ) { int index = relativePosToIndex(relX, relZ); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java index e211d4087..453f5b490 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java @@ -53,11 +53,6 @@ public class ColumnRenderSource implements IDataSource public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL; public static final int SECTION_SIZE = BitShiftUtil.powerOfTwo(SECTION_SIZE_OFFSET); - @Deprecated - public static final byte DATA_FORMAT_VERSION = 1; - @Override - public byte getDataFormatVersion() { return DATA_FORMAT_VERSION; } - public static final DataSourcePool DATA_SOURCE_POOL = new DataSourcePool<>(ColumnRenderSource::createEmptyRenderSource, null /* data source prep/cleanup needs to be done outside the pool since it requires additional inputs */); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/IDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/file/IDataSource.java index 44c708068..09d4d4ee8 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/IDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/IDataSource.java @@ -34,7 +34,4 @@ public interface IDataSource extends IBaseDTO