Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed multimeter merging in wrong direction

Browse source
This commit is contained in:
Calclavia 2014-02-02 14:16:50 +08:00
parent 961d6630cd
commit 1f0612c0d4
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/resonantinduction/archaic/firebox/TileFirebox.java
View file

@ -45,7 +45,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
* The power of the firebox in terms of thermal energy. The thermal energy can be transfered
* into fluids to increase their internal energy.
*/
private final long POWER = 50000;
private final long POWER = 100000;
@Synced
private int burnTime;
@ -141,6 +141,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
else if (blockID == Block.waterStill.blockID)
{
usedHeat = true;
if (heatEnergy >= getRequiredBoilWaterEnergy())
{
if (FluidRegistry.getFluid("steam") != null)
@ -173,7 +174,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
{
int temperatureChange = 373 - ThermalPhysics.getTemperatureForCoordinate(worldObj, xCoord, zCoord);
int mass = ThermalPhysics.getMass(1000, 1);
return ThermalPhysics.getEnergyForTemperatureChange(mass, 4200, temperatureChange) + ThermalPhysics.getEnergyForStateChange(mass, 2260000);
return ThermalPhysics.getEnergyForTemperatureChange(mass, 4200, temperatureChange) + ThermalPhysics.getEnergyForStateChange(mass, 2257000);
}
public long getMeltIronEnergy()

11
src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
View file

@ -562,11 +562,14 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
universalelectricity.api.vector.Vector3 vector = getPosition().translate(dir);
if (hasMultimeter(vector.intX(), vector.intY(), vector.intZ()))
if (dir != getDirection() && dir != getDirection().getOpposite())
{
connections[dir.ordinal()] = getMultimeter(vector.intX(), vector.intY(), vector.intZ());
universalelectricity.api.vector.Vector3 vector = getPosition().translate(dir);
if (hasMultimeter(vector.intX(), vector.intY(), vector.intZ()))
{
connections[dir.ordinal()] = getMultimeter(vector.intX(), vector.intY(), vector.intZ());
}
}
}