Move SAWTOOL to TreeFarmHelper

3 files changed, 8 insertions, 75 deletions

diff --git a/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java b/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java
deleted file mode 100644
index 588f17c92a..0000000000
--- a/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package gtPlusPlus.core.slots;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
-
-public class SlotBuzzSaw extends Slot {
-
-    public SAWTOOL currentTool = SAWTOOL.NONE;
-
-    public SlotBuzzSaw(final IInventory inventory, final int slot, final int x, final int y) {
-        super(inventory, slot, x, y);
-    }
-
-    @Override
-    public boolean isItemValid(final ItemStack itemstack) {
-        boolean isValid = false;
-
-        if (itemstack != null) {
-            if ((itemstack.getItem() instanceof GT_MetaGenerated_Item_02)
-                    || (itemstack.getItem() instanceof GT_MetaGenerated_Tool)) {
-                // Buzzsaw Blade //TODO
-                /*
-                 * if (OrePrefixes.toolHeadBuzzSaw.contains(itemstack)){ isValid = false; }
-                 */
-                if (OrePrefixes.craftingTool.contains(itemstack)) {
-                    if (itemstack.getDisplayName().toLowerCase().contains("saw")
-                            || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.10")
-                            || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.110")
-                            || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.112")
-                            || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.114")
-                            || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.140")) {
-                        if (itemstack.getItemDamage() == 10) {
-                            isValid = true;
-                            this.currentTool = SAWTOOL.SAW;
-                        } else if (itemstack.getItemDamage() == 110) {
-                            isValid = true;
-                            this.currentTool = SAWTOOL.CHAINSAW;
-                        } else if (itemstack.getItemDamage() == 112) {
-                            isValid = true;
-                            this.currentTool = SAWTOOL.CHAINSAW;
-                        } else if (itemstack.getItemDamage() == 114) {
-                            isValid = true;
-                            this.currentTool = SAWTOOL.CHAINSAW;
-                        } else if (itemstack.getItemDamage() == 140) {
-                            isValid = true;
-                            this.currentTool = SAWTOOL.BUZZSAW;
-                        }
-                        return isValid;
-                    }
-                }
-            }
-        }
-        this.currentTool = SAWTOOL.NONE;
-        return isValid;
-    }
-
-    @Override
-    public int getSlotStackLimit() {
-        return 1;
-    }
-
-    public enum SAWTOOL {
-        NONE,
-        SAW,
-        BUZZSAW,
-        CHAINSAW
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 6ed8c7ed0a..a8b3ea15ea 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.common.helpers;
 import net.minecraft.item.ItemStack;
 
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL;
 
 public class TreeFarmHelper {
 
@@ -29,4 +28,11 @@ public class TreeFarmHelper {
         return SAWTOOL.NONE;
     }
 
+    public enum SAWTOOL {
+        NONE,
+        SAW,
+        BUZZSAW,
+        CHAINSAW
+    }
+
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index fb4a210d84..fbc6b638d3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -65,7 +65,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -73,6 +72,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper;
+import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper.SAWTOOL;
 
 public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntityTreeFarm>
         implements ISurvivalConstructable {