fixes and additions

- fixed empty message of propick
- fixed low hp after login
+ Added smart tree tap

9 files changed, 136 insertions, 6 deletions

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index 58cfc88328..8835012e66 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -23,7 +23,7 @@ import net.minecraftforge.common.config.Configuration;
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "0.35";
+    public static final String VERSION = "0.40";
 
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
 
diff --git a/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java
index 90060b410b..f72388379d 100644
--- a/src/main/java/com/detrav/enums/DetravToolDictNames.java
+++ b/src/main/java/com/detrav/enums/DetravToolDictNames.java
@@ -8,5 +8,6 @@ public enum  DetravToolDictNames {
     craftingToolElectricProPick,
     craftingToolPortableCharger,
     craftingToolPortableAnvil,
-    craftingToolSmartPlunger;
+    craftingToolSmartPlunger,
+    craftingToolSmartTreeTap;
 }
diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java
index 6f230d8799..244c083309 100644
--- a/src/main/java/com/detrav/enums/Textures01.java
+++ b/src/main/java/com/detrav/enums/Textures01.java
@@ -19,6 +19,7 @@ public class Textures01 {
                     new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD"),
                     new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER"),
                     new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PORTABE_CHARGER_BORDER"),
-                    new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ANVIL_TOOL")
+                    new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ANVIL_TOOL"),
+                    new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/TOOL_TREE_TAP")
             };
 }
