Fixed multimeter merging in wrong direction
This commit is contained in:
parent
961d6630cd
commit
1f0612c0d4
2 changed files with 10 additions and 6 deletions
|
@ -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
|
* The power of the firebox in terms of thermal energy. The thermal energy can be transfered
|
||||||
* into fluids to increase their internal energy.
|
* into fluids to increase their internal energy.
|
||||||
*/
|
*/
|
||||||
private final long POWER = 50000;
|
private final long POWER = 100000;
|
||||||
|
|
||||||
@Synced
|
@Synced
|
||||||
private int burnTime;
|
private int burnTime;
|
||||||
|
@ -141,6 +141,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
|
||||||
else if (blockID == Block.waterStill.blockID)
|
else if (blockID == Block.waterStill.blockID)
|
||||||
{
|
{
|
||||||
usedHeat = true;
|
usedHeat = true;
|
||||||
|
|
||||||
if (heatEnergy >= getRequiredBoilWaterEnergy())
|
if (heatEnergy >= getRequiredBoilWaterEnergy())
|
||||||
{
|
{
|
||||||
if (FluidRegistry.getFluid("steam") != null)
|
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 temperatureChange = 373 - ThermalPhysics.getTemperatureForCoordinate(worldObj, xCoord, zCoord);
|
||||||
int mass = ThermalPhysics.getMass(1000, 1);
|
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()
|
public long getMeltIronEnergy()
|
||||||
|
|
|
@ -561,6 +561,8 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
|
||||||
Object[] connections = new Object[6];
|
Object[] connections = new Object[6];
|
||||||
|
|
||||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||||
|
{
|
||||||
|
if (dir != getDirection() && dir != getDirection().getOpposite())
|
||||||
{
|
{
|
||||||
universalelectricity.api.vector.Vector3 vector = getPosition().translate(dir);
|
universalelectricity.api.vector.Vector3 vector = getPosition().translate(dir);
|
||||||
|
|
||||||
|
@ -569,6 +571,7 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
|
||||||
connections[dir.ordinal()] = getMultimeter(vector.intX(), vector.intY(), vector.intZ());
|
connections[dir.ordinal()] = getMultimeter(vector.intX(), vector.intY(), vector.intZ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return connections;
|
return connections;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue