From 27259e04d4d1ea1600fa325507ff3e7a4669bdcc Mon Sep 17 00:00:00 2001
From: Buuz135 <buuz135@hotmail.com>
Date: Mon, 6 Jun 2022 15:46:08 +0200
Subject: [PATCH] Fixed Wooden Drawers not being able to be configured when
 locked, closes #42

---
 .gitignore                                          |  1 +
 build.gradle                                        |  8 +++++---
 .../block/tile/CompactingDrawerTile.java            |  3 +--
 .../functionalstorage/block/tile/DrawerTile.java    | 13 +++++++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b3afc6..97ab8fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ eclipse
 run
 classes
 
+/includedMods/
diff --git a/build.gradle b/build.gradle
index 08663cd..021953b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,15 +91,17 @@ repositories {
 
 dependencies {
 
-    minecraft 'net.minecraftforge:forge:1.18.2-40.1.0'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.18'
     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")
+    compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.180:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.180")
     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")
     //runtimeOnly fg.deobf("curse.maven:flywheel-486392:3600401")
+    runtimeOnly fg.deobf("curse.maven:mekanism-268560:3810540")
+    runtimeOnly fg.deobf("curse.maven:refined-pipes-370696:3816785")
     annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
 }
 
diff --git a/src/main/java/com/buuz135/functionalstorage/block/tile/CompactingDrawerTile.java b/src/main/java/com/buuz135/functionalstorage/block/tile/CompactingDrawerTile.java
index e2ee0f4..6e08486 100644
--- a/src/main/java/com/buuz135/functionalstorage/block/tile/CompactingDrawerTile.java
+++ b/src/main/java/com/buuz135/functionalstorage/block/tile/CompactingDrawerTile.java
@@ -87,8 +87,7 @@ public class CompactingDrawerTile extends ControllableDrawerTile<CompactingDrawe
                 }
             }
         }
-        super.onSlotActivated(playerIn, hand, facing, hitX, hitY, hitZ, slot);
-        return InteractionResult.SUCCESS;
+        return super.onSlotActivated(playerIn, hand, facing, hitX, hitY, hitZ, slot);
     }
 
     @Override
diff --git a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerTile.java b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerTile.java
index f5bc834..fe21367 100644
--- a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerTile.java
+++ b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerTile.java
@@ -2,6 +2,7 @@ package com.buuz135.functionalstorage.block.tile;
 
 import com.buuz135.functionalstorage.FunctionalStorage;
 import com.buuz135.functionalstorage.inventory.BigInventoryHandler;
+import com.buuz135.functionalstorage.util.CompactingUtil;
 import com.hrznstudio.titanium.annotation.Save;
 import com.hrznstudio.titanium.block.BasicTileBlock;
 import com.hrznstudio.titanium.block.tile.ActiveTile;
@@ -81,6 +82,18 @@ public class DrawerTile extends ControllableDrawerTile<DrawerTile> {
         return super.getCapability(cap, side);
     }
 
+    public InteractionResult onSlotActivated(Player playerIn, InteractionHand hand, Direction facing, double hitX, double hitY, double hitZ, int slot) {
+        ItemStack stack = playerIn.getItemInHand(hand);
+        if (stack.getItem().equals(FunctionalStorage.CONFIGURATION_TOOL.get()) || stack.getItem().equals(FunctionalStorage.LINKING_TOOL.get())) return InteractionResult.PASS;
+        if (slot != -1 && isLocked() && !playerIn.getItemInHand(hand).isEmpty()){
+            BigInventoryHandler.BigStack bigStack = getHandler().getStoredStacks().get(slot);
+            if (bigStack.getStack().isEmpty()){
+                bigStack.setStack(playerIn.getItemInHand(hand));
+            }
+        }
+        return super.onSlotActivated(playerIn, hand, facing, hitX, hitY, hitZ, slot);
+    }
+
     @NotNull
     @Override
     public DrawerTile getSelf() {