From 294a5ad7c074d792ff4d41e001fae9da87f454b0 Mon Sep 17 00:00:00 2001 From: Tofaa <82680183+Tofaa2@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:53:59 +0400 Subject: [PATCH] fix leftovers --- .idea/workspace.xml | 21 +------------------ .../java/me/tofaa/entitylib/APIConfig.java | 2 +- .../spigot/InternalRegistryListener.java | 4 ++-- .../testentitylib/TestEntityLibPlugin.java | 9 ++++---- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 608a959..d67dbee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,27 +5,8 @@ - - - - - - - - - - - - - - - - - - - diff --git a/api/src/main/java/me/tofaa/entitylib/APIConfig.java b/api/src/main/java/me/tofaa/entitylib/APIConfig.java index c38e804..30f9534 100644 --- a/api/src/main/java/me/tofaa/entitylib/APIConfig.java +++ b/api/src/main/java/me/tofaa/entitylib/APIConfig.java @@ -46,7 +46,7 @@ public final class APIConfig { return this; } - public @NotNull APIConfig usePlatformTracking() { + public @NotNull APIConfig trackPlatformEntities() { this.platformTracking = true; return this; } diff --git a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java b/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java index c4cdba4..688b7ac 100644 --- a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java +++ b/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java @@ -37,7 +37,7 @@ final class InternalRegistryListener extends PacketListenerAbstract implements L if (tracked == null) { continue; } - platform.getEventBus().call(new UserStopTrackingEntityEvent(user, tracked)); + platform.getEventHandler().callEvent(UserStopTrackingEntityEvent.class, new UserStopTrackingEntityEvent(user, tracked)); } } else if (type == PacketType.Play.Server.SPAWN_ENTITY) { @@ -77,7 +77,7 @@ final class InternalRegistryListener extends PacketListenerAbstract implements L if (entity == null) { return; } - platform.getEventBus().call(new UserTrackingEntityEvent(user, entity)); + platform.getEventHandler().callEvent(UserTrackingEntityEvent.class, new UserTrackingEntityEvent(user, entity)); } private TrackedEntity findTracker(int id) { diff --git a/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java b/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java index 23fc01e..40bbe86 100644 --- a/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java +++ b/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java @@ -30,18 +30,19 @@ public class TestEntityLibPlugin extends JavaPlugin implements CommandExecutor { APIConfig settings = new APIConfig(PacketEvents.getAPI()) .debugMode() .tickTickables() + .trackPlatformEntities() .usePlatformLogger(); EntityLib.init(platform, settings); api = platform.getAPI(); getCommand("testapi").setExecutor(this); platform.getEventHandler().addEventCallback(UserTrackingEntityEvent.class, event -> { - System.out.println("Tracking: " + event.getEntity().getEntityId()); - System.out.println("Size: " + platform.queryPlatformEntities().toArray().length); + event.getUser().sendMessage("Tracking: " + event.getEntity().getEntityId()); + event.getUser().sendMessage("Size: " + platform.queryPlatformEntities().toArray().length); }); platform.getEventHandler().addEventCallback(UserStopTrackingEntityEvent.class, event -> { - System.out.println("Stop Tracking: " + event.getEntity().getEntityId()); - System.out.println("Size: " + platform.queryPlatformEntities().toArray().length); + event.getUser().sendMessage("Stop Tracking: " + event.getEntity().getEntityId()); + event.getUser().sendMessage("Size: " + platform.queryPlatformEntities().toArray().length); }); }