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

Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x

Browse source
This commit is contained in:
SpaceToad 2014-06-06 09:00:23 +02:00
commit da32818bad
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/buildcraft/api/blueprints/Schematic.java
View file

@ -187,8 +187,10 @@ public abstract class Schematic {
public double getEnergyRequirement(LinkedList<ItemStack> stacksUsed) {
double result = 0;
for (ItemStack s : stacksUsed) {
result += s.stackSize * SchematicRegistry.BUILD_ENERGY;
if (stacksUsed != null) {
for (ItemStack s : stacksUsed) {
result += s.stackSize * SchematicRegistry.BUILD_ENERGY;
}
}
return result;

7
api/buildcraft/api/blueprints/SchematicFluid.java
View file

@ -70,12 +70,13 @@ public class SchematicFluid extends SchematicBlock {
@Override
public LinkedList<ItemStack> getStacksToDisplay(
LinkedList<ItemStack> stackConsumed) {
LinkedList<ItemStack> result = new LinkedList<ItemStack>();
result.add(fluidItem);
return result;
}
@Override
public double getEnergyRequirement(LinkedList<ItemStack> stacksUsed) {
return 1 * SchematicRegistry.BUILD_ENERGY;
}
}

6
common/buildcraft/core/blueprints/BptBuilderBlueprint.java
View file

@ -51,7 +51,6 @@ import buildcraft.core.utils.BlockUtil;
public class BptBuilderBlueprint extends BptBuilderBase {
public LinkedList<ItemStack> neededItems = new LinkedList<ItemStack>();
public LinkedList<FluidStack> neededFluids = new LinkedList<FluidStack>();
protected TreeSet<Integer> builtEntities = new TreeSet<Integer>();
@ -551,14 +550,11 @@ public class BptBuilderBlueprint extends BptBuilderBase {
}
}
builder.consumeEnergy(slot.getEnergyRequirement ());
return;
builder.consumeEnergy(slot.getEnergyRequirement());
}
public void recomputeNeededItems() {
neededItems.clear();
neededFluids.clear();
HashMap<StackKey, Integer> computeStacks = new HashMap<StackKey, Integer>();