From 68e9d64779de19a3b1050d67aa5ac6b9378e1e92 Mon Sep 17 00:00:00 2001 From: s809 <11816467-s809@users.noreply.gitlab.com> Date: Tue, 8 Aug 2023 20:25:07 +0500 Subject: [PATCH] Fix compiling (except 1.16.5 & 1.17.1) --- .../common/wrappers/block/BiomeWrapper.java | 21 ++++++++++++++++--- 1 file changed, 18 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 a54a01c88..3434badcf 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 @@ -24,23 +24,38 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import com.google.gson.JsonParser; -import com.mojang.serialization.JsonOps; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import net.minecraft.client.Minecraft; +#if POST_MC_1_17 import net.minecraft.core.Holder; +import net.minecraft.resources.RegistryOps; +#endif + #if POST_MC_1_19_2 import net.minecraft.data.worldgen.biome.EndBiomes; import net.minecraft.data.worldgen.biome.NetherBiomes; #endif + + +#if MC_1_16_5 || MC_1_17_1 import net.minecraft.core.Registry; -import net.minecraft.resources.RegistryOps; +#elif MC_1_18_2 || MC_1_19_2 +import net.minecraft.core.Holder; +import net.minecraft.core.Registry; +#else +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +#endif + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.Biome; +#if !PRE_MC_1_18_2 import net.minecraft.world.level.biome.Biomes; +#endif + /** This class wraps the minecraft BlockPos.Mutable (and BlockPos) class */