Fix biome degradation crash with envir acc, Closes #1045

CyclopsMC · Aug 6, 2024 · 92f2f2c · 92f2f2c
1 parent 651faa2
commit 92f2f2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/org/cyclops/evilcraft/RegistryEntries.java b/src/main/java/org/cyclops/evilcraft/RegistryEntries.java
@@ -6,6 +6,7 @@
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.effect.MobEffect;
@@ -265,7 +266,7 @@ public class RegistryEntries {
 
     public static final DeferredHolder<VillagerProfession, VillagerProfession> VILLAGER_PROFESSION_WEREWOLF = DeferredHolder.create(Registries.VILLAGER_PROFESSION, ResourceLocation.parse("evilcraft:werewolf"));
 
-    public static final DeferredHolder<Biome, Biome> BIOME_DEGRADED = DeferredHolder.create(Registries.BIOME, ResourceLocation.parse("evilcraft:degraded"));
+    public static final ResourceKey<Biome> BIOME_DEGRADED = ResourceKey.create(Registries.BIOME, ResourceLocation.parse("evilcraft:degraded"));
 
     public static final DeferredHolder<Structure, Structure> STRUCTURE_DARK_TEMPLE = DeferredHolder.create(Registries.STRUCTURE, ResourceLocation.parse("evilcraft:dark_temple"));
     public static final DeferredHolder<StructureType<?>, StructureType<WorldStructureDarkTemple>> STRUCTURE_TYPE_DARK_TEMPLE = DeferredHolder.create(Registries.STRUCTURE_TYPE, ResourceLocation.parse("evilcraft:dark_temple"));

diff --git a/src/main/java/org/cyclops/evilcraft/core/degradation/effect/BiomeDegradation.java b/src/main/java/org/cyclops/evilcraft/core/degradation/effect/BiomeDegradation.java
@@ -1,11 +1,12 @@
 package org.cyclops.evilcraft.core.degradation.effect;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
-import net.neoforged.neoforge.registries.DeferredHolder;
 import org.cyclops.cyclopscore.helper.LocationHelpers;
 import org.cyclops.evilcraft.RegistryEntries;
 import org.cyclops.evilcraft.api.degradation.IDegradable;
@@ -57,8 +58,8 @@ public void spreadTo(Level world, BlockPos location) {
         }
     }
 
-    public static DeferredHolder<Biome, Biome> getBiome(Level level) {
-        return RegistryEntries.BIOME_DEGRADED;
+    public static Holder.Reference<Biome> getBiome(Level level) {
+        return level.registryAccess().lookupOrThrow(Registries.BIOME).get(RegistryEntries.BIOME_DEGRADED).get();
     }
 
 }