Implement entity type registry

paper-api/src/main/java/co/aikar/timings/TimingHistory.java

@@ -24,8 +24,17 @@
 package co.aikar.timings;
 
 import co.aikar.timings.TimingHistory.RegionData.RegionId;
+import co.aikar.util.LoadingMap;
+import co.aikar.util.MRUMapCache;
 import com.google.common.base.Function;
 import com.google.common.collect.Sets;
+import java.lang.management.ManagementFactory;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
@@ -34,21 +43,17 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import co.aikar.util.LoadingMap;
-import co.aikar.util.MRUMapCache;
-
-import java.lang.management.ManagementFactory;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import static co.aikar.timings.TimingsManager.FULL_SERVER_TICK;
 import static co.aikar.timings.TimingsManager.MINUTE_REPORTS;
-import static co.aikar.util.JSONUtil.*;
+import static co.aikar.util.JSONUtil.JSONPair;
+import static co.aikar.util.JSONUtil.createObject;
+import static co.aikar.util.JSONUtil.pair;
+import static co.aikar.util.JSONUtil.toArray;
+import static co.aikar.util.JSONUtil.toArrayMapper;
+import static co.aikar.util.JSONUtil.toObjectMapper;
 
 /**
  * @hidden
@@ -143,13 +148,13 @@ public Object apply(RegionData input) {
                                 input.regionId.x,
                                 input.regionId.z,
                                 toObjectMapper(input.entityCounts.entrySet(),
-                                    new Function<Map.Entry<EntityType, Counter>, JSONPair>() {
+                                    new Function<Map.Entry<EntityType<?>, Counter>, JSONPair>() {
                                         @NotNull
                                         @Override
-                                        public JSONPair apply(Map.Entry<EntityType, Counter> entry) {
+                                        public JSONPair apply(Map.Entry<EntityType<?>, Counter> entry) {
                                             entityTypeSet.add(entry.getKey());
                                             return pair(
-                                                    String.valueOf(entry.getKey().ordinal()),
+                                                    entry.getKey().key().asString(), // todo check format
                                                     entry.getValue().count()
                                             );
                                         }
@@ -207,12 +212,12 @@ public int hashCode() {
         }
 
         @SuppressWarnings("unchecked")
-        final Map<EntityType, Counter> entityCounts = MRUMapCache.of(LoadingMap.of(
-                new EnumMap<EntityType, Counter>(EntityType.class), k -> new Counter()
+        final Map<EntityType<?>, Counter> entityCounts = MRUMapCache.of(LoadingMap.of(
+                new HashMap<>(), k -> new Counter()
         ));
         @SuppressWarnings("unchecked")
         final Map<Material, Counter> tileEntityCounts = MRUMapCache.of(LoadingMap.of(
-                new EnumMap<Material, Counter>(Material.class), k -> new Counter()
+                new EnumMap<>(Material.class), k -> new Counter()
         ));
 
         static class RegionId {

paper-api/src/main/java/io/papermc/paper/InternalAPIBridge.java

@@ -14,6 +14,7 @@
 import org.bukkit.block.Biome;
 import org.bukkit.damage.DamageEffect;
 import org.bukkit.damage.DamageSource;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Pose;
 import org.jetbrains.annotations.ApiStatus;
@@ -61,6 +62,15 @@ class Holder {
     @ApiStatus.ScheduledForRemoval(inVersion = "1.22")
     Biome constructLegacyCustomBiome();
 
+    /**
+     * Constructs the legacy unknown entity type instance for the entity type enum.
+     *
+     * @return the created entity type.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.11")
+    @ApiStatus.ScheduledForRemoval(inVersion = "1.22")
+    EntityType<?> constructLegacyUnknownEntityType();
+
     /**
      * Creates a new combat entry.
      * <p>

paper-api/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java

@@ -70,7 +70,7 @@ static Equippable.Builder equippable(final EquipmentSlot slot) {
      * @return the set of allowed entities
      */
     @Contract(pure = true)
-    @Nullable RegistryKeySet<EntityType> allowedEntities();
+    @Nullable RegistryKeySet<EntityType<?>> allowedEntities();
 
     /**
      * Checks if the item is dispensable.
@@ -161,7 +161,7 @@ interface Builder extends DataComponentBuilder<Equippable> {
          * @return the builder for chaining
          */
         @Contract(value = "_ -> this", mutates = "this")
-        Builder allowedEntities(@Nullable RegistryKeySet<EntityType> allowedEntities);
+        Builder allowedEntities(@Nullable RegistryKeySet<EntityType<?>> allowedEntities);
 
         /**
          * Sets whether the item is dispensable.

paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java

@@ -132,6 +132,11 @@ public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
      * @see io.papermc.paper.registry.keys.GameRuleKeys
      */
     RegistryKey<GameRule<?>> GAME_RULE = create("game_rule");
+    /**
+     * Built-in registry for entity types.
+     * @see io.papermc.paper.registry.keys.EntityTypeKeys
+     */
+    RegistryKey<EntityType<?>> ENTITY_TYPE = create("entity_type");
 
     /* ********************** *
      * Data-driven Registries *
@@ -236,7 +241,6 @@ public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
     /* ******************* *
      * API-only Registries *
      * ******************* */
-    RegistryKey<EntityType> ENTITY_TYPE = create("entity_type");
     RegistryKey<Particle> PARTICLE_TYPE = create("particle_type");
     RegistryKey<PotionType> POTION = create("potion");
     RegistryKey<MemoryKey<?>> MEMORY_MODULE_TYPE = create("memory_module_type");

paper-api/src/main/java/io/papermc/paper/tag/BaseTag.java

@@ -27,7 +27,7 @@ public BaseTag(@NotNull Class<T> clazz, @NotNull NamespacedKey key, @NotNull Pre
         add(filter);
     }
 
-    public BaseTag(@NotNull Class<T> clazz, @NotNull NamespacedKey key, @NotNull T...values) {
+    public BaseTag(@NotNull Class<T> clazz, @NotNull NamespacedKey key, @NotNull T... values) {
         this(clazz, key, Lists.newArrayList(values));
     }
 

paper-api/src/main/java/io/papermc/paper/tag/EntitySetTag.java

@@ -1,11 +1,12 @@
 package io.papermc.paper.tag;
 
 import java.util.Collection;
+import java.util.Locale;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.NotNull;
 
@@ -30,12 +31,12 @@ public EntitySetTag(@NotNull NamespacedKey key, @NotNull Collection<EntityType>
     @NotNull
     @Override
     protected Set<EntityType> getAllPossibleValues() {
-        return Stream.of(EntityType.values()).collect(Collectors.toSet());
+        return Registry.ENTITY_TYPE.stream().collect(Collectors.toSet());
     }
 
     @NotNull
     @Override
     protected String getName(@NotNull EntityType value) {
-        return value.name();
+        return value.key().value().toUpperCase(Locale.ROOT); // should be close enough
     }
 }