fix #1277

AlexModGuy · Oct 20, 2024 · 2e79b5d · 2e79b5d
1 parent ec7249e
commit 2e79b5d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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();
     }
 }
diff --git a/.../github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java b/.../github/alexmodguy/alexscaves/server/block/blockentity/ConversionCrucibleBlockEntity.java
@@ -321,11 +321,14 @@ public void recursivelySpreadBiomeBlocks(List<BlockPos> crossed, BlockPos to, in
     }
 
     public void convertBiome() {
-        Holder<Biome> biomeHolder = level.registryAccess().registryOrThrow(Registries.BIOME).getHolderOrThrow(convertingToBiome);
+        Optional<Holder.Reference<Biome>> 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
@@ -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");
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         public void checkModCompatibility(){
+            ACLoadedMods.init();
         }
     }