tilera
/
IndustrialWires
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed accidental conversion from FE to EU, closes #42 

Fixed connectors not blowing up as intended
This commit is contained in:
malte0811 2018-09-07 23:54:33 +02:00
parent 51e139b568
commit 93f156da4e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/malte0811/industrialwires/blocks/wire/TileEntityIC2ConnectorTin.java
View File

@ -349,7 +349,7 @@ public class TileEntityIC2ConnectorTin extends TileEntityImmersiveConnectable im
@Override
@Optional.Method(modid="ic2")
public double getDemandedEnergy() {
double ret = (getMaxIO() - bufferToNet) *ConversionUtil.euPerJoule() + .5;
double ret = (getMaxIO() - bufferToNet) * ConversionUtil.euPerJoule() + .05;
if (ret < .1)
ret = 0;
return ret;
@ -370,12 +370,18 @@ public class TileEntityIC2ConnectorTin extends TileEntityImmersiveConnectable im
@Override
@Optional.Method(modid="ic2")
public double getOfferedEnergy() {
if (energyType != NONE && energyType != EU_DC) {
return .01;
}
return Math.min(maxToMachine, bufferToMachine) * ConversionUtil.euPerJoule();
}
@Override
@Optional.Method(modid="ic2")
public void drawEnergy(double amount) {
if (energyType != NONE && energyType != EU_DC) {
shouldBreak = true;
}
bufferToMachine -= amount*ConversionUtil.joulesPerEu();
markDirty();
}
@ -405,7 +411,7 @@ public class TileEntityIC2ConnectorTin extends TileEntityImmersiveConnectable im
} else if (energyType!=type) {
shouldBreak = true;
}
joules = Math.min(getMaxIO()-externalInputInTick, joules);
joules = Math.min(getMaxIO() - externalInputInTick + .5, joules);
if (bufferToNet < getMaxIO()) {
if (!simulate) {
bufferToNet += joules;