Move CustomEntityDefinition into custom package

api/src/main/java/org/geysermc/geyser/api/entity/JavaEntityType.java

@@ -30,18 +30,25 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.api.GeyserApi;
 import org.geysermc.geyser.api.util.Identifier;
 
+/**
+ * Represents a Java edition entity type
+ */
 public interface JavaEntityType {
 
-    Identifier javaIdentifier();
+    /**
+     * @return the identifier of the type
+     */
+    Identifier identifier();
 
+    /**
+     * @return the
+     */
     int javaId();
 
-    boolean isUnregistered();
-
     boolean vanilla();
 
     default boolean is(Identifier javaIdentifier) {
-        return javaIdentifier().equals(javaIdentifier);
+        return identifier().equals(javaIdentifier);
     }
 
     static JavaEntityType ofVanilla(@NonNull Identifier javaIdentifier) {

api/src/main/java/org/geysermc/geyser/api/entity/custom/CustomEntityDefinition.java

@@ -23,17 +23,17 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.geyser.api.entity;
+package org.geysermc.geyser.api.entity.custom;
 
 import org.checkerframework.checker.index.qual.Positive;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.common.returnsreceiver.qual.This;
 import org.geysermc.geyser.api.GeyserApi;
+import org.geysermc.geyser.api.util.Identifier;
 
 public interface CustomEntityDefinition {
 
-    // TODO Identifier
-    String bedrockIdentifier();
+    Identifier bedrockIdentifier();
 
     float width();
 

api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomEntitiesEvent.java

@@ -26,7 +26,7 @@
 package org.geysermc.geyser.api.event.lifecycle;
 
 import org.geysermc.event.Event;
-import org.geysermc.geyser.api.entity.CustomEntityDefinition;
+import org.geysermc.geyser.api.entity.custom.CustomEntityDefinition;
 
 import java.util.List;