aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorDetrav <witalyezep@gmail.com>2016-04-08 00:51:27 +0300
committerDetrav <witalyezep@gmail.com>2016-04-08 00:51:27 +0300
commit8dbae8da3d0926eec0ef357c509548991b985060 (patch)
tree9905c36e3f321132f82ddd0a0bddbce8bc8acaf5 /src/main/java
parentdf7429e2f621a50a837ff65bcdbbe9578d5e6be1 (diff)
downloadGT5-Unofficial-8dbae8da3d0926eec0ef357c509548991b985060.tar.gz
GT5-Unofficial-8dbae8da3d0926eec0ef357c509548991b985060.tar.bz2
GT5-Unofficial-8dbae8da3d0926eec0ef357c509548991b985060.zip
Fixes durability now ^_^ drugged
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java3
-rw-r--r--src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java6
-rw-r--r--src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java10
3 files changed, 10 insertions, 9 deletions
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index 77dd08efed..857f6653f9 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -73,7 +73,8 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
break;
case 106:
case 107:
- aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Loss energy: " + EnumChatFormatting.GREEN + getElectricStatsLoss(aStack) + EnumChatFormatting.GRAY);
+ aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Loss/Tick EU: " + EnumChatFormatting.GREEN + getElectricStatsLoss(aStack) + EnumChatFormatting.GRAY);
+ aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
aList.add(tOffset + 1, "Right click to open GUI");
break;
}
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java
index c9e83a107d..08aa16a79c 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java
@@ -41,9 +41,9 @@ public class BehaviourDetravPortableCharger extends Behaviour_None {
long selfCharge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(aStack);
if(selfCharge <0) return;
//update info
- long max = DetravMetaGeneratedTool01.getToolMaxDamage(aStack);
- double p = ((double)selfCharge)/((double)selfStats[0]);
- DetravMetaGeneratedTool01.setToolDamage(aStack,(long) (max * p) + 200);
+ //long max = DetravMetaGeneratedTool01.getToolMaxDamage(aStack);
+ //double p = ((double)selfCharge)/((double)selfStats[0]);
+ //DetravMetaGeneratedTool01.setToolDamage(aStack,(long) (max * p) + 200);
}
}
}
diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java b/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java
index 36635439fb..0687b75bd6 100644
--- a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java
@@ -35,15 +35,15 @@ public class DetravToolPortableCharger implements IToolStats {
}
public int getToolDamagePerDropConversion() {
- return 100;
+ return 1000;
}
public int getToolDamagePerContainerCraft() {
- return 100;
+ return 1000;
}
public int getToolDamagePerEntityAttack() {
- return 200;
+ return 1000;
}
public int getBaseQuality() {
@@ -51,7 +51,7 @@ public class DetravToolPortableCharger implements IToolStats {
}
public float getBaseDamage() {
- return 1.0F;
+ return 2.5F;
}
@Override
@@ -123,7 +123,7 @@ public class DetravToolPortableCharger implements IToolStats {
@Override
public boolean isWeapon() {
- return false;
+ return true;
}
@Override