Skip to content

feat: add EntityType#getSpawnCategory() #14083

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

Open
jh508 wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −0
Open

feat: add EntityType#getSpawnCategory() #14083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions paper-api/src/main/java/io/papermc/paper/InternalAPIBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Pose;
import org.bukkit.entity.SpawnCategory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
Expand Down Expand Up @@ -97,6 +98,8 @@ class Holder {

String getTranslationKey(EntityType entityType);

SpawnCategory getSpawnCategory(EntityType entityType);

/*
* Called once by the version command on first use, then cached.
*/
Expand Down
11 changes: 11 additions & 0 deletions paper-api/src/main/java/org/bukkit/entity/EntityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,17 @@ public String getTranslationKey() {
return InternalAPIBridge.get().getTranslationKey(this);
}

/**
* Gets the spawn category of this entity type.
*
* @return the spawn category
* @throws IllegalArgumentException if the entity does not have a spawn category (is probably a custom entity)
*/
public @NotNull SpawnCategory getSpawnCategory() {
Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have a spawn category");
return InternalAPIBridge.get().getSpawnCategory(this);
}

/**
* Checks if the entity has default attributes.
*
Expand Down
7 changes: 7 additions & 0 deletions paper-server/src/main/java/io/papermc/paper/PaperServerInternalAPIBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.craftbukkit.util.CraftSpawnCategory;
import org.bukkit.damage.DamageEffect;
import org.bukkit.damage.DamageSource;
import org.bukkit.damage.DamageType;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Pose;
import org.bukkit.entity.SpawnCategory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
Expand Down Expand Up @@ -111,6 +113,11 @@ public CombatEntry createCombatEntry(
);
}

@Override
public SpawnCategory getSpawnCategory(EntityType entityType) {
return CraftSpawnCategory.toBukkit(CraftEntityType.bukkitToMinecraft(entityType).getCategory());
}

private CombatEntry createCombatEntry(
final net.minecraft.world.damagesource.DamageSource damageSource,
final float damage,
Expand Down
8 changes: 8 additions & 0 deletions paper-server/src/test/java/org/bukkit/entity/EntityTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,12 @@ public void testTranslationKey() {
}
}
}

@Test
void testGetSpawnCategory() {
for (EntityType type : EntityType.values()) {
if (type == EntityType.UNKNOWN) continue;
assertNotNull(type.getSpawnCategory(), "SpawnCategory should not be null for " + type);
}
}
}
Loading