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

Merge pull request #256 from AartBluestoke/newb

Browse source 
correctly save and restore hasPulsar()
This commit is contained in:
SirSengir 2012-09-13 15:12:02 -07:00
commit 49adae70b2
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/transport/GateVanilla.java
View file

@ -74,7 +74,7 @@ public class GateVanilla extends Gate {
}
// / INFORMATION
private boolean hasPulser() {
public boolean hasPulser() {
return pulser != null;
}

15
common/buildcraft/transport/blueprints/BptBlockPipe.java
View file

@ -55,7 +55,10 @@ public class BptBlockPipe extends BptBlock {
if (slot.cpt.hasKey("gate")) {
int gateId = slot.cpt.getInteger("gate");
requirements.add(new ItemStack(BuildCraftTransport.pipeGate, 1, gateId - 1));
if(slot.cpt.hasKey("hasPulser") && slot.cpt.getBoolean("hasPulser"))
requirements.add(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, gateId - 1));
else
requirements.add(new ItemStack(BuildCraftTransport.pipeGate, 1, gateId - 1));
}
if (BuildCraftCore.itemBptProps[pipeId] != null)
@ -93,8 +96,12 @@ public class BptBlockPipe extends BptBlock {
if (slot.cpt.hasKey("gate")) {
// / TODO: Does not save/load custom gates
int gateId = slot.cpt.getInteger("gate");
pipe.gate = new GateVanilla(pipe);
pipe.gate.kind = Gate.GateKind.values()[gateId];
GateVanilla newGate;
if(slot.cpt.hasKey("hasPulser") && slot.cpt.getBoolean("hasPulser"))
newGate= new GateVanilla(pipe,new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, gateId - 1));
else
newGate= new GateVanilla(pipe,new ItemStack(BuildCraftTransport.pipeGate, 1, gateId - 1));
pipe.gate = newGate;
for (int i = 0; i < 8; ++i) {
if (slot.cpt.hasKey("trigger" + i))
@ -134,6 +141,8 @@ public class BptBlockPipe extends BptBlock {
// / TODO: Does not save/load custom gates
if (pipe.hasGate()) {
bptSlot.cpt.setInteger("gate", pipe.gate.kind.ordinal());
if(pipe.gate instanceof GateVanilla)
bptSlot.cpt.setBoolean("hasPulser", ((GateVanilla)pipe.gate).hasPulser());
for (int i = 0; i < 8; ++i) {
if (pipe.activatedTriggers[i] != null)