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

Reorganizing namespaces.

Browse source
This commit is contained in:
SirSengir 2012-09-05 22:29:38 +02:00
parent 9643f4d52d
commit be58eee547
152 changed files with 486 additions and 488 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/buildcraft/BuildCraftBuilders.java
View file

@ -69,11 +69,11 @@ import buildcraft.builders.TileBuilder;
import buildcraft.builders.TileFiller;
import buildcraft.builders.TileMarker;
import buildcraft.builders.TilePathMarker;
import buildcraft.core.BptPlayerIndex;
import buildcraft.core.BptRootIndex;
import buildcraft.core.DefaultProps;
import buildcraft.core.ProxyCore;
import buildcraft.core.blueprints.BptPlayerIndex;
import buildcraft.core.blueprints.BptRootIndex;
import buildcraft.core.network.PacketHandler;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.Block;
import net.minecraft.src.Item;
@ -281,34 +281,34 @@ public class BuildCraftBuilders {
public static void loadRecipes() {
ProxyCore.proxy.addCraftingRecipe(new ItemStack(templateItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(templateItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('p'), Item.paper });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(blueprintItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(blueprintItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('p'), Item.paper });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(markerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(markerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('r'), Block.torchRedstoneActive });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(pathMarkerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(pathMarkerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
new ItemStack(Item.dyePowder, 1, 2), Character.valueOf('r'), Block.torchRedstoneActive });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(fillerBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(fillerBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('t'), markerBlock, Character.valueOf('y'),
new ItemStack(Item.dyePowder, 1, 11), Character.valueOf('c'), Block.workbench, Character.valueOf('g'),
BuildCraftCore.goldGearItem, Character.valueOf('C'), Block.chest });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(builderBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(builderBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('t'), markerBlock, Character.valueOf('y'),
new ItemStack(Item.dyePowder, 1, 11), Character.valueOf('c'), Block.workbench, Character.valueOf('g'),
BuildCraftCore.diamondGearItem, Character.valueOf('C'), Block.chest });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(architectBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(architectBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('t'), markerBlock, Character.valueOf('y'),
new ItemStack(Item.dyePowder, 1, 11), Character.valueOf('c'), Block.workbench, Character.valueOf('g'),
BuildCraftCore.diamondGearItem, Character.valueOf('C'), new ItemStack(templateItem, 1) });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(libraryBlock, 1), new Object[] { "bbb", "bBb", "bbb", Character.valueOf('b'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(libraryBlock, 1), new Object[] { "bbb", "bBb", "bbb", Character.valueOf('b'),
new ItemStack(blueprintItem), Character.valueOf('B'), Block.bookShelf });
// / INIT FILLER PATTERNS
FillerManager.registry.addRecipe(new FillerFillAll(), new Object[] { "bbb", "bbb", "bbb", Character.valueOf('b'),

26
common/buildcraft/BuildCraftCore.java
View file

@ -32,31 +32,31 @@ import buildcraft.api.liquids.LiquidData;
import buildcraft.api.liquids.LiquidManager;
import buildcraft.api.liquids.LiquidStack;
import buildcraft.api.power.PowerFramework;
import buildcraft.core.ActionMachineControl;
import buildcraft.core.ActionRedstoneOutput;
import buildcraft.core.BlockIndex;
import buildcraft.core.BptItem;
import buildcraft.core.BuildCraftConfiguration;
import buildcraft.core.DefaultActionProvider;
import buildcraft.core.DefaultProps;
import buildcraft.core.DefaultTriggerProvider;
import buildcraft.core.EntityEnergyLaser;
import buildcraft.core.EntityLaser;
import buildcraft.core.EntityRobot;
import buildcraft.core.ItemBuildCraft;
import buildcraft.core.ItemWrench;
import buildcraft.core.ProxyCore;
import buildcraft.core.RedstonePowerFramework;
import buildcraft.core.TriggerInventory;
import buildcraft.core.TriggerLiquidContainer;
import buildcraft.core.TriggerMachine;
import buildcraft.core.ActionMachineControl.Mode;
import buildcraft.core.blueprints.BptItem;
import buildcraft.core.network.EntityIds;
import buildcraft.core.network.PacketHandler;
//import buildcraft.core.network.ConnectionHandler;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.triggers.ActionMachineControl;
import buildcraft.core.triggers.ActionRedstoneOutput;
import buildcraft.core.triggers.DefaultActionProvider;
import buildcraft.core.triggers.DefaultTriggerProvider;
import buildcraft.core.triggers.TriggerInventory;
import buildcraft.core.triggers.TriggerLiquidContainer;
import buildcraft.core.triggers.TriggerMachine;
import buildcraft.core.triggers.ActionMachineControl.Mode;
import buildcraft.core.utils.Localization;
import buildcraft.transport.TriggerRedstoneInput;
import buildcraft.transport.triggers.TriggerRedstoneInput;
import net.minecraft.src.Block;
import net.minecraft.src.EntityList;
@ -246,8 +246,8 @@ public class BuildCraftCore {
EntityList.stringToClassMapping.remove("BuildCraft|Core.bcLaser");
EntityList.stringToClassMapping.remove("BuildCraft|Core.bcEnergyLaser");
ProxyCore.proxy.initializeRendering();
ProxyCore.proxy.initializeEntityRendering();
CoreProxy.proxy.initializeRendering();
CoreProxy.proxy.initializeEntityRendering();
Localization.addLocalization("/lang/buildcraft/", DefaultProps.DEFAULT_LANGUAGE);

8
common/buildcraft/BuildCraftEnergy.java
View file

@ -32,8 +32,8 @@ import buildcraft.api.recipes.RefineryRecipe;
import buildcraft.core.BlockIndex;
import buildcraft.core.DefaultProps;
import buildcraft.core.ItemBuildCraft;
import buildcraft.core.ProxyCore;
import buildcraft.core.network.PacketHandler;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.energy.BlockEngine;
import buildcraft.energy.BlockOilFlowing;
import buildcraft.energy.BlockOilStill;
@ -162,13 +162,13 @@ public class BuildCraftEnergy {
}
public static void loadRecipes() {
ProxyCore.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 0), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 0), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
Block.planks, Character.valueOf('g'), Block.glass, Character.valueOf('G'), BuildCraftCore.woodenGearItem,
Character.valueOf('p'), Block.pistonBase });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 1), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 1), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
Block.cobblestone, Character.valueOf('g'), Block.glass, Character.valueOf('G'), BuildCraftCore.stoneGearItem,
Character.valueOf('p'), Block.pistonBase });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 2), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 2), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
Item.ingotIron, Character.valueOf('g'), Block.glass, Character.valueOf('G'), BuildCraftCore.ironGearItem,
Character.valueOf('p'), Block.pistonBase });
}

70
common/buildcraft/BuildCraftFactory.java
View file

