From 24b48591783ddfcecf9b1c4f7b916034f160f26b Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 26 Oct 2014 12:34:07 +0100 Subject: [PATCH] use the API breaking changes as an occasion to make Schematic function names make more sense --- api/buildcraft/api/blueprints/Schematic.java | 12 +++++------ .../api/blueprints/SchematicBlock.java | 18 ++++++++--------- .../api/blueprints/SchematicEntity.java | 10 +++++----- .../api/blueprints/SchematicFluid.java | 6 +++--- .../api/blueprints/SchematicMask.java | 6 +++--- .../api/blueprints/SchematicTile.java | 20 +++++++++---------- .../builders/schematics/SchematicBed.java | 6 +++--- .../builders/schematics/SchematicCactus.java | 6 +++--- .../schematics/SchematicCustomStack.java | 4 ++-- .../builders/schematics/SchematicDirt.java | 6 +++--- .../builders/schematics/SchematicDoor.java | 18 ++++++++--------- .../schematics/SchematicEnderChest.java | 4 ++-- .../schematics/SchematicFactoryBlock.java | 4 ++-- .../schematics/SchematicFactoryEntity.java | 4 ++-- .../schematics/SchematicFactoryMask.java | 4 ++-- .../schematics/SchematicFarmland.java | 6 +++--- .../builders/schematics/SchematicFire.java | 4 ++-- .../schematics/SchematicGlassPane.java | 4 ++-- .../builders/schematics/SchematicGravel.java | 6 +++--- .../builders/schematics/SchematicIgnore.java | 8 ++++---- .../schematics/SchematicIgnoreMeta.java | 4 ++-- .../builders/schematics/SchematicPiston.java | 2 +- .../builders/schematics/SchematicPortal.java | 6 +++--- .../builders/schematics/SchematicPumpkin.java | 4 ++-- .../builders/schematics/SchematicRail.java | 2 +- .../schematics/SchematicRedstoneDiode.java | 4 ++-- .../schematics/SchematicRedstoneLamp.java | 4 ++-- .../schematics/SchematicRedstoneWire.java | 6 +++--- .../builders/schematics/SchematicSeeds.java | 6 +++--- .../builders/schematics/SchematicSign.java | 4 ++-- .../builders/schematics/SchematicStairs.java | 4 ++-- .../builders/schematics/SchematicStone.java | 6 +++--- .../schematics/SchematicTripWireHook.java | 2 +- .../buildcraft/core/blueprints/Blueprint.java | 12 +++++------ .../core/blueprints/BptBuilderBlueprint.java | 2 +- .../core/builders/BuildingSlotBlock.java | 4 ++-- common/buildcraft/energy/SchematicEngine.java | 8 ++++---- .../factory/schematics/SchematicPump.java | 10 +++++----- .../factory/schematics/SchematicRefinery.java | 12 +++++------ .../factory/schematics/SchematicTank.java | 8 ++++---- .../schematics/SchematicLaserTableBase.java | 4 ++-- .../transport/schematics/SchematicPipe.java | 14 ++++++------- 42 files changed, 142 insertions(+), 142 deletions(-) diff --git a/api/buildcraft/api/blueprints/Schematic.java b/api/buildcraft/api/blueprints/Schematic.java index 148cfc4b..1869befc 100755 --- a/api/buildcraft/api/blueprints/Schematic.java +++ b/api/buildcraft/api/blueprints/Schematic.java @@ -150,7 +150,7 @@ public abstract class Schematic { * y, z} on the world. For blocks, block and meta fields will be initialized * automatically. */ - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { } @@ -158,14 +158,14 @@ public abstract class Schematic { * Places the block in the world, at the location specified in the slot, * using the stack in parameters */ - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { } /** * Write specific requirements coming from the world to the blueprint. */ - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @@ -174,7 +174,7 @@ public abstract class Schematic { * requirements are met, they will be removed all at once from the builder, * before calling writeToWorld. */ - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { } @@ -263,14 +263,14 @@ public abstract class Schematic { /** * Saves this schematic to the blueprint NBT. */ - public void writeToNBT(NBTTagCompound nbt, MappingRegistry registry) { + public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { } /** * Loads this schematic from the blueprint NBT. */ - public void readFromNBT(NBTTagCompound nbt, MappingRegistry registry) { + public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) { } diff --git a/api/buildcraft/api/blueprints/SchematicBlock.java b/api/buildcraft/api/blueprints/SchematicBlock.java index a05699d3..d21d409d 100755 --- a/api/buildcraft/api/blueprints/SchematicBlock.java +++ b/api/buildcraft/api/blueprints/SchematicBlock.java @@ -34,7 +34,7 @@ public class SchematicBlock extends SchematicBlockBase { public ItemStack [] storedRequirements = new ItemStack [0]; @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { if (block != null) { if (storedRequirements.length != 0) { for (ItemStack s : storedRequirements) { @@ -52,15 +52,15 @@ public class SchematicBlock extends SchematicBlockBase { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { - super.writeToWorld(context, x, y, z, stacks); + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + super.placeInWorld(context, x, y, z, stacks); this.setBlockInWorld(context, x, y, z); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeRequirementsToBlueprint(context, x, y, z); + public void storeRequirements(IBuilderContext context, int x, int y, int z) { + super.storeRequirements(context, x, y, z); if (block != null) { ArrayList req = block.getDrops(context.world(), x, @@ -74,16 +74,16 @@ public class SchematicBlock extends SchematicBlockBase { } @Override - public void writeToNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.writeToNBT(nbt, registry); + public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.writeSchematicToNBT(nbt, registry); writeBlockToNBT(nbt, registry); writeRequirementsToNBT(nbt, registry); } @Override - public void readFromNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.readFromNBT(nbt, registry); + public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.readSchematicFromNBT(nbt, registry); readBlockFromNBT(nbt, registry); readRequirementsFromNBT(nbt, registry); diff --git a/api/buildcraft/api/blueprints/SchematicEntity.java b/api/buildcraft/api/blueprints/SchematicEntity.java index 99586653..94ec6a9f 100755 --- a/api/buildcraft/api/blueprints/SchematicEntity.java +++ b/api/buildcraft/api/blueprints/SchematicEntity.java @@ -42,7 +42,7 @@ public class SchematicEntity extends Schematic { public ItemStack[] storedRequirements = new ItemStack[0]; @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { for (ItemStack s : storedRequirements) { requirements.add(s); } @@ -112,8 +112,8 @@ public class SchematicEntity extends Schematic { } @Override - public void writeToNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.writeToNBT(nbt, registry); + public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.writeSchematicToNBT(nbt, registry); NBTTagList nbttaglist = entityNBT.getTagList("Pos", 6); @@ -133,8 +133,8 @@ public class SchematicEntity extends Schematic { } @Override - public void readFromNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.readFromNBT(nbt, registry); + public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.readSchematicFromNBT(nbt, registry); entityNBT = nbt.getCompoundTag("entity"); diff --git a/api/buildcraft/api/blueprints/SchematicFluid.java b/api/buildcraft/api/blueprints/SchematicFluid.java index 6b544ae0..304f56eb 100644 --- a/api/buildcraft/api/blueprints/SchematicFluid.java +++ b/api/buildcraft/api/blueprints/SchematicFluid.java @@ -22,14 +22,14 @@ public class SchematicFluid extends SchematicBlock { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { if (meta == 0) { requirements.add(fluidItem); } } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } @@ -53,7 +53,7 @@ public class SchematicFluid extends SchematicBlock { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { if (meta == 0) { context.world().setBlock(x, y, z, block, 0, 3); } diff --git a/api/buildcraft/api/blueprints/SchematicMask.java b/api/buildcraft/api/blueprints/SchematicMask.java index fc84f623..739445d3 100755 --- a/api/buildcraft/api/blueprints/SchematicMask.java +++ b/api/buildcraft/api/blueprints/SchematicMask.java @@ -29,7 +29,7 @@ public class SchematicMask extends SchematicBlockBase { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { if (isConcrete) { if (stacks.size() == 0 || !BuildCraftAPI.isSoftBlock(context.world(), x, y, z)) { return; @@ -59,12 +59,12 @@ public class SchematicMask extends SchematicBlockBase { } @Override - public void writeToNBT(NBTTagCompound nbt, MappingRegistry registry) { + public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { nbt.setBoolean("isConcrete", isConcrete); } @Override - public void readFromNBT(NBTTagCompound nbt, MappingRegistry registry) { + public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) { isConcrete = nbt.getBoolean("isConcrete"); } } diff --git a/api/buildcraft/api/blueprints/SchematicTile.java b/api/buildcraft/api/blueprints/SchematicTile.java index 40994046..86a9dd42 100755 --- a/api/buildcraft/api/blueprints/SchematicTile.java +++ b/api/buildcraft/api/blueprints/SchematicTile.java @@ -45,8 +45,8 @@ public class SchematicTile extends SchematicBlock { * Places the block in the world, at the location specified in the slot. */ @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { - super.writeToWorld(context, x, y, z, stacks); + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + super.placeInWorld(context, x, y, z, stacks); if (block.hasTileEntity(meta)) { TileEntity tile = context.world().getTileEntity(x, y, z); @@ -62,8 +62,8 @@ public class SchematicTile extends SchematicBlock { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeToBlueprint(context, x, y, z); + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { + super.initializeFromObjectAt(context, x, y, z); if (block.hasTileEntity(meta)) { TileEntity tile = context.world().getTileEntity(x, y, z); @@ -75,8 +75,8 @@ public class SchematicTile extends SchematicBlock { } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeRequirementsToBlueprint(context, x, y, z); + public void storeRequirements(IBuilderContext context, int x, int y, int z) { + super.storeRequirements(context, x, y, z); if (block.hasTileEntity(meta)) { TileEntity tile = context.world().getTileEntity(x, y, z); @@ -99,15 +99,15 @@ public class SchematicTile extends SchematicBlock { } @Override - public void writeToNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.writeToNBT(nbt, registry); + public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.writeSchematicToNBT(nbt, registry); nbt.setTag("blockCpt", tileNBT); } @Override - public void readFromNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.readFromNBT(nbt, registry); + public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.readSchematicFromNBT(nbt, registry); tileNBT = nbt.getCompoundTag("blockCpt"); } diff --git a/common/buildcraft/builders/schematics/SchematicBed.java b/common/buildcraft/builders/schematics/SchematicBed.java index 0e6972d6..f14983b2 100644 --- a/common/buildcraft/builders/schematics/SchematicBed.java +++ b/common/buildcraft/builders/schematics/SchematicBed.java @@ -19,14 +19,14 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicBed extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { if ((meta & 8) == 0) { requirements.add(new ItemStack(Items.bed)); } } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } @@ -52,7 +52,7 @@ public class SchematicBed extends SchematicBlock { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { if ((meta & 8) != 0) { return; } diff --git a/common/buildcraft/builders/schematics/SchematicCactus.java b/common/buildcraft/builders/schematics/SchematicCactus.java index 241b521c..c4575d25 100755 --- a/common/buildcraft/builders/schematics/SchematicCactus.java +++ b/common/buildcraft/builders/schematics/SchematicCactus.java @@ -19,17 +19,17 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicCactus extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Blocks.cactus)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, Blocks.cactus, 0, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicCustomStack.java b/common/buildcraft/builders/schematics/SchematicCustomStack.java index a83a12ce..fd8a5661 100644 --- a/common/buildcraft/builders/schematics/SchematicCustomStack.java +++ b/common/buildcraft/builders/schematics/SchematicCustomStack.java @@ -24,12 +24,12 @@ public class SchematicCustomStack extends SchematicBlock { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(customStack.copy()); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } } diff --git a/common/buildcraft/builders/schematics/SchematicDirt.java b/common/buildcraft/builders/schematics/SchematicDirt.java index 21aa0046..061d5436 100644 --- a/common/buildcraft/builders/schematics/SchematicDirt.java +++ b/common/buildcraft/builders/schematics/SchematicDirt.java @@ -20,17 +20,17 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicDirt extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Blocks.dirt)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, Blocks.dirt, meta, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicDoor.java b/common/buildcraft/builders/schematics/SchematicDoor.java index 8f536a31..1405d32a 100644 --- a/common/buildcraft/builders/schematics/SchematicDoor.java +++ b/common/buildcraft/builders/schematics/SchematicDoor.java @@ -27,14 +27,14 @@ public class SchematicDoor extends SchematicBlock { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { if ((meta & 8) == 0) { requirements.add(stack.copy()); } } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } @@ -72,7 +72,7 @@ public class SchematicDoor extends SchematicBlock { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, meta, 3); context.world().setBlock(x, y + 1, z, block, upperMeta, 3); @@ -81,8 +81,8 @@ public class SchematicDoor extends SchematicBlock { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeToBlueprint(context, x, y, z); + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { + super.initializeFromObjectAt(context, x, y, z); if ((meta & 8) == 0) { upperMeta = context.world().getBlockMetadata(x, y + 1, z); @@ -90,15 +90,15 @@ public class SchematicDoor extends SchematicBlock { } @Override - public void writeToNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.writeToNBT(nbt, registry); + public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.writeSchematicToNBT(nbt, registry); nbt.setByte("upperMeta", (byte) upperMeta); } @Override - public void readFromNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.readFromNBT(nbt, registry); + public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.readSchematicFromNBT(nbt, registry); upperMeta = nbt.getByte("upperMeta"); } diff --git a/common/buildcraft/builders/schematics/SchematicEnderChest.java b/common/buildcraft/builders/schematics/SchematicEnderChest.java index bd4ad4a4..86ad533a 100755 --- a/common/buildcraft/builders/schematics/SchematicEnderChest.java +++ b/common/buildcraft/builders/schematics/SchematicEnderChest.java @@ -23,13 +23,13 @@ public class SchematicEnderChest extends SchematicRotateMeta { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Blocks.obsidian, 8)); requirements.add(new ItemStack(Items.ender_eye, 1)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } diff --git a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java index a67a7b02..ed44ee0b 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java @@ -35,7 +35,7 @@ public class SchematicFactoryBlock extends SchematicFactory { SchematicBlock s = SchematicRegistry.INSTANCE.createSchematicBlock(b, nbt.getInteger("blockMeta")); if (s != null) { - s.readFromNBT(nbt, registry); + s.readSchematicFromNBT(nbt, registry); return s; } } @@ -48,7 +48,7 @@ public class SchematicFactoryBlock extends SchematicFactory { super.saveSchematicToWorldNBT(nbt, object, registry); nbt.setInteger("blockId", registry.getIdForBlock(object.block)); - object.writeToNBT(nbt, registry); + object.writeSchematicToNBT(nbt, registry); } } diff --git a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java index d376f533..35ae977f 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java @@ -24,7 +24,7 @@ public class SchematicFactoryEntity extends SchematicFactory { SchematicEntity s = SchematicRegistry.INSTANCE.createSchematicEntity(registry.getEntityForId(entityId)); if (s != null) { - s.readFromNBT(nbt, registry); + s.readSchematicFromNBT(nbt, registry); } else { return null; } @@ -37,7 +37,7 @@ public class SchematicFactoryEntity extends SchematicFactory { super.saveSchematicToWorldNBT(nbt, object, registry); nbt.setInteger("entityId", registry.getIdForEntity(object.entity)); - object.writeToNBT(nbt, registry); + object.writeSchematicToNBT(nbt, registry); } } diff --git a/common/buildcraft/builders/schematics/SchematicFactoryMask.java b/common/buildcraft/builders/schematics/SchematicFactoryMask.java index d55109a0..6378098b 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryMask.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryMask.java @@ -18,7 +18,7 @@ public class SchematicFactoryMask extends SchematicFactory { @Override protected SchematicMask loadSchematicFromWorldNBT (NBTTagCompound nbt, MappingRegistry registry) { SchematicMask s = new SchematicMask(); - s.readFromNBT(nbt, registry); + s.readSchematicFromNBT(nbt, registry); return s; } @@ -27,7 +27,7 @@ public class SchematicFactoryMask extends SchematicFactory { public void saveSchematicToWorldNBT (NBTTagCompound nbt, SchematicMask object, MappingRegistry registry) { super.saveSchematicToWorldNBT(nbt, object, registry); - object.writeToNBT(nbt, registry); + object.writeSchematicToNBT(nbt, registry); } } diff --git a/common/buildcraft/builders/schematics/SchematicFarmland.java b/common/buildcraft/builders/schematics/SchematicFarmland.java index 77508d53..59587a8a 100755 --- a/common/buildcraft/builders/schematics/SchematicFarmland.java +++ b/common/buildcraft/builders/schematics/SchematicFarmland.java @@ -20,17 +20,17 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicFarmland extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Blocks.dirt)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, 0, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicFire.java b/common/buildcraft/builders/schematics/SchematicFire.java index dcf45ea8..ab1b6ad8 100755 --- a/common/buildcraft/builders/schematics/SchematicFire.java +++ b/common/buildcraft/builders/schematics/SchematicFire.java @@ -19,12 +19,12 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicFire extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack (Items.flint_and_steel)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } } diff --git a/common/buildcraft/builders/schematics/SchematicGlassPane.java b/common/buildcraft/builders/schematics/SchematicGlassPane.java index b52432ed..44248c49 100755 --- a/common/buildcraft/builders/schematics/SchematicGlassPane.java +++ b/common/buildcraft/builders/schematics/SchematicGlassPane.java @@ -18,12 +18,12 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicGlassPane extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(block, 1, 0)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } diff --git a/common/buildcraft/builders/schematics/SchematicGravel.java b/common/buildcraft/builders/schematics/SchematicGravel.java index 0c0714b6..ca1dc5f4 100755 --- a/common/buildcraft/builders/schematics/SchematicGravel.java +++ b/common/buildcraft/builders/schematics/SchematicGravel.java @@ -20,17 +20,17 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicGravel extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Blocks.gravel)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, Blocks.gravel, 0, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicIgnore.java b/common/buildcraft/builders/schematics/SchematicIgnore.java index 15135d78..15db1fbd 100644 --- a/common/buildcraft/builders/schematics/SchematicIgnore.java +++ b/common/buildcraft/builders/schematics/SchematicIgnore.java @@ -18,7 +18,7 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicIgnore extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { } @@ -28,17 +28,17 @@ public class SchematicIgnore extends SchematicBlock { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } diff --git a/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java b/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java index e0db87a0..ebc47e11 100644 --- a/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java +++ b/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java @@ -18,12 +18,12 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicIgnoreMeta extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(block, 1, 0)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } diff --git a/common/buildcraft/builders/schematics/SchematicPiston.java b/common/buildcraft/builders/schematics/SchematicPiston.java index 80ccecb6..74c0eb1f 100644 --- a/common/buildcraft/builders/schematics/SchematicPiston.java +++ b/common/buildcraft/builders/schematics/SchematicPiston.java @@ -21,7 +21,7 @@ public class SchematicPiston extends SchematicRotateMeta { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { int localMeta = meta & 7; context.world().setBlock(x, y, z, block, localMeta, 3); diff --git a/common/buildcraft/builders/schematics/SchematicPortal.java b/common/buildcraft/builders/schematics/SchematicPortal.java index b4b7d9ac..79c00952 100755 --- a/common/buildcraft/builders/schematics/SchematicPortal.java +++ b/common/buildcraft/builders/schematics/SchematicPortal.java @@ -19,17 +19,17 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicPortal extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { } @Override diff --git a/common/buildcraft/builders/schematics/SchematicPumpkin.java b/common/buildcraft/builders/schematics/SchematicPumpkin.java index 4d5408b1..c8829cee 100644 --- a/common/buildcraft/builders/schematics/SchematicPumpkin.java +++ b/common/buildcraft/builders/schematics/SchematicPumpkin.java @@ -18,12 +18,12 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicPumpkin extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(block, 1, 0)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } diff --git a/common/buildcraft/builders/schematics/SchematicRail.java b/common/buildcraft/builders/schematics/SchematicRail.java index 20f684f1..b89b00c1 100755 --- a/common/buildcraft/builders/schematics/SchematicRail.java +++ b/common/buildcraft/builders/schematics/SchematicRail.java @@ -56,7 +56,7 @@ public class SchematicRail extends SchematicBlock { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, 0, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java b/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java index 107f4477..0c41e4e9 100644 --- a/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java @@ -24,12 +24,12 @@ public class SchematicRedstoneDiode extends SchematicBlock { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(baseItem)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java b/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java index 24a42f9b..6c870a60 100755 --- a/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java @@ -20,12 +20,12 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicRedstoneLamp extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Blocks.redstone_lamp, 1, 0)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneWire.java b/common/buildcraft/builders/schematics/SchematicRedstoneWire.java index 672f28d4..bd5cbaa0 100755 --- a/common/buildcraft/builders/schematics/SchematicRedstoneWire.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneWire.java @@ -24,17 +24,17 @@ public class SchematicRedstoneWire extends SchematicBlock { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(customStack.copy()); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, 0, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicSeeds.java b/common/buildcraft/builders/schematics/SchematicSeeds.java index 2192a561..cd5202a3 100755 --- a/common/buildcraft/builders/schematics/SchematicSeeds.java +++ b/common/buildcraft/builders/schematics/SchematicSeeds.java @@ -25,17 +25,17 @@ public class SchematicSeeds extends SchematicBlock { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(seeds)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, 0, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicSign.java b/common/buildcraft/builders/schematics/SchematicSign.java index 16227263..74b8ff65 100644 --- a/common/buildcraft/builders/schematics/SchematicSign.java +++ b/common/buildcraft/builders/schematics/SchematicSign.java @@ -27,12 +27,12 @@ public class SchematicSign extends SchematicTile { } @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Items.sign)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { // cancel requirements reading } diff --git a/common/buildcraft/builders/schematics/SchematicStairs.java b/common/buildcraft/builders/schematics/SchematicStairs.java index c6985e60..c0046ef2 100644 --- a/common/buildcraft/builders/schematics/SchematicStairs.java +++ b/common/buildcraft/builders/schematics/SchematicStairs.java @@ -18,12 +18,12 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicStairs extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(block, 1, 0)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } diff --git a/common/buildcraft/builders/schematics/SchematicStone.java b/common/buildcraft/builders/schematics/SchematicStone.java index d8fc4e0b..35e22d9e 100755 --- a/common/buildcraft/builders/schematics/SchematicStone.java +++ b/common/buildcraft/builders/schematics/SchematicStone.java @@ -20,17 +20,17 @@ import buildcraft.api.blueprints.SchematicBlock; public class SchematicStone extends SchematicBlock { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(Blocks.stone)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, Blocks.stone, 0, 3); } diff --git a/common/buildcraft/builders/schematics/SchematicTripWireHook.java b/common/buildcraft/builders/schematics/SchematicTripWireHook.java index 2d203988..4cdd8e82 100755 --- a/common/buildcraft/builders/schematics/SchematicTripWireHook.java +++ b/common/buildcraft/builders/schematics/SchematicTripWireHook.java @@ -41,7 +41,7 @@ public class SchematicTripWireHook extends SchematicBlock { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, meta, 3); } diff --git a/common/buildcraft/core/blueprints/Blueprint.java b/common/buildcraft/core/blueprints/Blueprint.java index 8cfbd610..eaf5a57e 100644 --- a/common/buildcraft/core/blueprints/Blueprint.java +++ b/common/buildcraft/core/blueprints/Blueprint.java @@ -101,8 +101,8 @@ public class Blueprint extends BlueprintBase { } try { - slot.writeToBlueprint(context, x, y, z); - slot.writeRequirementsToBlueprint(context, x, y, z); + slot.initializeFromObjectAt(context, x, y, z); + slot.storeRequirements(context, x, y, z); contents[posX][posY][posZ] = slot; } catch (Throwable t) { // Defensive code against errors in implementers @@ -158,7 +158,7 @@ public class Blueprint extends BlueprintBase { if (contents [x][y][z] != null) { contents[x][y][z].idsToBlueprint(mapping); - contents[x][y][z].writeToNBT(cpt, mapping); + contents[x][y][z].writeSchematicToNBT(cpt, mapping); } nbtContents.appendTag(cpt); @@ -173,7 +173,7 @@ public class Blueprint extends BlueprintBase { for (SchematicEntity s : entities) { NBTTagCompound subNBT = new NBTTagCompound(); s.idsToBlueprint(mapping); - s.writeToNBT(subNBT, mapping); + s.writeSchematicToNBT(subNBT, mapping); entitiesNBT.appendTag(subNBT); } @@ -211,7 +211,7 @@ public class Blueprint extends BlueprintBase { if (block != null) { contents[x][y][z] = SchematicRegistry.INSTANCE.createSchematicBlock(block, cpt.getInteger("blockMeta")); - contents[x][y][z].readFromNBT(cpt, mapping); + contents[x][y][z].readSchematicFromNBT(cpt, mapping); if (!contents[x][y][z].doNotUse()) { contents[x][y][z].idsToWorld(mapping); @@ -261,7 +261,7 @@ public class Blueprint extends BlueprintBase { if (entity != null) { SchematicEntity s = SchematicRegistry.INSTANCE.createSchematicEntity(entity); - s.readFromNBT(cpt, mapping); + s.readSchematicFromNBT(cpt, mapping); s.idsToWorld(mapping); entities.add(s); } else { diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 0d0b8d87..273d83b8 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -457,7 +457,7 @@ public class BptBuilderBlueprint extends BptBuilderBase { try { LinkedList req = new LinkedList(); - slot.writeRequirementsToWorld(context, req); + slot.getRequirementsForPlacement(context, req); for (ItemStack stk : req) { if (stk != null) { diff --git a/common/buildcraft/core/builders/BuildingSlotBlock.java b/common/buildcraft/core/builders/BuildingSlotBlock.java index afb9ad2f..f235deb8 100755 --- a/common/buildcraft/core/builders/BuildingSlotBlock.java +++ b/common/buildcraft/core/builders/BuildingSlotBlock.java @@ -53,7 +53,7 @@ public class BuildingSlotBlock extends BuildingSlot { } } else { try { - getSchematic().writeToWorld(context, x, y, z, stackConsumed); + getSchematic().placeInWorld(context, x, y, z, stackConsumed); // Once the schematic has been written, we're going to issue // calls @@ -86,7 +86,7 @@ public class BuildingSlotBlock extends BuildingSlot { } else { LinkedList req = new LinkedList(); - getSchematic().writeRequirementsToWorld(context, req); + getSchematic().getRequirementsForPlacement(context, req); return req; } diff --git a/common/buildcraft/energy/SchematicEngine.java b/common/buildcraft/energy/SchematicEngine.java index fa256d46..b9996f11 100644 --- a/common/buildcraft/energy/SchematicEngine.java +++ b/common/buildcraft/energy/SchematicEngine.java @@ -29,8 +29,8 @@ public class SchematicEngine extends SchematicTile { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeToBlueprint(context, x, y, z); + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { + super.initializeFromObjectAt(context, x, y, z); TileEngine engine = (TileEngine) context.world().getTileEntity(x, y, z); @@ -43,8 +43,8 @@ public class SchematicEngine extends SchematicTile { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { - super.writeToWorld(context, x, y, z, stacks); + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + super.placeInWorld(context, x, y, z, stacks); TileEngine engine = (TileEngine) context.world().getTileEntity(x, y, z); diff --git a/common/buildcraft/factory/schematics/SchematicPump.java b/common/buildcraft/factory/schematics/SchematicPump.java index 10bb1748..342aea13 100755 --- a/common/buildcraft/factory/schematics/SchematicPump.java +++ b/common/buildcraft/factory/schematics/SchematicPump.java @@ -19,25 +19,25 @@ import buildcraft.api.blueprints.SchematicTile; public class SchematicPump extends SchematicTile { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(BuildCraftFactory.pumpBlock)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeToBlueprint(context, x, y, z); + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { + super.initializeFromObjectAt(context, x, y, z); tileNBT.removeTag("tank"); tileNBT.removeTag("mjStored"); } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, 0, 3); } diff --git a/common/buildcraft/factory/schematics/SchematicRefinery.java b/common/buildcraft/factory/schematics/SchematicRefinery.java index 62cd83d0..1b141db7 100644 --- a/common/buildcraft/factory/schematics/SchematicRefinery.java +++ b/common/buildcraft/factory/schematics/SchematicRefinery.java @@ -21,12 +21,12 @@ import buildcraft.api.blueprints.SchematicTile; public class SchematicRefinery extends SchematicTile { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(BuildCraftFactory.refineryBlock)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @@ -36,8 +36,8 @@ public class SchematicRefinery extends SchematicTile { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeToBlueprint(context, x, y, z); + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { + super.initializeFromObjectAt(context, x, y, z); tileNBT.removeTag("tank1"); tileNBT.removeTag("tank2"); @@ -46,14 +46,14 @@ public class SchematicRefinery extends SchematicTile { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { // to support refineries coming from older blueprints tileNBT.removeTag("tank1"); tileNBT.removeTag("tank2"); tileNBT.removeTag("result"); tileNBT.removeTag("mjStored"); - super.writeToWorld(context, x, y, z, stacks); + super.placeInWorld(context, x, y, z, stacks); } } diff --git a/common/buildcraft/factory/schematics/SchematicTank.java b/common/buildcraft/factory/schematics/SchematicTank.java index 37724fcc..2207aa7a 100644 --- a/common/buildcraft/factory/schematics/SchematicTank.java +++ b/common/buildcraft/factory/schematics/SchematicTank.java @@ -18,22 +18,22 @@ import buildcraft.api.blueprints.SchematicTile; public class SchematicTank extends SchematicTile { @Override - public void writeRequirementsToWorld(IBuilderContext context, LinkedList requirements) { + public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { requirements.add(new ItemStack(block)); } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { context.world().setBlock(x, y, z, block, meta, 3); } diff --git a/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java b/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java index a0637bd3..606961d0 100755 --- a/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java +++ b/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java @@ -14,8 +14,8 @@ import buildcraft.api.blueprints.SchematicTile; public class SchematicLaserTableBase extends SchematicTile { @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { - super.writeToBlueprint(context, x, y, z); + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { + super.initializeFromObjectAt(context, x, y, z); tileNBT.removeTag("energy"); } diff --git a/common/buildcraft/transport/schematics/SchematicPipe.java b/common/buildcraft/transport/schematics/SchematicPipe.java index 5d89000b..2413db52 100644 --- a/common/buildcraft/transport/schematics/SchematicPipe.java +++ b/common/buildcraft/transport/schematics/SchematicPipe.java @@ -110,7 +110,7 @@ public class SchematicPipe extends SchematicTile { } @Override - public void writeToWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { + public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { tileNBT.setInteger("x", x); tileNBT.setInteger("y", y); tileNBT.setInteger("z", z); @@ -122,7 +122,7 @@ public class SchematicPipe extends SchematicTile { } @Override - public void writeToBlueprint(IBuilderContext context, int x, int y, int z) { + public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { TileEntity tile = context.world().getTileEntity(x, y, z); Pipe pipe = BlockGenericPipe.getPipe(context.world(), x, y, z); @@ -148,7 +148,7 @@ public class SchematicPipe extends SchematicTile { } @Override - public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { + public void storeRequirements(IBuilderContext context, int x, int y, int z) { Pipe pipe = BlockGenericPipe.getPipe(context.world(), x, y, z); if (BlockGenericPipe.isValid(pipe)) { @@ -201,14 +201,14 @@ public class SchematicPipe extends SchematicTile { } @Override - public void writeToNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.writeToNBT(nbt, registry); + public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.writeSchematicToNBT(nbt, registry); nbt.setInteger("version", 2); } @Override - public void readFromNBT(NBTTagCompound nbt, MappingRegistry registry) { - super.readFromNBT(nbt, registry); + public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) { + super.readSchematicFromNBT(nbt, registry); if (!nbt.hasKey("version") || nbt.getInteger("version") < 2) { // Schematics previous to the fixes in version 2 had item id