Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
index 92f9d497c6..09f3298ee8 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
@@ -1,11 +1,12 @@
 package gregtech.common.tools;

 

+import cpw.mods.fml.common.Loader;

 import gregtech.api.GregTech_API;

+import gregtech.api.enums.GT_Values;

 import gregtech.api.enums.Textures;

 import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.interfaces.IItemBehaviour;

 import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.util.GT_Utility;

+import gregtech.common.items.behaviors.Behaviour_None;

 import gregtech.common.items.behaviors.Behaviour_Scoop;

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

@@ -93,7 +94,12 @@ public class GT_Tool_Scoop
     }

 

     public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Scoop(200));

+        if(Loader.isModLoaded(GT_Values.MOD_ID_FR)){

+            aItem.addItemBehavior(aID, new Behaviour_Scoop(200));

+        }else{

+            aItem.addItemBehavior(aID, new Behaviour_None());

+        }

+

     }

 

     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {