From c2f11389768bd07c44ea5a7b9f6a6095fced7f12 Mon Sep 17 00:00:00 2001 From: zimzaza4 <3625282098@qq.com> Date: Sat, 20 Apr 2024 16:19:36 +0800 Subject: [PATCH] custom entity --- .../geyserutils/geyser/GeyserUtils.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java index c57559f..f4a0f29 100644 --- a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java +++ b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java @@ -96,6 +96,16 @@ public class GeyserUtils implements Extension { }); } + public static void addCustomEntity(String id) { + LOADED_ENTITY_DEFINITIONS.put(id, + EntityDefinition.builder() + .identifier(EntityIdentifier.builder().identifier(id) + .summonable(true) + .spawnEgg(false).build()) + .height(0.6f) + .width(0.6f) + .build()); + } public void loadEntities() { Gson gson = new Gson(); @@ -114,14 +124,7 @@ public class GeyserUtils implements Extension { for (String s : list) { logger().info("Registered: " + s); - LOADED_ENTITY_DEFINITIONS.put(s, - EntityDefinition.builder() - .identifier(EntityIdentifier.builder().identifier(s) - .summonable(true) - .spawnEgg(false).build()) - .height(0.6f) - .width(0.6f) - .build()); + addCustomEntity(s); } } catch (FileNotFoundException e) { throw new RuntimeException(e); @@ -363,10 +366,7 @@ public class GeyserUtils implements Extension { @Subscribe public void onEntitySpawn(ServerSpawnEntityEvent event) { String def = CUSTOM_ENTITIES.get(event.connection()).getIfPresent(event.entityId()); - - System.out.println("ID: " + event.entityId() + " Type: " + event.entityDefinition().entityIdentifier().identifier()); if (def == null) return; - System.out.println("FIND DEF:" + def); event.entityDefinition(LOADED_ENTITY_DEFINITIONS.getOrDefault(def, event.entityDefinition())); }