aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-09-14 20:31:03 +0200
committerTechnus <daniel112092@gmail.com>2017-09-14 20:31:03 +0200
commit851eaac539e361b8fdb75ee5174c48bd29a8749a (patch)
tree89ff9484953ac7b5653bff783720264529d0a180 /src/main/java/gregtech/api
parent3b721447ae976b83c7283553d6aaa980ef133f86 (diff)
downloadGT5-Unofficial-851eaac539e361b8fdb75ee5174c48bd29a8749a.tar.gz
GT5-Unofficial-851eaac539e361b8fdb75ee5174c48bd29a8749a.tar.bz2
GT5-Unofficial-851eaac539e361b8fdb75ee5174c48bd29a8749a.zip
Optimize wire code
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index 388f56edbb..17cdaec07a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -257,7 +257,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
long worldTick = aBaseMetaTileEntity.getWorld().getTotalWorldTime();
int tickDiff = (int) (worldTick - lastWorldTick);
lastWorldTick = worldTick;
- int ampsAvr=lastAmperage[15]=mTransferredAmperage;
+ lastAmperage[15]=mTransferredAmperage;
+ int ampOverheat=mTransferredAmperage-((int)mAmperage<<4);
if (tickDiff >= 16) {
for (int i = 0; i <= 14; i++) lastAmperage[i]=0;
} else {
@@ -266,11 +267,15 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
if(tickDiff>0){
lastAmperage[i]=0;
}else{
- ampsAvr+=lastAmperage[i];
+ ampOverheat+=lastAmperage[i];
}
}
}
- if (ampsAvr > (mAmperage<<4)) mOverheat+=100*(ampsAvr-(mAmperage<<4));
+
+ if (ampOverheat > 0) {
+ mOverheat+=100*ampOverheat;
+ lastAmperage[15]-=ampOverheat;
+ }
}
if(mOverheat>=mMaxOverheat) {
@@ -279,9 +284,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
//}else{
aBaseMetaTileEntity.setToFire();
//}
- }else if (mOverheat>0){
- mOverheat--;
- }
+ }else if (mOverheat>0) mOverheat--;
mTransferredVoltageOK=mTransferredVoltage;
mTransferredVoltage=0;