@ -21,7 +21,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import buildcraft.core.DefaultProps;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.factory.BlockAutoWorkbench;
import buildcraft.factory.BlockFrame;
import buildcraft.factory.BlockHopper;
@ -94,17 +94,17 @@ public class BuildCraftFactory {
// EntityRegistry.registerModEntity(EntityMechanicalArm.class, "bcMechanicalArm", EntityIds.MECHANICAL_ARM, instance, 50, 1, true);
ProxyCore.proxy.registerTileEntity(TileQuarry.class, "Machine");
ProxyCore.proxy.registerTileEntity(TileMiningWell.class, "MiningWell");
ProxyCore.proxy.registerTileEntity(TileAutoWorkbench.class, "AutoWorkbench");
ProxyCore.proxy.registerTileEntity(TilePump.class, "net.minecraft.src.buildcraft.factory.TilePump");
ProxyCore.proxy.registerTileEntity(TileTank.class, "net.minecraft.src.buildcraft.factory.TileTank");
ProxyCore.proxy.registerTileEntity(TileRefinery.class, "net.minecraft.src.buildcraft.factory.Refinery");
ProxyCore.proxy.registerTileEntity(TileLaser.class, "net.minecraft.src.buildcraft.factory.TileLaser");
ProxyCore.proxy.registerTileEntity(TileAssemblyTable.class, "net.minecraft.src.buildcraft.factory.TileAssemblyTable");
CoreProxy.proxy.registerTileEntity(TileQuarry.class, "Machine");
CoreProxy.proxy.registerTileEntity(TileMiningWell.class, "MiningWell");
CoreProxy.proxy.registerTileEntity(TileAutoWorkbench.class, "AutoWorkbench");
CoreProxy.proxy.registerTileEntity(TilePump.class, "net.minecraft.src.buildcraft.factory.TilePump");
CoreProxy.proxy.registerTileEntity(TileTank.class, "net.minecraft.src.buildcraft.factory.TileTank");
CoreProxy.proxy.registerTileEntity(TileRefinery.class, "net.minecraft.src.buildcraft.factory.Refinery");
CoreProxy.proxy.registerTileEntity(TileLaser.class, "net.minecraft.src.buildcraft.factory.TileLaser");
CoreProxy.proxy.registerTileEntity(TileAssemblyTable.class, "net.minecraft.src.buildcraft.factory.TileAssemblyTable");
if (!hopperDisabled) {
ProxyCore.proxy.registerTileEntity(TileHopper.class, "net.minecraft.src.buildcraft.factory.TileHopper");
CoreProxy.proxy.registerTileEntity(TileHopper.class, "net.minecraft.src.buildcraft.factory.TileHopper");
}
FactoryProxy.proxy.initializeTileEntities();
@ -138,42 +138,42 @@ public class BuildCraftFactory {
BuildCraftCore.mainConfiguration.save();
miningWellBlock = new BlockMiningWell(Integer.parseInt(minigWellId.value));
ProxyCore.proxy.registerBlock(miningWellBlock.setBlockName("miningWellBlock"));
ProxyCore.proxy.addName(miningWellBlock, "Mining Well");
CoreProxy.proxy.registerBlock(miningWellBlock.setBlockName("miningWellBlock"));
CoreProxy.proxy.addName(miningWellBlock, "Mining Well");
plainPipeBlock = new BlockPlainPipe(Integer.parseInt(plainPipeId.value));
ProxyCore.proxy.registerBlock(plainPipeBlock.setBlockName("plainPipeBlock"));
ProxyCore.proxy.addName(plainPipeBlock, "Mining Pipe");
CoreProxy.proxy.registerBlock(plainPipeBlock.setBlockName("plainPipeBlock"));
CoreProxy.proxy.addName(plainPipeBlock, "Mining Pipe");
autoWorkbenchBlock = new BlockAutoWorkbench(Integer.parseInt(autoWorkbenchId.value));
ProxyCore.proxy.registerBlock(autoWorkbenchBlock.setBlockName("autoWorkbenchBlock"));
ProxyCore.proxy.addName(autoWorkbenchBlock, "Automatic Crafting Table");
CoreProxy.proxy.registerBlock(autoWorkbenchBlock.setBlockName("autoWorkbenchBlock"));
CoreProxy.proxy.addName(autoWorkbenchBlock, "Automatic Crafting Table");
frameBlock = new BlockFrame(Integer.parseInt(frameId.value));
ProxyCore.proxy.registerBlock(frameBlock.setBlockName("frameBlock"));
ProxyCore.proxy.addName(frameBlock, "Frame");
CoreProxy.proxy.registerBlock(frameBlock.setBlockName("frameBlock"));
CoreProxy.proxy.addName(frameBlock, "Frame");
quarryBlock = new BlockQuarry(Integer.parseInt(quarryId.value));
ProxyCore.proxy.registerBlock(quarryBlock.setBlockName("machineBlock"));
ProxyCore.proxy.addName(quarryBlock, "Quarry");
CoreProxy.proxy.registerBlock(quarryBlock.setBlockName("machineBlock"));
CoreProxy.proxy.addName(quarryBlock, "Quarry");
tankBlock = new BlockTank(Integer.parseInt(tankId.value));
ProxyCore.proxy.registerBlock(tankBlock.setBlockName("tankBlock"));
ProxyCore.proxy.addName(tankBlock, "Tank");
CoreProxy.proxy.registerBlock(tankBlock.setBlockName("tankBlock"));
CoreProxy.proxy.addName(tankBlock, "Tank");
pumpBlock = new BlockPump(Integer.parseInt(pumpId.value));
ProxyCore.proxy.registerBlock(pumpBlock.setBlockName("pumpBlock"));
ProxyCore.proxy.addName(pumpBlock, "Pump");
CoreProxy.proxy.registerBlock(pumpBlock.setBlockName("pumpBlock"));
CoreProxy.proxy.addName(pumpBlock, "Pump");
refineryBlock = new BlockRefinery(Integer.parseInt(refineryId.value));
ProxyCore.proxy.registerBlock(refineryBlock.setBlockName("refineryBlock"));
ProxyCore.proxy.addName(refineryBlock, "Refinery");
CoreProxy.proxy.registerBlock(refineryBlock.setBlockName("refineryBlock"));
CoreProxy.proxy.addName(refineryBlock, "Refinery");
hopperDisabled = Boolean.parseBoolean(hopperDisable.value);
if (!hopperDisabled) {
hopperBlock = new BlockHopper(Integer.parseInt(hopperId.value));
ProxyCore.proxy.registerBlock(hopperBlock.setBlockName("blockHopper"));
ProxyCore.proxy.addName(hopperBlock, "Hopper");
CoreProxy.proxy.registerBlock(hopperBlock.setBlockName("blockHopper"));
CoreProxy.proxy.addName(hopperBlock, "Hopper");
}
BuildCraftCore.mainConfiguration.save();
@ -182,31 +182,31 @@ public class BuildCraftFactory {
public static void loadRecipes() {
if (allowMining) {
ProxyCore.proxy.addCraftingRecipe(new ItemStack(miningWellBlock, 1),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(miningWellBlock, 1),
new Object[] { "ipi", "igi", "iPi", Character.valueOf('p'), Item.redstone, Character.valueOf('i'),
Item.ingotIron, Character.valueOf('g'), BuildCraftCore.ironGearItem, Character.valueOf('P'),
Item.pickaxeSteel });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(quarryBlock), new Object[] { "ipi", "gig", "dDd", Character.valueOf('i'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(quarryBlock), new Object[] { "ipi", "gig", "dDd", Character.valueOf('i'),
BuildCraftCore.ironGearItem, Character.valueOf('p'), Item.redstone, Character.valueOf('g'),
BuildCraftCore.goldGearItem, Character.valueOf('d'), BuildCraftCore.diamondGearItem, Character.valueOf('D'),
Item.pickaxeDiamond, });
}
ProxyCore.proxy.addCraftingRecipe(new ItemStack(autoWorkbenchBlock), new Object[] { " g ", "gwg", " g ", Character.valueOf('w'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(autoWorkbenchBlock), new Object[] { " g ", "gwg", " g ", Character.valueOf('w'),
Block.workbench, Character.valueOf('g'), BuildCraftCore.woodenGearItem });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(pumpBlock), new Object[] { "T ", "W ", Character.valueOf('T'), tankBlock,
CoreProxy.proxy.addCraftingRecipe(new ItemStack(pumpBlock), new Object[] { "T ", "W ", Character.valueOf('T'), tankBlock,
Character.valueOf('W'), miningWellBlock, });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(tankBlock), new Object[] { "ggg", "g g", "ggg", Character.valueOf('g'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(tankBlock), new Object[] { "ggg", "g g", "ggg", Character.valueOf('g'),
Block.glass, });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(refineryBlock), new Object[] { " ", "RTR", "TGT", Character.valueOf('T'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(refineryBlock), new Object[] { " ", "RTR", "TGT", Character.valueOf('T'),
tankBlock, Character.valueOf('G'), BuildCraftCore.diamondGearItem, Character.valueOf('R'),
Block.torchRedstoneActive, });
if (!hopperDisabled) {
ProxyCore.proxy.addCraftingRecipe(new ItemStack(hopperBlock), new Object[] { "ICI", "IGI", " I ", Character.valueOf('I'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(hopperBlock), new Object[] { "ICI", "IGI", " I ", Character.valueOf('I'),
Item.ingotIron, Character.valueOf('C'), Block.chest, Character.valueOf('G'), BuildCraftCore.stoneGearItem });
}

76
common/buildcraft/BuildCraftSilicon.java
View file

@ -18,7 +18,7 @@ import buildcraft.api.bptblocks.BptBlockRotateMeta;
import buildcraft.api.recipes.AssemblyRecipe;
import buildcraft.core.DefaultProps;
import buildcraft.core.ItemRedstoneChipset;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.silicon.BlockAssemblyTable;
import buildcraft.silicon.BlockLaser;
import buildcraft.silicon.GuiHandler;
@ -67,12 +67,12 @@ public class BuildCraftSilicon {
BuildCraftCore.mainConfiguration.save();
laserBlock = new BlockLaser(Integer.parseInt(laserId.value));
ProxyCore.proxy.addName(laserBlock.setBlockName("laserBlock"), "Laser");
ProxyCore.proxy.registerBlock(laserBlock);
CoreProxy.proxy.addName(laserBlock.setBlockName("laserBlock"), "Laser");
CoreProxy.proxy.registerBlock(laserBlock);
assemblyTableBlock = new BlockAssemblyTable(Integer.parseInt(assemblyTableId.value));
ProxyCore.proxy.addName(assemblyTableBlock.setBlockName("assemblyTableBlock"), "Assembly Table");
ProxyCore.proxy.registerBlock(assemblyTableBlock);
CoreProxy.proxy.addName(assemblyTableBlock.setBlockName("assemblyTableBlock"), "Assembly Table");
CoreProxy.proxy.registerBlock(assemblyTableBlock);
redstoneChipset = new ItemRedstoneChipset(Integer.parseInt(redstoneChipsetId.value));
redstoneChipset.setItemName("redstoneChipset");
@ -81,10 +81,10 @@ public class BuildCraftSilicon {
public static void loadRecipes() {
ProxyCore.proxy.addCraftingRecipe(new ItemStack(laserBlock), new Object[] { "ORR", "DDR", "ORR", Character.valueOf('O'),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(laserBlock), new Object[] { "ORR", "DDR", "ORR", Character.valueOf('O'),
Block.obsidian, Character.valueOf('R'), Item.redstone, Character.valueOf('D'), Item.diamond, });
ProxyCore.proxy.addCraftingRecipe(new ItemStack(assemblyTableBlock),
CoreProxy.proxy.addCraftingRecipe(new ItemStack(assemblyTableBlock),
new Object[] { "ORO", "ODO", "OGO", Character.valueOf('O'), Block.obsidian, Character.valueOf('R'),
Item.redstone, Character.valueOf('D'), Item.diamond, Character.valueOf('G'),
BuildCraftCore.diamondGearItem, });
@ -92,127 +92,127 @@ public class BuildCraftSilicon {
//Add reverse recipies for all gates
//Iron
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 2),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 2),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 1)});
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 1),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 1),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 2)});
//Gold
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 4),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 4),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 3)});
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 3),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 3),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 4)});
//Diamond
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 6),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 6),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 5)});
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 5),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 5),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 6)});
//Iron - Autarchic
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1)});
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2)});
//Gold - Autarchic
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3)});
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4)});
//Diamond - Autarchic
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5)});
ProxyCore.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5),
CoreProxy.proxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5),
new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6)});
// / REDSTONE CHIPSETS
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.redstone) }, 10000,
new ItemStack(redstoneChipset, 1, 0)));
ProxyCore.proxy.addName(new ItemStack(redstoneChipset, 1, 0), "Redstone Chipset");
CoreProxy.proxy.addName(new ItemStack(redstoneChipset, 1, 0), "Redstone Chipset");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.redstone),
new ItemStack(Item.ingotIron) }, 20000, new ItemStack(redstoneChipset, 1, 1)));
ProxyCore.proxy.addName(new ItemStack(redstoneChipset, 1, 1), "Redstone Iron Chipset");
CoreProxy.proxy.addName(new ItemStack(redstoneChipset, 1, 1), "Redstone Iron Chipset");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.redstone),
new ItemStack(Item.ingotGold) }, 40000, new ItemStack(redstoneChipset, 1, 2)));
ProxyCore.proxy.addName(new ItemStack(redstoneChipset, 1, 2), "Redstone Golden Chipset");
CoreProxy.proxy.addName(new ItemStack(redstoneChipset, 1, 2), "Redstone Golden Chipset");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.redstone),
new ItemStack(Item.diamond) }, 80000, new ItemStack(redstoneChipset, 1, 3)));
ProxyCore.proxy.addName(new ItemStack(redstoneChipset, 1, 3), "Redstone Diamond Chipset");
CoreProxy.proxy.addName(new ItemStack(redstoneChipset, 1, 3), "Redstone Diamond Chipset");
// PULSATING CHIPSETS
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.redstone),
new ItemStack(Item.enderPearl) }, 40000, new ItemStack(redstoneChipset, 2, 4)));
ProxyCore.proxy.addName(new ItemStack(redstoneChipset, 1, 4), "Pulsating Chipset");
CoreProxy.proxy.addName(new ItemStack(redstoneChipset, 1, 4), "Pulsating Chipset");
// / REDSTONE GATES
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(redstoneChipset, 1, 0) }, 20000,
new ItemStack(BuildCraftTransport.pipeGate, 1, 0)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 0), "Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 0), "Gate");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] {
new ItemStack(BuildCraftTransport.pipeGate, 1, 0), new ItemStack(redstoneChipset, 1, 4),
new ItemStack(redstoneChipset, 1, 1) }, 10000, new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 0)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 0), "Autarchic Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 0), "Autarchic Gate");
// / IRON AND GATES
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(redstoneChipset, 1, 1),
new ItemStack(BuildCraftTransport.redPipeWire) }, 40000, new ItemStack(BuildCraftTransport.pipeGate, 1, 1)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 1), "Iron AND Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 1), "Iron AND Gate");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] {
new ItemStack(BuildCraftTransport.pipeGate, 1, 1), new ItemStack(redstoneChipset, 1, 4),
new ItemStack(redstoneChipset, 1, 1) }, 20000, new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1), "Autarchic Iron AND Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1), "Autarchic Iron AND Gate");
// / IRON OR GATES
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(redstoneChipset, 1, 1),
new ItemStack(BuildCraftTransport.redPipeWire) }, 40000, new ItemStack(BuildCraftTransport.pipeGate, 1, 2)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 2), "Iron OR Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 2), "Iron OR Gate");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] {
new ItemStack(BuildCraftTransport.pipeGate, 1, 2), new ItemStack(redstoneChipset, 1, 4),
new ItemStack(redstoneChipset, 1, 1) }, 20000, new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2), "Autarchic Iron OR Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2), "Autarchic Iron OR Gate");
// / GOLD AND GATES
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(redstoneChipset, 1, 2),
new ItemStack(BuildCraftTransport.redPipeWire), new ItemStack(BuildCraftTransport.bluePipeWire) }, 80000,
new ItemStack(BuildCraftTransport.pipeGate, 1, 3)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 3), "Gold AND Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 3), "Gold AND Gate");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] {
new ItemStack(BuildCraftTransport.pipeGate, 1, 3), new ItemStack(redstoneChipset, 1, 4),
new ItemStack(redstoneChipset, 1, 1) }, 40000, new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3), "Autarchic Gold AND Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3), "Autarchic Gold AND Gate");
// / GOLD OR GATES
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(redstoneChipset, 1, 2),
new ItemStack(BuildCraftTransport.redPipeWire), new ItemStack(BuildCraftTransport.bluePipeWire) }, 80000,
new ItemStack(BuildCraftTransport.pipeGate, 1, 4)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 4), "Gold OR Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 4), "Gold OR Gate");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] {
new ItemStack(BuildCraftTransport.pipeGate, 1, 4), new ItemStack(redstoneChipset, 1, 4),
new ItemStack(redstoneChipset, 1, 1) }, 40000, new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4), "Autarchic Gold OR Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4), "Autarchic Gold OR Gate");
// / DIAMOND AND GATES
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(redstoneChipset, 1, 3),
new ItemStack(BuildCraftTransport.redPipeWire), new ItemStack(BuildCraftTransport.bluePipeWire),
new ItemStack(BuildCraftTransport.greenPipeWire), new ItemStack(BuildCraftTransport.yellowPipeWire) }, 160000,
new ItemStack(BuildCraftTransport.pipeGate, 1, 5)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 5), "Diamond AND Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 5), "Diamond AND Gate");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] {
new ItemStack(BuildCraftTransport.pipeGate, 1, 5), new ItemStack(redstoneChipset, 1, 4),
new ItemStack(redstoneChipset, 1, 1) }, 80000, new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5), "Autarchic Diamond AND Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5), "Autarchic Diamond AND Gate");
// / DIAMOND OR GATES
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(redstoneChipset, 1, 3),
new ItemStack(BuildCraftTransport.redPipeWire), new ItemStack(BuildCraftTransport.bluePipeWire),
new ItemStack(BuildCraftTransport.greenPipeWire), new ItemStack(BuildCraftTransport.yellowPipeWire) }, 160000,
new ItemStack(BuildCraftTransport.pipeGate, 1, 6)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 6), "Diamond OR Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGate, 1, 6), "Diamond OR Gate");
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] {
new ItemStack(BuildCraftTransport.pipeGate, 1, 6), new ItemStack(redstoneChipset, 1, 4),
new ItemStack(redstoneChipset, 1, 1) }, 80000, new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6)));
ProxyCore.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6), "Autarchic Diamond OR Gate");
CoreProxy.proxy.addName(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6), "Autarchic Diamond OR Gate");
}
}

