From 902362f54f1d94d0672bb34fc04aa9321cc3bdf7 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 13 Aug 2023 17:23:36 -0500 Subject: [PATCH] Fix 1.16 and 1.17 compiling --- .../common/wrappers/block/BiomeWrapper.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 4729789b3..eb225280e 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 @@ -23,6 +23,8 @@ import java.io.IOException; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; @@ -52,8 +54,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; #if !PRE_MC_1_18_2 import net.minecraft.world.level.biome.Biomes; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; #endif @@ -147,7 +147,14 @@ public class BiomeWrapper implements IBiomeWrapper if (resourceLocation == null) { - LOGGER.warn("unable to serialize: "+this.biome.value()); + String biomeName; + #if MC_1_16_5 || MC_1_17_1 + biomeName = this.biome.toString(); + #else + biomeName = this.biome.value().toString(); + #endif + + LOGGER.warn("unable to serialize: "+biomeName); // shouldn't normally happen, but just in case this.serializationResult = ""; }