Netherite-Public/EntityLib
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix leftovers

Browse source
This commit is contained in:
Tofaa 2024-02-19 18:53:59 +04:00
parent 1527ddda93
commit 294a5ad7c0
4 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.idea/workspace.xml
View file

@ -5,27 +5,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment=""> <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventCallback.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventHandlerImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/APIConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/APIConfig.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/APIConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/APIConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/Platform.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/Platform.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventBus.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventBusAsync.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventBusSync.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/EventListener.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/UserReceiveMetaUpdateEvent.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/UserRefreshEntityEvent.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/tracking/GeneralTrackingEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/GeneralTrackingEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/tracking/UserStopTrackingEntityEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/UserStopTrackingEntityEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/tracking/UserTrackingEntityEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/event/types/UserTrackingEntityEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test-plugin/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -323,7 +304,7 @@
<workItem from="1708265094998" duration="204000" /> <workItem from="1708265094998" duration="204000" />
<workItem from="1708265345702" duration="358000" /> <workItem from="1708265345702" duration="358000" />
<workItem from="1708343107313" duration="8276000" /> <workItem from="1708343107313" duration="8276000" />
<workItem from="1708352150286" duration="1520000" /> <workItem from="1708352150286" duration="1849000" />
</task> </task>
<servers /> <servers />
</component> </component>

2
api/src/main/java/me/tofaa/entitylib/APIConfig.java
View file

@ -46,7 +46,7 @@ public final class APIConfig {
return this; return this;
} }
public @NotNull APIConfig usePlatformTracking() { public @NotNull APIConfig trackPlatformEntities() {
this.platformTracking = true; this.platformTracking = true;
return this; return this;
} }

4
platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java
View file

@ -37,7 +37,7 @@ final class InternalRegistryListener extends PacketListenerAbstract implements L
if (tracked == null) { if (tracked == null) {
continue; 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) { else if (type == PacketType.Play.Server.SPAWN_ENTITY) {
@ -77,7 +77,7 @@ final class InternalRegistryListener extends PacketListenerAbstract implements L
if (entity == null) { if (entity == null) {
return; return;
} }
platform.getEventBus().call(new UserTrackingEntityEvent(user, entity)); platform.getEventHandler().callEvent(UserTrackingEntityEvent.class, new UserTrackingEntityEvent(user, entity));
} }
private TrackedEntity findTracker(int id) { private TrackedEntity findTracker(int id) {

9
test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java
View file

@ -30,18 +30,19 @@ public class TestEntityLibPlugin extends JavaPlugin implements CommandExecutor {
APIConfig settings = new APIConfig(PacketEvents.getAPI()) APIConfig settings = new APIConfig(PacketEvents.getAPI())
.debugMode() .debugMode()
.tickTickables() .tickTickables()
.trackPlatformEntities()
.usePlatformLogger(); .usePlatformLogger();
EntityLib.init(platform, settings); EntityLib.init(platform, settings);
api = platform.getAPI(); api = platform.getAPI();
getCommand("testapi").setExecutor(this); getCommand("testapi").setExecutor(this);
platform.getEventHandler().addEventCallback(UserTrackingEntityEvent.class, event -> { platform.getEventHandler().addEventCallback(UserTrackingEntityEvent.class, event -> {
System.out.println("Tracking: " + event.getEntity().getEntityId()); event.getUser().sendMessage("Tracking: " + event.getEntity().getEntityId());
System.out.println("Size: " + platform.queryPlatformEntities().toArray().length); event.getUser().sendMessage("Size: " + platform.queryPlatformEntities().toArray().length);
}); });
platform.getEventHandler().addEventCallback(UserStopTrackingEntityEvent.class, event -> { platform.getEventHandler().addEventCallback(UserStopTrackingEntityEvent.class, event -> {
System.out.println("Stop Tracking: " + event.getEntity().getEntityId()); event.getUser().sendMessage("Stop Tracking: " + event.getEntity().getEntityId());
System.out.println("Size: " + platform.queryPlatformEntities().toArray().length); event.getUser().sendMessage("Size: " + platform.queryPlatformEntities().toArray().length);
}); });
} }