18
common/buildcraft/BuildCraftTransport.java
View file

@ -30,13 +30,7 @@ import buildcraft.api.transport.IExtractionHandler;
import buildcraft.api.transport.PipeManager;
import buildcraft.core.DefaultProps;
import buildcraft.core.ItemBuildCraft;
import buildcraft.transport.ActionEnergyPulser;
import buildcraft.transport.ActionSignalOutput;
import buildcraft.transport.BlockGenericPipe;
import buildcraft.transport.BptBlockPipe;
import buildcraft.transport.BptItemPipeDiamond;
import buildcraft.transport.BptItemPipeIron;
import buildcraft.transport.BptItemPipeWooden;
import buildcraft.transport.GuiHandler;
import buildcraft.transport.ItemFacade;
import buildcraft.transport.ItemGate;
@ -44,9 +38,10 @@ import buildcraft.transport.ItemPipe;
import buildcraft.transport.Pipe;
import buildcraft.transport.PipeTriggerProvider;
import buildcraft.transport.TransportProxy;
import buildcraft.transport.TriggerPipeContents;
import buildcraft.transport.TriggerPipeSignal;
import buildcraft.transport.TriggerPipeContents.Kind;
import buildcraft.transport.blueprints.BptBlockPipe;
import buildcraft.transport.blueprints.BptItemPipeDiamond;
import buildcraft.transport.blueprints.BptItemPipeIron;
import buildcraft.transport.blueprints.BptItemPipeWooden;
import buildcraft.transport.network.PacketHandlerTransport;
import buildcraft.transport.pipes.PipeItemsCobblestone;
import buildcraft.transport.pipes.PipeItemsDiamond;
@ -69,6 +64,11 @@ import buildcraft.transport.pipes.PipePowerGold;
import buildcraft.transport.pipes.PipePowerStone;
import buildcraft.transport.pipes.PipePowerWood;
import buildcraft.transport.pipes.PipeStructureCobblestone;
import buildcraft.transport.triggers.ActionEnergyPulser;
import buildcraft.transport.triggers.ActionSignalOutput;
import buildcraft.transport.triggers.TriggerPipeContents;
import buildcraft.transport.triggers.TriggerPipeSignal;
import buildcraft.transport.triggers.TriggerPipeContents.Kind;
import net.minecraft.src.Block;
import net.minecraft.src.CreativeTabs;

6
common/buildcraft/builders/BlockArchitect.java
View file

