diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/logger/AbstractLogger.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/logger/AbstractLogger.java index 8c1e2a0b..fafc4731 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/logger/AbstractLogger.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/logger/AbstractLogger.java @@ -24,13 +24,12 @@ */ package de.bluecolored.bluemap.core.logger; -import java.util.concurrent.TimeUnit; - import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; - import de.bluecolored.bluemap.core.BlueMap; +import java.util.concurrent.TimeUnit; + public abstract class AbstractLogger extends Logger { private static final Object DUMMY = new Object(); @@ -40,7 +39,7 @@ public abstract class AbstractLogger extends Logger { public AbstractLogger() { noFloodCache = Caffeine.newBuilder() .executor(BlueMap.THREAD_POOL) - .expireAfterWrite(1, TimeUnit.HOURS) + .expireAfterWrite(10, TimeUnit.MINUTES) .maximumSize(10000) .build(); } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java index 6b18ca14..fceb4aa7 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_13.java @@ -280,14 +280,14 @@ public class Chunk_1_13 extends MCAChunk { @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class HeightmapsData { + public static class HeightmapsData { @NBTName("WORLD_SURFACE") private long[] worldSurface = EMPTY_LONG_ARRAY; @NBTName("OCEAN_FLOOR") private long[] oceanFloor = EMPTY_LONG_ARRAY; } @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class SectionData { + public static class SectionData { private int y = 0; private byte[] blockLight = EMPTY_BYTE_ARRAY; private byte[] skyLight = EMPTY_BYTE_ARRAY; diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java index 0dc3cbbe..2d7ef716 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_16.java @@ -268,14 +268,14 @@ public class Chunk_1_16 extends MCAChunk { @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class HeightmapsData { + public static class HeightmapsData { @NBTName("WORLD_SURFACE") private long[] worldSurface = EMPTY_LONG_ARRAY; @NBTName("OCEAN_FLOOR") private long[] oceanFloor = EMPTY_LONG_ARRAY; } @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class SectionData { + public static class SectionData { private int y = 0; private byte[] blockLight = EMPTY_BYTE_ARRAY; private byte[] skyLight = EMPTY_BYTE_ARRAY; diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java index 6c030492..cf173605 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/world/mca/chunk/Chunk_1_18.java @@ -221,7 +221,7 @@ public class Chunk_1_18 extends MCAChunk { int id = blocks.get((y & 0xF) << 8 | (z & 0xF) << 4 | x & 0xF); if (id >= blockPalette.length) { - Logger.global.noFloodWarning("palette-warning", "Got block-palette id " + id + " but palette has size of " + blockPalette.length + "! (Future occasions of this error will not be logged)"); + Logger.global.noFloodWarning("palette-warning", "Got block-palette id " + id + " but palette has size of " + blockPalette.length + ". (Chunk"); return BlockState.MISSING; } @@ -234,7 +234,7 @@ public class Chunk_1_18 extends MCAChunk { int id = biomes.get((y & 0b1100) << 2 | z & 0b1100 | (x & 0b1100) >> 2); if (id >= biomePalette.length) { - Logger.global.noFloodWarning("biome-palette-warning", "Got biome-palette id " + id + " but palette has size of " + biomePalette.length + "! (Future occasions of this error will not be logged)"); + Logger.global.noFloodWarning("biome-palette-warning", "Got biome-palette id " + id + " but palette has size of " + biomePalette.length + "."); return Biome.DEFAULT.getValue(); } @@ -271,14 +271,14 @@ public class Chunk_1_18 extends MCAChunk { @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class HeightmapsData { + public static class HeightmapsData { @NBTName("WORLD_SURFACE") private long[] worldSurface = EMPTY_LONG_ARRAY; @NBTName("OCEAN_FLOOR") private long[] oceanFloor = EMPTY_LONG_ARRAY; } @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class SectionData { + public static class SectionData { private int y = 0; private byte[] blockLight = EMPTY_BYTE_ARRAY; private byte[] skyLight = EMPTY_BYTE_ARRAY; @@ -288,14 +288,14 @@ public class Chunk_1_18 extends MCAChunk { @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class BlockStatesData { + public static class BlockStatesData { private BlockState[] palette = EMPTY_BLOCKSTATE_ARRAY; private long[] data = EMPTY_LONG_ARRAY; } @Getter @SuppressWarnings("FieldMayBeFinal") - protected static class BiomesData { + public static class BiomesData { private String[] palette = EMPTY_STRING_ARRAY; private long[] data = EMPTY_LONG_ARRAY; }