From a4ef1e9ae4d409d25f2934cc927267e39d59cea6 Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Thu, 12 May 2022 13:48:51 +0200
Subject: [PATCH] Minor updates xD

---
 src/main/java/com/yes/yes/behaviours/ItemBehaviour.java    | 2 +-
 src/main/java/com/yes/yes/behaviours/OfferBehaviour.java   | 4 ++--
 src/main/java/com/yes/yes/behaviours/RecieveBehaviour.java | 4 ++--
 src/main/java/com/yes/yes/behaviours/TestBehaviour.java    | 3 +--
 src/main/java/com/yes/yes/utils/Entity.java                | 4 ++--
 src/main/java/com/yes/yes/utils/EventHandler.java          | 4 ++--
 src/main/java/com/yes/yes/utils/GlobalEventHandler.java    | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/yes/yes/behaviours/ItemBehaviour.java b/src/main/java/com/yes/yes/behaviours/ItemBehaviour.java
index 113fd90..cf0d803 100644
--- a/src/main/java/com/yes/yes/behaviours/ItemBehaviour.java
+++ b/src/main/java/com/yes/yes/behaviours/ItemBehaviour.java
@@ -49,6 +49,6 @@ public class ItemBehaviour extends Component {
 
     @Override
     public void destroy() {
-        parent.removeListener(dataKey + "Changed", this, this::itemChanged);
+        parent.removeListener(dataKey + "Changed", this);
     }
 }
diff --git a/src/main/java/com/yes/yes/behaviours/OfferBehaviour.java b/src/main/java/com/yes/yes/behaviours/OfferBehaviour.java
index 43fa2c8..d9dd7fc 100644
--- a/src/main/java/com/yes/yes/behaviours/OfferBehaviour.java
+++ b/src/main/java/com/yes/yes/behaviours/OfferBehaviour.java
@@ -63,8 +63,8 @@ public class OfferBehaviour extends Component {
 
     @Override
     public void destroy() {
-        this.parent.removeListener("itemAccepted", this, this::itemAccepted);
-        this.parent.removeListener("placed", this,this::placed);
+        this.parent.removeListener("itemAccepted", this);
+        this.parent.removeListener("placed", this);
 
         receiver = null;
     }
diff --git a/src/main/java/com/yes/yes/behaviours/RecieveBehaviour.java b/src/main/java/com/yes/yes/behaviours/RecieveBehaviour.java
index c373273..24308fc 100644
--- a/src/main/java/com/yes/yes/behaviours/RecieveBehaviour.java
+++ b/src/main/java/com/yes/yes/behaviours/RecieveBehaviour.java
@@ -55,8 +55,8 @@ public class RecieveBehaviour extends Component {
 
     @Override
     public void destroy() {
-        this.parent.removeListener("offerItem", this, this::receive);
-        this.parent.removeListener("placed", this, this::placed);
+        this.parent.removeListener("offerItem", this);
+        this.parent.removeListener("placed", this);
         
         offerer = null;
     }
diff --git a/src/main/java/com/yes/yes/behaviours/TestBehaviour.java b/src/main/java/com/yes/yes/behaviours/TestBehaviour.java
index 2939497..e6fb813 100644
--- a/src/main/java/com/yes/yes/behaviours/TestBehaviour.java
+++ b/src/main/java/com/yes/yes/behaviours/TestBehaviour.java
@@ -2,7 +2,6 @@ package com.yes.yes.behaviours;
 
 import com.yes.yes.utils.BlockContainer;
 import com.yes.yes.utils.Component;
-import com.yes.yes.utils.Coordinate;
 import com.yes.yes.utils.Entity;
 
 public class TestBehaviour extends Component {
@@ -41,6 +40,6 @@ public class TestBehaviour extends Component {
 
     @Override
     public void destroy() {
-        parent.removeListener("placed", this, this::onNeighborPlaced);
+        parent.removeListener("placed", this);
     }
 }
diff --git a/src/main/java/com/yes/yes/utils/Entity.java b/src/main/java/com/yes/yes/utils/Entity.java
index 9904c42..1a0d186 100644
--- a/src/main/java/com/yes/yes/utils/Entity.java
+++ b/src/main/java/com/yes/yes/utils/Entity.java
@@ -65,8 +65,8 @@ public abstract class Entity extends javafx.scene.Group {
         handler.addListener(eventName, object, function);
     }
 
-    public final <T> void removeListener(String eventName, Object object, Consumer<T> function) {
-        handler.removeListener(eventName, object, function);
+    public final <T> void removeListener(String eventName, Object object) {
+        handler.removeListener(eventName, object);
     }
 
     public final void trigger(String eventName, Object parameter) {
diff --git a/src/main/java/com/yes/yes/utils/EventHandler.java b/src/main/java/com/yes/yes/utils/EventHandler.java
index 055516e..5bb1efb 100644
--- a/src/main/java/com/yes/yes/utils/EventHandler.java
+++ b/src/main/java/com/yes/yes/utils/EventHandler.java
@@ -15,12 +15,12 @@ public class EventHandler {
         events.get(eventName).put(object, (e) -> function.accept((T) e));
     }
 
-    public <T> void removeListener(String eventName, Object object, Consumer<T> function) throws IllegalArgumentException {
+    public <T> void removeListener(String eventName, Object object) throws IllegalArgumentException {
         //NOTE: This needs to be called otherwise memory leak
         if (!events.containsKey(eventName)) {
             throw new IllegalArgumentException("Event " + eventName + " does not exist!");
         }
-        //noinspection SuspiciousMethodCalls
+
         events.get(eventName).remove(object);
     }
 
diff --git a/src/main/java/com/yes/yes/utils/GlobalEventHandler.java b/src/main/java/com/yes/yes/utils/GlobalEventHandler.java
index 64dd5ea..6402774 100644
--- a/src/main/java/com/yes/yes/utils/GlobalEventHandler.java
+++ b/src/main/java/com/yes/yes/utils/GlobalEventHandler.java
@@ -14,7 +14,7 @@ public class GlobalEventHandler {
     }
 
     public static <T> void removeListener(String eventName, Object object, Consumer<T> function) {
-        handler.removeListener(eventName, object, function);
+        handler.removeListener(eventName, object);
     }
 
     public static void trigger(String eventName, Object parameter) {