@ -27,8 +27,8 @@ import buildcraft.api.core.Position;
import buildcraft.api.tools.IToolWrench;
import buildcraft.core.DefaultProps;
import buildcraft.core.GuiIds;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
public class BlockArchitect extends BlockContainer {
@ -93,7 +93,7 @@ public class BlockArchitect extends BlockContainer {
return true;
} else {
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.ARCHITECT_TABLE, world, i, j, k);
return true;

4
common/buildcraft/builders/BlockBlueprintLibrary.java
View file

@ -22,7 +22,7 @@ import net.minecraft.src.World;
import buildcraft.BuildCraftBuilders;
import buildcraft.core.DefaultProps;
import buildcraft.core.GuiIds;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
public class BlockBlueprintLibrary extends BlockContainer {
@ -49,7 +49,7 @@ public class BlockBlueprintLibrary extends BlockContainer {
TileBlueprintLibrary tile = (TileBlueprintLibrary) world.getBlockTileEntity(i, j, k);
if (!tile.locked || entityplayer.username.equals(tile.owner))
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.BLUEPRINT_LIBRARY, world, i, j, k);
return true;

6
common/buildcraft/builders/BlockBuilder.java
View file

@ -25,8 +25,8 @@ import buildcraft.api.core.Position;
import buildcraft.api.tools.IToolWrench;
import buildcraft.core.DefaultProps;
import buildcraft.core.GuiIds;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
public class BlockBuilder extends BlockContainer {
@ -104,7 +104,7 @@ public class BlockBuilder extends BlockContainer {
return true;
} else {
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.BUILDER, world, i, j, k);
return true;

6
common/buildcraft/builders/BlockFiller.java
View file

@ -23,8 +23,8 @@ import buildcraft.BuildCraftBuilders;
import buildcraft.api.filler.IFillerPattern;
import buildcraft.core.DefaultProps;
import buildcraft.core.GuiIds;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
public class BlockFiller extends BlockContainer {
@ -52,7 +52,7 @@ public class BlockFiller extends BlockContainer {
if (entityplayer.isSneaking())
return false;
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.FILLER, world, i, j, k);
return true;

2
common/buildcraft/builders/BlockMarker.java
View file

@ -15,7 +15,7 @@ import buildcraft.BuildCraftBuilders;
import buildcraft.BuildCraftCore;
import buildcraft.builders.BuildersProxy;
import buildcraft.core.DefaultProps;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.Block;

2
common/buildcraft/builders/BlockPathMarker.java
View file

@ -11,7 +11,7 @@ package buildcraft.builders;
import java.util.ArrayList;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import net.minecraft.src.IBlockAccess;
import net.minecraft.src.ItemStack;

10
common/buildcraft/builders/ClientBuilderHook.java
View file

@ -4,15 +4,15 @@ import java.io.IOException;
import buildcraft.BuildCraftBuilders;
import buildcraft.builders.IBuilderHook;
import buildcraft.core.BptPlayerIndex;
import buildcraft.core.BptRootIndex;
import buildcraft.core.ProxyCore;
import buildcraft.core.blueprints.BptPlayerIndex;
import buildcraft.core.blueprints.BptRootIndex;
import buildcraft.core.proxy.CoreProxy;
public class ClientBuilderHook implements IBuilderHook {
@Override
public void rootIndexInitialized(BptRootIndex rootBptIndex) throws IOException {
BptPlayerIndex playerIndex = new BptPlayerIndex(ProxyCore.proxy.playerName() + ".list", rootBptIndex);
BuildCraftBuilders.playerLibrary.put(ProxyCore.proxy.playerName(), playerIndex);
BptPlayerIndex playerIndex = new BptPlayerIndex(CoreProxy.proxy.playerName() + ".list", rootBptIndex);
BuildCraftBuilders.playerLibrary.put(CoreProxy.proxy.playerName(), playerIndex);
}
}

4
common/buildcraft/builders/FillerFlattener.java
View file

@ -12,7 +12,7 @@ package buildcraft.builders;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.api.core.IBox;
import buildcraft.core.DefaultProps;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.ItemStack;
import net.minecraft.src.TileEntity;
@ -64,7 +64,7 @@ public class FillerFlattener extends FillerPattern {
}
if (lastX != Integer.MAX_VALUE && stackToPlace != null) {
stackToPlace.getItem().tryPlaceIntoWorld(stackToPlace, ProxyCore.proxy.getBuildCraftPlayer(tile.worldObj), tile.worldObj,
stackToPlace.getItem().tryPlaceIntoWorld(stackToPlace, CoreProxy.proxy.getBuildCraftPlayer(tile.worldObj), tile.worldObj,
lastX, lastY - 1, lastZ, 1, 0.0f, 0.0f, 0.0f);
}

4
common/buildcraft/builders/FillerPattern.java
View file

@ -14,7 +14,7 @@ import buildcraft.BuildCraftBuilders;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.api.core.IBox;
import buildcraft.api.filler.IFillerPattern;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.ItemStack;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
@ -66,7 +66,7 @@ public abstract class FillerPattern implements IFillerPattern {
}
if (found && stackToPlace != null) {
stackToPlace.getItem().tryPlaceIntoWorld(stackToPlace, ProxyCore.proxy.getBuildCraftPlayer(world), world, xSlot, ySlot - 1,
stackToPlace.getItem().tryPlaceIntoWorld(stackToPlace, CoreProxy.proxy.getBuildCraftPlayer(world), world, xSlot, ySlot - 1,
zSlot, 1, 0.0f, 0.0f, 0.0f);
}

2
common/buildcraft/builders/IBuilderHook.java
View file

@ -2,7 +2,7 @@ package buildcraft.builders;
import java.io.IOException;
import buildcraft.core.BptRootIndex;
import buildcraft.core.blueprints.BptRootIndex;
public interface IBuilderHook {

2
common/buildcraft/builders/ItemBptBase.java
View file

@ -12,8 +12,8 @@ package buildcraft.builders;
import java.util.List;
import buildcraft.BuildCraftBuilders;
import buildcraft.core.BptBase;
import buildcraft.core.ItemBuildCraft;
import buildcraft.core.blueprints.BptBase;
import net.minecraft.src.Entity;
import net.minecraft.src.ItemStack;

2
common/buildcraft/builders/ItemBptBluePrint.java
View file

@ -10,7 +10,7 @@
package buildcraft.builders;
import buildcraft.BuildCraftBuilders;
import buildcraft.core.BptBase;
import buildcraft.core.blueprints.BptBase;
public class ItemBptBluePrint extends ItemBptBase {

2
common/buildcraft/builders/ItemBptTemplate.java
View file

@ -1,7 +1,7 @@
package buildcraft.builders;
import buildcraft.BuildCraftBuilders;
import buildcraft.core.BptBase;
import buildcraft.core.blueprints.BptBase;
public class ItemBptTemplate extends ItemBptBase {

14
common/buildcraft/builders/TileArchitect.java
View file

@ -14,15 +14,15 @@ import buildcraft.api.core.IAreaProvider;
import buildcraft.api.core.LaserKind;
import buildcraft.api.core.Orientations;
import buildcraft.core.Box;
import buildcraft.core.BptBase;
import buildcraft.core.BptBlueprint;
import buildcraft.core.BptContext;
import buildcraft.core.BptTemplate;
import buildcraft.core.ProxyCore;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.Utils;
import buildcraft.core.blueprints.BptBase;
import buildcraft.core.blueprints.BptBlueprint;
import buildcraft.core.blueprints.BptContext;
import buildcraft.core.blueprints.BptTemplate;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack;
@ -72,7 +72,7 @@ public class TileArchitect extends TileBuildCraft implements IInventory {
}
}
if (!ProxyCore.proxy.isRemote(worldObj) && box.isInitialized()) {
if (!CoreProxy.proxy.isRemote(worldObj) && box.isInitialized()) {
box.createLasers(worldObj, LaserKind.Stripes);
}

6
common/buildcraft/builders/TileBlueprintLibrary.java
View file

@ -5,9 +5,9 @@ import java.util.LinkedList;
import buildcraft.BuildCraftBuilders;
import buildcraft.builders.BuildersProxy;
import buildcraft.core.BptBase;
import buildcraft.core.BptPlayerIndex;
import buildcraft.core.Utils;
import buildcraft.core.blueprints.BptBase;
import buildcraft.core.blueprints.BptPlayerIndex;
import buildcraft.core.utils.Utils;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory;

22
common/buildcraft/builders/TileBuilder.java
View file

@ -22,23 +22,23 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.core.BlockIndex;
import buildcraft.core.Box;
import buildcraft.core.BptBase;
import buildcraft.core.BptBlueprint;
import buildcraft.core.BptBuilderBase;
import buildcraft.core.BptBuilderBlueprint;
import buildcraft.core.BptBuilderTemplate;
import buildcraft.core.BptContext;
import buildcraft.core.DefaultProps;
import buildcraft.core.EntityLaser;
import buildcraft.core.EntityRobot;
import buildcraft.core.IBuilderInventory;
import buildcraft.core.IMachine;
import buildcraft.core.ProxyCore;
import buildcraft.core.SurroundingInventory;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.Utils;
import buildcraft.core.blueprints.BptBase;
import buildcraft.core.blueprints.BptBlueprint;
import buildcraft.core.blueprints.BptBuilderBase;
import buildcraft.core.blueprints.BptBuilderBlueprint;
import buildcraft.core.blueprints.BptBuilderTemplate;
import buildcraft.core.blueprints.BptContext;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.SurroundingInventory;
import buildcraft.core.utils.Utils;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.EntityPlayer;
@ -279,7 +279,7 @@ public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IP
@Override
public void doWork() {
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
return;
}
@ -588,7 +588,7 @@ public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IP
box.deleteLasers();
box.reset();
if (ProxyCore.proxy.isSimulating(worldObj)) {
if (CoreProxy.proxy.isSimulating(worldObj)) {
sendNetworkUpdate();
}

20
common/buildcraft/builders/TileFiller.java
View file

@ -21,16 +21,16 @@ import buildcraft.api.inventory.ISpecialInventory;
import buildcraft.api.power.IPowerProvider;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.core.ActionMachineControl;
import buildcraft.core.Box;
import buildcraft.core.IMachine;
import buildcraft.core.ProxyCore;
import buildcraft.core.StackUtil;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.Utils;
import buildcraft.core.ActionMachineControl.Mode;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.triggers.ActionMachineControl;
import buildcraft.core.triggers.ActionMachineControl.Mode;
import buildcraft.core.utils.StackUtil;
import buildcraft.core.utils.Utils;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ItemStack;
import net.minecraft.src.NBTTagCompound;
@ -63,7 +63,7 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo
public void initialize() {
super.initialize();
if (!ProxyCore.proxy.isRemote(worldObj)) {
if (!CoreProxy.proxy.isRemote(worldObj)) {
IAreaProvider a = Utils.getNearbyAreaProvider(worldObj, xCoord, yCoord, zCoord);
if (a != null) {
@ -73,7 +73,7 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo
((TileMarker) a).removeFromWorld();
}
if (!ProxyCore.proxy.isRemote(worldObj) && box.isInitialized()) {
if (!CoreProxy.proxy.isRemote(worldObj) && box.isInitialized()) {
box.createLasers(worldObj, LaserKind.Stripes);
}
sendNetworkUpdate();
@ -102,7 +102,7 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo
@Override
public void doWork() {
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
return;
}
@ -156,7 +156,7 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo
}
public void computeRecipe() {
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
return;
}
@ -185,7 +185,7 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo
currentPatternId = currentPattern.getId();
}
if (ProxyCore.proxy.isSimulating(worldObj)) {
if (CoreProxy.proxy.isSimulating(worldObj)) {
sendNetworkUpdate();
}
}

14
common/buildcraft/builders/TileMarker.java
View file

@ -14,11 +14,11 @@ import buildcraft.api.core.IAreaProvider;
import buildcraft.api.core.LaserKind;
import buildcraft.api.core.Position;
import buildcraft.core.EntityBlock;
import buildcraft.core.ProxyCore;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.Utils;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.Packet;
import net.minecraft.src.World;
@ -91,7 +91,7 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
public @TileNetworkData boolean showSignals = false;
public void updateSignals() {
if (ProxyCore.proxy.isSimulating(worldObj)) {
if (CoreProxy.proxy.isSimulating(worldObj)) {
showSignals = worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord);
sendNetworkUpdate();
}
@ -101,7 +101,7 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
if (signals != null) {
for (EntityBlock b : signals) {
if (b != null) {
ProxyCore.proxy.removeEntity(b);
CoreProxy.proxy.removeEntity(b);
}
}
signals = null;
@ -155,7 +155,7 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
}
public void tryConnection() {
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
return;
}
@ -242,7 +242,7 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
if (lasers != null) {
for (EntityBlock entity : lasers) {
if (entity != null) {
ProxyCore.proxy.removeEntity(entity);
CoreProxy.proxy.removeEntity(entity);
}
}
}
@ -396,7 +396,7 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
signals = null;
if (ProxyCore.proxy.isSimulating(worldObj) && markerOrigin != null && markerOrigin != this) {
if (CoreProxy.proxy.isSimulating(worldObj) && markerOrigin != null && markerOrigin != this) {
markerOrigin.sendNetworkUpdate();
}
}

4
common/buildcraft/builders/TilePathMarker.java
View file

@ -8,7 +8,7 @@ import buildcraft.api.core.Position;
import buildcraft.core.BlockIndex;
import buildcraft.core.DefaultProps;
import buildcraft.core.EntityLaser;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.TileEntity;
@ -55,7 +55,7 @@ public class TilePathMarker extends TileMarker {
public void createLaserAndConnect(TilePathMarker pathMarker) {
if (ProxyCore.proxy.isRemote(worldObj))
if (CoreProxy.proxy.isRemote(worldObj))
return;
EntityLaser laser = new EntityLaser(worldObj, new Position(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5), new Position(pathMarker.xCoord + 0.5, pathMarker.yCoord + 0.5, pathMarker.zCoord + 0.5));

2
common/buildcraft/builders/gui/ContainerBlueprintLibrary.java
View file

@ -12,7 +12,7 @@ package buildcraft.builders.gui;
import java.util.LinkedList;
import buildcraft.builders.TileBlueprintLibrary;
import buildcraft.core.BptBase;
import buildcraft.core.blueprints.BptBase;
import buildcraft.core.gui.BuildCraftContainer;
import net.minecraft.src.EntityPlayer;

4
common/buildcraft/builders/gui/GuiBlueprintLibrary.java
View file

@ -19,9 +19,9 @@ import cpw.mods.fml.client.FMLClientHandler;
import buildcraft.BuildCraftBuilders;
import buildcraft.builders.TileBlueprintLibrary;
import buildcraft.core.BptBase;
import buildcraft.core.BptPlayerIndex;
import buildcraft.core.DefaultProps;
import buildcraft.core.blueprints.BptBase;
import buildcraft.core.blueprints.BptPlayerIndex;
import buildcraft.core.gui.GuiBuildCraft;
import buildcraft.core.utils.StringUtil;

2
common/buildcraft/core/BlockBuildCraft.java
View file

@ -2,6 +2,8 @@ package buildcraft.core;
import java.util.Random;
import buildcraft.core.utils.Utils;
import net.minecraft.src.BlockContainer;
import net.minecraft.src.Material;
import net.minecraft.src.World;

4
common/buildcraft/core/Box.java
View file

@ -17,6 +17,8 @@ import buildcraft.api.core.IBox;
import buildcraft.api.core.LaserKind;
import buildcraft.api.core.Position;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.World;
@ -218,7 +220,7 @@ public class Box implements IBox {
if (lasers != null) {
for (EntityBlock b : lasers)
ProxyCore.proxy.removeEntity(b);
CoreProxy.proxy.removeEntity(b);
lasers = null;
}

61
common/buildcraft/core/BuildCraftNetworkTicker.java
View file

@ -1,61 +0,0 @@
/**
* Copyright (c) SpaceToad, 2011
* http://www.mod-buildcraft.com
*
* BuildCraft is distributed under the terms of the Minecraft Mod Public
* License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
import java.util.Date;
import java.util.EnumSet;
import cpw.mods.fml.common.IScheduledTickHandler;
import cpw.mods.fml.common.TickType;
import buildcraft.BuildCraftCore;
public class BuildCraftNetworkTicker implements IScheduledTickHandler {
long lastReport = 0;
public boolean tick() {
if (BuildCraftCore.trackNetworkUsage) {
Date d = new Date();
if (d.getTime() - lastReport > 10000) {
lastReport = d.getTime();
int bytes = ClassMapping.report();
System.out.println("BuildCraft bandwidth = " + (bytes / 10) + " bytes / second");
System.out.println();
}
}
return true;
}
@Override
public void tickStart(EnumSet<TickType> type, Object... tickData) {
}
@Override
public void tickEnd(EnumSet<TickType> type, Object... tickData) {
tick();
}
@Override
public EnumSet<TickType> ticks() {
return BuildCraftCore.trackNetworkUsage ? EnumSet.of(TickType.WORLD) : EnumSet.noneOf(TickType.class);
}
@Override
public String getLabel() {
return "BuildCraftNetworkTickMonitor";
}
@Override
public int nextTickSpacing() {
return 200;
}
}

3
common/buildcraft/core/EntityLaser.java
View file

@ -15,6 +15,7 @@ import com.google.common.io.ByteArrayDataOutput;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import buildcraft.api.core.Position;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.Entity;
import net.minecraft.src.NBTTagCompound;
@ -88,7 +89,7 @@ public class EntityLaser extends Entity implements IEntityAdditionalSpawnData {
if (head == null || tail == null)
return;
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
updateData();
}

3
common/buildcraft/core/EntityPassiveItem.java
View file

@ -17,6 +17,7 @@ import buildcraft.api.core.SafeTimeTracker;
import buildcraft.api.transport.IPassiveItemContribution;
import buildcraft.api.transport.IPipedItem;
import buildcraft.api.transport.PipeManager;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.EntityItem;
import net.minecraft.src.Item;
@ -288,7 +289,7 @@ public class EntityPassiveItem implements IPipedItem {
*/
@Override
public EntityItem toEntityItem(Orientations dir) {
if (!ProxyCore.proxy.isRemote(worldObj)) {
if (!CoreProxy.proxy.isRemote(worldObj)) {
if (getItemStack().stackSize <= 0) {
return null;
}

8
common/buildcraft/core/EntityRobot.java
View file

@ -24,7 +24,11 @@ import buildcraft.BuildCraftCore;
import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.api.core.Position;
import buildcraft.core.BptSlot.Mode;
import buildcraft.core.blueprints.BptBuilderBase;
import buildcraft.core.blueprints.BptContext;
import buildcraft.core.blueprints.BptSlot;
import buildcraft.core.blueprints.BptSlot.Mode;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.Entity;
import net.minecraft.src.NBTTagCompound;
@ -202,7 +206,7 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData {
BptSlot target = a.slot;
if (wait <= 0) {
if (!ProxyCore.proxy.isRemote(worldObj)) {
if (!CoreProxy.proxy.isRemote(worldObj)) {
if (target.mode == Mode.ClearIfInvalid) {

1
common/buildcraft/core/IBptContributor.java
View file

@ -1,6 +1,7 @@
package buildcraft.core;
import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.core.blueprints.BptBase;
import net.minecraft.src.TileEntity;
public interface IBptContributor {

6
common/buildcraft/core/TileBuildCraft.java
View file

@ -18,6 +18,8 @@ import buildcraft.core.network.PacketPayload;
import buildcraft.core.network.PacketTileUpdate;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TilePacketWrapper;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import net.minecraft.src.Packet;
import net.minecraft.src.TileEntity;
@ -76,8 +78,8 @@ public abstract class TileBuildCraft extends TileEntity implements ISynchronized
}
public void sendNetworkUpdate() {
if(ProxyCore.proxy.isSimulating(worldObj))
ProxyCore.proxy.sendToPlayers(getUpdatePacket(), worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE);
if(CoreProxy.proxy.isSimulating(worldObj))
CoreProxy.proxy.sendToPlayers(getUpdatePacket(), worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE);
}
@Override

2
common/buildcraft/core/BptActionBuild.java → common/buildcraft/core/blueprints/BptActionBuild.java
View file

@ -1,4 +1,4 @@
package buildcraft.core;
package buildcraft.core.blueprints;
import buildcraft.api.blueprints.BptSlotInfo;

7
common/buildcraft/core/BptBase.java → common/buildcraft/core/blueprints/BptBase.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -21,6 +21,9 @@ import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import buildcraft.BuildCraftCore;
import buildcraft.core.Box;
import buildcraft.core.DefaultProps;
import buildcraft.core.proxy.CoreProxy;
public abstract class BptBase {
@ -102,7 +105,7 @@ public abstract class BptBase {
public File save() {
try {
File baseDir = ProxyCore.proxy.getBuildCraftBase();
File baseDir = CoreProxy.proxy.getBuildCraftBase();
baseDir.mkdir();

3
common/buildcraft/core/BptBlueprint.java → common/buildcraft/core/blueprints/BptBlueprint.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -30,6 +30,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext;
import buildcraft.api.blueprints.ItemSignature;
import buildcraft.core.IBptContributor;
public class BptBlueprint extends BptBase {

4
common/buildcraft/core/BptBuilderBase.java → common/buildcraft/core/blueprints/BptBuilderBase.java
View file

@ -7,9 +7,11 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import buildcraft.api.core.IAreaProvider;
import buildcraft.core.Box;
import buildcraft.core.IBuilderInventory;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.World;

5
common/buildcraft/core/BptBuilderBlueprint.java → common/buildcraft/core/blueprints/BptBuilderBlueprint.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.util.Comparator;
import java.util.LinkedList;
@ -16,7 +16,8 @@ import java.util.TreeSet;
import buildcraft.BuildCraftCore;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.core.BptSlot.Mode;
import buildcraft.core.IBuilderInventory;
import buildcraft.core.blueprints.BptSlot.Mode;
import net.minecraft.src.Block;
import net.minecraft.src.EnumGameType;

5
common/buildcraft/core/BptBuilderTemplate.java → common/buildcraft/core/blueprints/BptBuilderTemplate.java
View file

@ -7,12 +7,13 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.util.LinkedList;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.core.BptSlot.Mode;
import buildcraft.core.IBuilderInventory;
import buildcraft.core.blueprints.BptSlot.Mode;
import net.minecraft.src.ItemStack;
import net.minecraft.src.World;

3
common/buildcraft/core/BptContext.java → common/buildcraft/core/blueprints/BptContext.java
View file

@ -7,11 +7,12 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import buildcraft.api.blueprints.IBptContext;
import buildcraft.api.core.IBox;
import buildcraft.api.core.Position;
import buildcraft.core.Box;
import net.minecraft.src.ItemStack;
import net.minecraft.src.World;

2
common/buildcraft/core/BptDataStream.java → common/buildcraft/core/blueprints/BptDataStream.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.io.DataInput;
import java.io.DataOutput;

2
common/buildcraft/core/BptError.java → common/buildcraft/core/blueprints/BptError.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import buildcraft.BuildCraftCore;

2
common/buildcraft/core/BptItem.java → common/buildcraft/core/blueprints/BptItem.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.util.LinkedList;

6
common/buildcraft/core/BptPlayerIndex.java → common/buildcraft/core/blueprints/BptPlayerIndex.java
View file

@ -1,4 +1,4 @@
package buildcraft.core;
package buildcraft.core.blueprints;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -10,6 +10,8 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.util.TreeMap;
import buildcraft.core.proxy.CoreProxy;
public class BptPlayerIndex {
@ -19,7 +21,7 @@ public class BptPlayerIndex {
private File file;
public BptPlayerIndex(String filename, BptRootIndex rootIndex) throws IOException {
baseDir = new File(ProxyCore.proxy.getBuildCraftBase(), "blueprints/");
baseDir = new File(CoreProxy.proxy.getBuildCraftBase(), "blueprints/");
file = new File(baseDir, filename);
baseDir.mkdir();

6
common/buildcraft/core/BptRootIndex.java → common/buildcraft/core/blueprints/BptRootIndex.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -19,6 +19,8 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.util.TreeMap;
import buildcraft.core.proxy.CoreProxy;
public class BptRootIndex {
@ -33,7 +35,7 @@ public class BptRootIndex {
public int maxBpt = 0;
public BptRootIndex(String filename) throws IOException {
baseDir = new File(ProxyCore.proxy.getBuildCraftBase(), "blueprints/");
baseDir = new File(CoreProxy.proxy.getBuildCraftBase(), "blueprints/");
file = new File(baseDir, filename);
baseDir.mkdir();

2
common/buildcraft/core/BptSlot.java → common/buildcraft/core/blueprints/BptSlot.java
View file

@ -1,4 +1,4 @@
package buildcraft.core;
package buildcraft.core.blueprints;
import java.util.LinkedList;

2
common/buildcraft/core/BptTemplate.java → common/buildcraft/core/blueprints/BptTemplate.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.blueprints;
import java.io.BufferedReader;
import java.io.BufferedWriter;

4
common/buildcraft/core/ClassMapping.java → common/buildcraft/core/network/ClassMapping.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.network;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
@ -15,7 +15,7 @@ import java.util.LinkedList;
import java.util.TreeMap;
import buildcraft.BuildCraftCore;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.ByteBuffer;
public class ClassMapping {

2
common/buildcraft/core/network/PacketPayload.java
View file

@ -1,6 +1,6 @@
package buildcraft.core.network;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
public class PacketPayload {

3
common/buildcraft/core/network/TilePacketWrapper.java
View file

@ -10,8 +10,7 @@
package buildcraft.core.network;
import buildcraft.core.ByteBuffer;
import buildcraft.core.ClassMapping;
import buildcraft.core.ClassMapping.Indexes;
import buildcraft.core.network.ClassMapping.Indexes;
import net.minecraft.src.TileEntity;
public class TilePacketWrapper {

13
common/buildcraft/core/ProxyCore.java → common/buildcraft/core/proxy/CoreProxy.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.proxy;
import java.io.File;
import java.util.List;
@ -16,6 +16,7 @@ import java.util.Random;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.registry.GameRegistry;
import buildcraft.core.ItemBlockBuildCraft;
import buildcraft.core.network.BuildCraftPacket;
import net.minecraft.src.Block;
@ -31,10 +32,10 @@ import net.minecraft.src.Packet;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
public class ProxyCore {
public class CoreProxy {
@SidedProxy(clientSide="buildcraft.core.ClientProxyCore", serverSide="buildcraft.core.ProxyCore")
public static ProxyCore proxy;
public static CoreProxy proxy;
/* INSTANCES */
public Object getClient() { return null; }
@ -149,11 +150,11 @@ public class ProxyCore {
}
public EntityPlayer getBuildCraftPlayer(World world) {
if (ProxyCore.buildCraftPlayer == null) {
ProxyCore.buildCraftPlayer = createNewPlayer(world);
if (CoreProxy.buildCraftPlayer == null) {
CoreProxy.buildCraftPlayer = createNewPlayer(world);
}
return ProxyCore.buildCraftPlayer;
return CoreProxy.buildCraftPlayer;
}
}

15
common/buildcraft/core/ClientProxyCore.java → common/buildcraft/core/proxy/CoreProxyClient.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.proxy;
import java.io.File;
import java.util.List;
@ -17,6 +17,11 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import buildcraft.BuildCraftCore;
import buildcraft.core.DefaultProps;
import buildcraft.core.EntityBlock;
import buildcraft.core.EntityEnergyLaser;
import buildcraft.core.EntityLaser;
import buildcraft.core.EntityRobot;
import buildcraft.core.render.RenderEnergyLaser;
import buildcraft.core.render.RenderEntityBlock;
import buildcraft.core.render.RenderLaser;
@ -41,7 +46,7 @@ import net.minecraft.src.World;
import net.minecraft.src.WorldClient;
import net.minecraftforge.client.MinecraftForgeClient;
public class ClientProxyCore extends ProxyCore {
public class CoreProxyClient extends CoreProxy {
/* INSTANCES */
public Object getClient() {
@ -146,11 +151,11 @@ public class ClientProxyCore extends ProxyCore {
@Override
public EntityPlayer getBuildCraftPlayer(World world) {
if (ProxyCore.buildCraftPlayer == null) {
ProxyCore.buildCraftPlayer = createNewPlayer(world);
if (CoreProxy.buildCraftPlayer == null) {
CoreProxy.buildCraftPlayer = createNewPlayer(world);
}
return ProxyCore.buildCraftPlayer;
return CoreProxy.buildCraftPlayer;
}
}

2
common/buildcraft/core/render/RenderingEntityBlocks.java
View file

@ -6,7 +6,7 @@ import org.lwjgl.opengl.GL11;
import buildcraft.BuildCraftCore;
import buildcraft.core.IInventoryRenderer;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import net.minecraft.src.Block;
import net.minecraft.src.IBlockAccess;
import net.minecraft.src.RenderBlocks;

3
common/buildcraft/core/ActionMachineControl.java → common/buildcraft/core/triggers/ActionMachineControl.java
View file

@ -1,6 +1,7 @@
package buildcraft.core;
package buildcraft.core.triggers;
import buildcraft.api.gates.Action;
import buildcraft.core.DefaultProps;
public class ActionMachineControl extends Action {

3
common/buildcraft/core/ActionRedstoneOutput.java → common/buildcraft/core/triggers/ActionRedstoneOutput.java
View file

@ -7,9 +7,10 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.triggers;
import buildcraft.api.gates.Action;
import buildcraft.core.DefaultProps;
public class ActionRedstoneOutput extends Action {

3
common/buildcraft/core/DefaultActionProvider.java → common/buildcraft/core/triggers/DefaultActionProvider.java
View file

@ -1,10 +1,11 @@
package buildcraft.core;
package buildcraft.core.triggers;
import java.util.LinkedList;
import buildcraft.BuildCraftCore;
import buildcraft.api.gates.IAction;
import buildcraft.api.gates.IActionProvider;
import buildcraft.core.IMachine;
import net.minecraft.src.Block;
import net.minecraft.src.TileEntity;

3
common/buildcraft/core/DefaultTriggerProvider.java → common/buildcraft/core/triggers/DefaultTriggerProvider.java
View file

@ -1,4 +1,4 @@
package buildcraft.core;
package buildcraft.core.triggers;
import java.util.LinkedList;
@ -8,6 +8,7 @@ import buildcraft.api.gates.ITrigger;
import buildcraft.api.gates.ITriggerProvider;
import buildcraft.api.liquids.ITankContainer;
import buildcraft.api.transport.IPipe;
import buildcraft.core.IMachine;
import net.minecraft.src.Block;
import net.minecraft.src.IInventory;

4
common/buildcraft/core/TriggerInventory.java → common/buildcraft/core/triggers/TriggerInventory.java
View file

@ -7,10 +7,12 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.triggers;
import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.gates.Trigger;
import buildcraft.core.DefaultProps;
import buildcraft.core.utils.Utils;
import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack;
import net.minecraft.src.TileEntity;

3
common/buildcraft/core/TriggerLiquidContainer.java → common/buildcraft/core/triggers/TriggerLiquidContainer.java
View file

@ -7,13 +7,14 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.triggers;
import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.gates.Trigger;
import buildcraft.api.liquids.ILiquidTank;
import buildcraft.api.liquids.ITankContainer;
import buildcraft.api.liquids.LiquidManager;
import buildcraft.core.DefaultProps;
import net.minecraft.src.TileEntity;
public class TriggerLiquidContainer extends Trigger {

4
common/buildcraft/core/TriggerMachine.java → common/buildcraft/core/triggers/TriggerMachine.java
View file

@ -7,10 +7,12 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.triggers;
import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.gates.Trigger;
import buildcraft.core.DefaultProps;
import buildcraft.core.IMachine;
import net.minecraft.src.TileEntity;
public class TriggerMachine extends Trigger {

4
common/buildcraft/core/utils/Localization.java
View file

@ -6,7 +6,7 @@ import java.io.InputStream;
import java.util.LinkedList;
import java.util.Properties;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
/**
@ -98,6 +98,6 @@ public class Localization {
}
private static String getCurrentLanguage() {
return ProxyCore.proxy.getCurrentLanguage();
return CoreProxy.proxy.getCurrentLanguage();
}
}

2
common/buildcraft/core/StackUtil.java → common/buildcraft/core/utils/StackUtil.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.utils;
import java.util.LinkedList;

3
common/buildcraft/core/SurroundingInventory.java → common/buildcraft/core/utils/SurroundingInventory.java
View file

@ -7,12 +7,13 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.utils;
import java.util.LinkedList;
import buildcraft.api.core.Orientations;
import buildcraft.api.core.Position;
import buildcraft.core.IBuilderInventory;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory;

11
common/buildcraft/core/Utils.java → common/buildcraft/core/utils/Utils.java
View file

@ -7,7 +7,7 @@
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*/
package buildcraft.core;
package buildcraft.core.utils;
import java.util.Arrays;
import java.util.LinkedList;
@ -21,8 +21,15 @@ import buildcraft.api.liquids.ILiquid;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.api.transport.IPipeEntry;
import buildcraft.api.transport.IPipedItem;
import buildcraft.core.BlockIndex;
import buildcraft.core.EntityBlock;
import buildcraft.core.EntityPassiveItem;
import buildcraft.core.IDropControlInventory;
import buildcraft.core.IFramePipeConnection;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.network.ISynchronizedTile;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.Block;
import net.minecraft.src.EntityItem;
@ -329,7 +336,7 @@ public class Utils {
public static void preDestroyBlock(World world, int i, int j, int k) {
TileEntity tile = world.getBlockTileEntity(i, j, k);
if (tile instanceof IInventory && !ProxyCore.proxy.isRemote(world))
if (tile instanceof IInventory && !CoreProxy.proxy.isRemote(world))
if (!(tile instanceof IDropControlInventory) || ((IDropControlInventory) tile).doDrop())
dropItems(world, (IInventory) tile, i, j, k);

6
common/buildcraft/energy/BlockEngine.java
View file

@ -26,7 +26,7 @@ import buildcraft.api.core.Orientations;
import buildcraft.api.tools.IToolWrench;
import buildcraft.core.GuiIds;
import buildcraft.core.IItemPipe;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
public class BlockEngine extends BlockContainer {
@ -92,12 +92,12 @@ public class BlockEngine extends BlockContainer {
return false;
if (tile.engine instanceof EngineStone) {
if (!ProxyCore.proxy.isRemote(tile.worldObj))
if (!CoreProxy.proxy.isRemote(tile.worldObj))
entityplayer.openGui(BuildCraftEnergy.instance, GuiIds.ENGINE_STONE, world, i, j, k);
return true;
} else if (tile.engine instanceof EngineIron) {
if (!ProxyCore.proxy.isRemote(tile.worldObj))
if (!CoreProxy.proxy.isRemote(tile.worldObj))
entityplayer.openGui(BuildCraftEnergy.instance, GuiIds.ENGINE_IRON, world, i, j, k);
return true;
}

4
common/buildcraft/energy/Engine.java
View file

@ -11,8 +11,8 @@ package buildcraft.energy;
import buildcraft.api.core.Orientations;
import buildcraft.api.liquids.LiquidTank;
import buildcraft.core.ProxyCore;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.energy.gui.ContainerEngine;
import net.minecraft.src.ICrafting;
import net.minecraft.src.ItemStack;
@ -58,7 +58,7 @@ public abstract class Engine {
}
public final EnergyStage getEnergyStage() {
if (!ProxyCore.proxy.isRemote(tile.worldObj)) {
if (!CoreProxy.proxy.isRemote(tile.worldObj)) {
computeEnergyStage();
}

2
common/buildcraft/energy/EngineIron.java
View file

@ -16,7 +16,7 @@ import buildcraft.api.liquids.LiquidManager;
import buildcraft.api.liquids.LiquidStack;
import buildcraft.api.liquids.LiquidTank;
import buildcraft.core.DefaultProps;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import buildcraft.energy.gui.ContainerEngine;
import net.minecraft.src.ICrafting;
import net.minecraft.src.ItemStack;

2
common/buildcraft/energy/EngineStone.java
View file

@ -10,7 +10,7 @@
package buildcraft.energy;
import buildcraft.core.DefaultProps;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import buildcraft.energy.gui.ContainerEngine;
import net.minecraft.src.ICrafting;
import net.minecraft.src.ItemStack;

4
common/buildcraft/energy/OilPopulate.java
View file

@ -15,7 +15,7 @@ import cpw.mods.fml.common.IWorldGenerator;
import buildcraft.BuildCraftCore;
import buildcraft.BuildCraftEnergy;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.BiomeGenBase;
import net.minecraft.src.Block;
@ -43,7 +43,7 @@ public class OilPopulate implements IWorldGenerator {
}
if (rand == null) {
rand = ProxyCore.proxy.createNewRandom(world);
rand = CoreProxy.proxy.createNewRandom(world);
}
BiomeGenBase biomegenbase = world.getWorldChunkManager().getBiomeGenAt(x, z);

8
common/buildcraft/energy/TileEngine.java
View file

@ -26,10 +26,10 @@ import buildcraft.api.power.PowerFramework;
import buildcraft.api.power.PowerProvider;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.core.IBuilderInventory;
import buildcraft.core.ProxyCore;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory;
@ -66,7 +66,7 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven
@Override
public void initialize() {
if (!ProxyCore.proxy.isRemote(worldObj)) {
if (!CoreProxy.proxy.isRemote(worldObj)) {
if (engine == null) {
createEngineIfNeeded();
}
@ -85,7 +85,7 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven
return;
}
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
if (progressPart != 0) {
engine.progress += serverPistonSpeed;
@ -362,7 +362,7 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven
@Override
public void doWork() {
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
return;
}

4
common/buildcraft/factory/BlockAutoWorkbench.java
View file

@ -21,7 +21,7 @@ import buildcraft.BuildCraftFactory;
import buildcraft.core.BlockBuildCraft;
import buildcraft.core.GuiIds;
import buildcraft.core.IItemPipe;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
public class BlockAutoWorkbench extends BlockBuildCraft {
@ -59,7 +59,7 @@ public class BlockAutoWorkbench extends BlockBuildCraft {
}
}
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftFactory.instance, GuiIds.AUTO_CRAFTING_TABLE, world, i, j, k);
return true;

2
common/buildcraft/factory/BlockFrame.java
View file

@ -16,7 +16,7 @@ import java.util.Random;
import buildcraft.BuildCraftCore;
import buildcraft.core.DefaultProps;
import buildcraft.core.IFramePipeConnection;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.Block;

4
common/buildcraft/factory/BlockHopper.java
View file

@ -13,7 +13,7 @@ import buildcraft.BuildCraftFactory;
import buildcraft.core.BlockBuildCraft;
import buildcraft.core.GuiIds;
import buildcraft.core.IItemPipe;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
public class BlockHopper extends BlockBuildCraft {
@ -62,7 +62,7 @@ public class BlockHopper extends BlockBuildCraft {
}
}
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftFactory.instance, GuiIds.HOPPER, world, x, y, z);
return true;

2
common/buildcraft/factory/BlockMiningWell.java
View file

@ -14,7 +14,7 @@ import java.util.ArrayList;
import buildcraft.api.core.Orientations;
import buildcraft.api.core.Position;
import buildcraft.core.DefaultProps;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import buildcraft.factory.BlockMachineRoot;
import net.minecraft.src.EntityLiving;

2
common/buildcraft/factory/BlockPlainPipe.java
View file

@ -14,7 +14,7 @@ import java.util.Random;
import buildcraft.core.DefaultProps;
import buildcraft.core.IFramePipeConnection;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import net.minecraft.src.Block;
import net.minecraft.src.IBlockAccess;

2
common/buildcraft/factory/BlockPump.java
View file

@ -12,7 +12,7 @@ package buildcraft.factory;
import java.util.ArrayList;
import buildcraft.core.DefaultProps;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import net.minecraft.src.BlockContainer;
import net.minecraft.src.CreativeTabs;

6
common/buildcraft/factory/BlockQuarry.java
View file

@ -17,8 +17,8 @@ import buildcraft.api.core.Position;
import buildcraft.api.tools.IToolWrench;
import buildcraft.core.Box;
import buildcraft.core.DefaultProps;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import buildcraft.factory.BlockMachineRoot;
import net.minecraft.src.EntityLiving;
@ -129,7 +129,7 @@ public class BlockQuarry extends BlockMachineRoot {
@Override
public void breakBlock(World world, int i, int j, int k, int par5, int par6) {
if (ProxyCore.proxy.isRemote(world)){
if (CoreProxy.proxy.isRemote(world)){
return;
}

6
common/buildcraft/factory/BlockRefinery.java
View file

@ -28,8 +28,8 @@ import buildcraft.api.liquids.LiquidManager;
import buildcraft.api.liquids.LiquidStack;
import buildcraft.api.tools.IToolWrench;
import buildcraft.core.GuiIds;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
public class BlockRefinery extends BlockContainer {
@ -119,7 +119,7 @@ public class BlockRefinery extends BlockContainer {
}
}
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftFactory.instance, GuiIds.REFINERY, world, i, j, k);
return true;

2
common/buildcraft/factory/BlockTank.java
View file

@ -16,7 +16,7 @@ import buildcraft.api.core.Orientations;
import buildcraft.api.liquids.LiquidManager;
import buildcraft.api.liquids.LiquidStack;
import buildcraft.core.DefaultProps;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import net.minecraft.src.BlockContainer;
import net.minecraft.src.CreativeTabs;

8
common/buildcraft/factory/TileAssemblyTable.java
View file

@ -7,13 +7,13 @@ import buildcraft.api.recipes.AssemblyRecipe;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.core.DefaultProps;
import buildcraft.core.IMachine;
import buildcraft.core.ProxyCore;
import buildcraft.core.StackUtil;
import buildcraft.core.Utils;
import buildcraft.core.network.PacketIds;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.network.TilePacketWrapper;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.StackUtil;
import buildcraft.core.utils.Utils;
import net.minecraft.src.Container;
import net.minecraft.src.EntityItem;
@ -413,7 +413,7 @@ public class TileAssemblyTable extends TileEntity implements IMachine, IInventor
packet.posY = yCoord;
packet.posZ = zCoord;
// FIXME: This needs to be switched over to new synch system.
ProxyCore.proxy.sendToPlayers(packet.getPacket(), worldObj, (int) player.posX, (int) player.posY, (int) player.posZ,
CoreProxy.proxy.sendToPlayers(packet.getPacket(), worldObj, (int) player.posX, (int) player.posY, (int) player.posZ,
DefaultProps.NETWORK_UPDATE_RANGE);
}
}

4
common/buildcraft/factory/TileAutoWorkbench.java
View file

@ -14,8 +14,8 @@ import java.util.LinkedList;
import buildcraft.api.core.Orientations;
import buildcraft.api.core.Position;
import buildcraft.api.inventory.ISpecialInventory;
import buildcraft.core.StackUtil;
import buildcraft.core.Utils;
import buildcraft.core.utils.StackUtil;
import buildcraft.core.utils.Utils;
import net.minecraft.src.Container;
import net.minecraft.src.CraftingManager;

4
common/buildcraft/factory/TileHopper.java
View file

@ -2,8 +2,8 @@ package buildcraft.factory;
import buildcraft.api.core.Orientations;
import buildcraft.api.inventory.ISpecialInventory;
import buildcraft.core.ProxyCore;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.InventoryUtil;
import buildcraft.core.utils.SidedInventoryAdapter;
import buildcraft.core.utils.SimpleInventory;
@ -37,7 +37,7 @@ public class TileHopper extends TileBuildCraft implements IInventory {
@Override
public void updateEntity() {
super.updateEntity();
if (ProxyCore.proxy.isRemote(worldObj) || worldObj.getWorldTime() % 5 != 0)
if (CoreProxy.proxy.isRemote(worldObj) || worldObj.getWorldTime() % 5 != 0)
return;
int internalSlot = _internalInventory.getIdForFirstSlot();
if (internalSlot < 0)

4
common/buildcraft/factory/TileMiningWell.java
View file

@ -19,8 +19,8 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.core.IMachine;
import buildcraft.core.StackUtil;
import buildcraft.core.Utils;
import buildcraft.core.utils.StackUtil;
import buildcraft.core.utils.Utils;
import net.minecraft.src.Block;
import net.minecraft.src.EntityItem;

14
common/buildcraft/factory/TilePump.java
View file

@ -25,10 +25,10 @@ import buildcraft.api.power.PowerFramework;
import buildcraft.core.BlockIndex;
import buildcraft.core.EntityBlock;
import buildcraft.core.IMachine;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import net.minecraft.src.Block;
import net.minecraft.src.NBTTagCompound;
@ -66,13 +66,13 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor {
return;
}
if (!ProxyCore.proxy.isRemote(worldObj)) {
if (!CoreProxy.proxy.isRemote(worldObj)) {
if (tube.posY - aimY > 0.01) {
tubeY = tube.posY - 0.01;
setTubePosition();
if (ProxyCore.proxy.isSimulating(worldObj)) {
if (CoreProxy.proxy.isSimulating(worldObj)) {
sendNetworkUpdate();
}
@ -97,7 +97,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor {
internalLiquid = internalLiquid += LiquidManager.BUCKET_VOLUME;
if (ProxyCore.proxy.isSimulating(worldObj)) {
if (CoreProxy.proxy.isSimulating(worldObj)) {
sendNetworkUpdate();
}
}
@ -160,7 +160,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor {
worldObj.spawnEntityInWorld(tube);
if (ProxyCore.proxy.isSimulating(worldObj)) {
if (CoreProxy.proxy.isSimulating(worldObj)) {
sendNetworkUpdate();
}
}
@ -351,7 +351,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor {
@Override
public void destroy() {
if (tube != null) {
ProxyCore.proxy.removeEntity(tube);
CoreProxy.proxy.removeEntity(tube);
tube = null;
tubeY = Double.NaN;
aimY = 0;

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

@ -23,18 +23,18 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.core.Box;
import buildcraft.core.BptBlueprint;
import buildcraft.core.BptBuilderBase;
import buildcraft.core.BptBuilderBlueprint;
import buildcraft.core.DefaultAreaProvider;
import buildcraft.core.EntityRobot;
import buildcraft.core.IBuilderInventory;
import buildcraft.core.IMachine;
import buildcraft.core.ProxyCore;
import buildcraft.core.StackUtil;
import buildcraft.core.Utils;
import buildcraft.core.blueprints.BptBlueprint;
import buildcraft.core.blueprints.BptBuilderBase;
import buildcraft.core.blueprints.BptBuilderBlueprint;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.StackUtil;
import buildcraft.core.utils.Utils;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.Block;
@ -153,7 +153,7 @@ public class TileQuarry extends TileMachine implements IArmListener, IMachine, I
speed = arm.getArmSpeed();
}
if (ProxyCore.proxy.isSimulating(worldObj)) {
if (CoreProxy.proxy.isSimulating(worldObj)) {
sendNetworkUpdate();
}
if (inProcess || !isDigging) {
@ -394,7 +394,7 @@ public class TileQuarry extends TileMachine implements IArmListener, IMachine, I
continue;
if (entity.item.stackSize <= 0)
continue;
ProxyCore.proxy.removeEntity(entity);
CoreProxy.proxy.removeEntity(entity);
mineStack(entity.item);
}
}

6
common/buildcraft/factory/TileRefinery.java
View file

@ -22,8 +22,8 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.api.recipes.RefineryRecipe;
import buildcraft.core.IMachine;
import buildcraft.core.ProxyCore;
import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.Container;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ICrafting;
@ -165,9 +165,9 @@ public class TileRefinery extends TileMachine implements ITankContainer, IPowerR
@Override
public void updateEntity() {
if (ProxyCore.proxy.isRemote(worldObj)) {
if (CoreProxy.proxy.isRemote(worldObj)) {
simpleAnimationIterate();
} else if (ProxyCore.proxy.isSimulating(worldObj) && updateNetworkTime.markTimeIfDelay(worldObj, 2 * BuildCraftCore.updateFactor)) {
} else if (CoreProxy.proxy.isSimulating(worldObj) && updateNetworkTime.markTimeIfDelay(worldObj, 2 * BuildCraftCore.updateFactor)) {
sendNetworkUpdate();
}

6
common/buildcraft/factory/TileTank.java
View file

@ -16,10 +16,10 @@ import buildcraft.api.liquids.ITankContainer;
import buildcraft.api.liquids.LiquidManager;
import buildcraft.api.liquids.LiquidStack;
import buildcraft.api.liquids.LiquidTank;
import buildcraft.core.ProxyCore;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.network.PacketPayload;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.TileEntity;
@ -34,12 +34,12 @@ public class TileTank extends TileBuildCraft implements ITankContainer
@Override
public void updateEntity()
{
if(ProxyCore.proxy.isSimulating(worldObj) && hasUpdate && tracker.markTimeIfDelay(worldObj, 2 * BuildCraftCore.updateFactor)) {
if(CoreProxy.proxy.isSimulating(worldObj) && hasUpdate && tracker.markTimeIfDelay(worldObj, 2 * BuildCraftCore.updateFactor)) {
sendNetworkUpdate();
hasUpdate = false;
}
if(ProxyCore.proxy.isRemote(worldObj)) {
if(CoreProxy.proxy.isRemote(worldObj)) {
return;
}

6
common/buildcraft/factory/gui/ContainerAutoWorkbench.java
View file

@ -9,8 +9,8 @@
package buildcraft.factory.gui;
import buildcraft.core.ProxyCore;
import buildcraft.core.gui.BuildCraftContainer;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.factory.TileAutoWorkbench;
import net.minecraft.src.AchievementList;
import net.minecraft.src.Block;
@ -47,7 +47,7 @@ public class ContainerAutoWorkbench extends BuildCraftContainer {
@Override
public void onPickupFromSlot(ItemStack itemstack) {
ProxyCore.proxy.onCraftingPickup(thePlayer.worldObj, thePlayer, itemstack);
CoreProxy.proxy.onCraftingPickup(thePlayer.worldObj, thePlayer, itemstack);
if (itemstack.itemID == Block.workbench.blockID) {
thePlayer.addStat(AchievementList.buildWorkBench, 1);
} else if (itemstack.itemID == Item.pickaxeWood.shiftedIndex) {
@ -69,7 +69,7 @@ public class ContainerAutoWorkbench extends BuildCraftContainer {
} else if (itemstack.itemID == Block.bookShelf.blockID) {
thePlayer.addStat(AchievementList.bookcase, 1);
}
ProxyCore.proxy.TakenFromCrafting(thePlayer, itemstack, craftMatrix);
CoreProxy.proxy.TakenFromCrafting(thePlayer, itemstack, craftMatrix);
// FIXME: Autocrafting table should post a forge event.
//ForgeHooks.onTakenFromCrafting(thePlayer, itemstack, craftMatrix);

6
common/buildcraft/factory/gui/ContainerRefinery.java
View file

@ -8,11 +8,11 @@
*/
package buildcraft.factory.gui;
import buildcraft.core.ProxyCore;
import buildcraft.core.gui.BuildCraftContainer;
import buildcraft.core.network.PacketIds;
import buildcraft.core.network.PacketPayload;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.factory.TileRefinery;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ICrafting;
@ -54,12 +54,12 @@ public class ContainerRefinery extends BuildCraftContainer {
refinery.setFilter(slot, liquidId);
if (ProxyCore.proxy.isRemote(refinery.worldObj)) {
if (CoreProxy.proxy.isRemote(refinery.worldObj)) {
PacketPayload payload = new PacketPayload(3, 0, 0);
payload.intPayload[0] = slot;
payload.intPayload[1] = liquidId;
payload.intPayload[2] = liquidMeta;
ProxyCore.proxy.sendToServer(new PacketUpdate(PacketIds.REFINERY_FILTER_SET, refinery.xCoord, refinery.yCoord,
CoreProxy.proxy.sendToServer(new PacketUpdate(PacketIds.REFINERY_FILTER_SET, refinery.xCoord, refinery.yCoord,
refinery.zCoord, payload).getPacket());
}
}

6
common/buildcraft/silicon/BlockAssemblyTable.java
View file

@ -12,8 +12,8 @@ import net.minecraft.src.World;
import buildcraft.BuildCraftSilicon;
import buildcraft.core.DefaultProps;
import buildcraft.core.GuiIds;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import buildcraft.factory.TileAssemblyTable;
@ -49,7 +49,7 @@ public class BlockAssemblyTable extends BlockContainer {
if (entityplayer.isSneaking())
return false;
if (!ProxyCore.proxy.isRemote(world))
if (!CoreProxy.proxy.isRemote(world))
entityplayer.openGui(BuildCraftSilicon.instance, GuiIds.ASSEMBLY_TABLE, world, i, j, k);
return true;
}

2
common/buildcraft/silicon/SiliconRenderBlock.java
View file

@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import buildcraft.api.core.Orientations;
import buildcraft.core.Utils;
import buildcraft.core.utils.Utils;
import buildcraft.silicon.SiliconProxyClient;
public class SiliconRenderBlock implements ISimpleBlockRenderingHandler {

4
common/buildcraft/silicon/TileLaser.java
View file

@ -19,8 +19,8 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.core.BlockIndex;
import buildcraft.core.EntityEnergyLaser;
import buildcraft.core.ProxyCore;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.factory.TileAssemblyTable;
import net.minecraft.src.NBTTagCompound;
@ -164,7 +164,7 @@ public class TileLaser extends TileBuildCraft implements IPowerReceptor {
protected void createLaser() {
if (ProxyCore.proxy.isSimulating(worldObj))
if (CoreProxy.proxy.isSimulating(worldObj))
return;
laser = new EntityEnergyLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord, zCoord));

10
common/buildcraft/silicon/gui/GuiAssemblyTable.java
View file

@ -19,12 +19,12 @@ import org.lwjgl.opengl.GL11;
import buildcraft.api.recipes.AssemblyRecipe;
import buildcraft.core.DefaultProps;
import buildcraft.core.ProxyCore;
import buildcraft.core.gui.GuiAdvancedInterface;
import buildcraft.core.network.PacketCoordinates;
import buildcraft.core.network.PacketIds;
import buildcraft.core.network.PacketPayload;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.StringUtil;
import buildcraft.factory.TileAssemblyTable;
import buildcraft.factory.TileAssemblyTable.SelectionMessage;
@ -70,8 +70,8 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
updateRecipes();
// Request current selection from server
if(ProxyCore.proxy.isRemote(assemblyTable.worldObj))
ProxyCore.proxy.sendToServer(new PacketCoordinates(PacketIds.SELECTION_ASSEMBLY_GET, assemblyTable.xCoord,
if(CoreProxy.proxy.isRemote(assemblyTable.worldObj))
CoreProxy.proxy.sendToServer(new PacketCoordinates(PacketIds.SELECTION_ASSEMBLY_GET, assemblyTable.xCoord,
assemblyTable.yCoord, assemblyTable.zCoord).getPacket());
}
@ -152,7 +152,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
ContainerAssemblyTable container = (ContainerAssemblyTable) inventorySlots;
if (ProxyCore.proxy.isRemote(assemblyTable.worldObj)) {
if (CoreProxy.proxy.isRemote(assemblyTable.worldObj)) {
PacketPayload payload = TileAssemblyTable.selectionMessageWrapper.toPayload(container.x, container.y,
container.z, message);
@ -161,7 +161,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
packet.posY = assemblyTable.yCoord;
packet.posZ = assemblyTable.zCoord;
ProxyCore.proxy.sendToServer(packet.getPacket());
CoreProxy.proxy.sendToServer(packet.getPacket());
}
}

10
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -21,8 +21,8 @@ import buildcraft.api.tools.IToolWrench;
import buildcraft.api.transport.IPipe;
import buildcraft.core.BlockIndex;
import buildcraft.core.DefaultProps;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.BlockContainer;
@ -219,7 +219,7 @@ public class BlockGenericPipe extends BlockContainer {
@Override
public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int dmg) {
if (ProxyCore.proxy.isRemote(world))
if (CoreProxy.proxy.isRemote(world))
return;
int i1 = quantityDropped(world.rand);
@ -370,7 +370,7 @@ public class BlockGenericPipe extends BlockContainer {
// Try to strip wires first, starting with yellow.
for (IPipe.WireColor color : IPipe.WireColor.values())
if (pipe.wireSet[color.reverse().ordinal()]) {
if (!ProxyCore.proxy.isRemote(pipe.worldObj))
if (!CoreProxy.proxy.isRemote(pipe.worldObj))
dropWire(color.reverse(), pipe.worldObj, pipe.xCoord, pipe.yCoord, pipe.zCoord);
pipe.wireSet[color.reverse().ordinal()] = false;
//pipe.worldObj.markBlockNeedsUpdate(pipe.xCoord, pipe.yCoord, pipe.zCoord);
@ -380,7 +380,7 @@ public class BlockGenericPipe extends BlockContainer {
// Try to strip gate next
if (pipe.hasGate()) {
if (!ProxyCore.proxy.isRemote(pipe.worldObj))
if (!CoreProxy.proxy.isRemote(pipe.worldObj))
pipe.gate.dropGate(pipe.worldObj, pipe.xCoord, pipe.yCoord, pipe.zCoord);
pipe.resetGate();
return true;

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

@ -9,8 +9,9 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.transport.IPipe;
import buildcraft.core.DefaultProps;
import buildcraft.core.GuiIds;
import buildcraft.core.ProxyCore;
import buildcraft.core.Utils;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils;
import buildcraft.transport.triggers.ActionEnergyPulser;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Item;
@ -61,7 +62,7 @@ public class GateVanilla extends Gate {
// GUI
@Override
public void openGui(EntityPlayer player) {
if (!ProxyCore.proxy.isRemote(player.worldObj))
if (!CoreProxy.proxy.isRemote(player.worldObj))
player.openGui(BuildCraftTransport.instance, GuiIds.GATES, pipe.worldObj, pipe.xCoord, pipe.yCoord, pipe.zCoord);
}

1
common/buildcraft/transport/GuiHandler.java
View file

@ -7,6 +7,7 @@ import buildcraft.transport.gui.ContainerDiamondPipe;
import buildcraft.transport.gui.ContainerGateInterface;
import buildcraft.transport.gui.GuiDiamondPipe;
import buildcraft.transport.gui.GuiGateInterface;
import buildcraft.transport.pipes.PipeLogicDiamond;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;

6
common/buildcraft/transport/ItemFacade.java
View file

@ -12,7 +12,7 @@ import buildcraft.BuildCraftTransport;
import buildcraft.api.core.Orientations;
import buildcraft.api.recipes.AssemblyRecipe;
import buildcraft.core.ItemBuildCraft;
import buildcraft.core.ProxyCore;
import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.Block;
import net.minecraft.src.CreativeTabs;
@ -42,7 +42,7 @@ public class ItemFacade extends ItemBuildCraft {
int decodedMeta = ItemFacade.getMetaData(itemstack.getItemDamage());
ItemStack newStack = new ItemStack(decodedBlockId, 1, decodedMeta);
if (Item.itemsList[decodedBlockId] != null){
name += ": " + ProxyCore.proxy.getItemDisplayName(newStack);
name += ": " + CoreProxy.proxy.getItemDisplayName(newStack);
} else {
name += " < BROKEN (" + decodedBlockId + ":"+ decodedMeta +" )>";
}
@ -122,7 +122,7 @@ public class ItemFacade extends ItemBuildCraft {
for (Block block : Block.blocksList)
if (block != null)
ProxyCore.proxy.feedSubBlocks(block.blockID, null, itemList);
CoreProxy.proxy.feedSubBlocks(block.blockID, null, itemList);
return itemList;
}

6
common/buildcraft/transport/Pipe.java
View file

@ -26,11 +26,13 @@ import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.gates.Trigger;
import buildcraft.api.gates.TriggerParameter;
import buildcraft.api.transport.IPipe;
import buildcraft.core.ActionRedstoneOutput;
import buildcraft.core.IDropControlInventory;
import buildcraft.core.Utils;
import buildcraft.core.network.TilePacketWrapper;
import buildcraft.core.triggers.ActionRedstoneOutput;
import buildcraft.core.utils.Utils;
import buildcraft.transport.Gate.GateConditional;
import buildcraft.transport.pipes.PipeLogic;
import buildcraft.transport.triggers.ActionSignalOutput;
import net.minecraft.src.Entity;
import net.minecraft.src.EntityItem;

Some files were not shown because too many files have changed in this diff Show more