Skip to content

cleaned up RegisterSpawnPlacementEvent patch #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ItsBlackGear wants to merge 3 commits into from
Closed

cleaned up RegisterSpawnPlacementEvent patch #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ed7a2c
cleaned up RegisterSpawnPlacementEvent patch
ItsBlackGear Jul 27, 2026
62ffd9b
Update RegisterSpawnPlacementsEvent.java
ItsBlackGear Jul 27, 2026
b4828a3
commented code and reason
ItsBlackGear Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions src/main/java/net/neoforged/neoforge/event/entity/RegisterSpawnPlacementsEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ public <T extends Entity> void register(EntityType<T> entityType, SpawnPlacement
*/
@SuppressWarnings("unchecked")
public <T extends Entity> void register(EntityType<T> entityType, @Nullable SpawnPlacementType placementType, @Nullable Heightmap.Types heightmap, SpawnPlacements.SpawnPredicate<T> predicate, Operation operation) {
// Kilt: patch by @ItsBlackGear to fix Vanilla Backport (Fabric) + NML + Kilt, may be upstreamed.
if (this.map.containsKey(entityType) && operation != Operation.REPLACE) {
if (placementType != null || heightmap != null) {
((MergedSpawnPredicate<T>) this.map.get(entityType)).merge(operation, predicate, null, null);
return;
}
}

if (!map.containsKey(entityType)) {
if (placementType == null) {
throw new NullPointerException("Registering a new Spawn Predicate requires a nonnull placement type! Entity Type: " + BuiltInRegistries.ENTITY_TYPE.getKey(entityType));
Expand All @@ -87,9 +79,10 @@ public <T extends Entity> void register(EntityType<T> entityType, @Nullable Spaw
}
map.put(entityType, new MergedSpawnPredicate<>(predicate, placementType, heightmap));
} else {
if (operation != Operation.REPLACE && (heightmap != null || placementType != null)) {
throw new IllegalStateException("Nonnull heightmap types or spawn placement types may only be used with the REPLACE operation. Entity Type: " + BuiltInRegistries.ENTITY_TYPE.getKey(entityType));
}
// commented out as it's both punishing and redundant, merge already handles the operations without need of a throw
Comment thread
ItsBlackGear marked this conversation as resolved.
// if (operation != Operation.REPLACE && (heightmap != null || placementType != null)) {
// throw new IllegalStateException("Nonnull heightmap types or spawn placement types may only be used with the REPLACE operation. Entity Type: " + BuiltInRegistries.ENTITY_TYPE.getKey(entityType));
// }
Comment thread
ItsBlackGear marked this conversation as resolved.
((MergedSpawnPredicate<T>) map.get(entityType)).merge(operation, predicate, placementType, heightmap);
}
}
Expand Down