From 6c58f0980c690e947a19ef5735a34bdc675e77d1 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 13 Aug 2022 15:36:57 +0200
Subject: [PATCH] Add utility method for initializing entity types

---
 .../minecraft/entities/Entity1_19Types.java   | 11 +----
 .../viaversion/util/EntityTypeUtil.java       | 46 ++++++++++++++-----
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_19Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_19Types.java
index 2707e0317..73f4d3cfe 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_19Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_19Types.java
@@ -269,15 +269,6 @@ public enum Entity1_19Types implements EntityType {
     }
 
     public static void initialize(final Protocol<?, ?, ?, ?> protocol) {
-        for (final Entity1_19Types type : values()) {
-            if (type.isAbstractType()) {
-                continue;
-            }
-
-            final int id = protocol.getMappingData().getEntityMappings().mappedId(type.identifier());
-            Preconditions.checkArgument(id != -1, "Entity type %s has no id", type.identifier());
-            type.id = id;
-        }
-        EntityTypeUtil.fill(values(), TYPES);
+        EntityTypeUtil.initialize(values(), TYPES, protocol, (type, id) -> type.id = id);
     }
 }
diff --git a/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java b/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java
index ebfcc09c4..d0469d4ab 100644
--- a/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java
+++ b/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java
@@ -22,14 +22,18 @@
  */
 package com.viaversion.viaversion.util;
 
+import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.Protocol;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-public class EntityTypeUtil {
+public final class EntityTypeUtil {
+
+    private static final EntityType[] EMPTY_ARRAY = new EntityType[0];
 
     /**
      * Returns an ordered array with each index representing the actual entity id.
@@ -46,7 +50,29 @@ public class EntityTypeUtil {
         }
 
         types.sort(Comparator.comparingInt(EntityType::getId));
-        return types.toArray(new EntityType[0]);
+        return types.toArray(EMPTY_ARRAY);
+    }
+
+    /**
+     * Sets entity type ids based on the protocol's mapping data and fills the given typesToFill array with the index corresponding to the id.
+     *
+     * @param values      full enum values
+     * @param typesToFill yet unfilled array to be filled with types ordered by id
+     * @param protocol    protocol to get entity types from
+     * @param idSetter    function to set the internal entity id
+     * @param <T>         entity type
+     */
+    public static <T extends EntityType> void initialize(final T[] values, final EntityType[] typesToFill, final Protocol<?, ?, ?, ?> protocol, final EntityIdSetter<T> idSetter) {
+        for (final T type : values) {
+            if (type.isAbstractType()) {
+                continue;
+            }
+
+            final int id = protocol.getMappingData().getEntityMappings().mappedId(type.identifier());
+            Preconditions.checkArgument(id != -1, "Entity type %s has no id", type.identifier());
+            idSetter.setId(type, id);
+            typesToFill[id] = type;
+        }
     }
 
     public static EntityType[] createSizedArray(final EntityType[] values) {
@@ -56,15 +82,7 @@ public class EntityTypeUtil {
                 count++;
             }
         }
-        return new EntityType[(int) count];
-    }
-
-    public static void fill(final EntityType[] values, final EntityType[] toFill) {
-        for (final EntityType type : values) {
-            if (!type.isAbstractType()) {
-                toFill[type.getId()] = type;
-            }
-        }
+        return new EntityType[count];
     }
 
     /**
@@ -83,4 +101,10 @@ public class EntityTypeUtil {
         }
         return type;
     }
+
+    @FunctionalInterface
+    public interface EntityIdSetter<T extends EntityType> {
+
+        void setId(T entityType, int id);
+    }
 }