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

whoops, was supposed to undo this refactor

Browse source
This commit is contained in:
asiekierka 2014-10-26 13:22:57 +01:00
parent 626709a806
commit 5d7b5109d3
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.blueprints.BuildingPermission;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicBlockShaped;
import buildcraft.api.blueprints.SchematicBlockBase;
import buildcraft.api.blueprints.Translation;
import buildcraft.api.core.BCLog;
import buildcraft.api.core.Position;
@ -36,7 +36,7 @@ public abstract class BlueprintBase {
public ArrayList<NBTTagCompound> subBlueprintsNBT = new ArrayList<NBTTagCompound>();
public SchematicBlockShaped[][][] contents;
public SchematicBlockBase[][][] contents;
public int anchorX, anchorY, anchorZ;
public int sizeX, sizeY, sizeZ;
public BlueprintId id = new BlueprintId();
@ -56,7 +56,7 @@ public abstract class BlueprintBase {
}
public BlueprintBase(int sizeX, int sizeY, int sizeZ) {
contents = new SchematicBlockShaped[sizeX][sizeY][sizeZ];
contents = new SchematicBlockBase[sizeX][sizeY][sizeZ];
this.sizeX = sizeX;
this.sizeY = sizeY;
@ -92,7 +92,7 @@ public abstract class BlueprintBase {
}
public void rotateLeft(BptContext context) {
SchematicBlockShaped[][][] newContents = new SchematicBlockShaped[sizeZ][sizeY][sizeX];
SchematicBlockBase[][][] newContents = new SchematicBlockBase[sizeZ][sizeY][sizeX];
for (int x = 0; x < sizeZ; ++x) {
for (int y = 0; y < sizeY; ++y) {
@ -218,7 +218,7 @@ public abstract class BlueprintBase {
excavate = true;
}
contents = new SchematicBlockShaped[sizeX][sizeY][sizeZ];
contents = new SchematicBlockBase[sizeX][sizeY][sizeZ];
try {
loadContents(nbt);

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

@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.blueprints.BuilderAPI;
import buildcraft.api.blueprints.SchematicBlockShaped;
import buildcraft.api.blueprints.SchematicBlockBase;
import buildcraft.api.core.BlockIndex;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.api.core.IInvSlot;
@ -49,7 +49,7 @@ public class BptBuilderTemplate extends BptBuilderBase {
continue;
}
SchematicBlockShaped slot = blueprint.contents[i][j][k];
SchematicBlockBase slot = blueprint.contents[i][j][k];
if (slot == null
&& !clearedLocations.contains(new BlockIndex(
@ -81,7 +81,7 @@ public class BptBuilderTemplate extends BptBuilderBase {
continue;
}
SchematicBlockShaped slot = blueprint.contents[i][j][k];
SchematicBlockBase slot = blueprint.contents[i][j][k];
if (slot != null && !builtLocations.contains(new BlockIndex(xCoord, yCoord, zCoord))) {
BuildingSlotBlock b = new BuildingSlotBlock();

8
common/buildcraft/core/builders/BuildingSlotBlock.java
View file

@ -18,7 +18,7 @@ import net.minecraftforge.common.util.Constants;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.MappingNotFoundException;
import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicBlockShaped;
import buildcraft.api.blueprints.SchematicBlockBase;
import buildcraft.api.blueprints.SchematicFactory;
import buildcraft.api.blueprints.SchematicMask;
import buildcraft.api.core.Position;
@ -26,7 +26,7 @@ import buildcraft.api.core.Position;
public class BuildingSlotBlock extends BuildingSlot {
public int x, y, z;
public SchematicBlockShaped schematic;
public SchematicBlockBase schematic;
public enum Mode {
ClearIfInvalid, Build
@ -37,7 +37,7 @@ public class BuildingSlotBlock extends BuildingSlot {
public int buildStage = 0;
@Override
public SchematicBlockShaped getSchematic () {
public SchematicBlockBase getSchematic () {
if (schematic == null) {
return new SchematicMask(false);
} else {
@ -145,7 +145,7 @@ public class BuildingSlotBlock extends BuildingSlot {
z = nbt.getInteger("z");
if (nbt.hasKey("schematic")) {
schematic = (SchematicBlockShaped) SchematicFactory
schematic = (SchematicBlockBase) SchematicFactory
.createSchematicFromWorldNBT(nbt.getCompoundTag("schematic"), registry);
}