diff --git a/src/main/java/com/github/alexmodguy/alexscaves/server/CommonProxy.java b/src/main/java/com/github/alexmodguy/alexscaves/server/CommonProxy.java index 59b6df29..6d5f5b93 100644 --- a/src/main/java/com/github/alexmodguy/alexscaves/server/CommonProxy.java +++ b/src/main/java/com/github/alexmodguy/alexscaves/server/CommonProxy.java @@ -159,6 +159,6 @@ public void renderVanillaMapDecoration(MapDecoration mapDecoration, int index) { } public void checkModCompatibility(){ - + ACLoadedMods.init(); } } \ No newline at end of file diff --git a/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java b/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java index e75dc827..bba79162 100644 --- a/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java +++ b/src/main/java/com/github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java @@ -321,11 +321,14 @@ public void recursivelySpreadBiomeBlocks(List crossed, BlockPos to, in } public void convertBiome() { - Holder biomeHolder = level.registryAccess().registryOrThrow(Registries.BIOME).getHolderOrThrow(convertingToBiome); + Optional> biomeHolder = level.registryAccess().registryOrThrow(Registries.BIOME).getHolder(convertingToBiome); + if(biomeHolder.isEmpty()){ + return; + } AABB aabb = new AABB(this.getBlockPos().offset(-32, -32, -32), this.getBlockPos().offset(32, 32, 32)); for (Player player : level.getEntitiesOfClass(Player.class, aabb, EntitySelector.NO_SPECTATORS)) { ACAdvancementTriggerRegistry.CONVERT_BIOME.triggerForEntity(player); - if (biomeHolder.is(BiomeTags.IS_NETHER) && this.level.dimensionType().bedWorks()) { + if (biomeHolder.get().is(BiomeTags.IS_NETHER) && this.level.dimensionType().bedWorks()) { ACAdvancementTriggerRegistry.CONVERT_NETHER_BIOME.triggerForEntity(player); } } @@ -352,7 +355,7 @@ public void convertBiome() { for (int biomeZ = 0; biomeZ < 4; ++biomeZ) { BlockPos recobbled = chunkAccess.getPos().getBlockAt(biomeX * 4, k1 + biomeY * 4, biomeZ * 4); if (recobbled.distSqr(this.getBlockPos()) < sqWidth) { - container.getAndSetUnchecked(biomeX, biomeY, biomeZ, biomeHolder); + container.getAndSetUnchecked(biomeX, biomeY, biomeZ, biomeHolder.get()); } } } diff --git a/src/main/java/com/github/alexmodguy/alexscaves/server/misc/ACLoadedMods.java b/src/main/java/com/github/alexmodguy/alexscaves/server/misc/ACLoadedMods.java index cb49d397..975ddcaf 100644 --- a/src/main/java/com/github/alexmodguy/alexscaves/server/misc/ACLoadedMods.java +++ b/src/main/java/com/github/alexmodguy/alexscaves/server/misc/ACLoadedMods.java @@ -8,7 +8,7 @@ public class ACLoadedMods { private static boolean entityCullingLoaded; - public void init(){ + public static void init(){ distantHorizonsLoaded = ModList.get().isLoaded("distanthorizons"); entityCullingLoaded = ModList.get().isLoaded("entityculling");