+ Added smartplunger 16 and 64

8 files changed, 69 insertions, 14 deletions

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index 8f87e8a140..15cdfb61d4 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -22,7 +22,7 @@ import net.minecraftforge.common.config.Configuration;
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "0.32";
+    public static final String VERSION = "0.33";
 
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
 
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index f058afcdcd..92ae1142e5 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -30,7 +30,9 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
         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, "Portable Anvil", "", new DetravToolPortableAnvil(), new Object[] {DetravToolDictNames.craftingToolPortableAnvil}, new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM,10));
-        addTool(4, "Smart plunger", "", 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(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(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));
@@ -76,6 +78,8 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
                     count = ((int)(getLevel(aStack,8)*100)); if(count > 0) {aList.add(tOffset, "Bonus 8 level: +" + count + "%");tOffset++;}
                     break;
                 case 4:
+                case 6:
+                case 8:
                     aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
                     aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl " + getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY);
                     aList.add(tOffset + 2, "It can suck in fluid");
@@ -188,8 +192,8 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
     {
         for(int i=0;i<9;i++)
         {
-            detravLevel.hasKey("level"+Integer.toString(i));
-            return false;
+            if(detravLevel.hasKey("level"+Integer.toString(i)))
+              return false;
         }
         return true;
     }
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java
index 8278b1e569..0e7331ad6b 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java
@@ -23,9 +23,11 @@ import net.minecraftforge.fluids.IFluidHandler;
 public class BehaviourDetravToolSmartPlunger extends Behaviour_None {
 
     protected final int mCosts;
+    protected final int mFluidSpace;
 
-    public BehaviourDetravToolSmartPlunger(int aCosts) {
+    public BehaviourDetravToolSmartPlunger(int aCosts,int fluidSpace) {
         mCosts = aCosts;
+        mFluidSpace = fluidSpace;
     }
 
     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) {
@@ -58,9 +60,9 @@ public class BehaviourDetravToolSmartPlunger extends Behaviour_None {
             TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
             if ((aTileEntity instanceof IFluidHandler)) {
                 for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) {
-                    if (((IFluidHandler) aTileEntity).drain(tDirection, 1000, false) != null) {
+                    if (((IFluidHandler) aTileEntity).drain(tDirection, mFluidSpace, false) != null) {
                         if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
-                            fs = ((IFluidHandler) aTileEntity).drain(tDirection, 1000, true);
+                            fs = ((IFluidHandler) aTileEntity).drain(tDirection, mFluidSpace, true);
                             GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);
                             DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack,fs);
                             return true;
@@ -75,8 +77,8 @@ public class BehaviourDetravToolSmartPlunger extends Behaviour_None {
                     GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity;
                     if (machine.mFluid != null && machine.mFluid.amount > 0) {
                         fs = machine.mFluid.copy();
-                        if (fs.amount > 1000) fs.amount = 1000;
-                        machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000);
+                        if (fs.amount > mFluidSpace) fs.amount = mFluidSpace;
+                        machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, mFluidSpace);
                         DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack,fs);
                     }
                     return true;
diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java b/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java
index e9f76590d6..c866f95ea0 100644
--- a/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java
+++ b/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java
@@ -20,14 +20,29 @@ public class ProcessingDetravSmartPlunger implements IOreRecipeRegistrator {
 
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
         if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
-            if (aMaterial != Materials.Rubber)
+            if (aMaterial != Materials.Rubber) {
                 GT_ModHandler.addCraftingRecipe(
-                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4,1,aMaterial,aMaterial,null),
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, aMaterial, aMaterial, null),
                         GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
                         new Object[]{"xRR", " CR", "S f",
                                 Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
                                 Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
                                 Character.valueOf('C'), Ic2Items.cell});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Steel.get(1)});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_TungstenSteel.get(1)});
+            }
         }
     }
 }
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java
index a157ad5460..7cde3efad2 100644
--- a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java
@@ -27,7 +27,7 @@ public class DetravToolSmartPlunger
     }
 
     public float getMaxDurabilityMultiplier() {
-        return 0.25F;
+        return 0.50F;
     }
 
     public String getCraftingSound() {
@@ -60,7 +60,7 @@ public class DetravToolSmartPlunger
     }
 
     public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion()));
+        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(),1000));
     }
 
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java
new file mode 100644
index 0000000000..28b08cb226
--- /dev/null
+++ b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java
@@ -0,0 +1,17 @@
+package com.detrav.items.tools;
+
+import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
+/**
+ * Created by Detrav on 16.12.2016.
+ */
+public class DetravToolSmartPlunger16 extends DetravToolSmartPlunger {
+    public float getMaxDurabilityMultiplier() {
+        return 1F;
+    }
+
+    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(),16000));
+    }
+}
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java
new file mode 100644
index 0000000000..0e13efa837
--- /dev/null
+++ b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java
@@ -0,0 +1,17 @@
+package com.detrav.items.tools;
+
+import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
+/**
+ * Created by Detrav on 16.12.2016.
+ */
+public class DetravToolSmartPlunger64 extends DetravToolSmartPlunger {
+    public float getMaxDurabilityMultiplier() {
+        return 2F;
+    }
+
+    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(), 64000));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/utils/PortableAnvilInventory.java b/src/main/java/com/detrav/utils/PortableAnvilInventory.java
index 05502b090e..8843c26e89 100644
--- a/src/main/java/com/detrav/utils/PortableAnvilInventory.java
+++ b/src/main/java/com/detrav/utils/PortableAnvilInventory.java
@@ -53,7 +53,7 @@ public class PortableAnvilInventory extends InventoryBasic {
                                 repair = Math.min(repair,damage);
                                 damage -= repair;
 
-                                float delta = ((float)repair) / ((float)maxDamage) / ((float)level);
+                                float delta = ((float)repair) / ((float)maxDamage) / ((float)level) * 2.7f;
                                 flevel += delta;
                                 DetravMetaGeneratedTool01.INSTANCE.setLevelToItemStack(meStack,mat.mToolQuality,flevel);