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

fixed anchor rotations, for #1544

Browse source
This commit is contained in:
SpaceToad 2014-09-06 17:44:18 +02:00
parent 0381a4edd0
commit 66e5e8387d
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,8 +128,8 @@ public abstract class BlueprintBase {
Position pos = new Position(sub.getInteger("x"), sub.getInteger("y"), sub.getInteger("z"));
Position np = context.rotatePositionLeft(pos);
sub.setInteger("x", (int) pos.x);
sub.setInteger("z", (int) pos.z);
sub.setInteger("x", (int) np.x);
sub.setInteger("z", (int) np.z);
sub.setByte("dir", (byte) dir.ordinal());
NBTTagCompound bpt = sub.getCompoundTag("bpt");

26
common/buildcraft/core/blueprints/RecursiveBlueprintBuilder.java
View file

@ -10,11 +10,14 @@ package buildcraft.core.blueprints;
import java.util.ArrayList;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.core.Box;
public class RecursiveBlueprintBuilder {
private boolean returnedThis = false;
@ -25,8 +28,10 @@ public class RecursiveBlueprintBuilder {
private int x, y, z;
private ForgeDirection dir;
private World world;
private Box box = new Box();
public RecursiveBlueprintBuilder(BlueprintBase iBlueprint, World iWorld, int iX, int iY, int iZ, ForgeDirection iDir) {
public RecursiveBlueprintBuilder(BlueprintBase iBlueprint, World iWorld, int iX, int iY, int iZ,
ForgeDirection iDir) {
blueprint = iBlueprint;
subBlueprints = iBlueprint.subBlueprintsNBT;
world = iWorld;
@ -42,13 +47,19 @@ public class RecursiveBlueprintBuilder {
returnedThis = true;
BptBuilderBase builder;
if (blueprint instanceof Blueprint) {
return new BptBuilderBlueprint((Blueprint) blueprint, world, x, y, z);
builder = new BptBuilderBlueprint((Blueprint) blueprint, world, x, y, z);
} else if (blueprint instanceof Template) {
return new BptBuilderTemplate(blueprint, world, x, y, z);
builder = new BptBuilderTemplate(blueprint, world, x, y, z);
} else {
return null;
}
box.initialize(builder);
return builder;
}
blueprint = null;
@ -68,12 +79,15 @@ public class RecursiveBlueprintBuilder {
NBTTagCompound nbt = subBlueprints.get(nextSubBlueprint);
BlueprintBase bpt = BlueprintBase.loadBluePrint(nbt.getCompoundTag("bpt"));
int nx = x + nbt.getInteger("x");
int ny = y + nbt.getInteger("y");
int nz = z + nbt.getInteger("z");
int nx = box.xMin + nbt.getInteger("x");
int ny = box.yMin + nbt.getInteger("y");
int nz = box.zMin + nbt.getInteger("z");
ForgeDirection nbtDir = ForgeDirection.values()[nbt.getByte("dir")];
// TODO: this is just here for debug, to be removed
world.setBlock(nx, ny, nz, Blocks.sponge);
current = new RecursiveBlueprintBuilder(bpt, world, nx, ny, nz, nbtDir);
nextSubBlueprint++;

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

@ -104,9 +104,9 @@ public class RecursiveBlueprintReader {
if (currentSubReader.isDone()) {
writingBlueprint.addSubBlueprint
(currentSubReader.getBlueprint(),
currentSubReader.architect.xCoord - architect.xCoord,
currentSubReader.architect.yCoord - architect.yCoord,
currentSubReader.architect.zCoord - architect.zCoord,
currentSubReader.architect.xCoord - architect.getBox().xMin,
currentSubReader.architect.yCoord - architect.getBox().yMin,
currentSubReader.architect.zCoord - architect.getBox().zMin,
ForgeDirection.values()[architect.getWorld().getBlockMetadata(
architect.xCoord, architect.yCoord, architect.zCoord)].getOpposite());