From 5b6382e4eaca5febe91acaf510199f0d9ac94818 Mon Sep 17 00:00:00 2001
From: Danielshe <shekwancheung0528@gmail.com>
Date: Sun, 22 Sep 2019 23:46:02 +0800
Subject: Fix Vanilla Tab Container

---
 src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java |  5 +++++
 src/main/java/me/shedaniel/rei/api/ConfigObject.java       |  2 ++
 src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java  | 12 ++++++++++++
 3 files changed, 19 insertions(+)

(limited to 'src/main/java/me')

diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 768c97dbd..40b56a5b8 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -282,6 +282,11 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
             if (screen instanceof AbstractContainerScreen)
                 if (ScreenHelper.getLastOverlay().keyPressed(i, i1, i2))
                     return ActionResult.SUCCESS;
+            if (screen instanceof AbstractContainerScreen && configManager.getConfig().doesDisableRecipeBook() && configManager.getConfig().doesFixTabCloseContainer())
+                if (i == 258 && minecraftClient.options.keyInventory.matchesKey(i, i1)) {
+                    minecraftClient.player.closeContainer();
+                    return ActionResult.SUCCESS;
+                }
             return ActionResult.PASS;
         });
     }
diff --git a/src/main/java/me/shedaniel/rei/api/ConfigObject.java b/src/main/java/me/shedaniel/rei/api/ConfigObject.java
index f529d4581..c037b612c 100644
--- a/src/main/java/me/shedaniel/rei/api/ConfigObject.java
+++ b/src/main/java/me/shedaniel/rei/api/ConfigObject.java
@@ -58,6 +58,8 @@ public interface ConfigObject {
     
     boolean doesDisableRecipeBook();
     
+    boolean doesFixTabCloseContainer();
+    
     boolean areClickableRecipeArrowsEnabled();
     
     ItemCheatingMode getItemCheatingMode();
diff --git a/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java b/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java
index 910d1aeb5..12521e09e 100644
--- a/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java
@@ -130,6 +130,13 @@ public class ConfigObjectImpl implements ConfigObject {
             .withName("disableRecipeBook")
             .build();
     
+    private ConfigValue<Boolean> fixTabCloseContainer = ConfigValue.builder(Boolean.class)
+            .withParent(modules)
+            .withDefaultValue(false)
+            .withComment("Declares whether REI should fix closing container with tab.")
+            .withName("fixTabCloseContainer")
+            .build();
+    
     private ConfigValue<Boolean> clickableRecipeArrows = ConfigValue.builder(Boolean.class)
             .withParent(appearance)
             .withDefaultValue(true)
@@ -296,6 +303,11 @@ public class ConfigObjectImpl implements ConfigObject {
         return disableRecipeBook.getValue().booleanValue();
     }
     
+    @Override
+    public boolean doesFixTabCloseContainer() {
+        return fixTabCloseContainer.getValue().booleanValue();
+    }
+    
     @Override
     public boolean areClickableRecipeArrowsEnabled() {
         return clickableRecipeArrows.getValue().booleanValue();
-- 
cgit