Skip to content

Commit 86e28de

Browse files
committed
rename RegisterSpawnPlacementsEvent usages. Fixes #8156
1 parent bdbc095 commit 86e28de

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/java/mekanism/common/registration/impl/EntityTypeDeferredRegister.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import net.minecraft.world.level.levelgen.Heightmap;
2020
import net.neoforged.bus.api.IEventBus;
2121
import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent;
22-
import net.neoforged.neoforge.event.entity.SpawnPlacementRegisterEvent;
22+
import net.neoforged.neoforge.event.entity.RegisterSpawnPlacementsEvent;
2323
import org.jetbrains.annotations.NotNull;
2424

2525
public class EntityTypeDeferredRegister extends MekanismDeferredRegister<EntityType<?>> {
@@ -39,12 +39,12 @@ public <ENTITY extends Monster> MekanismDeferredHolder<EntityType<?>, EntityType
3939
public <ENTITY extends LivingEntity> MekanismDeferredHolder<EntityType<?>, EntityType<ENTITY>> registerBasicPlacement(String name,
4040
Supplier<EntityType.Builder<ENTITY>> builder, Supplier<AttributeSupplier.Builder> attributes, SpawnPlacements.SpawnPredicate<ENTITY> placementPredicate) {
4141
return register(name, builder, attributes, SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, placementPredicate,
42-
SpawnPlacementRegisterEvent.Operation.AND);
42+
RegisterSpawnPlacementsEvent.Operation.AND);
4343
}
4444

4545
public <ENTITY extends LivingEntity> MekanismDeferredHolder<EntityType<?>, EntityType<ENTITY>> register(String name, Supplier<EntityType.Builder<ENTITY>> builder,
4646
Supplier<AttributeSupplier.Builder> attributes, @Nullable SpawnPlacementType placementType, @Nullable Heightmap.Types heightmap,
47-
SpawnPlacements.SpawnPredicate<ENTITY> placementPredicate, SpawnPlacementRegisterEvent.Operation placementOperation) {
47+
SpawnPlacements.SpawnPredicate<ENTITY> placementPredicate, RegisterSpawnPlacementsEvent.Operation placementOperation) {
4848
MekanismDeferredHolder<EntityType<?>, EntityType<ENTITY>> entityTypeRO = register(name, builder, attributes);
4949
livingEntityPlacements.put(entityTypeRO, new SpawnPlacementData<>(placementType, heightmap, placementPredicate, placementOperation));
5050
return entityTypeRO;
@@ -81,7 +81,7 @@ private void registerEntityAttributes(EntityAttributeCreationEvent event) {
8181
}
8282
}
8383

84-
private void registerPlacements(SpawnPlacementRegisterEvent event) {
84+
private void registerPlacements(RegisterSpawnPlacementsEvent event) {
8585
if (livingEntityPlacements == null) {
8686
Mekanism.logger.error("Entity Placements have already been set. This should not happen.");
8787
} else {
@@ -96,9 +96,9 @@ private void registerPlacements(SpawnPlacementRegisterEvent event) {
9696

9797
private record SpawnPlacementData<ENTITY extends LivingEntity>(@Nullable SpawnPlacementType placementType, @Nullable Heightmap.Types heightmap,
9898
SpawnPlacements.SpawnPredicate<ENTITY> predicate,
99-
SpawnPlacementRegisterEvent.Operation operation) {
99+
RegisterSpawnPlacementsEvent.Operation operation) {
100100

101-
private void register(SpawnPlacementRegisterEvent event, EntityType<?> entityType) {
101+
private void register(RegisterSpawnPlacementsEvent event, EntityType<?> entityType) {
102102
event.register((EntityType<ENTITY>) entityType, placementType, heightmap, predicate, operation);
103103
}
104104
}

0 commit comments

Comments
 (0)