aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
diff options
context:
space:
mode:
authoraerospark <lukefay12@gmail.com>2015-06-22 19:06:38 -0400
committeraerospark <lukefay12@gmail.com>2015-06-22 19:06:38 -0400
commitb803f59de5a66fcb4ef53e117b912fbbc2841392 (patch)
tree45aed590c09043396293839276b90e738d3ff420 /main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
parentff871d6b8ae08704a6ad73f4b0103d458bc9b65d (diff)
parent55c596b008807a7cb4b58422efd07636425be1e2 (diff)
downloadGT5-Unofficial-b803f59de5a66fcb4ef53e117b912fbbc2841392.tar.gz
GT5-Unofficial-b803f59de5a66fcb4ef53e117b912fbbc2841392.tar.bz2
GT5-Unofficial-b803f59de5a66fcb4ef53e117b912fbbc2841392.zip
Merge pull request #1 from Blood-Asp/master
version 5.08.20
Diffstat (limited to 'main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java')
-rw-r--r--main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index c859f5345f..85104f4584 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -39,6 +39,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
public final Materials mMaterial;
public final long mCableLossPerMeter, mAmperage, mVoltage;
public final boolean mInsulated, mCanShock;
+ public long mRestRF;
public GT_MetaPipeEntity_Cable(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, long aCableLossPerMeter, long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) {
super(aID, aName, aNameRegional, 0);
@@ -143,6 +144,14 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
int rfOut = (int) (aVoltage * GregTech_API.mEUtoRF / 100);
if(((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, rfOut, true)==rfOut){
((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, rfOut, false); rUsedAmperes++;
+ }else if(((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, rfOut, true)>0){
+ if(mRestRF==0){
+ int RFtrans = ((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, (int) rfOut, false);rUsedAmperes++;
+ mRestRF = rfOut - RFtrans;
+ }else{
+ int RFtrans = ((IEnergyReceiver)tTileEntity).receiveEnergy(tDirection, (int) mRestRF, false);
+ mRestRF = mRestRF - RFtrans;
+ }
}
if(GregTech_API.mRFExplosions && ((IEnergyReceiver)tTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600){
if(rfOut > 32 * GregTech_API.mEUtoRF / 100) this.doExplosion(rfOut);