Add *EventListener methods to Entity

api/src/main/java/com/bartlomiejpluta/base/api/character/Character.java

@@ -19,8 +19,4 @@ public interface Character extends Movable, Animated, Entity {
    void changeCharacterSet(String characterSetUid);
 
    CompletableFuture<Void> performInstantAnimation();
-
-   <E extends Event> void addEventListener(EventType<E> type, Consumer<E> listener);
-
-   <E extends Event> void removeEventListener(EventType<E> type, Consumer<E> listener);
 }

api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java

@@ -1,11 +1,15 @@
 package com.bartlomiejpluta.base.api.entity;
 
+import com.bartlomiejpluta.base.api.event.Event;
+import com.bartlomiejpluta.base.api.event.EventType;
 import com.bartlomiejpluta.base.api.event.Reactive;
 import com.bartlomiejpluta.base.api.location.Locationable;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
 import com.bartlomiejpluta.base.internal.logic.Updatable;
 import com.bartlomiejpluta.base.internal.render.Renderable;
 
+import java.util.function.Consumer;
+
 public interface Entity extends Locationable, Renderable, Updatable, Reactive {
    boolean isBlocking();
 
@@ -20,4 +24,8 @@ public interface Entity extends Locationable, Renderable, Updatable, Reactive {
    void onAdd(ObjectLayer layer);
 
    void onRemove(ObjectLayer layer);
+
+   <E extends Event> void addEventListener(EventType<E> type, Consumer<E> listener);
+
+   <E extends Event> void removeEventListener(EventType<E> type, Consumer<E> listener);
 }

api/src/main/java/com/bartlomiejpluta/base/lib/entity/EntityDelegate.java

@@ -3,6 +3,7 @@ package com.bartlomiejpluta.base.lib.entity;
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.entity.Entity;
 import com.bartlomiejpluta.base.api.event.Event;
+import com.bartlomiejpluta.base.api.event.EventType;
 import com.bartlomiejpluta.base.api.location.Locationable;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
 import com.bartlomiejpluta.base.api.move.Direction;
@@ -13,6 +14,8 @@ import org.joml.Matrix4fc;
 import org.joml.Vector2fc;
 import org.joml.Vector2ic;
 
+import java.util.function.Consumer;
+
 public abstract class EntityDelegate implements Entity {
    protected final Entity entity;
 
@@ -195,6 +198,16 @@ public abstract class EntityDelegate implements Entity {
       entity.setZIndex(zIndex);
    }
 
+   @Override
+   public <E extends Event> void addEventListener(EventType<E> type, Consumer<E> listener) {
+      entity.addEventListener(type, listener);
+   }
+
+   @Override
+   public <E extends Event> void removeEventListener(EventType<E> type, Consumer<E> listener) {
+      entity.removeEventListener(type, listener);
+   }
+
    @Override
    public <E extends Event> void handleEvent(E event) {
       entity.handleEvent(event);

api/src/main/java/com/bartlomiejpluta/base/lib/icon/IconDelegate.java

@@ -2,6 +2,7 @@ package com.bartlomiejpluta.base.lib.icon;
 
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.event.Event;
+import com.bartlomiejpluta.base.api.event.EventType;
 import com.bartlomiejpluta.base.api.icon.Icon;
 import com.bartlomiejpluta.base.api.location.Locationable;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
@@ -14,6 +15,8 @@ import org.joml.Matrix4fc;
 import org.joml.Vector2fc;
 import org.joml.Vector2ic;
 
+import java.util.function.Consumer;
+
 public abstract class IconDelegate implements Icon {
    protected final Icon icon;
 
@@ -221,6 +224,16 @@ public abstract class IconDelegate implements Icon {
       icon.setZIndex(zIndex);
    }
 
+   @Override
+   public <E extends Event> void addEventListener(EventType<E> type, Consumer<E> listener) {
+      icon.addEventListener(type, listener);
+   }
+
+   @Override
+   public <E extends Event> void removeEventListener(EventType<E> type, Consumer<E> listener) {
+      icon.removeEventListener(type, listener);
+   }
+
    @Override
    public <E extends Event> void handleEvent(E event) {
       icon.handleEvent(event);