diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-17 12:03:45 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-17 12:03:45 +0200 |
| commit | 31d23320197750b0a10569c82e5fe1ed2993f7b2 (patch) | |
| tree | 30e919718e384effa32e91869d5e88b2c77772a5 | |
| parent | 084961c2f6986d91f1a78506570792d8b1456a63 (diff) | |
| download | GT5-Unofficial-31d23320197750b0a10569c82e5fe1ed2993f7b2.tar.gz GT5-Unofficial-31d23320197750b0a10569c82e5fe1ed2993f7b2.tar.bz2 GT5-Unofficial-31d23320197750b0a10569c82e5fe1ed2993f7b2.zip | |
Optimize wirefix code
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 28 |
1 files changed, 9 insertions, 19 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 4ad53a4ca4..2c141728a1 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 @@ -256,11 +256,6 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile int tickDiff = (int) (worldTick - lastWorldTick); lastWorldTick = worldTick; - //for(int i=0;i<16;i++) sendToPlayerAppend(lastAmperage[i]+" "); - //sendToPlayerAppend(tickDiff+" "); - //sendToPlayerAppend(mTransferredAmperage+" "); - //sendToPlayerAppend(mTransferredAmperageOK+" "); - if (tickDiff >= 16) for (int i = 0; i <= 14; i++) lastAmperage[i] = 0; else { System.arraycopy(lastAmperage, tickDiff, lastAmperage, 0, 16 - tickDiff); @@ -274,26 +269,21 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile if (lastAmperage[15] > mAmperage) { int i = 0; - for (; i < 15; i++) { - int diff = (int) mAmperage - lastAmperage[i]; - if (diff > 0) { - lastAmperage[15] -= diff; - lastAmperage[i] += diff; + for (; i <= 14; i++) { + if (lastAmperage[i] < mAmperage) { + lastAmperage[15] -= (int) mAmperage - lastAmperage[i]; + lastAmperage[i] = (int)mAmperage; if (lastAmperage[15] <= mAmperage) break; } } - if (lastAmperage[15] != mAmperage) { - lastAmperage[i] -= (int) mAmperage - lastAmperage[15]; + if (lastAmperage[15] > mAmperage) { + mOverheat += 100 * (lastAmperage[15] - mAmperage); + lastAmperage[15] = (int) mAmperage; + } else if (lastAmperage[15] < mAmperage) { + lastAmperage[i] = lastAmperage[15]; lastAmperage[15] = (int) mAmperage; } } - - //sendToPlayer(lastAmperage[15]); - - if (lastAmperage[15] > mAmperage) { - mOverheat += 100 * (lastAmperage[15] - mAmperage); - lastAmperage[15] -= mAmperage; - } } if(mOverheat>=mMaxOverheat) { |