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

renamed BlueprintMangager into SchematicRegistry

Browse source
This commit is contained in:
SpaceToad 2014-03-09 14:48:09 +01:00
parent d8163eeca1
commit a083857efc
13 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
common/buildcraft/BuildCraftBuilders.java
View file

@ -17,7 +17,7 @@ import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Property;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.filler.FillerManager; import buildcraft.api.filler.FillerManager;
import buildcraft.api.filler.IFillerPattern; import buildcraft.api.filler.IFillerPattern;
import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.ActionManager;
@ -137,89 +137,89 @@ public class BuildCraftBuilders extends BuildCraftMod {
// Register save handler // Register save handler
MinecraftForge.EVENT_BUS.register(new EventHandlerBuilders()); MinecraftForge.EVENT_BUS.register(new EventHandlerBuilders());
BlueprintManager.registerSchematicClass(Blocks.snow, SchematicIgnore.class); SchematicRegistry.registerSchematicClass(Blocks.snow, SchematicIgnore.class);
BlueprintManager.registerSchematicClass(Blocks.tallgrass, SchematicIgnore.class); SchematicRegistry.registerSchematicClass(Blocks.tallgrass, SchematicIgnore.class);
BlueprintManager.registerSchematicClass(Blocks.ice, SchematicIgnore.class); SchematicRegistry.registerSchematicClass(Blocks.ice, SchematicIgnore.class);
BlueprintManager.registerSchematicClass(Blocks.piston_head, SchematicIgnore.class); SchematicRegistry.registerSchematicClass(Blocks.piston_head, SchematicIgnore.class);
BlueprintManager.registerSchematicClass(Blocks.dirt, SchematicDirt.class); SchematicRegistry.registerSchematicClass(Blocks.dirt, SchematicDirt.class);
BlueprintManager.registerSchematicClass(Blocks.grass, SchematicDirt.class); SchematicRegistry.registerSchematicClass(Blocks.grass, SchematicDirt.class);
BlueprintManager.registerSchematicClass(Blocks.farmland, SchematicDirt.class); SchematicRegistry.registerSchematicClass(Blocks.farmland, SchematicDirt.class);
BlueprintManager.registerSchematicClass(Blocks.torch, SchematicWallSide.class); SchematicRegistry.registerSchematicClass(Blocks.torch, SchematicWallSide.class);
BlueprintManager.registerSchematicClass(Blocks.redstone_torch, SchematicWallSide.class); SchematicRegistry.registerSchematicClass(Blocks.redstone_torch, SchematicWallSide.class);
BlueprintManager.registerSchematicClass(Blocks.unlit_redstone_torch, SchematicWallSide.class); SchematicRegistry.registerSchematicClass(Blocks.unlit_redstone_torch, SchematicWallSide.class);
BlueprintManager.registerSchematicClass(Blocks.ladder, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.ladder, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.fence_gate, SchematicRotateMeta.class, new int[]{0, 1, 2, 3}, true); SchematicRegistry.registerSchematicClass(Blocks.fence_gate, SchematicRotateMeta.class, new int[]{0, 1, 2, 3}, true);
BlueprintManager.registerSchematicClass(Blocks.log, SchematicRotateMeta.class, new int[]{8, 4, 8, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.log, SchematicRotateMeta.class, new int[]{8, 4, 8, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.log2, SchematicRotateMeta.class, new int[]{8, 4, 8, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.log2, SchematicRotateMeta.class, new int[]{8, 4, 8, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.hay_block, SchematicRotateMeta.class, new int[]{8, 4, 8, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.hay_block, SchematicRotateMeta.class, new int[]{8, 4, 8, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.quartz_block, SchematicRotateMeta.class, new int[]{4, 3, 4, 3}, true); SchematicRegistry.registerSchematicClass(Blocks.quartz_block, SchematicRotateMeta.class, new int[]{4, 3, 4, 3}, true);
BlueprintManager.registerSchematicClass(Blocks.furnace, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.furnace, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.lit_furnace, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.lit_furnace, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.chest, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.chest, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.dispenser, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(Blocks.dispenser, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(Blocks.brewing_stand, SchematicInventory.class); SchematicRegistry.registerSchematicClass(Blocks.brewing_stand, SchematicInventory.class);
BlueprintManager.registerSchematicClass(Blocks.vine, SchematicRotateMeta.class, new int[]{1, 4, 8, 2}, false); SchematicRegistry.registerSchematicClass(Blocks.vine, SchematicRotateMeta.class, new int[]{1, 4, 8, 2}, false);
BlueprintManager.registerSchematicClass(Blocks.trapdoor, SchematicRotateMeta.class, new int[]{0, 1, 2, 3}, false); SchematicRegistry.registerSchematicClass(Blocks.trapdoor, SchematicRotateMeta.class, new int[]{0, 1, 2, 3}, false);
BlueprintManager.registerSchematicClass(Blocks.wooden_button, SchematicLever.class); SchematicRegistry.registerSchematicClass(Blocks.wooden_button, SchematicLever.class);
BlueprintManager.registerSchematicClass(Blocks.stone_button, SchematicLever.class); SchematicRegistry.registerSchematicClass(Blocks.stone_button, SchematicLever.class);
BlueprintManager.registerSchematicClass(Blocks.lever, SchematicLever.class); SchematicRegistry.registerSchematicClass(Blocks.lever, SchematicLever.class);
BlueprintManager.registerSchematicClass(Blocks.stone, SchematicCustomStack.class, new ItemStack(Blocks.stone)); SchematicRegistry.registerSchematicClass(Blocks.stone, SchematicCustomStack.class, new ItemStack(Blocks.stone));
BlueprintManager.registerSchematicClass(Blocks.redstone_wire, SchematicCustomStack.class, new ItemStack(Items.redstone)); SchematicRegistry.registerSchematicClass(Blocks.redstone_wire, SchematicCustomStack.class, new ItemStack(Items.redstone));
BlueprintManager.registerSchematicClass(Blocks.cake, SchematicCustomStack.class, new ItemStack(Items.cake)); SchematicRegistry.registerSchematicClass(Blocks.cake, SchematicCustomStack.class, new ItemStack(Items.cake));
//new BptBlockCustomStack(Blocks.crops.blockID, new ItemStack(Items.seeds)); //new BptBlockCustomStack(Blocks.crops.blockID, new ItemStack(Items.seeds));
BlueprintManager.registerSchematicClass(Blocks.pumpkin_stem, SchematicCustomStack.class, new ItemStack(Items.pumpkin_seeds)); SchematicRegistry.registerSchematicClass(Blocks.pumpkin_stem, SchematicCustomStack.class, new ItemStack(Items.pumpkin_seeds));
BlueprintManager.registerSchematicClass(Blocks.melon_stem, SchematicCustomStack.class, new ItemStack(Items.melon_seeds)); SchematicRegistry.registerSchematicClass(Blocks.melon_stem, SchematicCustomStack.class, new ItemStack(Items.melon_seeds));
BlueprintManager.registerSchematicClass(Blocks.glowstone, SchematicCustomStack.class, new ItemStack(Blocks.glowstone)); SchematicRegistry.registerSchematicClass(Blocks.glowstone, SchematicCustomStack.class, new ItemStack(Blocks.glowstone));
BlueprintManager.registerSchematicClass(Blocks.powered_repeater, SchematicRedstoneRepeater.class); SchematicRegistry.registerSchematicClass(Blocks.powered_repeater, SchematicRedstoneRepeater.class);
BlueprintManager.registerSchematicClass(Blocks.unpowered_repeater, SchematicRedstoneRepeater.class); SchematicRegistry.registerSchematicClass(Blocks.unpowered_repeater, SchematicRedstoneRepeater.class);
BlueprintManager.registerSchematicClass(Blocks.water, SchematicFluid.class, new ItemStack(Items.water_bucket)); SchematicRegistry.registerSchematicClass(Blocks.water, SchematicFluid.class, new ItemStack(Items.water_bucket));
BlueprintManager.registerSchematicClass(Blocks.flowing_water, SchematicFluid.class, new ItemStack(Items.water_bucket)); SchematicRegistry.registerSchematicClass(Blocks.flowing_water, SchematicFluid.class, new ItemStack(Items.water_bucket));
BlueprintManager.registerSchematicClass(Blocks.lava, SchematicFluid.class, new ItemStack(Items.lava_bucket)); SchematicRegistry.registerSchematicClass(Blocks.lava, SchematicFluid.class, new ItemStack(Items.lava_bucket));
BlueprintManager.registerSchematicClass(Blocks.flowing_lava, SchematicFluid.class, new ItemStack(Items.lava_bucket)); SchematicRegistry.registerSchematicClass(Blocks.flowing_lava, SchematicFluid.class, new ItemStack(Items.lava_bucket));
BlueprintManager.registerSchematicClass(Blocks.rail, SchematicIgnoreMeta.class); SchematicRegistry.registerSchematicClass(Blocks.rail, SchematicIgnoreMeta.class);
BlueprintManager.registerSchematicClass(Blocks.detector_rail, SchematicIgnoreMeta.class); SchematicRegistry.registerSchematicClass(Blocks.detector_rail, SchematicIgnoreMeta.class);
BlueprintManager.registerSchematicClass(Blocks.glass_pane, SchematicIgnoreMeta.class); SchematicRegistry.registerSchematicClass(Blocks.glass_pane, SchematicIgnoreMeta.class);
BlueprintManager.registerSchematicClass(Blocks.piston, SchematicPiston.class); SchematicRegistry.registerSchematicClass(Blocks.piston, SchematicPiston.class);
BlueprintManager.registerSchematicClass(Blocks.piston_extension, SchematicPiston.class); SchematicRegistry.registerSchematicClass(Blocks.piston_extension, SchematicPiston.class);
BlueprintManager.registerSchematicClass(Blocks.sticky_piston, SchematicPiston.class); SchematicRegistry.registerSchematicClass(Blocks.sticky_piston, SchematicPiston.class);
BlueprintManager.registerSchematicClass(Blocks.lit_pumpkin, SchematicPumpkin.class); SchematicRegistry.registerSchematicClass(Blocks.lit_pumpkin, SchematicPumpkin.class);
BlueprintManager.registerSchematicClass(Blocks.stone_stairs, SchematicStairs.class); SchematicRegistry.registerSchematicClass(Blocks.stone_stairs, SchematicStairs.class);
BlueprintManager.registerSchematicClass(Blocks.oak_stairs, SchematicStairs.class); SchematicRegistry.registerSchematicClass(Blocks.oak_stairs, SchematicStairs.class);
BlueprintManager.registerSchematicClass(Blocks.nether_brick_stairs, SchematicStairs.class); SchematicRegistry.registerSchematicClass(Blocks.nether_brick_stairs, SchematicStairs.class);
BlueprintManager.registerSchematicClass(Blocks.brick_stairs, SchematicStairs.class); SchematicRegistry.registerSchematicClass(Blocks.brick_stairs, SchematicStairs.class);
BlueprintManager.registerSchematicClass(Blocks.stone_brick_stairs, SchematicStairs.class); SchematicRegistry.registerSchematicClass(Blocks.stone_brick_stairs, SchematicStairs.class);
BlueprintManager.registerSchematicClass(Blocks.wooden_button, SchematicDoor.class, new ItemStack(Items.wooden_door)); SchematicRegistry.registerSchematicClass(Blocks.wooden_button, SchematicDoor.class, new ItemStack(Items.wooden_door));
BlueprintManager.registerSchematicClass(Blocks.iron_door, SchematicDoor.class, new ItemStack(Items.iron_door)); SchematicRegistry.registerSchematicClass(Blocks.iron_door, SchematicDoor.class, new ItemStack(Items.iron_door));
BlueprintManager.registerSchematicClass(Blocks.bed, SchematicBed.class); SchematicRegistry.registerSchematicClass(Blocks.bed, SchematicBed.class);
BlueprintManager.registerSchematicClass(Blocks.wall_sign, SchematicSign.class, true); SchematicRegistry.registerSchematicClass(Blocks.wall_sign, SchematicSign.class, true);
BlueprintManager.registerSchematicClass(Blocks.standing_sign, SchematicSign.class, false); SchematicRegistry.registerSchematicClass(Blocks.standing_sign, SchematicSign.class, false);
// BUILDCRAFT BLOCKS // BUILDCRAFT BLOCKS
BlueprintManager.registerSchematicClass(architectBlock, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(architectBlock, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(builderBlock, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(builderBlock, SchematicRotateInventory.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(libraryBlock, SchematicInventory.class); SchematicRegistry.registerSchematicClass(libraryBlock, SchematicInventory.class);
BlueprintManager.registerSchematicClass(markerBlock, SchematicWallSide.class); SchematicRegistry.registerSchematicClass(markerBlock, SchematicWallSide.class);
BlueprintManager.registerSchematicClass(pathMarkerBlock, SchematicWallSide.class); SchematicRegistry.registerSchematicClass(pathMarkerBlock, SchematicWallSide.class);
if (BuildCraftCore.loadDefaultRecipes) { if (BuildCraftCore.loadDefaultRecipes) {
loadRecipes(); loadRecipes();

4
common/buildcraft/BuildCraftEnergy.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.fuels.IronEngineCoolant; import buildcraft.api.fuels.IronEngineCoolant;
import buildcraft.api.fuels.IronEngineFuel; import buildcraft.api.fuels.IronEngineFuel;
import buildcraft.api.recipes.BuildcraftRecipes; import buildcraft.api.recipes.BuildcraftRecipes;
@ -255,7 +255,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler()); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());
BlueprintManager.registerSchematicClass(engineBlock, SchematicEngine.class); SchematicRegistry.registerSchematicClass(engineBlock, SchematicEngine.class);
if (BuildCraftCore.loadDefaultRecipes) { if (BuildCraftCore.loadDefaultRecipes) {
loadRecipes(); loadRecipes();

10
common/buildcraft/BuildCraftFactory.java
View file

@ -22,7 +22,7 @@ import net.minecraftforge.common.ForgeChunkManager.Ticket;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Property;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import buildcraft.core.InterModComms; import buildcraft.core.InterModComms;
import buildcraft.core.Version; import buildcraft.core.Version;
@ -146,10 +146,10 @@ public class BuildCraftFactory extends BuildCraftMod {
FactoryProxy.proxy.initializeTileEntities(); FactoryProxy.proxy.initializeTileEntities();
BlueprintManager.registerSchematicClass(autoWorkbenchBlock, SchematicAutoWorkbench.class); SchematicRegistry.registerSchematicClass(autoWorkbenchBlock, SchematicAutoWorkbench.class);
BlueprintManager.registerSchematicClass(frameBlock, SchematicFrame.class); SchematicRegistry.registerSchematicClass(frameBlock, SchematicFrame.class);
BlueprintManager.registerSchematicClass(refineryBlock, SchematicRefinery.class); SchematicRegistry.registerSchematicClass(refineryBlock, SchematicRefinery.class);
BlueprintManager.registerSchematicClass(tankBlock, SchematicTank.class); SchematicRegistry.registerSchematicClass(tankBlock, SchematicTank.class);
if (BuildCraftCore.loadDefaultRecipes) { if (BuildCraftCore.loadDefaultRecipes) {
loadRecipes(); loadRecipes();

6
common/buildcraft/BuildCraftSilicon.java
View file

@ -15,7 +15,7 @@ import java.util.List;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.recipes.BuildcraftRecipes; import buildcraft.api.recipes.BuildcraftRecipes;
import buildcraft.api.schematics.SchematicInventory; import buildcraft.api.schematics.SchematicInventory;
import buildcraft.api.schematics.SchematicRotateMeta; import buildcraft.api.schematics.SchematicRotateMeta;
@ -94,8 +94,8 @@ public class BuildCraftSilicon extends BuildCraftMod {
CoreProxy.proxy.registerTileEntity(TileAdvancedCraftingTable.class, "net.minecraft.src.buildcraft.factory.TileAssemblyAdvancedWorkbench"); CoreProxy.proxy.registerTileEntity(TileAdvancedCraftingTable.class, "net.minecraft.src.buildcraft.factory.TileAssemblyAdvancedWorkbench");
CoreProxy.proxy.registerTileEntity(TileIntegrationTable.class, "net.minecraft.src.buildcraft.factory.TileIntegrationTable"); CoreProxy.proxy.registerTileEntity(TileIntegrationTable.class, "net.minecraft.src.buildcraft.factory.TileIntegrationTable");
BlueprintManager.registerSchematicClass(laserBlock, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true); SchematicRegistry.registerSchematicClass(laserBlock, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true);
BlueprintManager.registerSchematicClass(assemblyTableBlock, SchematicInventory.class); SchematicRegistry.registerSchematicClass(assemblyTableBlock, SchematicInventory.class);
if (BuildCraftCore.loadDefaultRecipes) { if (BuildCraftCore.loadDefaultRecipes) {
loadRecipes(); loadRecipes();

4
common/buildcraft/BuildCraftTransport.java
View file

@ -21,7 +21,7 @@ import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Property;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.core.IIconProvider; import buildcraft.api.core.IIconProvider;
import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.ActionManager;
import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.GateExpansions;
@ -435,7 +435,7 @@ public class BuildCraftTransport extends BuildCraftMod {
TransportProxy.proxy.registerTileEntities(); TransportProxy.proxy.registerTileEntities();
BlueprintManager.registerSchematicClass(genericPipeBlock, SchematicPipe.class); SchematicRegistry.registerSchematicClass(genericPipeBlock, SchematicPipe.class);
new BptPipeIron(pipeItemsIron); new BptPipeIron(pipeItemsIron);
new BptPipeIron(pipeFluidsIron); new BptPipeIron(pipeFluidsIron);

2
common/buildcraft/api/blueprints/Schematic.java
View file

@ -59,7 +59,7 @@ public class Schematic {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public Schematic clone() { public Schematic clone() {
Schematic obj = BlueprintManager.newSchematic(block); Schematic obj = SchematicRegistry.newSchematic(block);
obj.block = block; obj.block = block;
obj.meta = meta; obj.meta = meta;

2
common/buildcraft/api/blueprints/BlueprintManager.java → common/buildcraft/api/blueprints/SchematicRegistry.java
View file

@ -15,7 +15,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
public class BlueprintManager { public class SchematicRegistry {
private static class SchematicConstructor { private static class SchematicConstructor {
Class clas; Class clas;

4
common/buildcraft/builders/filler/pattern/PatternFill.java
View file

@ -12,7 +12,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.Box; import buildcraft.core.Box;
import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.BptBuilderTemplate;
@ -54,7 +54,7 @@ public class PatternFill extends FillerPattern {
for (int y = yMin; y <= yMax; ++y) { for (int y = yMin; y <= yMax; ++y) {
for (int x = xMin; x <= xMax; ++x) { for (int x = xMin; x <= xMax; ++x) {
for (int z = zMin; z <= zMax; ++z) { for (int z = zMin; z <= zMax; ++z) {
bpt.contents[x - xMin][y - yMin][z - zMin] = BlueprintManager bpt.contents[x - xMin][y - yMin][z - zMin] = SchematicRegistry
.newSchematic(Blocks.stone); .newSchematic(Blocks.stone);
} }
} }

4
common/buildcraft/builders/filler/pattern/PatternFlatten.java
View file

@ -12,7 +12,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.Box; import buildcraft.core.Box;
import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.BptBuilderTemplate;
@ -56,7 +56,7 @@ public class PatternFlatten extends FillerPattern {
for (int y = yMax; y >= yMin; --y) { for (int y = yMax; y >= yMin; --y) {
for (int x = xMin; x <= xMax && !found; ++x) { for (int x = xMin; x <= xMax && !found; ++x) {
for (int z = zMin; z <= zMax && !found; ++z) { for (int z = zMin; z <= zMax && !found; ++z) {
bpt.contents[x - xMin][y - yMin][z - zMin] = BlueprintManager bpt.contents[x - xMin][y - yMin][z - zMin] = SchematicRegistry
.newSchematic(Blocks.stone); .newSchematic(Blocks.stone);
} }
} }

4
common/buildcraft/builders/filler/pattern/PatternPyramid.java
View file

@ -12,7 +12,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.Box; import buildcraft.core.Box;
import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.BptBuilderTemplate;
@ -101,7 +101,7 @@ public class PatternPyramid extends FillerPattern {
while (step <= xSize / 2 && step <= zSize / 2 && height >= yMin && height <= yMax) { while (step <= xSize / 2 && step <= zSize / 2 && height >= yMin && height <= yMax) {
for (int x = xMin + step; x <= xMax - step; ++x) { for (int x = xMin + step; x <= xMax - step; ++x) {
for (int z = zMin + step; z <= zMax - step; ++z) { for (int z = zMin + step; z <= zMax - step; ++z) {
bpt.contents [x - xMin][height - yMin][z - zMin] = BlueprintManager.newSchematic(Blocks.stone); bpt.contents [x - xMin][height - yMin][z - zMin] = SchematicRegistry.newSchematic(Blocks.stone);
} }
} }

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

@ -13,7 +13,7 @@ import net.minecraft.block.BlockContainer;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.Schematic;
import buildcraft.core.utils.BCLog; import buildcraft.core.utils.BCLog;
@ -31,7 +31,7 @@ public class Blueprint extends BlueprintBase {
public void readFromWorld(IBuilderContext context, TileEntity anchorTile, int x, int y, int z) { public void readFromWorld(IBuilderContext context, TileEntity anchorTile, int x, int y, int z) {
Block block = anchorTile.getWorldObj().getBlock(x, y, z); Block block = anchorTile.getWorldObj().getBlock(x, y, z);
Schematic slot = BlueprintManager.newSchematic(block); Schematic slot = SchematicRegistry.newSchematic(block);
if (slot == null) { if (slot == null) {
return; return;
@ -102,7 +102,7 @@ public class Blueprint extends BlueprintBase {
if (cpt.hasKey("blockId")) { if (cpt.hasKey("blockId")) {
int blockId = cpt.getInteger("blockId"); int blockId = cpt.getInteger("blockId");
contents[x][y][z] = BlueprintManager.newSchematic(mapping.getBlockForId(blockId)); contents[x][y][z] = SchematicRegistry.newSchematic(mapping.getBlockForId(blockId));
contents[x][y][z].readFromNBT(cpt, mapping); contents[x][y][z].readFromNBT(cpt, mapping);
} else { } else {
contents[x][y][z] = null; contents[x][y][z] = null;

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

@ -14,7 +14,7 @@ import net.minecraft.block.Block;
import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World; import net.minecraft.world.World;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.Schematic;
import buildcraft.builders.blueprints.BlueprintId; import buildcraft.builders.blueprints.BlueprintId;
@ -51,7 +51,7 @@ public abstract class BlueprintBase {
public void setBlock(int x, int y, int z, Block block) { public void setBlock(int x, int y, int z, Block block) {
if (contents[x][y][z] == null) { if (contents[x][y][z] == null) {
contents[x][y][z] = BlueprintManager.newSchematic(block); contents[x][y][z] = SchematicRegistry.newSchematic(block);
} }
contents[x][y][z].block = block; contents[x][y][z].block = block;

18
common/buildcraft/factory/TileQuarry.java
View file

@ -26,7 +26,7 @@ import net.minecraftforge.common.ForgeChunkManager.Type;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore;
import buildcraft.BuildCraftFactory; import buildcraft.BuildCraftFactory;
import buildcraft.api.blueprints.BlueprintManager; import buildcraft.api.blueprints.SchematicRegistry;
import buildcraft.api.blueprints.SchematicToBuild; import buildcraft.api.blueprints.SchematicToBuild;
import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.IAreaProvider;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
@ -636,21 +636,21 @@ public class TileQuarry extends TileBuildCraft implements IMachine, IPowerRecept
for (int it = 0; it < 2; it++) { for (int it = 0; it < 2; it++) {
for (int i = 0; i < blueprint.sizeX; ++i) { for (int i = 0; i < blueprint.sizeX; ++i) {
blueprint.contents [i][it * (box.sizeY() - 1)][0] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [i][it * (box.sizeY() - 1)][0] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
blueprint.contents [i][it * (box.sizeY() - 1)][blueprint.sizeZ - 1] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [i][it * (box.sizeY() - 1)][blueprint.sizeZ - 1] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
} }
for (int k = 0; k < blueprint.sizeZ; ++k) { for (int k = 0; k < blueprint.sizeZ; ++k) {
blueprint.contents [0][it * (box.sizeY() - 1)][k] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [0][it * (box.sizeY() - 1)][k] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
blueprint.contents [blueprint.sizeX - 1][it * (box.sizeY() - 1)][k] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [blueprint.sizeX - 1][it * (box.sizeY() - 1)][k] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
} }
} }
for (int h = 1; h < box.sizeY(); ++h) { for (int h = 1; h < box.sizeY(); ++h) {
blueprint.contents [0][h][0] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [0][h][0] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
blueprint.contents [0][h][blueprint.sizeZ - 1] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [0][h][blueprint.sizeZ - 1] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
blueprint.contents [blueprint.sizeX - 1][h][0] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [blueprint.sizeX - 1][h][0] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
blueprint.contents [blueprint.sizeX - 1][h][blueprint.sizeZ - 1] = BlueprintManager.newSchematic(BuildCraftFactory.frameBlock); blueprint.contents [blueprint.sizeX - 1][h][blueprint.sizeZ - 1] = SchematicRegistry.newSchematic(BuildCraftFactory.frameBlock);
} }
blueprintBuilder = new BptBuilderBlueprint(blueprint, worldObj, box.xMin, yCoord, box.zMin); //ForgeDirection.NORTH blueprintBuilder = new BptBuilderBlueprint(blueprint, worldObj, box.xMin, yCoord, box.zMin); //ForgeDirection.NORTH