\ No newline at end of file
diff --git a/src/main/java/com/detrav/events/DetravLevelUpEvent.java b/src/main/java/com/detrav/events/DetravLevelUpEvent.java
index cb47220c6e..6dbcf4bfca 100644
--- a/src/main/java/com/detrav/events/DetravLevelUpEvent.java
+++ b/src/main/java/com/detrav/events/DetravLevelUpEvent.java
@@ -24,8 +24,8 @@ public class DetravLevelUpEvent {
         EntityPlayer player = ev.entityPlayer;
         if (player != null) {
             if (!player.getEntityWorld().isRemote) {
-                if ((player.experience + ev.orb.xpValue) >= player.xpBarCap()) {
-                    UpdateHealthAttribute(player);
+                if ((player.experience + ev.orb.xpValue*2) >= player.xpBarCap()) {
+                    UpdateHealthAttribute(player,1);
                 }
             }
         }
@@ -33,14 +33,20 @@ public class DetravLevelUpEvent {
 
     public static void UpdateHealthAttribute(EntityPlayer player)
     {
+        UpdateHealthAttribute(player,0);
+    }
+
+    public static void UpdateHealthAttribute(EntityPlayer player,int bonus)
+    {
         if (!player.getEntityWorld().isRemote) {
-            AttributeModifier mod = GetAttributeModifier(player.experienceLevel);
+            AttributeModifier mod = GetAttributeModifier(player.experienceLevel+bonus);
             player.getEntityAttribute(
                     SharedMonsterAttributes.maxHealth
             ).removeModifier(mod);
             player.getEntityAttribute(
                     SharedMonsterAttributes.maxHealth
             ).applyModifier(mod);
+            player.heal(player.getMaxHealth());
         }
     }
 
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index 92ae1142e5..7ffd561169 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -33,6 +33,7 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
         addTool(4, "Smart plunger 1 bucket", "", new DetravToolSmartPlunger(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
         addTool(6, "Smart plunger 16 buckets", "", new DetravToolSmartPlunger16(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
         addTool(8, "Smart plunger 64 buckets", "", new DetravToolSmartPlunger64(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+        addTool(10, "Smart Tree Tap","Changes resin tap",new DetravToolSmartTreeTap(),new Object[] {DetravToolDictNames.craftingToolSmartTreeTap}, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 5L) );
         addTool(100, "Electric Prospector's Scanner (LV)", "", new DetravToolLVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L));
         addTool(102, "Electric Prospector's Scanner (MV)", "", new DetravToolMVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L));
         addTool(104, "Electric Prospector's Scanner (HV)", "", new DetravToolHVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L));
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index 56b2ee18ee..6b5fa11e57 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -181,6 +181,10 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
             addChatMassageByValue(aPlayer,total,"Total");
             if (!aPlayer.capabilities.isCreativeMode)
                 aItem.doDamage(aStack, this.mCosts);
+            if(total==0)
+            {
+                addChatMassageByValue(aPlayer,0,null);
+            }
             return;
         }
         addChatMassageByValue(aPlayer,0,null);
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java
new file mode 100644
index 0000000000..a49b5b28de
--- /dev/null
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java
@@ -0,0 +1,47 @@
+package com.detrav.items.behaviours;
+
+import com.detrav.items.DetravMetaGeneratedTool01;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.common.items.behaviors.Behaviour_None;
+import ic2.core.block.BlockRubWood;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+/**
+ * Created by Detrav on 01.04.2017.
+ */
+public class BehaviourDetravToolTreeTap extends Behaviour_None {
+
+    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+        if (aWorld.isRemote) {
+            return false;
+        }
+        Block b = aWorld.getBlock(aX,aY,aZ);
+        if(b instanceof BlockRubWood)
+        {
+            int startPos = aY;
+            for(int i = aY; i> aY-10 && i> 1 && aWorld.getBlock(aX,i,aZ) instanceof  BlockRubWood; i--)
+                startPos = i;
+
+            for(int i = startPos; i< aY + 10; i++)
+            {
+                if(!(aWorld.getBlock(aX,i,aZ) instanceof  BlockRubWood))
+                    break;
+                if(i == aY)
+                {
+                    aWorld.setBlockMetadataWithNotify(aX,i,aZ,aSide,2);
+                }
+                else
+                {
+                    aWorld.setBlockMetadataWithNotify(aX,i,aZ,1,2);
+                }
+            }
+
+            ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, 100);
+            return  true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java b/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java
new file mode 100644
index 0000000000..911dc87061
--- /dev/null
+++ b/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java
@@ -0,0 +1,63 @@
+package com.detrav.items.tools;
+
+import com.detrav.enums.Textures01;
+import com.detrav.items.behaviours.BehaviourDetravToolTreeTap;
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.tools.GT_Tool;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+/**
+ * Created by Detrav on 01.04.2017.
+ */
+public class DetravToolSmartTreeTap extends GT_Tool {
+    public float getBaseDamage() {
+        return 1.25F;
+    }
+
+    public float getMaxDurabilityMultiplier() {
+        return 0.5F;
+    }
+
+    public String getCraftingSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+    }
+
+    public String getEntityHitSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+    }
+
+    public String getBreakingSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
+    }
+
+    public String getMiningSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+    }
+
+    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
+        return false;
+    }
+
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? Textures01.mTextures[7] : null;
+    }
+
+    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+    }
+
+    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourDetravToolTreeTap());
+    }
+
+    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
+        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was sucked through a hole while fighting " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index 3fef4e1e78..32dfc87801 100644
--- a/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
@@ -19,6 +19,8 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
+import ic2.api.item.IC2Items;
+import ic2.core.Ic2Items;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -60,6 +62,11 @@ public class CommonProxy implements IGuiHandler {
 
         GT_ModHandler.addShapelessCraftingRecipe(DetravItemList.DetravAdvancedMiner2.get(1L, new Object[0]),new Object[]{ItemList.AdvancedMiner2});
 
+        //Treetap recipes
+
+        GT_ModHandler.addShapelessCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(10,1, Materials.Wood,Materials.Wood, null ),
+                new Object[]{Ic2Items.treetap,Ic2Items.rubberWood,Ic2Items.resin});
+
         //DetravCraftingEventHandler.register();
         DetravEntityDropEvent.register();
         DetravLevelUpEvent.register();