From 734bb4afb8bcfac3cd9638c2a7f8686d808a1719 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 23 Mar 2024 16:23:40 -0500 Subject: [PATCH] minor biome/block wrapper changes --- .../distanthorizons/common/wrappers/block/BiomeWrapper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java index d685e36c2..366087528 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java @@ -56,8 +56,10 @@ import net.minecraft.world.level.biome.Biomes; /** This class wraps the minecraft BlockPos.Mutable (and BlockPos) class */ public class BiomeWrapper implements IBiomeWrapper { + // must be defined before AIR, otherwise a null pointer will be thrown private static final Logger LOGGER = LogManager.getLogger(); + #if MC_VER < MC_1_18_2 public static final ConcurrentMap WRAPPER_BY_BIOME = new ConcurrentHashMap<>(); #else @@ -65,7 +67,7 @@ public class BiomeWrapper implements IBiomeWrapper #endif public static final String EMPTY_STRING = "EMPTY"; - public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper(); + public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper(null, null); /** keep track of broken biomes so we don't log every time */ private static final HashSet brokenResourceLocationStrings = new HashSet<>(); @@ -89,7 +91,7 @@ public class BiomeWrapper implements IBiomeWrapper /** technically final, but since it requires a method call to generate it can't be marked as such */ private String serialString; - private int hashCode; + private final int hashCode;