From a1d13d833d01e7dd5480ebb47b440ea54264f42f Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Thu, 6 Apr 2023 11:44:41 +0200 Subject: [PATCH] cleanup constants but keep some of the informative stuff --- .../endlessids/constants/ExtendedConstants.java | 6 ++---- .../falsepattern/endlessids/constants/VanillaConstants.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java b/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java index 8435e60..d78a57f 100644 --- a/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java +++ b/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java @@ -2,6 +2,7 @@ package com.falsepattern.endlessids.constants; import com.falsepattern.endlessids.config.GeneralConfig; +@SuppressWarnings("unused") public class ExtendedConstants { //Tunables public static final int bitsPerID = 24; @@ -37,10 +38,7 @@ public class ExtendedConstants { public static final int biomeIDMask = biomeIDCount - 1; public static final int biomeIDNull = biomeIDMask; public static final int bytesPerBiome = (bitsPerBiome + 7) / 8; - //Chunk - public static final int bytesPerChunk = - (GeneralConfig.extendBiome ? bytesPerBiome : VanillaConstants.bytesPerBiome) * 256 + - (GeneralConfig.extendBlockItem ? bytesPerEBS : VanillaConstants.bytesPerEBS) * 16; + //DataWatcher public static final int watchableCount = 1 << watchableBits; public static final int maxWatchableID = watchableCount - 1; diff --git a/src/main/java/com/falsepattern/endlessids/constants/VanillaConstants.java b/src/main/java/com/falsepattern/endlessids/constants/VanillaConstants.java index 5ed1328..d6ee2cd 100644 --- a/src/main/java/com/falsepattern/endlessids/constants/VanillaConstants.java +++ b/src/main/java/com/falsepattern/endlessids/constants/VanillaConstants.java @@ -1,5 +1,6 @@ package com.falsepattern.endlessids.constants; +@SuppressWarnings("unused") public class VanillaConstants { //Tunables public static final int bitsPerID = 12; @@ -32,8 +33,7 @@ public class VanillaConstants { public static final int biomeIDMask = biomeIDCount - 1; public static final int biomeIDNull = biomeIDMask; public static final int bytesPerBiome = (bitsPerBiome + 7) / 8; - //Chunk - public static final int bytesPerChunk = bytesPerBiome * 256 + bytesPerEBS * 16; + //DataWatcher public static final int watchableCount = 1 << watchableBits; public static final int maxWatchableID = watchableCount - 1;