Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert BuildCraft power to the 4.2.2 @CovertJaguar system, fix Gate Copier issues

Browse source
This commit is contained in:
asiekierka 2015-02-22 21:48:21 +01:00
parent be6c0e09df
commit e2ae3a349a
3 changed files with 70 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/buildcraft/transport/Gate.java
View file

@ -216,6 +216,19 @@ public final class Gate implements IGate, IStatementContainer {
}
public void readStatementsFromNBT(NBTTagCompound data) {
// Clear
for (int i = 0; i < material.numSlots; ++i) {
triggers[i] = null;
actions[i] = null;
for (int j = 0; j < material.numTriggerParameters; j++) {
triggerParameters[i][j] = null;
}
for (int j = 0; j < material.numActionParameters; j++) {
actionParameters[i][j] = null;
}
}
// Read
for (int i = 0; i < material.numSlots; ++i) {
if (data.hasKey("trigger[" + i + "]")) {
triggers[i] = StatementManager.statements.get(data.getString("trigger[" + i + "]"));

6
common/buildcraft/transport/ItemGateCopier.java
View file

@ -52,9 +52,8 @@ public class ItemGateCopier extends ItemBuildCraft {
Gate gate = null;
if (tile == null || !(tile instanceof TileGenericPipe) || !(block instanceof BlockGenericPipe)) {
return false;
}
isCopying = true;
} else {
RaytraceResult rayTraceResult = ((BlockGenericPipe) block).doRayTrace(world, x, y, z, player);
if (rayTraceResult != null && rayTraceResult.boundingBox != null && rayTraceResult.hitPart == Part.Pluggable) {
@ -63,6 +62,7 @@ public class ItemGateCopier extends ItemBuildCraft {
gate = ((TileGenericPipe) tile).pipe.gates[rayTraceResult.sideHit.ordinal()];
}
}
}
if (isCopying) {
if (gate == null) {

139
common/buildcraft/transport/PipeTransportPower.java
View file

@ -199,102 +199,58 @@ public class PipeTransportPower extends PipeTransport {
}
// Send the power to nearby pipes who requested it
System.arraycopy(displayPower, 0, prevDisplayPower, 0, 6);
Arrays.fill(displayPower, (short) 0);
// STEP 1 - computes the total amount of power contained and total
// amount of power queried
int totalPowerContained = 0;
int totalPowerQuery = 0;
for (int dir = 0; dir < 6; ++dir) {
totalPowerContained += internalPower[dir];
if (internalPower[dir] == 0) {
totalPowerQuery += powerQuery[dir];
for (int i = 0; i < 6; ++i) {
if (internalPower[i] > 0) {
float totalPowerQuery = 0;
for (int j = 0; j < 6; ++j) {
if (j != i && powerQuery[j] > 0)
if (tiles[j] instanceof TileGenericPipe || tiles[j] instanceof IEnergyReceiver || tiles[j] instanceof IEnergyHandler) {
totalPowerQuery += powerQuery[j];
}
}
for (int j = 0; j < 6; ++j) {
if (j != i && powerQuery[j] > 0) {
int watts = (int) Math.floor((internalPower[i] * powerQuery[j]) / totalPowerQuery);
// STEP 2 - sends the power to all directions and computes the actual
// amount of power that was consumed
int totalPowerConsumed = 0;
if (totalPowerContained > 0) {
for (int out = 0; out < 6; ++out) {
externalPower[out] = 0;
if (powerQuery[out] > 0 && internalPower[out] == 0) {
int powerConsumed = powerQuery[out] * totalPowerContained / totalPowerQuery;
boolean tilePowered = false;
if (tiles[out] instanceof IPipeTile) {
// Transmit power to the nearby pipe
Pipe<?> nearbyPipe = (Pipe<?>) ((IPipeTile) tiles[out]).getPipe();
if (tiles[j] instanceof IPipeTile) {
Pipe<?> nearbyPipe = (Pipe<?>) ((IPipeTile) tiles[j]).getPipe();
PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyPipe.transport;
powerConsumed = nearbyTransport.receiveEnergy(
ForgeDirection.VALID_DIRECTIONS[out].getOpposite(),
powerConsumed);
tilePowered = true;
} else if (tiles[out] instanceof IEnergyHandler) {
IEnergyHandler handler = (IEnergyHandler) tiles[out];
if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite())) {
// Transmit power to an RF energy handler
powerConsumed = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite(),
powerConsumed, false);
tilePowered = true;
watts = nearbyTransport.receiveEnergy(
ForgeDirection.VALID_DIRECTIONS[j].getOpposite(),
watts);
internalPower[i] -= watts;
} else if (tiles[j] instanceof IEnergyHandler) {
IEnergyHandler handler = (IEnergyHandler) tiles[j];
if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite())) {
watts = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite(),
watts, false);
internalPower[i] -= watts;
}
} else if (tiles[out] instanceof IEnergyReceiver) {
IEnergyReceiver handler = (IEnergyReceiver) tiles[out];
if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite())) {
// Transmit power to an RF energy handler
powerConsumed = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite(),
powerConsumed, false);
tilePowered = true;
} else if (tiles[j] instanceof IEnergyReceiver) {
IEnergyReceiver handler = (IEnergyReceiver) tiles[j];
if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite())) {
watts = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite(),
watts, false);
internalPower[i] -= watts;
}
}
if (!tilePowered) {
externalPower[out] = powerConsumed;
}
displayPower[out] += powerConsumed;
totalPowerConsumed += powerConsumed;
displayPower[j] += watts;
displayPower[i] += watts;
}
}
}
// STEP 3 - assume equal repartition of all consumed locations and
// compute display for each source of power
if (totalPowerConsumed > 0) {
for (int in = 0; in < 6; ++in) {
int powerConsumed = internalPower[in] * totalPowerConsumed / totalPowerContained;
displayPower[in] += powerConsumed;
}
}
// NEXT STEPS... other things to do...
highestPower = 0;
double highestPower = 0;
for (int i = 0; i < 6; i++) {
displayPower[i] = (short) ((prevDisplayPower[i] * (DISPLAY_SMOOTHING - 1.0F) + displayPower[i]) / DISPLAY_SMOOTHING);
if (displayPower[i] > highestPower) {
highestPower = displayPower[i];
}
if (displayPower[i] < 0) {
displayPower[i] = 0;
}
}
overload += highestPower > maxPower * 0.95 ? 1 : -1;
if (overload < 0) {
overload = 0;
@ -304,7 +260,6 @@ public class PipeTransportPower extends PipeTransport {
}
// Compute the tiles requesting energy that are not power pipes
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
if (!outputOpen(dir)) {
continue;
@ -315,12 +270,10 @@ public class PipeTransportPower extends PipeTransport {
if (tile instanceof IPipeTile && ((Pipe<?>) ((IPipeTile) tile).getPipe()).transport instanceof PipeTransportPower) {
continue;
}
if (tile instanceof IEnergyHandler) {
IEnergyHandler handler = (IEnergyHandler) tile;
if (handler.canConnectEnergy(dir.getOpposite())) {
int request = handler.receiveEnergy(dir.getOpposite(), this.maxPower, true);
if (request > 0) {
requestEnergy(dir, request);
}
@ -329,7 +282,6 @@ public class PipeTransportPower extends PipeTransport {
IEnergyReceiver handler = (IEnergyReceiver) tile;
if (handler.canConnectEnergy(dir.getOpposite())) {
int request = handler.receiveEnergy(dir.getOpposite(), this.maxPower, true);
if (request > 0) {
requestEnergy(dir, request);
}
@ -338,46 +290,35 @@ public class PipeTransportPower extends PipeTransport {
}
// Sum the amount of energy requested on each side
int[] transferQuery = new int[6];
for (int i = 0; i < 6; ++i) {
transferQuery[i] = 0;
if (!inputOpen(ForgeDirection.getOrientation(i))) {
continue;
}
for (int j = 0; j < 6; ++j) {
if (j != i) {
transferQuery[i] += powerQuery[j];
}
}
transferQuery[i] = Math.min(transferQuery[i], maxPower);
}
// Transfer the requested energy to nearby pipes
for (int i = 0; i < 6; ++i) {
if (transferQuery[i] != 0) {
if (tiles[i] != null) {
TileEntity entity = tiles[i];
if (entity instanceof IPipeTile) {
Pipe<?> nearbyPipe = (Pipe<?>) ((IPipeTile) entity).getPipe();
if (nearbyPipe == null) {
if (entity instanceof TileGenericPipe) {
TileGenericPipe nearbyTile = (TileGenericPipe) entity;
if (nearbyTile.pipe == null) {
continue;
}
PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyPipe.transport;
PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyTile.pipe.transport;
nearbyTransport.requestEnergy(ForgeDirection.VALID_DIRECTIONS[i].getOpposite(), transferQuery[i]);
}
}
}
}
if (tracker.markTimeIfDelay(container.getWorldObj())) {
PacketPowerUpdate packet = new PacketPowerUpdate(container.xCoord, container.yCoord, container.zCoord);
@ -399,13 +340,9 @@ public class PipeTransportPower extends PipeTransport {
powerQuery = nextPowerQuery;
nextPowerQuery = new int[6];
int[] next = internalPower;
internalPower = internalNextPower;
internalNextPower = new int[6];
for (int i = 0; i < internalNextPower.length; ++i) {
internalNextPower[i] = 0;
nextPowerQuery[i] = 0;
}
internalNextPower = internalPower;
}
}