WTF!!!

5 files changed, 23 insertions, 229 deletions

diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index cb0676a363..fb41a24a93 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -27,7 +27,6 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
         super("detrav.metatool.01");
         INSTANCE = this;
         addTool(0, "Prospector's Pick", "", new DetravToolProPick(), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)});
-        addTool(2, "Repair tools", "", new DetravRepairTool(), new Object[]{DetravToolDictNames.craftingRepairTool, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L)});
         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));
@@ -60,13 +59,6 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
                     aList.add(tOffset + 7, "Large: 60-99");
                     aList.add(tOffset + 8, "Very large: 100-***");
                     break;
-                case 2:
-                    aList.add(tOffset + 0, EnumChatFormatting.GRAY + "Can repair some tools");
-                    aList.add(tOffset + 1, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
-                    aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Efficiency 90%" + EnumChatFormatting.GRAY);
-                    aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Cost 1k per operation" + EnumChatFormatting.GRAY);
-                    aList.add(tOffset + 4, "Right click to open GUI");
-                    break;
                 case 100:
                 case 101:
                 case 102:
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java
deleted file mode 100644
index ab23490fa3..0000000000
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.detrav.items.behaviours;
-
-import com.detrav.DetravScannerMod;
-import com.detrav.items.DetravMetaGeneratedTool01;
-import gregtech.api.enums.SubTag;
-import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.common.items.behaviors.Behaviour_None;
-import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import java.util.List;
-
-/**
- * Created by wital_000 on 08.04.2016.
- */
-public class BehaviourDetravRepairTool extends Behaviour_None {
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-        if(DetravMetaGeneratedTool01.getToolDamage(aStack)< DetravMetaGeneratedTool01.INSTANCE.getToolMaxDamage(aStack)-1) {
-            DetravScannerMod.proxy.openRepairToolGui(aPlayer);
-        } else DetravMetaGeneratedTool01.INSTANCE.doDamage(aStack,1000);
-
-        return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
-        //aPlayer.openContainer
-    }
-}
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index d14323139f..1fe38299b8 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -35,12 +35,20 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
             long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack);
             //Проверяем если нажат шифт
             if (aPlayer.isSneaking()) {
-                if (data == 0) {
-                    aPlayer.addChatMessage(new ChatComponentText("Set Mode: Oil, Any Block"));
-                    DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 1);
-                } else {
-                    aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore, Any Rock Block"));
-                    DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 0);
+                switch ((int)data)
+                {
+                    case 0:
+                        aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore (with small), Any Rock Block"));
+                        DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 1);
+                        break;
+                    case 1:
+                        aPlayer.addChatMessage(new ChatComponentText("Set Mode: Oil, Any Block"));
+                        DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 2);
+                        break;
+                    default:
+                        aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore, Any Rock Block"));
+                        DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 0);
+                        break;
                 }
                 return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
             }
@@ -69,7 +77,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                     for (int z = 0; z < 16; z++) {
                         int ySize = c.getHeightValue(x, z);
                         for (int y = 1; y < ySize; y++) {
-                            if(data == 0) {
+                            if(data < 2) {
                                 Block b = c.getBlock(x, y, z);
                                 if (b == GregTech_API.sBlockOres1) {
                                     TileEntity entity = c.getTileEntityUnsafe(x, y, z);
@@ -77,7 +85,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                         GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) entity;
                                         String name = GT_LanguageManager.getTranslation(
                                                 b.getUnlocalizedName() + "." + gt_entity.getMetaData() + ".name");
-                                        if (name.startsWith("Small")) continue;
+                                        if (name.startsWith("Small")) if(data!=1) continue;
                                         packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, gt_entity.getMetaData());
                                     }
                                 }
@@ -110,7 +118,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
 
     public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
         long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack);
-        if (data == 0)
+        if (data < 2)
             return super.onItemUse(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
         if (!aWorld.isRemote) {
             FluidStack fStack = getUndergroundOil(aWorld,aX,aZ);
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index 9e7a97752a..f33d88555d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -79,6 +79,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                 return;
             }
         } else if (aRandom.nextInt(10) < 4) {
+            long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack);
             HashMap<String, Integer> ores = new HashMap<String, Integer>();
             for (int x = 0; x < 16; x++)
                 for (int z = 0; z < 16; z++) {
@@ -91,7 +92,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                                 GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) entity;
                                 String name = GT_LanguageManager.getTranslation(
                                         b.getUnlocalizedName() + "." + gt_entity.getMetaData() + ".name");
-                                if (name.startsWith("Small")) continue;
+                                if (name.startsWith("Small")) if(data!=1) continue;
                                 if (!ores.containsKey(name))
                                     ores.put(name, 1);
                                 else {
@@ -102,10 +103,13 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                         }
                     }
                 }
+            int total = 0;
             for (String key : ores.keySet()) {
                 int value = ores.get(key);
+                total+=value;
                addChatMassageByValue(aPlayer,value,key);
             }
+            addChatMassageByValue(aPlayer,total,"Total");
             if (!aPlayer.capabilities.isCreativeMode)
                 aItem.doDamage(aStack, this.mCosts);
             return;
@@ -114,6 +118,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
     }
 
     void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) {
+        if(name == "Total") return;
         if (value < 0) {
             aPlayer.addChatMessage(new ChatComponentText(foundTexts[6] + name));
         } else if (value < 1) {
diff --git a/src/main/java/com/detrav/items/tools/DetravRepairTool.java b/src/main/java/com/detrav/items/tools/DetravRepairTool.java
deleted file mode 100644
index 65868ce963..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravRepairTool.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravRepairTool;
-import gregtech.api.GregTech_API;
-import gregtech.api.damagesources.GT_DamageSources;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import net.minecraft.block.Block;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.AchievementList;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraftforge.event.world.BlockEvent;
-
-import java.util.List;
-
-/**
- * Created by wital_000 on 08.04.2016.
- */
-public class DetravRepairTool implements IToolStats {
-    public int getToolDamagePerBlockBreak() {
-        return 100;
-    }
-
-    public int getToolDamagePerDropConversion() {
-        return 100;
-    }
-
-    public int getToolDamagePerContainerCraft() {
-        return 100;
-    }
-
-    public int getToolDamagePerEntityAttack() {
-        return 100;
-    }
-
-    public int getBaseQuality() {
-        return 0;
-    }
-
-    public float getBaseDamage() {
-        return 1.0F;
-    }
-
-    @Override
-    public int getHurtResistanceTime(int i, Entity entity) {
-        return i;
-    }
-
-    public float getSpeedMultiplier() {
-        return 0.5F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 0.5F;
-    }
-
-    @Override
-    public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {
-        return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
-    }
-
-    public String getCraftingSound() {
-        return null;
-    }
-
-    public String getEntityHitSound() {
-        return null;
-    }
-
-    public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
-    }
-
-    @Override
-    public Enchantment[] getEnchantments(ItemStack itemStack) {
-        return new Enchantment[0];
-    }
-
-    @Override
-    public int[] getEnchantmentLevels(ItemStack itemStack) {
-        return new int[0];
-    }
-
-    public String getMiningSound() {
-        return null;
-    }
-
-    public boolean canBlock() {
-        return false;
-    }
-
-    public boolean isCrowbar() {
-        return false;
-    }
-
-    @Override
-    public boolean isGrafter() {
-        return false;
-    }
-
-    @Override
-    public boolean isChainsaw() {
-        return false;
-    }
-
-    @Override
-    public boolean isWrench() {
-        return false;
-    }
-
-    @Override
-    public boolean isWeapon() {
-        return false;
-    }
-
-    @Override
-    public boolean isRangedWeapon() {
-        return false;
-    }
-
-    @Override
-    public boolean isMiningTool() {
-        return false;
-    }
-
-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return false;
-    }
-
-    @Override
-    public int convertBlockDrops(List<ItemStack> list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) {
-        return 0;
-    }
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-
-    @Override
-    public float getNormalDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    @Override
-    public float getMagicDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return Textures01.mTextures[6];
-    }
-
-    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 BehaviourDetravRepairTool());
-    }
-
-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
-
-        aPlayer.triggerAchievement(AchievementList.openInventory);
-        aPlayer.triggerAchievement(AchievementList.mineWood);
-        aPlayer.triggerAchievement(AchievementList.buildWorkBench);
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got ProPicked by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-    }
-}