From cd1da8175a25dfe3fd3a789fd97a9ba44ebe2151 Mon Sep 17 00:00:00 2001
From: Buuz135 <buuz135@hotmail.com>
Date: Thu, 5 May 2022 20:08:43 +0200
Subject: [PATCH] Fixed Controller adding air to its controllable and updating
 constantly, closes #32

---
 build.gradle                                                   | 2 +-
 .../functionalstorage/block/tile/DrawerControllerTile.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a178df7..17c98f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,7 +95,7 @@ dependencies {
     implementation fg.deobf (project.dependencies.create('com.hrznstudio:titanium:1.18.2-3.5.0-32'))
     compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143:api")
     runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143")
-    //runtimeOnly fg.deobf("curse.maven:refined-storage-243076:3569563")
+    runtimeOnly fg.deobf("curse.maven:refined-storage-243076:3712882")
     implementation fg.deobf("curse.maven:the-one-probe-245211:3671753")
     //implementation fg.deobf("curse.maven:allthecompressed-514045:3723881")
     //runtimeOnly fg.deobf("curse.maven:create-328085:3600402")
diff --git a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java
index b756ed4..a16f0cb 100644
--- a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java
+++ b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java
@@ -63,6 +63,7 @@ public class DrawerControllerTile extends ControllableDrawerTile<DrawerControlle
     public void serverTick(Level level, BlockPos pos, BlockState state, DrawerControllerTile blockEntity) {
         super.serverTick(level, pos, state, blockEntity);
         if (this.connectedDrawers.getConnectedDrawers().size() != this.connectedDrawers.getHandlers().size()) {
+            this.connectedDrawers.getConnectedDrawers().removeIf(aLong -> !(this.getLevel().getBlockEntity(BlockPos.of(aLong)) instanceof ControllableDrawerTile<?>));
             this.connectedDrawers.setLevel(getLevel());
             this.connectedDrawers.rebuild();
             markForUpdate();
@@ -147,7 +148,7 @@ public class DrawerControllerTile extends ControllableDrawerTile<DrawerControlle
     public void addConnectedDrawers(LinkingToolItem.ActionMode action, BlockPos... positions) {
         for (BlockPos position : positions) {
             if (level.getBlockState(position).is(FunctionalStorage.DRAWER_CONTROLLER.getLeft().get())) continue;
-            if (this.getBlockPos().closerThan(position, FunctionalStorageConfig.DRAWER_CONTROLLER_LINKING_RANGE)) {
+            if (this.getBlockPos().closerThan(position, FunctionalStorageConfig.DRAWER_CONTROLLER_LINKING_RANGE) && this.getLevel().getBlockEntity(position) instanceof ControllableDrawerTile<?>) {
                 if (action == LinkingToolItem.ActionMode.ADD) {
                     if (!connectedDrawers.getConnectedDrawers().contains(position.asLong()))
                         this.connectedDrawers.getConnectedDrawers().add(position.asLong());