[1.20.6] Fix crash when biomes have been disabled via modloader metho…

…ds. (#169) * Fix crash when biomes have been disabled via modloader methods. * Remove unused import.
Glitchfiend · May 28, 2024 · bfea924 · bfea924
1 parent dac7cf6
commit bfea924
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Common/src/main/java/terrablender/mixin/MixinParameterList.java b/Common/src/main/java/terrablender/mixin/MixinParameterList.java
@@ -27,7 +27,6 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import terrablender.api.Region;
 import terrablender.api.RegionType;
 import terrablender.api.Regions;
@@ -48,13 +47,9 @@ public abstract class MixinParameterList<T> implements IExtendedParameterList<T>
     @Shadow
     public abstract T findValue(Climate.TargetPoint target);
 
-    @Unique
     private boolean initialized = false;
-    @Unique
     private boolean treesPopulated = false;
-    @Unique
     private Area uniqueness;
-    @Unique
     private Climate.RTree[] uniqueTrees;
 
     @Override
@@ -81,7 +76,10 @@ public void initializeForTerraBlender(RegistryAccess registryAccess, RegionType
             else
             {
                 List<Pair<Climate.ParameterPoint, Holder<Biome>>> pairs = new ArrayList<>();
-                region.addBiomes(biomeRegistry, pair -> pairs.add(pair.mapSecond(biomeRegistry::getHolderOrThrow)));
+                region.addBiomes(biomeRegistry, pair -> {
+                    if (biomeRegistry.getHolder(pair.getSecond()).isPresent())
+                        pairs.add(pair.mapSecond(biomeRegistry::getHolderOrThrow));
+                });
 
                 // We can't create an RTree if there are no values present.
                 if (!pairs.isEmpty())

diff --git a/Common/src/main/java/terrablender/util/LevelUtils.java b/Common/src/main/java/terrablender/util/LevelUtils.java
@@ -114,7 +114,10 @@ public static void initializeBiomes(RegistryAccess registryAccess, Holder<Dimens
         // Append modded biomes to the biome source biome list
         Registry<Biome> biomeRegistry = registryAccess.registryOrThrow(Registries.BIOME);
         ImmutableList.Builder<Holder<Biome>> builder = ImmutableList.builder();
-        Regions.get(regionType).forEach(region -> region.addBiomes(biomeRegistry, pair -> builder.add(biomeRegistry.getHolderOrThrow(pair.getSecond()))));
+        Regions.get(regionType).forEach(region -> region.addBiomes(biomeRegistry, pair -> {
+            if (biomeRegistry.getHolder(pair.getSecond()).isPresent())
+                builder.add(biomeRegistry.getHolderOrThrow(pair.getSecond()));
+        }));
         biomeSourceEx.appendDeferredBiomesList(builder.build());
 
         TerraBlender.LOGGER.info(String.format("Initialized TerraBlender biomes for level stem %s", levelResourceKey.location()));