T cloneEntity(@NotNull Object platformEntity, @NotNull Location location);
+ @NotNull P cloneEntity(@NotNull Object platformEntity);
@Nullable WrapperEntity getEntity(int id);
@Nullable WrapperEntity getEntity(@NotNull UUID uuid);
- void removeEntity(WrapperEntity entity);
-
@NotNull Collection getAllEntities();
/**
@@ -71,4 +54,13 @@ public interface EntityLibAPI {
* @param tickContainer the TickContainer to add.
*/
void addTickContainer(@NotNull TickContainer tickContainer);
+
+ @NotNull
+ EntityContainer getDefaultContainer();
+
+ void addContainer(EntityContainer container);
+
+ void removeContainer(EntityContainer container);
+
+ @NotNull Collection getEntityContainers();
}
diff --git a/api/src/main/java/me/tofaa/entitylib/container/AbstractEntityContainer.java b/api/src/main/java/me/tofaa/entitylib/container/AbstractEntityContainer.java
new file mode 100644
index 0000000..04556a1
--- /dev/null
+++ b/api/src/main/java/me/tofaa/entitylib/container/AbstractEntityContainer.java
@@ -0,0 +1,90 @@
+package me.tofaa.entitylib.container;
+
+import me.tofaa.entitylib.wrapper.WrapperEntity;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+public abstract class AbstractEntityContainer implements EntityContainer {
+
+ private final Map entities = new ConcurrentHashMap<>();
+ private final Map entitiesById = new ConcurrentHashMap<>();
+
+
+ @Override
+ public void addEntity(WrapperEntity entity) {
+ entities.put(entity.getUuid(), entity);
+ entitiesById.put(entity.getEntityId(), entity);
+ }
+
+ @Override
+ public void removeEntity(WrapperEntity entity, boolean despawn) {
+ entities.remove(entity.getUuid());
+ entitiesById.remove(entity.getEntityId());
+ if (despawn) {
+ entity.despawn();
+ }
+ }
+
+ @Override
+ public void removeEntity(int entityId, boolean despawn) {
+ WrapperEntity entity = entitiesById.get(entityId);
+ if (entity != null) {
+ removeEntity(entity, despawn);
+ }
+ }
+
+ @Override
+ public void removeEntity(UUID uuid, boolean despawn) {
+ WrapperEntity entity = entities.get(uuid);
+ if (entity != null) {
+ removeEntity(entity, despawn);
+ }
+ }
+
+ @Override
+ public void clearEntities(boolean despawn) {
+ entities.values().forEach(entity -> removeEntity(entity, despawn));
+ }
+
+
+ @Override
+ public void tick() {
+
+ }
+
+ public @NotNull Iterator iterator() {
+ return entities.values().iterator();
+ }
+
+ @Override
+ public Collection getEntities() {
+ return Collections.unmodifiableCollection(entities.values());
+ }
+
+ @Override
+ public WrapperEntity getEntity(UUID uuid) {
+ return entities.get(uuid);
+ }
+
+ @Override
+ public WrapperEntity getEntity(int entityId) {
+ return entitiesById.get(entityId);
+ }
+
+ @Override
+ public boolean containsEntity(UUID uuid) {
+ return entities.containsKey(uuid);
+ }
+
+ @Override
+ public boolean containsEntity(int entityId) {
+ return entitiesById.containsKey(entityId);
+ }
+
+ @Override
+ public boolean containsEntity(WrapperEntity entity) {
+ return entities.containsValue(entity);
+ }
+}
diff --git a/api/src/main/java/me/tofaa/entitylib/container/ContainerImpl.java b/api/src/main/java/me/tofaa/entitylib/container/ContainerImpl.java
new file mode 100644
index 0000000..50cf86e
--- /dev/null
+++ b/api/src/main/java/me/tofaa/entitylib/container/ContainerImpl.java
@@ -0,0 +1,4 @@
+package me.tofaa.entitylib.container;
+
+class ContainerImpl extends AbstractEntityContainer {
+}
diff --git a/api/src/main/java/me/tofaa/entitylib/container/EntityContainer.java b/api/src/main/java/me/tofaa/entitylib/container/EntityContainer.java
new file mode 100644
index 0000000..40c28e5
--- /dev/null
+++ b/api/src/main/java/me/tofaa/entitylib/container/EntityContainer.java
@@ -0,0 +1,63 @@
+package me.tofaa.entitylib.container;
+
+import me.tofaa.entitylib.wrapper.WrapperEntity;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.UUID;
+
+
+/**
+ * Containers are basic iterable classes that hold entities. These containers can be extended to provide more functionality, and this allows for seperation of logic between certain entities.
+ *
+ * To access a specific {@link WrapperEntity}'s container you can use {@link WrapperEntity#getParentContainer()}.
+ *
+ */
+public interface EntityContainer extends Iterable {
+
+ static EntityContainer basic() {
+ return new ContainerImpl();
+ }
+
+ void addEntity(WrapperEntity entity);
+
+ void removeEntity(WrapperEntity entity, boolean despawn);
+
+ default void removeEntity(WrapperEntity entity) {
+ removeEntity(entity, false);
+ }
+
+ void removeEntity(int entityId, boolean despawn);
+
+ default void removeEntity(int entityId) {
+ removeEntity(entityId, false);
+ }
+
+ void removeEntity(UUID uuid, boolean despawn);
+
+ default void removeEntity(UUID entity) {
+ removeEntity(entity, false);
+ }
+
+ void clearEntities(boolean despawn);
+
+ default void clearEntities() {
+ clearEntities(false);
+ }
+
+ void tick();
+
+ Collection getEntities();
+
+ @Nullable WrapperEntity getEntity(UUID uuid);
+
+ @Nullable WrapperEntity getEntity(int entityId);
+
+ boolean containsEntity(UUID uuid);
+
+ boolean containsEntity(int entityId);
+
+ /** Value based contains, not reference based */
+ boolean containsEntity(WrapperEntity entity);
+
+}
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
index b75735e..02bd72f 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
@@ -8,6 +8,7 @@ import com.github.retrooper.packetevents.wrapper.PacketWrapper;
import com.github.retrooper.packetevents.wrapper.play.server.*;
import me.tofaa.entitylib.EntityLib;
import me.tofaa.entitylib.TrackedEntity;
+import me.tofaa.entitylib.container.EntityContainer;
import me.tofaa.entitylib.meta.EntityMeta;
import me.tofaa.entitylib.meta.types.ObjectData;
import me.tofaa.entitylib.tick.Tickable;
@@ -34,6 +35,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
private Vector3d velocity;
private int riding = -1;
private final Set passengers;
+ private EntityContainer parent;
public WrapperEntity(int entityId, UUID uuid, EntityType entityType, EntityMeta entityMeta) {
this.entityId = entityId;
@@ -45,7 +47,22 @@ public class WrapperEntity implements Tickable, TrackedEntity {
this.passengers = ConcurrentHashMap.newKeySet();
}
- public boolean spawn(Location location) {
+ public WrapperEntity(int entityId, EntityType entityType) {
+ this(entityId, EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
+ public WrapperEntity(UUID uuid, EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityIdProvider().provide(uuid, entityType), uuid, entityType);
+ }
+ public WrapperEntity(EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
+ public WrapperEntity(int entityId, UUID uuid, EntityType entityType) {
+ this(entityId, uuid, entityType, EntityMeta.createMeta(entityId, entityType));
+ }
+
+ public boolean spawn(Location location, EntityContainer parent) {
if (spawned) return false;
this.location = location;
this.spawned = true;
@@ -63,9 +80,15 @@ public class WrapperEntity implements Tickable, TrackedEntity {
)
);
sendPacketToViewers(entityMeta.createPacket());
+ this.parent = parent;
+ parent.addEntity(this);
return true;
}
+ public boolean spawn(Location location) {
+ return spawn(location, EntityLib.getApi().getDefaultContainer());
+ }
+
protected int getObjectData() {
if (entityMeta instanceof ObjectData) {
return ((ObjectData) entityMeta).getObjectData();
@@ -98,7 +121,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
}
public void remove() {
- EntityLib.getApi().removeEntity(this);
+ parent.removeEntity(this, true);
}
public void despawn() {
@@ -159,6 +182,10 @@ public class WrapperEntity implements Tickable, TrackedEntity {
}
}
+ public EntityContainer getParentContainer() {
+ return parent;
+ }
+
public void sendMessageToViewers(Component message) {
sendPacketToViewers(new WrapperPlayServerSystemChatMessage(false, message));
}
@@ -381,6 +408,18 @@ public class WrapperEntity implements Tickable, TrackedEntity {
}
}
+ public void sendPacketToViewersIfSpawned(PacketWrapper packet) {
+ if (spawned) {
+ sendPacketToViewers(packet);
+ }
+ }
+
+ public void sendPacketsToViewersIfSpawned(PacketWrapper... wrappers) {
+ if (spawned) {
+ sendPacketsToViewers(wrappers);
+ }
+ }
+
private static void sendPacket(UUID user, PacketWrapper wrapper) {
if (wrapper == null) return;
Object channel = EntityLib.getApi().getPacketEvents().getProtocolManager().getChannel(user);
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityAttributes.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityAttributes.java
index 8c4a1f4..4f9ead5 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityAttributes.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityAttributes.java
@@ -75,7 +75,7 @@ public final class WrapperEntityAttributes {
public void refresh() {
- entity.sendPacketToViewers(createPacket());
+ if (entity.isSpawned()) entity.sendPacketToViewers(createPacket());
}
public WrapperPlayServerUpdateAttributes createPacket() {
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityCreature.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityCreature.java
index 6771d15..6be04b3 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityCreature.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityCreature.java
@@ -1,6 +1,7 @@
package me.tofaa.entitylib.wrapper;
import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
+import me.tofaa.entitylib.EntityLib;
import me.tofaa.entitylib.meta.EntityMeta;
import me.tofaa.entitylib.wrapper.ai.AIGroup;
import org.jetbrains.annotations.NotNull;
@@ -29,6 +30,21 @@ public class WrapperEntityCreature extends WrapperLivingEntity {
this.aiGroups = new HashSet<>();
}
+ public WrapperEntityCreature(int entityId, @NotNull UUID uuid, EntityType entityType) {
+ this(entityId, uuid, entityType, EntityMeta.createMeta(entityId, entityType));
+ }
+
+ public WrapperEntityCreature(int entityId, EntityType entityType) {
+ this(entityId, EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
+ public WrapperEntityCreature(UUID uuid, EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityIdProvider().provide(uuid, entityType), uuid, entityType);
+ }
+ public WrapperEntityCreature(EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
@Override
public void tick(long time) {
super.tick(time);
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperExperienceOrbEntity.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperExperienceOrbEntity.java
index 27b38b8..6744044 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperExperienceOrbEntity.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperExperienceOrbEntity.java
@@ -3,6 +3,7 @@ package me.tofaa.entitylib.wrapper;
import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
import com.github.retrooper.packetevents.protocol.world.Location;
import com.github.retrooper.packetevents.util.Vector3d;
+import me.tofaa.entitylib.EntityLib;
import me.tofaa.entitylib.meta.EntityMeta;
import org.jetbrains.annotations.NotNull;
@@ -17,6 +18,21 @@ public class WrapperExperienceOrbEntity extends WrapperEntity {
super(entityId, uuid, entityType, meta);
}
+ public WrapperExperienceOrbEntity(int entityId, @NotNull UUID uuid, EntityType entityType) {
+ this(entityId, uuid, entityType, EntityMeta.createMeta(entityId, entityType));
+ }
+
+ public WrapperExperienceOrbEntity(int entityId, EntityType entityType) {
+ this(entityId, EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
+ public WrapperExperienceOrbEntity(UUID uuid, EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityIdProvider().provide(uuid, entityType), uuid, entityType);
+ }
+ public WrapperExperienceOrbEntity(EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
/**
* Applies a slight slide motion towards the given location.
*
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java
index cfa8069..df599ce 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java
@@ -1,19 +1,14 @@
package me.tofaa.entitylib.wrapper;
-import com.github.retrooper.packetevents.protocol.attribute.Attribute;
import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
-import com.github.retrooper.packetevents.protocol.player.HumanoidArm;
import com.github.retrooper.packetevents.protocol.potion.PotionType;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityAnimation;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityEffect;
-import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerTeams;
-import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerUpdateAttributes;
+import me.tofaa.entitylib.EntityLib;
import me.tofaa.entitylib.meta.EntityMeta;
-import me.tofaa.entitylib.meta.types.LivingEntityMeta;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
import java.util.UUID;
public class WrapperLivingEntity extends WrapperEntity{
@@ -27,6 +22,21 @@ public class WrapperLivingEntity extends WrapperEntity{
this.attributes = new WrapperEntityAttributes(this);
}
+ public WrapperLivingEntity(int entityId, UUID uuid, EntityType entityType) {
+ this(entityId, uuid, entityType, EntityMeta.createMeta(entityId, entityType));
+ }
+
+ public WrapperLivingEntity(int entityId, EntityType entityType) {
+ this(entityId, EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
+ public WrapperLivingEntity(UUID uuid, EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityIdProvider().provide(uuid, entityType), uuid, entityType);
+ }
+ public WrapperLivingEntity(EntityType entityType) {
+ this(EntityLib.getPlatform().getEntityUuidProvider().provide(entityType), entityType);
+ }
+
@Override
public void refresh() {
super.refresh();
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperPlayer.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperPlayer.java
index 93a056d..ff7d510 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperPlayer.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperPlayer.java
@@ -46,12 +46,12 @@ public class WrapperPlayer extends WrapperLivingEntity {
public void setGameMode(GameMode gameMode) {
this.gameMode = gameMode;
- sendPacketsToViewers(new WrapperPlayServerPlayerInfoUpdate(WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_GAME_MODE, createInfo()));
+ sendPacketsToViewersIfSpawned(new WrapperPlayServerPlayerInfoUpdate(WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_GAME_MODE, createInfo()));
}
public void setDisplayName(Component displayName) {
this.displayName = displayName;
- sendPacketsToViewers(new WrapperPlayServerPlayerInfoUpdate(WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_DISPLAY_NAME, createInfo()));
+ sendPacketsToViewersIfSpawned(new WrapperPlayServerPlayerInfoUpdate(WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_DISPLAY_NAME, createInfo()));
}
public Component getDisplayName() {
@@ -94,9 +94,9 @@ public class WrapperPlayer extends WrapperLivingEntity {
public void setInTablist(boolean tablist) {
this.tablist = tablist;
- sendPacketToViewers(tabListPacket());
+ sendPacketsToViewersIfSpawned(tabListPacket());
if (!tablist) {
- sendPacketToViewers(tabListRemovePacket());
+ sendPacketsToViewersIfSpawned(tabListRemovePacket());
}
}
@@ -106,7 +106,7 @@ public class WrapperPlayer extends WrapperLivingEntity {
public void setLatency(int latency) {
this.latency = latency;
- sendPacketsToViewers(
+ sendPacketsToViewersIfSpawned(
new WrapperPlayServerPlayerInfoUpdate(
WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_LATENCY,
createInfo()
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/LegacyHologram.java b/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/LegacyHologram.java
index 4062f21..6cf847c 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/LegacyHologram.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/LegacyHologram.java
@@ -96,7 +96,8 @@ final class LegacyHologram implements Hologram.Legacy {
@Override
public void setLine(int index, @Nullable Component line) {
- WrapperEntity e = EntityLib.getApi().spawnEntity(EntityTypes.ARMOR_STAND, location);
+ WrapperEntity e = new WrapperEntity(EntityTypes.ARMOR_STAND);
+ e.spawn(location);
ArmorStandMeta meta = (ArmorStandMeta) e.getEntityMeta();
meta.setCustomName(line);
meta.setCustomNameVisible(true);
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/ModernHologram.java b/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/ModernHologram.java
index 110af16..7391d1f 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/ModernHologram.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/ModernHologram.java
@@ -10,6 +10,7 @@ import net.kyori.adventure.text.Component;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import java.sql.Wrapper;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -72,7 +73,8 @@ final class ModernHologram implements Hologram.Modern {
@Override
public void setLine(int index, @Nullable Component line) {
- WrapperEntity e = EntityLib.getApi().spawnEntity(EntityTypes.TEXT_DISPLAY, location);
+ WrapperEntity e = new WrapperEntity(EntityTypes.TEXT_DISPLAY);
+ e.spawn(location);
TextDisplayMeta meta = (TextDisplayMeta) e.getEntityMeta();
meta.setInvisible(true);
meta.setHasNoGravity(true);
diff --git a/build.gradle b/build.gradle
index 981e340..81db5c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,6 +11,8 @@ allprojects {
"net.kyori:adventure-text-serializer-legacy:${adventureVersion}",
"net.kyori:adventure-nbt:${adventureVersion}"]
+ project.ext.peVersion = '2.3.0'
+
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'maven-publish'
@@ -59,6 +61,6 @@ allprojects {
dependencies {
- compileOnlyApi 'com.github.retrooper.packetevents:spigot:2.3.0'
+ compileOnlyApi 'com.github.retrooper.packetevents:spigot:${project.ext.peVersion}'
}
diff --git a/common/src/main/java/me/tofaa/entitylib/common/AbstractEntityLibAPI.java b/common/src/main/java/me/tofaa/entitylib/common/AbstractEntityLibAPI.java
index 564174d..1287850 100644
--- a/common/src/main/java/me/tofaa/entitylib/common/AbstractEntityLibAPI.java
+++ b/common/src/main/java/me/tofaa/entitylib/common/AbstractEntityLibAPI.java
@@ -9,6 +9,7 @@ import me.tofaa.entitylib.APIConfig;
import me.tofaa.entitylib.EntityLib;
import me.tofaa.entitylib.EntityLibAPI;
import me.tofaa.entitylib.Platform;
+import me.tofaa.entitylib.container.EntityContainer;
import me.tofaa.entitylib.meta.EntityMeta;
import me.tofaa.entitylib.meta.projectile.ThrownExpBottleMeta;
import me.tofaa.entitylib.meta.types.LivingEntityMeta;
@@ -33,6 +34,9 @@ public abstract class AbstractEntityLibAPI implements EntityLibAPI {
protected final Map entitiesById = new ConcurrentHashMap<>();
protected final Map entities = new ConcurrentHashMap<>();
+ protected final Set entityContainers = ConcurrentHashMap.newKeySet();
+ protected final EntityContainer defaultEntityContainer = EntityContainer.basic();
+
protected AbstractEntityLibAPI(Platform platform, APIConfig settings) {
this.platform = platform;
this.packetEvents = settings.getPacketEvents();
@@ -40,125 +44,6 @@ public abstract class AbstractEntityLibAPI implements EntityLibAPI {
this.tickContainers = settings.shouldTickTickables() ? new HashSet<>() : Collections.emptyList();
}
- @Override
- public @NotNull T1 createEntity(UUID uuid, int entityId, EntityType type) {
- if (entities.containsKey(uuid)) {
- throw new IllegalArgumentException("Entity with UUID " + uuid + " already exists in this world.");
- }
- if (entitiesById.containsKey(entityId)) {
- throw new IllegalArgumentException("Entity with ID " + entityId + " already exists in this world.");
- }
- EntityMeta meta = EntityMeta.createMeta(entityId, type);
- WrapperEntity e;
- if (meta instanceof LivingEntityMeta) {
- e = new WrapperLivingEntity(entityId, uuid, type, meta);
- }
- else if (meta instanceof ThrownExpBottleMeta) {
- e = new WrapperExperienceOrbEntity(entityId, uuid, type, meta);
- }
- else {
- e = new WrapperEntity(entityId, uuid, type, meta);
- }
- entities.put(uuid, e);
- entitiesById.put(entityId, e);
- return (T1) e;
- }
-
- @Override
- public @NotNull T1 createEntity(EntityType type) {
- UUID uuid = EntityLib.getPlatform().getEntityUuidProvider().provide(type);
- while (entities.containsKey(uuid)) {
- uuid = EntityLib.getPlatform().getEntityUuidProvider().provide(type);
- }
- int entityId = EntityLib.getPlatform().getEntityIdProvider().provide(uuid, type);
- while (entitiesById.containsKey(entityId)) {
- entityId = EntityLib.getPlatform().getEntityIdProvider().provide(uuid, type);
- }
- return createEntity(uuid, entityId, type);
- }
-
- @Override
- public @NotNull WrapperPlayer spawnPlayer(UserProfile profile, Location location) {
- if (getEntity(profile.getUUID()) != null) {
- throw new IllegalArgumentException("Entity with UUID " + profile.getUUID() + " already exists in this world.");
- }
-
- int id = EntityLib.getPlatform().getEntityIdProvider().provide(profile.getUUID(), EntityTypes.PLAYER);
- while (entitiesById.containsKey(id)) {
- id = EntityLib.getPlatform().getEntityIdProvider().provide(profile.getUUID(), EntityTypes.PLAYER);
- }
- WrapperPlayer player = new WrapperPlayer(profile, id);
- player.spawn(location);
- entities.put(player.getUuid(), player);
- entitiesById.put(player.getEntityId(), player);
- return player;
- }
-
- @Override
- public @NotNull WrapperPlayer createPlayer(UserProfile profile) {
- int id = EntityLib.getPlatform().getEntityIdProvider().provide(profile.getUUID(), EntityTypes.PLAYER);
- while (entitiesById.containsKey
- (id)) {
- id = EntityLib.getPlatform().getEntityIdProvider().provide(profile.getUUID(), EntityTypes.PLAYER);
- }
- return createPlayer(profile, id);
- }
-
- @Override
- public @NotNull WrapperPlayer createPlayer(UserProfile profile, int entityId) {
- if (getEntity(profile.getUUID()) != null) {
- throw new IllegalArgumentException("Entity with UUID " + profile.getUUID() + " already exists in this world.");
- }
- WrapperPlayer player = new WrapperPlayer(profile, entityId);
- entities.put(player.getUuid(), player);
- entitiesById.put(player.getEntityId(), player);
- return player;
- }
-
- @Override
- public @NotNull T1 spawnEntity(@NotNull T1 entity, @NotNull Location location) {
- entity.spawn(location);
- entities.put(entity.getUuid(), entity);
- entitiesById.put(entity.getEntityId(), entity);
- return entity;
- }
-
- @Override
- public void removeEntity(WrapperEntity entity) {
- entity.despawn();
- this.entities.remove(entity.getUuid());
- this.entitiesById.remove(entity.getEntityId());
- }
-
- @Override
- public @NotNull T1 spawnEntity(@NotNull Class wrapperClass, @NotNull EntityType entityType, @NotNull Location location) {
- UUID uuid = EntityLib.getPlatform().getEntityUuidProvider().provide(entityType);
- while (entities.containsKey(uuid)) {
- uuid = EntityLib.getPlatform().getEntityUuidProvider().provide(entityType);
- }
- int entityId = EntityLib.getPlatform().getEntityIdProvider().provide(uuid, entityType);
- while (entitiesById.containsKey(entityId)) {
- entityId = EntityLib.getPlatform().getEntityIdProvider().provide(uuid, entityType);
- }
- EntityMeta meta = EntityMeta.createMeta(entityId, entityType);
- WrapperEntity e;
- if (meta instanceof LivingEntityMeta) {
- e = new WrapperLivingEntity(entityId, uuid, entityType, meta);
- }
- else if (meta instanceof ThrownExpBottleMeta) {
- e = new WrapperExperienceOrbEntity(entityId, uuid, entityType, meta);
- }
- else {
- e = new WrapperEntity(entityId, uuid, entityType, meta);
- }
- return spawnEntity(wrapperClass.cast(e), location);
- }
-
- @Override
- public @NotNull WrapperEntity spawnEntity(@NotNull EntityType entityType, @NotNull Location location) {
- return spawnEntity(WrapperEntity.class, entityType, location);
- }
-
@Override
public @Nullable WrapperEntity getEntity(int id) {
return entitiesById.get(id);
@@ -174,6 +59,27 @@ public abstract class AbstractEntityLibAPI implements EntityLibAPI {
return Collections.unmodifiableCollection(entities.values());
}
+ @Override
+ public void addContainer(EntityContainer container) {
+ entityContainers.add(container);
+ }
+
+ @Override
+ public void removeContainer(EntityContainer container) {
+ entityContainers.remove(container);
+ }
+
+ @Override
+ public @NotNull EntityContainer getDefaultContainer() {
+ return defaultEntityContainer;
+ }
+
+ @NotNull
+ @Override
+ public Set getEntityContainers() {
+ return entityContainers;
+ }
+
@NotNull
@Override
public APIConfig getSettings() {
diff --git a/platforms/spigot/build.gradle b/platforms/spigot/build.gradle
index 6a9b678..0a819da 100644
--- a/platforms/spigot/build.gradle
+++ b/platforms/spigot/build.gradle
@@ -1,6 +1,6 @@
dependencies {
api(project(":common"))
- compileOnly('com.github.retrooper.packetevents:spigot:2.3.0')
+ compileOnly('com.github.retrooper.packetevents:spigot:' + peVersion)
compileOnly('org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT')
}
diff --git a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java b/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java
index a7e519d..a9a8122 100644
--- a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java
+++ b/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java
@@ -44,7 +44,7 @@ public class SpigotEntityLibAPI extends AbstractEntityLibAPI @NotNull T cloneEntity(@NotNull Object platformEntity, @NotNull Location location) {
+ public @NotNull T cloneEntity(@NotNull Object platformEntity) {
Check.stateCondition(!(platformEntity instanceof Entity), "Entity must be a Bukkit entity");
Entity e = (Entity) platformEntity;
EntityType type = SpigotConversionUtil.fromBukkitEntityType(e.getType());
@@ -84,10 +84,7 @@ public class SpigotEntityLibAPI extends AbstractEntityLibAPI {
+
+ private final Scheduler scheduler = Scheduler.newScheduler();
+
+ protected StandaloneEntityLibApi(Platform