Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

revert cable fixes

Browse source
This commit is contained in:
Technus 2016-12-16 09:37:57 +01:00
parent 3be8aef524
commit e59c63ac64
1 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
View file

@ -42,9 +42,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
public int mTransferredAmperage = 0, mTransferredAmperageLast20 = 0,mTransferredAmperageLast20OK=0,mTransferredAmperageOK=0; public int mTransferredAmperage = 0, mTransferredAmperageLast20 = 0,mTransferredAmperageLast20OK=0,mTransferredAmperageOK=0;
public long mTransferredVoltageLast20 = 0, mTransferredVoltage = 0,mTransferredVoltageLast20OK=0,mTransferredVoltageOK=0; public long mTransferredVoltageLast20 = 0, mTransferredVoltage = 0,mTransferredVoltageLast20OK=0,mTransferredVoltageOK=0;
public long mRestRF; public long mRestRF;
public short mOverheat,mLastOverheat=10; public short mOverheat;
public static short mMaxOverheat=(short) (GT_Mod.gregtechproxy.mWireHeatingTicks * 100); public static short mMaxOverheat=(short) (GT_Mod.gregtechproxy.mWireHeatingTicks * 100);
public long lastTick=0,tickDiff;
public GT_MetaPipeEntity_Cable(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, long aCableLossPerMeter, long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) { 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); super(aID, aName, aNameRegional, 0);
@ -208,27 +207,15 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
mTransferredAmperage += rUsedAmperes; mTransferredAmperage += rUsedAmperes;
mTransferredVoltageLast20 = (Math.max(mTransferredVoltageLast20, aVoltage)); mTransferredVoltageLast20 = (Math.max(mTransferredVoltageLast20, aVoltage));
mTransferredAmperageLast20 = Math.max(mTransferredAmperageLast20, mTransferredAmperage); mTransferredAmperageLast20 = Math.max(mTransferredAmperageLast20, mTransferredAmperage);
boolean didOverheat=false; if (aVoltage > mVoltage || mTransferredAmperage > mAmperage) {
if (aVoltage > mVoltage) { if(mOverheat>mMaxOverheat)
if(mLastOverheat<=5) getBaseMetaTileEntity().setToFire();
mOverheat+=(Math.max(100,100*(GT_Utility.getTier(aVoltage)-GT_Utility.getTier(mVoltage)))); else
didOverheat=true; mOverheat +=100;
}
if (mTransferredAmperage > (mAmperage*tickDiff)) {
if(mLastOverheat<=5) {
mOverheat += (100 * (mTransferredAmperage - mAmperage));
}
didOverheat=true;
}
if(mOverheat>mMaxOverheat && mLastOverheat<=0)
this.getBaseMetaTileEntity().setToFire();
if (didOverheat) {
if(mLastOverheat<=0)
mLastOverheat=5;
return aAmperage; return aAmperage;
} }
return rUsedAmperes; return rUsedAmperes;
//Always return amount of used amperes, used all on overheat
} }
@Override @Override
@ -238,15 +225,12 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
mTransferredVoltage=0; mTransferredVoltage=0;
mTransferredAmperageOK=mTransferredAmperage; mTransferredAmperageOK=mTransferredAmperage;
mTransferredAmperage = 0; mTransferredAmperage = 0;
tickDiff=aTick-lastTick;
lastTick=aTick;
if(mOverheat>0)mOverheat--; if(mOverheat>0)mOverheat--;
if(mLastOverheat>0)mLastOverheat--;
if (aTick % 20 == 0) { if (aTick % 20 == 0) {
mTransferredAmperageLast20OK=mTransferredAmperageLast20;
mTransferredAmperageLast20 = 0;
mTransferredVoltageLast20OK=mTransferredVoltageLast20; mTransferredVoltageLast20OK=mTransferredVoltageLast20;
mTransferredVoltageLast20 = 0; mTransferredVoltageLast20 = 0;
mTransferredAmperageLast20OK=mTransferredAmperageLast20;
mTransferredAmperageLast20 = 0;
mConnections = 0; mConnections = 0;
for (byte i = 0, j = 0; i < 6; i++) { for (byte i = 0, j = 0; i < 6; i++) {
j = GT_Utility.getOppositeSide(i); j = GT_Utility.getOppositeSide(i);