Merge remote-tracking branch 'origin/unstable' into

CircuitChemistryUpdateFollowup

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java

1 files changed, 2 insertions, 9 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 5569cab715..142d3d73eb 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
@@ -3,9 +3,8 @@ package gregtech.common.tools;
 import gregtech.api.GregTech_API;

 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_Scoop;

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.entity.EntityLivingBase;

@@ -92,13 +91,7 @@ public class GT_Tool_Scoop
     }

 

     public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        try {

-            Object tObject = GT_Utility.callConstructor("gregtech.common.items.behaviors.Behaviour_Scoop", 0, null, false, new Object[]{Integer.valueOf(200)});

-            if ((tObject instanceof IItemBehaviour)) {

-                aItem.addItemBehavior(aID, (IItemBehaviour) tObject);

-            }

-        } catch (Throwable e) {

-        }

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

     }

 

     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {