x4 speed factor for battery charger

2 files changed, 22 insertions, 19 deletions

diff --git a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java b/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java
index e0a6c77f19..eeb6d0e4a3 100644
--- a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java
+++ b/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java
@@ -89,30 +89,31 @@ public class DetravPortableChargerContainer extends Container {
 
         //GT_ModHandler.ch
 
+        for(int forTry = 0; forTry<4;forTry++){
+            Long[] selfStats = DetravMetaGeneratedTool01.INSTANCE.getElectricStats(mItem);
+            if (selfStats == null) return;
 
-        Long[] selfStats = DetravMetaGeneratedTool01.INSTANCE.getElectricStats(mItem);
-        if(selfStats == null) return;
+            long selfCharge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(mItem);
+            if (selfCharge <= 0) return;
 
-        long selfCharge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(mItem);
-        if(selfCharge <=0) return;
+            long loss = DetravMetaGeneratedTool01.INSTANCE.getElectricStatsLoss(mItem);
+            if (loss < 0) return;
 
-        long loss = DetravMetaGeneratedTool01.INSTANCE.getElectricStatsLoss(mItem);
-        if(loss<0) return;
+            long energyToTransfer = (selfStats[1] - loss) * aTimer;
 
-        long energyToTransfer = (selfStats[1] - loss)*aTimer ;
+            int removeEnergy = GT_ModHandler.chargeElectricItem(item, (int) energyToTransfer, Integer.MAX_VALUE, false, false);
+            if (removeEnergy == 0) return;
+            GT_ModHandler.dischargeElectricItem(mItem, (int) (removeEnergy + loss * aTimer), Integer.MAX_VALUE, false, false, true);
 
-        int removeEnergy = GT_ModHandler.chargeElectricItem(item, (int) energyToTransfer, Integer.MAX_VALUE, false, false);
-        if(removeEnergy==0) return;
-        GT_ModHandler.dischargeElectricItem(mItem,(int)(removeEnergy+loss*aTimer),Integer.MAX_VALUE,false,false,true);
+            if (aWorld.isRemote) return;
+            if (aPlayer instanceof EntityPlayerMP) {
+                DetravPortableChargerPacket01 packet = new DetravPortableChargerPacket01();
+                packet.charge = selfCharge - removeEnergy + loss * aTimer;
+                DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer);
 
-        if(aWorld.isRemote) return;
-        if(aPlayer instanceof EntityPlayerMP) {
-            DetravPortableChargerPacket01 packet = new DetravPortableChargerPacket01();
-            packet.charge = selfCharge - removeEnergy + loss * aTimer;
-            DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP)aPlayer);
-
-            //crafters
-        }
+                //crafters
+            }
+        };
         //long max = DetravMetaGeneratedTool01.getToolMaxDamage(mItem);
         //double p = ((double)selfCharge)/((double)selfStats[0]);
         //DetravMetaGeneratedTool01.setToolDamage(mItem,(long) (max * p) + 200);
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index a9af20e6b5..6584b9fbd8 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -82,7 +82,9 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
                 case 107:
                     aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Loss/Tick EU: " + EnumChatFormatting.GREEN + getElectricStatsLoss(aStack) + EnumChatFormatting.GRAY);
                     aList.add(tOffset + 1, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
-                    aList.add(tOffset + 2, "Right click to open GUI");
+                    aList.add(tOffset + 2, "Can use as normal battery");
+                    aList.add(tOffset + 3, "x4 charge speed for tools");
+                    aList.add(tOffset + 4, "Right click to open GUI");
                     break;
             }
         }