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

minor adjustments in building items display and costs

Browse source
This commit is contained in:
SpaceToad 2014-05-05 13:52:26 +02:00
parent cf54f0e68a
commit 52bedc0bd4
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/buildcraft/builders/BuildingItem.java
View file

@ -30,6 +30,8 @@ import buildcraft.core.blueprints.IBuilder;
public class BuildingItem implements IBuilder {
private static int ITEMS_SPACE = 2;
@NetworkData
public Position origin, destination;
@ -136,9 +138,9 @@ public class BuildingItem implements IBuilder {
lifetime++;
if (lifetime > maxLifetime + stacksToDisplay.size() - 1) {
if (lifetime > maxLifetime + stacksToDisplay.size() * ITEMS_SPACE - 1) {
isDone = true;
build ();
build();
}
lifetimeDisplay = lifetime;
@ -146,7 +148,7 @@ public class BuildingItem implements IBuilder {
if (slotToBuild != null && lifetime > maxLifetime) {
slotToBuild.writeCompleted(context, (lifetime - maxLifetime)
/ stacksToDisplay.size());
/ (stacksToDisplay.size() * ITEMS_SPACE));
}
}
@ -200,7 +202,7 @@ public class BuildingItem implements IBuilder {
s.display = false;
}
d++;
d += ITEMS_SPACE;
}
return stacksToDisplay;
@ -281,9 +283,12 @@ public class BuildingItem implements IBuilder {
public void setStacksToDisplay(LinkedList<ItemStack> stacks) {
if (stacks != null) {
for (ItemStack s : stacks) {
StackAtPosition sPos = new StackAtPosition();
sPos.stack = s;
stacksToDisplay.add(sPos);
for (int i = 0; i < s.stackSize; ++i) {
StackAtPosition sPos = new StackAtPosition();
sPos.stack = s.copy();
sPos.stack.stackSize = 1;
stacksToDisplay.add(sPos);
}
}
}
}

2
common/buildcraft/builders/TileAbstractBuilder.java
View file

@ -147,5 +147,7 @@ public abstract class TileAbstractBuilder extends TileBuildCraft implements ITil
super.readFromNBT(nbttagcompound);
nbttagcompound.setDouble("mjStored", mjStored);
mjPrev = mjStored;
mjUnchangedCycles = 0;
}
}

4
common/buildcraft/core/blueprints/BptBuilderBase.java
View file

@ -148,7 +148,9 @@ public abstract class BptBuilderBase implements IAreaProvider {
.world()
.getBlock(slot.x, slot.y, slot.z)
.getBlockHardness(context.world(), slot.x, slot.y,
slot.z) + 1;
slot.z) + 1;
hardness *= 2;
if (builder.energyAvailable() < hardness * SchematicRegistry.BREAK_ENERGY) {
return false;