This commit is contained in:
gnembon committed 2022-02-10 03:15:53 +01:00
1 parent 695b569977
commit 212814f46d
27 files changed
+264 -144

No files matched your search

@@ -2,6 +2,7 @@ package carpet.mixins;
import carpet.CarpetSettings;
import carpet.helpers.CustomSpawnLists;
import net.minecraft.core.Holder;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@@ -28,13 +29,13 @@ public abstract class NoiseBasedChunkGenerator_husksSpawnMixin extends ChunkGene
}
@Inject(method = "getMobsAt", at = @At("HEAD"), cancellable = true)
private void isInsidePyramid(Biome biome, StructureFeatureManager accessor, MobCategory group, BlockPos pos, CallbackInfoReturnable<WeightedRandomList<MobSpawnSettings.SpawnerData>> cir)
private void isInsidePyramid(Holder<Biome> holder, StructureFeatureManager structureFeatureManager, MobCategory mobCategory, BlockPos blockPos, CallbackInfoReturnable<WeightedRandomList<MobSpawnSettings.SpawnerData>> cir)
{
if (group == MobCategory.MONSTER)
if (mobCategory == MobCategory.MONSTER)
{
if (CarpetSettings.huskSpawningInTemples)
{
if (accessor.getStructureAt(pos, StructureFeature.DESERT_PYRAMID).isValid())
if (structureFeatureManager.getStructureAt(blockPos, StructureFeature.DESERT_PYRAMID).isValid())
{
cir.setReturnValue(CustomSpawnLists.PYRAMID_SPAWNS);
return;
@@ -42,7 +43,7 @@ public abstract class NoiseBasedChunkGenerator_husksSpawnMixin extends ChunkGene
}
if (CarpetSettings.shulkerSpawningInEndCities)
{
if (accessor.getStructureAt(pos, StructureFeature.END_CITY).isValid())
if (structureFeatureManager.getStructureAt(blockPos, StructureFeature.END_CITY).isValid())
{
cir.setReturnValue(CustomSpawnLists.SHULKER_SPAWNS);
return;
@@ -50,7 +51,7 @@ public abstract class NoiseBasedChunkGenerator_husksSpawnMixin extends ChunkGene
}
if (CarpetSettings.piglinsSpawningInBastions)
{
if (accessor.getStructureAt(pos, StructureFeature.BASTION_REMNANT).isValid())
if (structureFeatureManager.getStructureAt(blockPos, StructureFeature.BASTION_REMNANT).isValid())
{
cir.setReturnValue(CustomSpawnLists.BASTION_SPAWNS);
}