From 66ce258fe1d7f995b51acda0767545294d94c946 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 11 Apr 2026 21:34:50 -0500 Subject: [PATCH] fix biome/block wrapper preprocessors --- .../distanthorizons/common/wrappers/block/BiomeWrapper.java | 5 +++-- .../common/wrappers/block/BlockStateWrapper.java | 4 ++-- 2 files changed, 5 insertions(+), 4 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 f147aeea9..0d557f2df 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 @@ -232,12 +232,13 @@ public class BiomeWrapper implements IBiomeWrapper resourceLocation = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).getKey(this.biome); #elif MC_VER <= MC_1_19_2 resourceLocation = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).getKey(this.biome.value()); - #elif MC_VER <= MC_1_21_4 + #elif MC_VER <= MC_1_21_1 resourceLocation = registryAccess.registryOrThrow(Registries.BIOME).getKey(this.biome.value()); #else resourceLocation = registryAccess.lookupOrThrow(Registries.BIOME).getKey(this.biome.value()); #endif + if (resourceLocation == null) { String biomeName; @@ -362,7 +363,7 @@ public class BiomeWrapper implements IBiomeWrapper Biome unwrappedBiome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation); success = (unwrappedBiome != null); Holder biome = new Holder.Direct<>(unwrappedBiome); - #elif MC_VER <= MC_1_21_4 + #elif MC_VER <= MC_1_21_1 Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation); success = (unwrappedBiome != null); Holder biome = new Holder.Direct<>(unwrappedBiome); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index f80723f57..9af3cb78f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -691,7 +691,7 @@ public class BlockStateWrapper implements IBlockStateWrapper resourceLocation = Registry.BLOCK.getKey(this.blockState.getBlock()); #elif MC_VER <= MC_1_19_2 resourceLocation = registryAccess.registryOrThrow(Registry.BLOCK_REGISTRY).getKey(this.blockState.getBlock()); - #elif MC_VER <= MC_1_21_4 + #elif MC_VER <= MC_1_21_1 resourceLocation = registryAccess.registryOrThrow(Registries.BLOCK).getKey(this.blockState.getBlock()); #else resourceLocation = registryAccess.lookupOrThrow(Registries.BLOCK).getKey(this.blockState.getBlock()); @@ -792,7 +792,7 @@ public class BlockStateWrapper implements IBlockStateWrapper #elif MC_VER <= MC_1_19_2 net.minecraft.core.RegistryAccess registryAccess = level.registryAccess(); block = registryAccess.registryOrThrow(Registry.BLOCK_REGISTRY).get(resourceLocation); - #elif MC_VER <= MC_1_21_4 + #elif MC_VER <= MC_1_21_1 net.minecraft.core.RegistryAccess registryAccess = level.registryAccess(); block = registryAccess.registryOrThrow(Registries.BLOCK).get(resourceLocation); #else