From 9d2b2b9c47c786f8165380065fee4b8e4dede1ad Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Tue, 28 Mar 2017 17:16:33 +0200
Subject: [PATCH] fix drill, filter and bag being openable in the offhand slot
 Closes #714

---
 .../de/ellpeck/actuallyadditions/mod/items/ItemBag.java   | 8 ++------
 .../de/ellpeck/actuallyadditions/mod/items/ItemDrill.java | 2 +-
 .../ellpeck/actuallyadditions/mod/items/ItemFilter.java   | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java
index 59eb002a4..f064ff9aa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java
@@ -15,11 +15,7 @@ import de.ellpeck.actuallyadditions.mod.inventory.ContainerBag;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler.GuiTypes;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
 import de.ellpeck.actuallyadditions.mod.tile.FilterSettings;
-import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerCustom;
-import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
-import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.StackUtil;
-import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.util.*;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -191,7 +187,7 @@ public class ItemBag extends ItemBase{
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
-        if(!world.isRemote){
+        if(!world.isRemote && hand == EnumHand.MAIN_HAND){
             player.openGui(ActuallyAdditions.instance, (this.isVoid ? GuiTypes.VOID_BAG : GuiTypes.BAG).ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ);
         }
         return new ActionResult<ItemStack>(EnumActionResult.PASS, player.getHeldItem(hand));
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
index 8edbc5d9e..062eba97f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
@@ -160,7 +160,7 @@ public class ItemDrill extends ItemEnergy{
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
-        if(!world.isRemote && player.isSneaking()){
+        if(!world.isRemote && player.isSneaking() && hand == EnumHand.MAIN_HAND){
             player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.DRILL.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ);
         }
         return new ActionResult<ItemStack>(EnumActionResult.PASS, player.getHeldItem(hand));
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java
index 00b112154..35785ab9f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java
@@ -40,7 +40,7 @@ public class ItemFilter extends ItemBase{
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
-        if(!world.isRemote){
+        if(!world.isRemote && hand == EnumHand.MAIN_HAND){
             player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.FILTER.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ);
         }
         return new ActionResult<ItemStack>(EnumActionResult.PASS, player.getHeldItem(hand));