From be58eee5475d8b3fcd9dae67e94afa663afa9285 Mon Sep 17 00:00:00 2001 From: SirSengir Date: Wed, 5 Sep 2012 22:29:38 +0200 Subject: [PATCH] Reorganizing namespaces. --- common/buildcraft/BuildCraftBuilders.java | 22 +++--- common/buildcraft/BuildCraftCore.java | 26 +++---- common/buildcraft/BuildCraftEnergy.java | 8 +- common/buildcraft/BuildCraftFactory.java | 70 ++++++++--------- common/buildcraft/BuildCraftSilicon.java | 76 +++++++++---------- common/buildcraft/BuildCraftTransport.java | 18 ++--- .../buildcraft/builders/BlockArchitect.java | 6 +- .../builders/BlockBlueprintLibrary.java | 4 +- common/buildcraft/builders/BlockBuilder.java | 6 +- common/buildcraft/builders/BlockFiller.java | 6 +- common/buildcraft/builders/BlockMarker.java | 2 +- .../buildcraft/builders/BlockPathMarker.java | 2 +- .../builders/ClientBuilderHook.java | 10 +-- .../buildcraft/builders/FillerFlattener.java | 4 +- common/buildcraft/builders/FillerPattern.java | 4 +- common/buildcraft/builders/IBuilderHook.java | 2 +- common/buildcraft/builders/ItemBptBase.java | 2 +- .../buildcraft/builders/ItemBptBluePrint.java | 2 +- .../buildcraft/builders/ItemBptTemplate.java | 2 +- common/buildcraft/builders/TileArchitect.java | 14 ++-- .../builders/TileBlueprintLibrary.java | 6 +- common/buildcraft/builders/TileBuilder.java | 22 +++--- common/buildcraft/builders/TileFiller.java | 20 ++--- common/buildcraft/builders/TileMarker.java | 14 ++-- .../buildcraft/builders/TilePathMarker.java | 4 +- .../gui/ContainerBlueprintLibrary.java | 2 +- .../builders/gui/GuiBlueprintLibrary.java | 4 +- common/buildcraft/core/BlockBuildCraft.java | 2 + common/buildcraft/core/Box.java | 4 +- .../core/BuildCraftNetworkTicker.java | 61 --------------- common/buildcraft/core/EntityLaser.java | 3 +- common/buildcraft/core/EntityPassiveItem.java | 3 +- common/buildcraft/core/EntityRobot.java | 8 +- common/buildcraft/core/IBptContributor.java | 1 + common/buildcraft/core/TileBuildCraft.java | 6 +- .../core/{ => blueprints}/BptActionBuild.java | 2 +- .../core/{ => blueprints}/BptBase.java | 7 +- .../core/{ => blueprints}/BptBlueprint.java | 3 +- .../core/{ => blueprints}/BptBuilderBase.java | 4 +- .../{ => blueprints}/BptBuilderBlueprint.java | 5 +- .../{ => blueprints}/BptBuilderTemplate.java | 5 +- .../core/{ => blueprints}/BptContext.java | 3 +- .../core/{ => blueprints}/BptDataStream.java | 2 +- .../core/{ => blueprints}/BptError.java | 2 +- .../core/{ => blueprints}/BptItem.java | 2 +- .../core/{ => blueprints}/BptPlayerIndex.java | 6 +- .../core/{ => blueprints}/BptRootIndex.java | 6 +- .../core/{ => blueprints}/BptSlot.java | 2 +- .../core/{ => blueprints}/BptTemplate.java | 2 +- .../core/{ => network}/ClassMapping.java | 4 +- .../core/network/PacketPayload.java | 2 +- .../core/network/TilePacketWrapper.java | 3 +- .../{ProxyCore.java => proxy/CoreProxy.java} | 13 ++-- .../CoreProxyClient.java} | 15 ++-- .../core/render/RenderingEntityBlocks.java | 2 +- .../{ => triggers}/ActionMachineControl.java | 3 +- .../{ => triggers}/ActionRedstoneOutput.java | 3 +- .../{ => triggers}/DefaultActionProvider.java | 3 +- .../DefaultTriggerProvider.java | 3 +- .../core/{ => triggers}/TriggerInventory.java | 4 +- .../TriggerLiquidContainer.java | 3 +- .../core/{ => triggers}/TriggerMachine.java | 4 +- .../buildcraft/core/utils/Localization.java | 4 +- .../core/{ => utils}/StackUtil.java | 2 +- .../{ => utils}/SurroundingInventory.java | 3 +- common/buildcraft/core/{ => utils}/Utils.java | 11 ++- common/buildcraft/energy/BlockEngine.java | 6 +- common/buildcraft/energy/Engine.java | 4 +- common/buildcraft/energy/EngineIron.java | 2 +- common/buildcraft/energy/EngineStone.java | 2 +- common/buildcraft/energy/OilPopulate.java | 4 +- common/buildcraft/energy/TileEngine.java | 8 +- .../factory/BlockAutoWorkbench.java | 4 +- common/buildcraft/factory/BlockFrame.java | 2 +- common/buildcraft/factory/BlockHopper.java | 4 +- .../buildcraft/factory/BlockMiningWell.java | 2 +- common/buildcraft/factory/BlockPlainPipe.java | 2 +- common/buildcraft/factory/BlockPump.java | 2 +- common/buildcraft/factory/BlockQuarry.java | 6 +- common/buildcraft/factory/BlockRefinery.java | 6 +- common/buildcraft/factory/BlockTank.java | 2 +- .../buildcraft/factory/TileAssemblyTable.java | 8 +- .../buildcraft/factory/TileAutoWorkbench.java | 4 +- common/buildcraft/factory/TileHopper.java | 4 +- common/buildcraft/factory/TileMiningWell.java | 4 +- common/buildcraft/factory/TilePump.java | 14 ++-- common/buildcraft/factory/TileQuarry.java | 16 ++-- common/buildcraft/factory/TileRefinery.java | 6 +- common/buildcraft/factory/TileTank.java | 6 +- .../factory/gui/ContainerAutoWorkbench.java | 6 +- .../factory/gui/ContainerRefinery.java | 6 +- .../silicon/BlockAssemblyTable.java | 6 +- .../silicon/SiliconRenderBlock.java | 2 +- common/buildcraft/silicon/TileLaser.java | 4 +- .../silicon/gui/GuiAssemblyTable.java | 10 +-- .../transport/BlockGenericPipe.java | 10 +-- common/buildcraft/transport/GateVanilla.java | 7 +- common/buildcraft/transport/GuiHandler.java | 1 + common/buildcraft/transport/ItemFacade.java | 6 +- common/buildcraft/transport/Pipe.java | 6 +- .../transport/PipeTransportItems.java | 10 +-- .../transport/PipeTransportLiquids.java | 10 +-- .../transport/PipeTransportPower.java | 8 +- .../buildcraft/transport/TileGenericPipe.java | 2 +- .../{ => blueprints}/BptBlockPipe.java | 7 +- .../{ => blueprints}/BptItemPipeDiamond.java | 4 +- .../{ => blueprints}/BptItemPipeIron.java | 4 +- .../{ => blueprints}/BptItemPipeWooden.java | 4 +- .../transport/gui/ContainerGateInterface.java | 26 +++---- .../transport/gui/GuiDiamondPipe.java | 8 +- .../network/PacketHandlerTransport.java | 2 +- .../transport/pipes/PipeItemsCobblestone.java | 1 - .../transport/pipes/PipeItemsDiamond.java | 1 - .../transport/pipes/PipeItemsGold.java | 3 +- .../transport/pipes/PipeItemsIron.java | 1 - .../transport/pipes/PipeItemsObsidian.java | 13 ++-- .../transport/pipes/PipeItemsSandstone.java | 1 - .../transport/pipes/PipeItemsStone.java | 3 +- .../transport/pipes/PipeItemsVoid.java | 1 - .../transport/pipes/PipeItemsWood.java | 3 +- .../pipes/PipeLiquidsCobblestone.java | 1 - .../transport/pipes/PipeLiquidsGold.java | 1 - .../transport/pipes/PipeLiquidsIron.java | 1 - .../transport/pipes/PipeLiquidsSandstone.java | 1 - .../transport/pipes/PipeLiquidsStone.java | 1 - .../transport/pipes/PipeLiquidsVoid.java | 1 - .../transport/pipes/PipeLiquidsWood.java | 1 - .../transport/{ => pipes}/PipeLogic.java | 3 +- .../{ => pipes}/PipeLogicCobblestone.java | 4 +- .../{ => pipes}/PipeLogicDiamond.java | 15 ++-- .../transport/{ => pipes}/PipeLogicGold.java | 2 +- .../transport/{ => pipes}/PipeLogicIron.java | 3 +- .../{ => pipes}/PipeLogicObsidian.java | 4 +- .../{ => pipes}/PipeLogicSandstone.java | 4 +- .../transport/{ => pipes}/PipeLogicStone.java | 4 +- .../{ => pipes}/PipeLogicStripes.java | 4 +- .../transport/{ => pipes}/PipeLogicVoid.java | 2 +- .../transport/{ => pipes}/PipeLogicWood.java | 13 ++-- .../transport/pipes/PipePowerGold.java | 1 - .../transport/pipes/PipePowerStone.java | 1 - .../transport/pipes/PipePowerWood.java | 3 +- .../pipes/PipeStructureCobblestone.java | 1 - .../transport/render/FacadeItemRenderer.java | 2 +- .../transport/render/PipeItemRenderer.java | 2 +- .../transport/render/PipeWorldRenderer.java | 2 +- .../transport/render/RenderPipe.java | 2 +- .../transport/render/TileEntityPickupFX.java | 2 +- .../{ => triggers}/ActionEnergyPulser.java | 2 +- .../{ => triggers}/ActionSignalOutput.java | 2 +- .../{ => triggers}/TriggerPipeContents.java | 8 +- .../{ => triggers}/TriggerPipeSignal.java | 4 +- .../{ => triggers}/TriggerRedstoneInput.java | 4 +- 152 files changed, 486 insertions(+), 488 deletions(-) delete mode 100644 common/buildcraft/core/BuildCraftNetworkTicker.java rename common/buildcraft/core/{ => blueprints}/BptActionBuild.java (73%) rename common/buildcraft/core/{ => blueprints}/BptBase.java (97%) rename common/buildcraft/core/{ => blueprints}/BptBlueprint.java (99%) rename common/buildcraft/core/{ => blueprints}/BptBuilderBase.java (94%) rename common/buildcraft/core/{ => blueprints}/BptBuilderBlueprint.java (98%) rename common/buildcraft/core/{ => blueprints}/BptBuilderTemplate.java (96%) rename common/buildcraft/core/{ => blueprints}/BptContext.java (95%) rename common/buildcraft/core/{ => blueprints}/BptDataStream.java (99%) rename common/buildcraft/core/{ => blueprints}/BptError.java (93%) rename common/buildcraft/core/{ => blueprints}/BptItem.java (96%) rename common/buildcraft/core/{ => blueprints}/BptPlayerIndex.java (94%) rename common/buildcraft/core/{ => blueprints}/BptRootIndex.java (96%) rename common/buildcraft/core/{ => blueprints}/BptSlot.java (98%) rename common/buildcraft/core/{ => blueprints}/BptTemplate.java (97%) rename common/buildcraft/core/{ => network}/ClassMapping.java (99%) rename common/buildcraft/core/{ProxyCore.java => proxy/CoreProxy.java} (93%) rename common/buildcraft/core/{ClientProxyCore.java => proxy/CoreProxyClient.java} (92%) rename common/buildcraft/core/{ => triggers}/ActionMachineControl.java (90%) rename common/buildcraft/core/{ => triggers}/ActionRedstoneOutput.java (90%) rename common/buildcraft/core/{ => triggers}/DefaultActionProvider.java (91%) rename common/buildcraft/core/{ => triggers}/DefaultTriggerProvider.java (96%) rename common/buildcraft/core/{ => triggers}/TriggerInventory.java (96%) rename common/buildcraft/core/{ => triggers}/TriggerLiquidContainer.java (97%) rename common/buildcraft/core/{ => triggers}/TriggerMachine.java (91%) rename common/buildcraft/core/{ => utils}/StackUtil.java (99%) rename common/buildcraft/core/{ => utils}/SurroundingInventory.java (97%) rename common/buildcraft/core/{ => utils}/Utils.java (97%) rename common/buildcraft/transport/{ => blueprints}/BptBlockPipe.java (95%) rename common/buildcraft/transport/{ => blueprints}/BptItemPipeDiamond.java (95%) rename common/buildcraft/transport/{ => blueprints}/BptItemPipeIron.java (92%) rename common/buildcraft/transport/{ => blueprints}/BptItemPipeWooden.java (92%) rename common/buildcraft/transport/{ => pipes}/PipeLogic.java (95%) rename common/buildcraft/transport/{ => pipes}/PipeLogicCobblestone.java (87%) rename common/buildcraft/transport/{ => pipes}/PipeLogicDiamond.java (90%) rename common/buildcraft/transport/{ => pipes}/PipeLogicGold.java (90%) rename common/buildcraft/transport/{ => pipes}/PipeLogicIron.java (97%) rename common/buildcraft/transport/{ => pipes}/PipeLogicObsidian.java (87%) rename common/buildcraft/transport/{ => pipes}/PipeLogicSandstone.java (86%) rename common/buildcraft/transport/{ => pipes}/PipeLogicStone.java (87%) rename common/buildcraft/transport/{ => pipes}/PipeLogicStripes.java (87%) rename common/buildcraft/transport/{ => pipes}/PipeLogicVoid.java (90%) rename common/buildcraft/transport/{ => pipes}/PipeLogicWood.java (92%) rename common/buildcraft/transport/{ => triggers}/ActionEnergyPulser.java (91%) rename common/buildcraft/transport/{ => triggers}/ActionSignalOutput.java (96%) rename common/buildcraft/transport/{ => triggers}/TriggerPipeContents.java (92%) rename common/buildcraft/transport/{ => triggers}/TriggerPipeSignal.java (94%) rename common/buildcraft/transport/{ => triggers}/TriggerRedstoneInput.java (91%) diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index ad7af4ab..5d22f922 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -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'), diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index aa571e83..f06de5ae 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -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); diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index cb1d76a5..ca929a7b 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -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 }); } diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index a00fa39b..f0a58b02 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -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 }); } diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 629f71d3..904a0c2d 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -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"); } } diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 716d0613..bc2a74d6 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -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; diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 2f1a0858..5bff6b26 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -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; diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index c9ec9c93..f4654dbe 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -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; diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 73193945..a964cb9d 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -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; diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 2814d47f..d5289567 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -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; diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index d53009e5..764d3e06 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -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; diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index a06b5468..5d1ca498 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -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; diff --git a/common/buildcraft/builders/ClientBuilderHook.java b/common/buildcraft/builders/ClientBuilderHook.java index 347badfa..e018a20e 100644 --- a/common/buildcraft/builders/ClientBuilderHook.java +++ b/common/buildcraft/builders/ClientBuilderHook.java @@ -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); } } diff --git a/common/buildcraft/builders/FillerFlattener.java b/common/buildcraft/builders/FillerFlattener.java index 08f91b4a..e283d4fe 100644 --- a/common/buildcraft/builders/FillerFlattener.java +++ b/common/buildcraft/builders/FillerFlattener.java @@ -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); } diff --git a/common/buildcraft/builders/FillerPattern.java b/common/buildcraft/builders/FillerPattern.java index 7bb49000..57927925 100644 --- a/common/buildcraft/builders/FillerPattern.java +++ b/common/buildcraft/builders/FillerPattern.java @@ -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); } diff --git a/common/buildcraft/builders/IBuilderHook.java b/common/buildcraft/builders/IBuilderHook.java index ada5f6f1..6ec781fc 100644 --- a/common/buildcraft/builders/IBuilderHook.java +++ b/common/buildcraft/builders/IBuilderHook.java @@ -2,7 +2,7 @@ package buildcraft.builders; import java.io.IOException; -import buildcraft.core.BptRootIndex; +import buildcraft.core.blueprints.BptRootIndex; public interface IBuilderHook { diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index c17948ed..655c5d19 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -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; diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java index 4594f864..381e2fea 100644 --- a/common/buildcraft/builders/ItemBptBluePrint.java +++ b/common/buildcraft/builders/ItemBptBluePrint.java @@ -10,7 +10,7 @@ package buildcraft.builders; import buildcraft.BuildCraftBuilders; -import buildcraft.core.BptBase; +import buildcraft.core.blueprints.BptBase; public class ItemBptBluePrint extends ItemBptBase { diff --git a/common/buildcraft/builders/ItemBptTemplate.java b/common/buildcraft/builders/ItemBptTemplate.java index 2bcd6ac6..0bcdd028 100644 --- a/common/buildcraft/builders/ItemBptTemplate.java +++ b/common/buildcraft/builders/ItemBptTemplate.java @@ -1,7 +1,7 @@ package buildcraft.builders; import buildcraft.BuildCraftBuilders; -import buildcraft.core.BptBase; +import buildcraft.core.blueprints.BptBase; public class ItemBptTemplate extends ItemBptBase { diff --git a/common/buildcraft/builders/TileArchitect.java b/common/buildcraft/builders/TileArchitect.java index c6bb8e46..24b40091 100644 --- a/common/buildcraft/builders/TileArchitect.java +++ b/common/buildcraft/builders/TileArchitect.java @@ -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); } diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java index 2558af20..84edfd97 100644 --- a/common/buildcraft/builders/TileBlueprintLibrary.java +++ b/common/buildcraft/builders/TileBlueprintLibrary.java @@ -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; diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index b533add7..8691812d 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -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(); } diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index ab78158a..c37b2345 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -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(); } } diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index 87158cd0..c8f306ce 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -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(); } } diff --git a/common/buildcraft/builders/TilePathMarker.java b/common/buildcraft/builders/TilePathMarker.java index 282b2905..6b1b8824 100644 --- a/common/buildcraft/builders/TilePathMarker.java +++ b/common/buildcraft/builders/TilePathMarker.java @@ -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)); diff --git a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java index 32f9d82a..6e58b1dc 100644 --- a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java @@ -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; diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index 18c4eea7..e42e2d74 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -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; diff --git a/common/buildcraft/core/BlockBuildCraft.java b/common/buildcraft/core/BlockBuildCraft.java index 1876d690..5633efa9 100644 --- a/common/buildcraft/core/BlockBuildCraft.java +++ b/common/buildcraft/core/BlockBuildCraft.java @@ -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; diff --git a/common/buildcraft/core/Box.java b/common/buildcraft/core/Box.java index 3ed8db93..6513f690 100644 --- a/common/buildcraft/core/Box.java +++ b/common/buildcraft/core/Box.java @@ -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; } diff --git a/common/buildcraft/core/BuildCraftNetworkTicker.java b/common/buildcraft/core/BuildCraftNetworkTicker.java deleted file mode 100644 index c8e9af54..00000000 --- a/common/buildcraft/core/BuildCraftNetworkTicker.java +++ /dev/null @@ -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 type, Object... tickData) { - } - - @Override - public void tickEnd(EnumSet type, Object... tickData) { - tick(); - } - - @Override - public EnumSet ticks() { - return BuildCraftCore.trackNetworkUsage ? EnumSet.of(TickType.WORLD) : EnumSet.noneOf(TickType.class); - } - - @Override - public String getLabel() { - return "BuildCraftNetworkTickMonitor"; - } - - @Override - public int nextTickSpacing() { - return 200; - } - -} diff --git a/common/buildcraft/core/EntityLaser.java b/common/buildcraft/core/EntityLaser.java index ff4e101e..1f994929 100644 --- a/common/buildcraft/core/EntityLaser.java +++ b/common/buildcraft/core/EntityLaser.java @@ -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(); } diff --git a/common/buildcraft/core/EntityPassiveItem.java b/common/buildcraft/core/EntityPassiveItem.java index 9d51da97..d638da38 100644 --- a/common/buildcraft/core/EntityPassiveItem.java +++ b/common/buildcraft/core/EntityPassiveItem.java @@ -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; } diff --git a/common/buildcraft/core/EntityRobot.java b/common/buildcraft/core/EntityRobot.java index 3580d8cb..8066b766 100644 --- a/common/buildcraft/core/EntityRobot.java +++ b/common/buildcraft/core/EntityRobot.java @@ -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) { diff --git a/common/buildcraft/core/IBptContributor.java b/common/buildcraft/core/IBptContributor.java index b4d8a809..9bd8fa1e 100644 --- a/common/buildcraft/core/IBptContributor.java +++ b/common/buildcraft/core/IBptContributor.java @@ -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 { diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index 9b54d555..b511fe30 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -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 diff --git a/common/buildcraft/core/BptActionBuild.java b/common/buildcraft/core/blueprints/BptActionBuild.java similarity index 73% rename from common/buildcraft/core/BptActionBuild.java rename to common/buildcraft/core/blueprints/BptActionBuild.java index 8d188299..b8ece4a6 100644 --- a/common/buildcraft/core/BptActionBuild.java +++ b/common/buildcraft/core/blueprints/BptActionBuild.java @@ -1,4 +1,4 @@ -package buildcraft.core; +package buildcraft.core.blueprints; import buildcraft.api.blueprints.BptSlotInfo; diff --git a/common/buildcraft/core/BptBase.java b/common/buildcraft/core/blueprints/BptBase.java similarity index 97% rename from common/buildcraft/core/BptBase.java rename to common/buildcraft/core/blueprints/BptBase.java index 6dfae1d8..9629c6f2 100644 --- a/common/buildcraft/core/BptBase.java +++ b/common/buildcraft/core/blueprints/BptBase.java @@ -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(); diff --git a/common/buildcraft/core/BptBlueprint.java b/common/buildcraft/core/blueprints/BptBlueprint.java similarity index 99% rename from common/buildcraft/core/BptBlueprint.java rename to common/buildcraft/core/blueprints/BptBlueprint.java index ebb34d9e..b54c6cf5 100644 --- a/common/buildcraft/core/BptBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBlueprint.java @@ -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 { diff --git a/common/buildcraft/core/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java similarity index 94% rename from common/buildcraft/core/BptBuilderBase.java rename to common/buildcraft/core/blueprints/BptBuilderBase.java index e0e9a1e7..a80b232c 100644 --- a/common/buildcraft/core/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -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; diff --git a/common/buildcraft/core/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java similarity index 98% rename from common/buildcraft/core/BptBuilderBlueprint.java rename to common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 65dfbfc2..0f9c7fe4 100644 --- a/common/buildcraft/core/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -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; diff --git a/common/buildcraft/core/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java similarity index 96% rename from common/buildcraft/core/BptBuilderTemplate.java rename to common/buildcraft/core/blueprints/BptBuilderTemplate.java index 9b03a18a..b1c295eb 100644 --- a/common/buildcraft/core/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -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; diff --git a/common/buildcraft/core/BptContext.java b/common/buildcraft/core/blueprints/BptContext.java similarity index 95% rename from common/buildcraft/core/BptContext.java rename to common/buildcraft/core/blueprints/BptContext.java index 60d2b6d0..8863dfec 100644 --- a/common/buildcraft/core/BptContext.java +++ b/common/buildcraft/core/blueprints/BptContext.java @@ -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; diff --git a/common/buildcraft/core/BptDataStream.java b/common/buildcraft/core/blueprints/BptDataStream.java similarity index 99% rename from common/buildcraft/core/BptDataStream.java rename to common/buildcraft/core/blueprints/BptDataStream.java index 848d0866..4a849aa2 100644 --- a/common/buildcraft/core/BptDataStream.java +++ b/common/buildcraft/core/blueprints/BptDataStream.java @@ -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; diff --git a/common/buildcraft/core/BptError.java b/common/buildcraft/core/blueprints/BptError.java similarity index 93% rename from common/buildcraft/core/BptError.java rename to common/buildcraft/core/blueprints/BptError.java index 3ae759f6..91492698 100644 --- a/common/buildcraft/core/BptError.java +++ b/common/buildcraft/core/blueprints/BptError.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.blueprints; import buildcraft.BuildCraftCore; diff --git a/common/buildcraft/core/BptItem.java b/common/buildcraft/core/blueprints/BptItem.java similarity index 96% rename from common/buildcraft/core/BptItem.java rename to common/buildcraft/core/blueprints/BptItem.java index d0439691..a5a25e36 100644 --- a/common/buildcraft/core/BptItem.java +++ b/common/buildcraft/core/blueprints/BptItem.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.blueprints; import java.util.LinkedList; diff --git a/common/buildcraft/core/BptPlayerIndex.java b/common/buildcraft/core/blueprints/BptPlayerIndex.java similarity index 94% rename from common/buildcraft/core/BptPlayerIndex.java rename to common/buildcraft/core/blueprints/BptPlayerIndex.java index c103d732..1e21273f 100644 --- a/common/buildcraft/core/BptPlayerIndex.java +++ b/common/buildcraft/core/blueprints/BptPlayerIndex.java @@ -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(); diff --git a/common/buildcraft/core/BptRootIndex.java b/common/buildcraft/core/blueprints/BptRootIndex.java similarity index 96% rename from common/buildcraft/core/BptRootIndex.java rename to common/buildcraft/core/blueprints/BptRootIndex.java index 5c6a364c..87ead52b 100644 --- a/common/buildcraft/core/BptRootIndex.java +++ b/common/buildcraft/core/blueprints/BptRootIndex.java @@ -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(); diff --git a/common/buildcraft/core/BptSlot.java b/common/buildcraft/core/blueprints/BptSlot.java similarity index 98% rename from common/buildcraft/core/BptSlot.java rename to common/buildcraft/core/blueprints/BptSlot.java index cdac0bf2..1aeecf59 100644 --- a/common/buildcraft/core/BptSlot.java +++ b/common/buildcraft/core/blueprints/BptSlot.java @@ -1,4 +1,4 @@ -package buildcraft.core; +package buildcraft.core.blueprints; import java.util.LinkedList; diff --git a/common/buildcraft/core/BptTemplate.java b/common/buildcraft/core/blueprints/BptTemplate.java similarity index 97% rename from common/buildcraft/core/BptTemplate.java rename to common/buildcraft/core/blueprints/BptTemplate.java index fc5b7d64..c8bfa6ab 100644 --- a/common/buildcraft/core/BptTemplate.java +++ b/common/buildcraft/core/blueprints/BptTemplate.java @@ -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; diff --git a/common/buildcraft/core/ClassMapping.java b/common/buildcraft/core/network/ClassMapping.java similarity index 99% rename from common/buildcraft/core/ClassMapping.java rename to common/buildcraft/core/network/ClassMapping.java index 03ea08aa..228951c9 100644 --- a/common/buildcraft/core/ClassMapping.java +++ b/common/buildcraft/core/network/ClassMapping.java @@ -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 { diff --git a/common/buildcraft/core/network/PacketPayload.java b/common/buildcraft/core/network/PacketPayload.java index 6eb399a2..c36a1825 100644 --- a/common/buildcraft/core/network/PacketPayload.java +++ b/common/buildcraft/core/network/PacketPayload.java @@ -1,6 +1,6 @@ package buildcraft.core.network; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; public class PacketPayload { diff --git a/common/buildcraft/core/network/TilePacketWrapper.java b/common/buildcraft/core/network/TilePacketWrapper.java index 4ab0dc14..de71ef26 100644 --- a/common/buildcraft/core/network/TilePacketWrapper.java +++ b/common/buildcraft/core/network/TilePacketWrapper.java @@ -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 { diff --git a/common/buildcraft/core/ProxyCore.java b/common/buildcraft/core/proxy/CoreProxy.java similarity index 93% rename from common/buildcraft/core/ProxyCore.java rename to common/buildcraft/core/proxy/CoreProxy.java index d01b1381..7f853097 100644 --- a/common/buildcraft/core/ProxyCore.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -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; } } diff --git a/common/buildcraft/core/ClientProxyCore.java b/common/buildcraft/core/proxy/CoreProxyClient.java similarity index 92% rename from common/buildcraft/core/ClientProxyCore.java rename to common/buildcraft/core/proxy/CoreProxyClient.java index 9d398d8a..26722e55 100644 --- a/common/buildcraft/core/ClientProxyCore.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -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; } } diff --git a/common/buildcraft/core/render/RenderingEntityBlocks.java b/common/buildcraft/core/render/RenderingEntityBlocks.java index ae3b5778..aae84447 100644 --- a/common/buildcraft/core/render/RenderingEntityBlocks.java +++ b/common/buildcraft/core/render/RenderingEntityBlocks.java @@ -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; diff --git a/common/buildcraft/core/ActionMachineControl.java b/common/buildcraft/core/triggers/ActionMachineControl.java similarity index 90% rename from common/buildcraft/core/ActionMachineControl.java rename to common/buildcraft/core/triggers/ActionMachineControl.java index 6af10bab..811a6307 100644 --- a/common/buildcraft/core/ActionMachineControl.java +++ b/common/buildcraft/core/triggers/ActionMachineControl.java @@ -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 { diff --git a/common/buildcraft/core/ActionRedstoneOutput.java b/common/buildcraft/core/triggers/ActionRedstoneOutput.java similarity index 90% rename from common/buildcraft/core/ActionRedstoneOutput.java rename to common/buildcraft/core/triggers/ActionRedstoneOutput.java index 261646e8..c504d9b8 100644 --- a/common/buildcraft/core/ActionRedstoneOutput.java +++ b/common/buildcraft/core/triggers/ActionRedstoneOutput.java @@ -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 { diff --git a/common/buildcraft/core/DefaultActionProvider.java b/common/buildcraft/core/triggers/DefaultActionProvider.java similarity index 91% rename from common/buildcraft/core/DefaultActionProvider.java rename to common/buildcraft/core/triggers/DefaultActionProvider.java index 18e1fd80..d2f04064 100644 --- a/common/buildcraft/core/DefaultActionProvider.java +++ b/common/buildcraft/core/triggers/DefaultActionProvider.java @@ -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; diff --git a/common/buildcraft/core/DefaultTriggerProvider.java b/common/buildcraft/core/triggers/DefaultTriggerProvider.java similarity index 96% rename from common/buildcraft/core/DefaultTriggerProvider.java rename to common/buildcraft/core/triggers/DefaultTriggerProvider.java index 798cc553..5975a9ea 100644 --- a/common/buildcraft/core/DefaultTriggerProvider.java +++ b/common/buildcraft/core/triggers/DefaultTriggerProvider.java @@ -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; diff --git a/common/buildcraft/core/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java similarity index 96% rename from common/buildcraft/core/TriggerInventory.java rename to common/buildcraft/core/triggers/TriggerInventory.java index b56bd09e..2a477850 100644 --- a/common/buildcraft/core/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -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; diff --git a/common/buildcraft/core/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java similarity index 97% rename from common/buildcraft/core/TriggerLiquidContainer.java rename to common/buildcraft/core/triggers/TriggerLiquidContainer.java index e4251f55..ecf83ee4 100644 --- a/common/buildcraft/core/TriggerLiquidContainer.java +++ b/common/buildcraft/core/triggers/TriggerLiquidContainer.java @@ -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 { diff --git a/common/buildcraft/core/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java similarity index 91% rename from common/buildcraft/core/TriggerMachine.java rename to common/buildcraft/core/triggers/TriggerMachine.java index 55ee52e9..28d66676 100644 --- a/common/buildcraft/core/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -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 { diff --git a/common/buildcraft/core/utils/Localization.java b/common/buildcraft/core/utils/Localization.java index 77c6a0a7..36db1442 100644 --- a/common/buildcraft/core/utils/Localization.java +++ b/common/buildcraft/core/utils/Localization.java @@ -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(); } } diff --git a/common/buildcraft/core/StackUtil.java b/common/buildcraft/core/utils/StackUtil.java similarity index 99% rename from common/buildcraft/core/StackUtil.java rename to common/buildcraft/core/utils/StackUtil.java index b4b69744..7bbed246 100644 --- a/common/buildcraft/core/StackUtil.java +++ b/common/buildcraft/core/utils/StackUtil.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.utils; import java.util.LinkedList; diff --git a/common/buildcraft/core/SurroundingInventory.java b/common/buildcraft/core/utils/SurroundingInventory.java similarity index 97% rename from common/buildcraft/core/SurroundingInventory.java rename to common/buildcraft/core/utils/SurroundingInventory.java index 7815a7a2..e7f138d9 100644 --- a/common/buildcraft/core/SurroundingInventory.java +++ b/common/buildcraft/core/utils/SurroundingInventory.java @@ -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; diff --git a/common/buildcraft/core/Utils.java b/common/buildcraft/core/utils/Utils.java similarity index 97% rename from common/buildcraft/core/Utils.java rename to common/buildcraft/core/utils/Utils.java index 7db1cb6d..9f7cfe40 100644 --- a/common/buildcraft/core/Utils.java +++ b/common/buildcraft/core/utils/Utils.java @@ -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); diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 24913cf0..9c6123f3 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -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; } diff --git a/common/buildcraft/energy/Engine.java b/common/buildcraft/energy/Engine.java index 597987e6..f8908734 100644 --- a/common/buildcraft/energy/Engine.java +++ b/common/buildcraft/energy/Engine.java @@ -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(); } diff --git a/common/buildcraft/energy/EngineIron.java b/common/buildcraft/energy/EngineIron.java index 0055afde..d6ccefd8 100644 --- a/common/buildcraft/energy/EngineIron.java +++ b/common/buildcraft/energy/EngineIron.java @@ -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; diff --git a/common/buildcraft/energy/EngineStone.java b/common/buildcraft/energy/EngineStone.java index eb15a798..0f621bb8 100644 --- a/common/buildcraft/energy/EngineStone.java +++ b/common/buildcraft/energy/EngineStone.java @@ -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; diff --git a/common/buildcraft/energy/OilPopulate.java b/common/buildcraft/energy/OilPopulate.java index 1fc0e1c4..00dc5a02 100644 --- a/common/buildcraft/energy/OilPopulate.java +++ b/common/buildcraft/energy/OilPopulate.java @@ -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); diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index 3b86b092..d2794944 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -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; } diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index e655a639..18666185 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -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; diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 2336fe8c..c814e263 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -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; diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index 97d7a905..3480e30c 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -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; diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 7f964580..4e25a405 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -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; diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index fa8bb1c7..2296e138 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -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; diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index 79fba476..184fcdc2 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -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; diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index c6ba2892..c1dac584 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -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; } diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index a113a50d..d3309a75 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -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; diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 2580842e..90a98e00 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -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; diff --git a/common/buildcraft/factory/TileAssemblyTable.java b/common/buildcraft/factory/TileAssemblyTable.java index bca95392..b6bfc48d 100644 --- a/common/buildcraft/factory/TileAssemblyTable.java +++ b/common/buildcraft/factory/TileAssemblyTable.java @@ -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); } } diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 6901cc99..cb7bbf89 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -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; diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index 5a60f15e..bc60221b 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -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) diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 42035499..26d99884 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -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; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index fe3ae287..7bbb437c 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -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; diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 0fe16814..0edba60b 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -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); } } diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index 10115dcf..434c6783 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -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(); } diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 013c0009..0bf312e7 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -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; } diff --git a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java index be1d12a9..0d40f9b5 100644 --- a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java +++ b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java @@ -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); diff --git a/common/buildcraft/factory/gui/ContainerRefinery.java b/common/buildcraft/factory/gui/ContainerRefinery.java index a2cfa757..f799e0d3 100644 --- a/common/buildcraft/factory/gui/ContainerRefinery.java +++ b/common/buildcraft/factory/gui/ContainerRefinery.java @@ -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()); } } diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index b7d1dfee..281eec34 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -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; } diff --git a/common/buildcraft/silicon/SiliconRenderBlock.java b/common/buildcraft/silicon/SiliconRenderBlock.java index e3c401cb..98bb1ec2 100644 --- a/common/buildcraft/silicon/SiliconRenderBlock.java +++ b/common/buildcraft/silicon/SiliconRenderBlock.java @@ -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 { diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index 1bb7e896..081e9dae 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -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)); diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 33d708ec..664e3885 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -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()); } } diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 924eb637..bdd5a74a 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -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; diff --git a/common/buildcraft/transport/GateVanilla.java b/common/buildcraft/transport/GateVanilla.java index d2dc4d44..cadac832 100644 --- a/common/buildcraft/transport/GateVanilla.java +++ b/common/buildcraft/transport/GateVanilla.java @@ -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); } diff --git a/common/buildcraft/transport/GuiHandler.java b/common/buildcraft/transport/GuiHandler.java index 540fd010..29c99b18 100644 --- a/common/buildcraft/transport/GuiHandler.java +++ b/common/buildcraft/transport/GuiHandler.java @@ -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; diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 5bb94f31..d2ea23d4 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -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; } diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index ed5165cd..5d5901ba 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -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; diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index 411bc869..59c8e4dc 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -28,11 +28,11 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; 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.PacketPipeTransportContent; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.StackUtil; +import buildcraft.core.utils.Utils; import net.minecraft.src.EntityItem; import net.minecraft.src.IInventory; @@ -257,7 +257,7 @@ public class PipeTransportItems extends PipeTransport { } else if (tile instanceof IInventory) { StackUtil utils = new StackUtil(data.item.getItemStack()); - if (!ProxyCore.proxy.isRemote(worldObj)) + if (!CoreProxy.proxy.isRemote(worldObj)) if (utils.checkAvailableSlot((IInventory) tile, true, data.orientation.reverse()) && utils.items.stackSize == 0) data.item.remove(); else { @@ -360,7 +360,7 @@ public class PipeTransportItems extends PipeTransport { else { int i; - if (ProxyCore.proxy.isRemote(worldObj) || ProxyCore.proxy.isSimulating(worldObj)) + if (CoreProxy.proxy.isRemote(worldObj) || CoreProxy.proxy.isSimulating(worldObj)) { i = Math.abs(data.item.getEntityId() + xCoord + yCoord + zCoord + data.item.getDeterministicRandomization()) % listOfPossibleMovements.size(); diff --git a/common/buildcraft/transport/PipeTransportLiquids.java b/common/buildcraft/transport/PipeTransportLiquids.java index 301fd6fc..79693976 100644 --- a/common/buildcraft/transport/PipeTransportLiquids.java +++ b/common/buildcraft/transport/PipeTransportLiquids.java @@ -21,8 +21,8 @@ import buildcraft.api.liquids.LiquidTank; import buildcraft.api.transport.IPipeEntry; import buildcraft.core.DefaultProps; import buildcraft.core.IMachine; -import buildcraft.core.ProxyCore; -import buildcraft.core.Utils; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; import buildcraft.transport.network.PacketLiquidUpdate; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; @@ -178,7 +178,7 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine @Override public void updateEntity() { - if (ProxyCore.proxy.isRemote(worldObj)) + if (CoreProxy.proxy.isRemote(worldObj)) return; moveLiquids(); @@ -213,12 +213,12 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine } - if (ProxyCore.proxy.isSimulating(worldObj)) + if (CoreProxy.proxy.isSimulating(worldObj)) if (tracker.markTimeIfDelay(worldObj, 1 * BuildCraftCore.updateFactor)){ PacketLiquidUpdate packet = new PacketLiquidUpdate(xCoord, yCoord, zCoord); packet.displayLiquid = this.renderCache; - ProxyCore.proxy.sendToPlayers(packet.getPacket(), worldObj, xCoord, yCoord, zCoord, + CoreProxy.proxy.sendToPlayers(packet.getPacket(), worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE); } diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index f69e22b2..b9d2ad6f 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -19,8 +19,8 @@ import buildcraft.api.gates.ITrigger; import buildcraft.api.power.IPowerReceptor; import buildcraft.core.DefaultProps; import buildcraft.core.IMachine; -import buildcraft.core.ProxyCore; -import buildcraft.core.Utils; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; import buildcraft.transport.network.PacketPowerUpdate; public class PipeTransportPower extends PipeTransport { @@ -50,7 +50,7 @@ public class PipeTransportPower extends PipeTransport { @Override public void updateEntity() { - if (ProxyCore.proxy.isRemote(worldObj)) + if (CoreProxy.proxy.isRemote(worldObj)) return; step(); @@ -150,7 +150,7 @@ public class PipeTransportPower extends PipeTransport { if (!worldObj.isRemote && tracker.markTimeIfDelay(worldObj, 2 * BuildCraftCore.updateFactor)) { PacketPowerUpdate packet = new PacketPowerUpdate(xCoord, yCoord, zCoord); packet.displayPower = displayPower; - ProxyCore.proxy.sendToPlayers(packet.getPacket(), worldObj, xCoord, yCoord, zCoord, + CoreProxy.proxy.sendToPlayers(packet.getPacket(), worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE); } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index b2d55c9c..1277145e 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -36,10 +36,10 @@ import buildcraft.core.EntityPassiveItem; import buildcraft.core.IDropControlInventory; import buildcraft.core.ITileBufferHolder; import buildcraft.core.TileBuffer; -import buildcraft.core.Utils; import buildcraft.core.network.v2.IClientState; import buildcraft.core.network.v2.ISyncedTile; import buildcraft.core.network.v2.PacketTileState; +import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateKind; import buildcraft.transport.network.PipeRenderStatePacket; diff --git a/common/buildcraft/transport/BptBlockPipe.java b/common/buildcraft/transport/blueprints/BptBlockPipe.java similarity index 95% rename from common/buildcraft/transport/BptBlockPipe.java rename to common/buildcraft/transport/blueprints/BptBlockPipe.java index e0ef2777..96be0791 100644 --- a/common/buildcraft/transport/BptBlockPipe.java +++ b/common/buildcraft/transport/blueprints/BptBlockPipe.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.blueprints; import java.util.LinkedList; @@ -20,6 +20,11 @@ import buildcraft.api.blueprints.IBptContext; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.TriggerParameter; import buildcraft.core.DefaultProps; +import buildcraft.transport.BlockGenericPipe; +import buildcraft.transport.Gate; +import buildcraft.transport.GateVanilla; +import buildcraft.transport.Pipe; +import buildcraft.transport.Gate.GateKind; import net.minecraft.src.Block; import net.minecraft.src.ItemStack; diff --git a/common/buildcraft/transport/BptItemPipeDiamond.java b/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java similarity index 95% rename from common/buildcraft/transport/BptItemPipeDiamond.java rename to common/buildcraft/transport/blueprints/BptItemPipeDiamond.java index 48a72e13..1f3c2c54 100644 --- a/common/buildcraft/transport/BptItemPipeDiamond.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.blueprints; import java.util.LinkedList; @@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlockUtils; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.api.core.Orientations; -import buildcraft.core.BptItem; +import buildcraft.core.blueprints.BptItem; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; diff --git a/common/buildcraft/transport/BptItemPipeIron.java b/common/buildcraft/transport/blueprints/BptItemPipeIron.java similarity index 92% rename from common/buildcraft/transport/BptItemPipeIron.java rename to common/buildcraft/transport/blueprints/BptItemPipeIron.java index ea29a8bb..c5311068 100644 --- a/common/buildcraft/transport/BptItemPipeIron.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeIron.java @@ -7,14 +7,14 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.blueprints; import java.util.LinkedList; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.api.core.Orientations; -import buildcraft.core.BptItem; +import buildcraft.core.blueprints.BptItem; import net.minecraft.src.ItemStack; diff --git a/common/buildcraft/transport/BptItemPipeWooden.java b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java similarity index 92% rename from common/buildcraft/transport/BptItemPipeWooden.java rename to common/buildcraft/transport/blueprints/BptItemPipeWooden.java index 19fe4e71..119c0bf9 100644 --- a/common/buildcraft/transport/BptItemPipeWooden.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java @@ -7,14 +7,14 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.blueprints; import java.util.LinkedList; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.api.core.Orientations; -import buildcraft.core.BptItem; +import buildcraft.core.blueprints.BptItem; import net.minecraft.src.ItemStack; diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index 4fafb367..2da64de6 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -19,12 +19,12 @@ import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.TriggerParameter; -import buildcraft.core.ProxyCore; import buildcraft.core.gui.BuildCraftContainer; 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.transport.Pipe; import net.minecraft.src.Block; @@ -60,7 +60,7 @@ public class ContainerGateInterface extends BuildCraftContainer { // Do not attempt to create a list of potential actions and triggers on // the client. - if (!ProxyCore.proxy.isRemote(pipe.worldObj)) { + if (!CoreProxy.proxy.isRemote(pipe.worldObj)) { _potentialActions.addAll(pipe.getActions()); _potentialTriggers.addAll(ActionManager.getPipeTriggers(pipe)); @@ -188,7 +188,7 @@ public class ContainerGateInterface extends BuildCraftContainer { payload.intPayload[5] = pipe.triggerParameters[position].getItemStack().getItemDamage(); } - ProxyCore.proxy.sendToServer(new PacketUpdate(PacketIds.GATE_SELECTION_CHANGE, pipe.xCoord, pipe.yCoord, pipe.zCoord, payload) + CoreProxy.proxy.sendToServer(new PacketUpdate(PacketIds.GATE_SELECTION_CHANGE, pipe.xCoord, pipe.yCoord, pipe.zCoord, payload) .getPacket()); } @@ -198,15 +198,15 @@ public class ContainerGateInterface extends BuildCraftContainer { */ public void synchronize() { - if (!isNetInitialized && ProxyCore.proxy.isRemote(pipe.worldObj)) { + if (!isNetInitialized && CoreProxy.proxy.isRemote(pipe.worldObj)) { isNetInitialized = true; - ProxyCore.proxy.sendToServer(new PacketCoordinates(PacketIds.GATE_REQUEST_INIT, pipe.xCoord, pipe.yCoord, pipe.zCoord) + CoreProxy.proxy.sendToServer(new PacketCoordinates(PacketIds.GATE_REQUEST_INIT, pipe.xCoord, pipe.yCoord, pipe.zCoord) .getPacket()); } - if (!isSynchronized && ProxyCore.proxy.isRemote(pipe.worldObj)) { + if (!isSynchronized && CoreProxy.proxy.isRemote(pipe.worldObj)) { isSynchronized = true; - ProxyCore.proxy.sendToServer(new PacketCoordinates(PacketIds.GATE_REQUEST_SELECTION, pipe.xCoord, pipe.yCoord, pipe.zCoord) + CoreProxy.proxy.sendToServer(new PacketCoordinates(PacketIds.GATE_REQUEST_SELECTION, pipe.xCoord, pipe.yCoord, pipe.zCoord) .getPacket()); } @@ -271,7 +271,7 @@ public class ContainerGateInterface extends BuildCraftContainer { PacketUpdate packet = new PacketUpdate(PacketIds.GATE_ACTIONS, pipe.xCoord, pipe.yCoord, pipe.zCoord, payload); // Send to player - ProxyCore.proxy.sendToPlayer(player, packet); + CoreProxy.proxy.sendToPlayer(player, packet); } /** @@ -292,7 +292,7 @@ public class ContainerGateInterface extends BuildCraftContainer { PacketUpdate packet = new PacketUpdate(PacketIds.GATE_TRIGGERS, pipe.xCoord, pipe.yCoord, pipe.zCoord, payload); // Send to player - ProxyCore.proxy.sendToPlayer(player, packet); + CoreProxy.proxy.sendToPlayer(player, packet); } /** @@ -344,7 +344,7 @@ public class ContainerGateInterface extends BuildCraftContainer { payload.intPayload[5] = pipe.triggerParameters[position].getItemStack().getItemDamage(); } - ProxyCore.proxy.sendToPlayer(player, new PacketUpdate(PacketIds.GATE_SELECTION, pipe.xCoord, pipe.yCoord, pipe.zCoord, + CoreProxy.proxy.sendToPlayer(player, new PacketUpdate(PacketIds.GATE_SELECTION, pipe.xCoord, pipe.yCoord, pipe.zCoord, payload)); } @@ -374,13 +374,13 @@ public class ContainerGateInterface extends BuildCraftContainer { public void setTrigger(int position, ITrigger trigger, boolean notify) { pipe.setTrigger(position, trigger); - if (ProxyCore.proxy.isRemote(pipe.worldObj) && notify) + if (CoreProxy.proxy.isRemote(pipe.worldObj) && notify) sendSelectionChange(position); } public void setTriggerParameter(int position, ITriggerParameter parameter, boolean notify) { pipe.setTriggerParameter(position, parameter); - if (ProxyCore.proxy.isRemote(pipe.worldObj) && notify) + if (CoreProxy.proxy.isRemote(pipe.worldObj) && notify) sendSelectionChange(position); } @@ -403,7 +403,7 @@ public class ContainerGateInterface extends BuildCraftContainer { public void setAction(int position, IAction action, boolean notify) { pipe.setAction(position, action); - if (ProxyCore.proxy.isRemote(pipe.worldObj) && notify) + if (CoreProxy.proxy.isRemote(pipe.worldObj) && notify) sendSelectionChange(position); } diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index 07e41145..d1c51e2c 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -15,13 +15,13 @@ import net.minecraft.src.ItemStack; import org.lwjgl.opengl.GL11; import buildcraft.core.DefaultProps; -import buildcraft.core.ProxyCore; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketSlotChange; +import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.StringUtil; -import buildcraft.transport.PipeLogicDiamond; import buildcraft.transport.TileGenericPipe; +import buildcraft.transport.pipes.PipeLogicDiamond; public class GuiDiamondPipe extends GuiAdvancedInterface { @@ -91,10 +91,10 @@ public class GuiDiamondPipe extends GuiAdvancedInterface { filterInventory.setInventorySlotContents(position, newStack); - if (ProxyCore.proxy.isRemote(filterInventory.worldObj)) { + if (CoreProxy.proxy.isRemote(filterInventory.worldObj)) { PacketSlotChange packet = new PacketSlotChange(PacketIds.DIAMOND_PIPE_SELECT, filterInventory.xCoord, filterInventory.yCoord, filterInventory.zCoord, position, newStack); - ProxyCore.proxy.sendToServer(packet.getPacket()); + CoreProxy.proxy.sendToServer(packet.getPacket()); } } } diff --git a/common/buildcraft/transport/network/PacketHandlerTransport.java b/common/buildcraft/transport/network/PacketHandlerTransport.java index 79298bfd..cb0dfcc2 100644 --- a/common/buildcraft/transport/network/PacketHandlerTransport.java +++ b/common/buildcraft/transport/network/PacketHandlerTransport.java @@ -16,12 +16,12 @@ import buildcraft.core.network.PacketNBT; import buildcraft.core.network.PacketPipeTransportContent; import buildcraft.core.network.PacketSlotChange; import buildcraft.core.network.PacketUpdate; -import buildcraft.transport.PipeLogicDiamond; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.TileGenericPipe; import buildcraft.transport.gui.ContainerGateInterface; +import buildcraft.transport.pipes.PipeLogicDiamond; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index f5d28f80..4e212677 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicCobblestone; import buildcraft.transport.PipeTransportItems; public class PipeItemsCobblestone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index b62a2b39..f49299d9 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -17,7 +17,6 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.transport.IPipeTransportItemsHook; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicDiamond; import buildcraft.transport.PipeTransportItems; import net.minecraft.src.Item; diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index d26fc488..0390fa02 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -15,10 +15,9 @@ import buildcraft.api.core.Orientations; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicGold; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 3f282042..046ba561 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicIron; import buildcraft.transport.PipeTransportItems; public class PipeItemsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index c05812fd..d958b382 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -18,10 +18,9 @@ import buildcraft.api.power.PowerFramework; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; -import buildcraft.core.ProxyCore; -import buildcraft.core.Utils; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicObsidian; import buildcraft.transport.PipeTransportItems; import net.minecraft.src.AxisAlignedBB; @@ -202,7 +201,7 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { } public void pullItemIntoPipe(Entity entity, int distance) { - if (ProxyCore.proxy.isRemote(worldObj)) + if (CoreProxy.proxy.isRemote(worldObj)) return; Orientations orientation = getOpenOrientation().reverse(); @@ -217,13 +216,13 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { if (entity instanceof EntityItem) { EntityItem item = (EntityItem) entity; - ProxyCore.proxy.obsidianPipePickup(worldObj, item, this.container); + CoreProxy.proxy.obsidianPipePickup(worldObj, item, this.container); float energyUsed = powerProvider.useEnergy(distance, item.item.stackSize * distance, true); if (distance == 0 || energyUsed / distance == item.item.stackSize) { stack = item.item; - ProxyCore.proxy.removeEntity(entity); + CoreProxy.proxy.removeEntity(entity); } else stack = item.item.splitStack((int) (energyUsed / distance)); @@ -235,7 +234,7 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { } else if (entity instanceof EntityArrow) { powerProvider.useEnergy(distance, distance, true); stack = new ItemStack(Item.arrow, 1); - ProxyCore.proxy.removeEntity(entity); + CoreProxy.proxy.removeEntity(entity); } IPipedItem passive = new EntityPassiveItem(worldObj, xCoord + 0.5, yCoord + Utils.getPipeFloorOf(stack), diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index a390126b..a2c92640 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -12,7 +12,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicSandstone; import buildcraft.transport.PipeTransportItems; public class PipeItemsSandstone extends Pipe{ diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index b40029a0..d50af64f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -14,10 +14,9 @@ import buildcraft.api.core.Orientations; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicStone; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index 65a3f83d..c324e599 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -14,7 +14,6 @@ import buildcraft.core.DefaultProps; import buildcraft.transport.EntityData; import buildcraft.transport.IItemTravelingHook; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicVoid; import buildcraft.transport.PipeTransportItems; import net.minecraft.src.TileEntity; diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 60ce7b6c..caabedb7 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -18,9 +18,8 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.api.transport.PipeManager; import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicWood; import buildcraft.transport.PipeTransportItems; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java index 6afc6e06..ae1b7925 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicCobblestone; import buildcraft.transport.PipeTransportLiquids; public class PipeLiquidsCobblestone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeLiquidsGold.java b/common/buildcraft/transport/pipes/PipeLiquidsGold.java index 3887096c..9b25fee4 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsGold.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsGold.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicGold; import buildcraft.transport.PipeTransportLiquids; public class PipeLiquidsGold extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeLiquidsIron.java b/common/buildcraft/transport/pipes/PipeLiquidsIron.java index 589a5b9d..b730fdde 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsIron.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsIron.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicIron; import buildcraft.transport.PipeTransportLiquids; public class PipeLiquidsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java index 3b0d1752..cff6c41d 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -14,7 +14,6 @@ import buildcraft.api.liquids.LiquidStack; import buildcraft.core.DefaultProps; import buildcraft.transport.IPipeTransportLiquidsHook; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicSandstone; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsStone.java b/common/buildcraft/transport/pipes/PipeLiquidsStone.java index b97572bf..0b9c6ace 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsStone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsStone.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicStone; import buildcraft.transport.PipeTransportLiquids; public class PipeLiquidsStone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java index 0aca6e32..72a56388 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java @@ -14,7 +14,6 @@ import buildcraft.api.liquids.LiquidStack; import buildcraft.core.DefaultProps; import buildcraft.transport.IPipeTransportLiquidsHook; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicVoid; import buildcraft.transport.PipeTransportLiquids; public class PipeLiquidsVoid extends Pipe implements IPipeTransportLiquidsHook{ diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index e82b2ebb..4306267d 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -20,7 +20,6 @@ import buildcraft.api.transport.PipeManager; import buildcraft.core.DefaultProps; import buildcraft.core.network.TileNetworkData; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicWood; import buildcraft.transport.PipeTransportLiquids; import net.minecraft.src.TileEntity; import net.minecraft.src.World; diff --git a/common/buildcraft/transport/PipeLogic.java b/common/buildcraft/transport/pipes/PipeLogic.java similarity index 95% rename from common/buildcraft/transport/PipeLogic.java rename to common/buildcraft/transport/pipes/PipeLogic.java index a66355e6..68d54ca2 100644 --- a/common/buildcraft/transport/PipeLogic.java +++ b/common/buildcraft/transport/pipes/PipeLogic.java @@ -7,10 +7,11 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.IDropControlInventory; +import buildcraft.transport.TileGenericPipe; import net.minecraft.src.EntityPlayer; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; diff --git a/common/buildcraft/transport/PipeLogicCobblestone.java b/common/buildcraft/transport/pipes/PipeLogicCobblestone.java similarity index 87% rename from common/buildcraft/transport/PipeLogicCobblestone.java rename to common/buildcraft/transport/pipes/PipeLogicCobblestone.java index ef9622d0..69ed91b8 100644 --- a/common/buildcraft/transport/PipeLogicCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeLogicCobblestone.java @@ -7,9 +7,11 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.BuildCraftTransport; +import buildcraft.transport.Pipe; +import buildcraft.transport.TileGenericPipe; import net.minecraft.src.TileEntity; public class PipeLogicCobblestone extends PipeLogic { diff --git a/common/buildcraft/transport/PipeLogicDiamond.java b/common/buildcraft/transport/pipes/PipeLogicDiamond.java similarity index 90% rename from common/buildcraft/transport/PipeLogicDiamond.java rename to common/buildcraft/transport/pipes/PipeLogicDiamond.java index 43aa9e55..d01c84da 100644 --- a/common/buildcraft/transport/PipeLogicDiamond.java +++ b/common/buildcraft/transport/pipes/PipeLogicDiamond.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; @@ -16,10 +16,11 @@ import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.inventory.ISpecialInventory; import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; -import buildcraft.core.ProxyCore; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketNBT; +import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.SimpleInventory; +import buildcraft.transport.BlockGenericPipe; import net.minecraft.src.Block; import net.minecraft.src.EntityPlayer; import net.minecraft.src.ItemStack; @@ -43,7 +44,7 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory { if (Block.blocksList[entityplayer.getCurrentEquippedItem().itemID] instanceof BlockGenericPipe) return false; - if (!ProxyCore.proxy.isRemote(container.worldObj)) + if (!CoreProxy.proxy.isRemote(container.worldObj)) entityplayer.openGui(BuildCraftTransport.instance, GuiIds.PIPE_DIAMOND, container.worldObj, container.xCoord, container.yCoord, container.zCoord); return true; @@ -53,7 +54,7 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory { @Override public void updateEntity() { if (tracker.markTimeIfDelay(worldObj, 20 * BuildCraftCore.updateFactor)) - if (ProxyCore.proxy.isSimulating(container.worldObj)) + if (CoreProxy.proxy.isSimulating(container.worldObj)) sendFilterSet(); } @@ -95,7 +96,7 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory { public ItemStack decrStackSize(int i, int j) { ItemStack stack = filters.decrStackSize(i, j); - if (ProxyCore.proxy.isSimulating(container.worldObj)) + if (CoreProxy.proxy.isSimulating(container.worldObj)) sendFilterSet(); return stack; @@ -105,7 +106,7 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory { public void setInventorySlotContents(int i, ItemStack itemstack) { filters.setInventorySlotContents(i, itemstack); - if (ProxyCore.proxy.isSimulating(container.worldObj)) + if (CoreProxy.proxy.isSimulating(container.worldObj)) sendFilterSet(); } @@ -115,7 +116,7 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory { NBTTagCompound nbttagcompound = new NBTTagCompound(); this.writeToNBT(nbttagcompound); PacketNBT packet = new PacketNBT(PacketIds.DIAMOND_PIPE_CONTENTS, nbttagcompound, xCoord, yCoord, zCoord); - ProxyCore.proxy.sendToPlayers(packet.getPacket(), worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE); + CoreProxy.proxy.sendToPlayers(packet.getPacket(), worldObj, xCoord, yCoord, zCoord, DefaultProps.NETWORK_UPDATE_RANGE); } /* CLIENT SIDE */ diff --git a/common/buildcraft/transport/PipeLogicGold.java b/common/buildcraft/transport/pipes/PipeLogicGold.java similarity index 90% rename from common/buildcraft/transport/PipeLogicGold.java rename to common/buildcraft/transport/pipes/PipeLogicGold.java index a397c926..db6827c7 100644 --- a/common/buildcraft/transport/PipeLogicGold.java +++ b/common/buildcraft/transport/pipes/PipeLogicGold.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; public class PipeLogicGold extends PipeLogic { diff --git a/common/buildcraft/transport/PipeLogicIron.java b/common/buildcraft/transport/pipes/PipeLogicIron.java similarity index 97% rename from common/buildcraft/transport/PipeLogicIron.java rename to common/buildcraft/transport/pipes/PipeLogicIron.java index 88b37391..e4be3007 100644 --- a/common/buildcraft/transport/PipeLogicIron.java +++ b/common/buildcraft/transport/pipes/PipeLogicIron.java @@ -7,12 +7,13 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.api.liquids.ITankContainer; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipeEntry; +import buildcraft.transport.TileGenericPipe; import net.minecraft.src.EntityPlayer; import net.minecraft.src.IInventory; import net.minecraft.src.Item; diff --git a/common/buildcraft/transport/PipeLogicObsidian.java b/common/buildcraft/transport/pipes/PipeLogicObsidian.java similarity index 87% rename from common/buildcraft/transport/PipeLogicObsidian.java rename to common/buildcraft/transport/pipes/PipeLogicObsidian.java index e3813794..f74a5050 100644 --- a/common/buildcraft/transport/PipeLogicObsidian.java +++ b/common/buildcraft/transport/pipes/PipeLogicObsidian.java @@ -7,9 +7,11 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.BuildCraftTransport; +import buildcraft.transport.Pipe; +import buildcraft.transport.TileGenericPipe; import net.minecraft.src.TileEntity; public class PipeLogicObsidian extends PipeLogic { diff --git a/common/buildcraft/transport/PipeLogicSandstone.java b/common/buildcraft/transport/pipes/PipeLogicSandstone.java similarity index 86% rename from common/buildcraft/transport/PipeLogicSandstone.java rename to common/buildcraft/transport/pipes/PipeLogicSandstone.java index 7099ee08..9fb40c0b 100644 --- a/common/buildcraft/transport/PipeLogicSandstone.java +++ b/common/buildcraft/transport/pipes/PipeLogicSandstone.java @@ -7,10 +7,10 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; -import buildcraft.transport.PipeLogic; import buildcraft.transport.TileGenericPipe; +import buildcraft.transport.pipes.PipeLogic; import net.minecraft.src.TileEntity; public class PipeLogicSandstone extends PipeLogic{ diff --git a/common/buildcraft/transport/PipeLogicStone.java b/common/buildcraft/transport/pipes/PipeLogicStone.java similarity index 87% rename from common/buildcraft/transport/PipeLogicStone.java rename to common/buildcraft/transport/pipes/PipeLogicStone.java index 5818cc2a..500614bb 100644 --- a/common/buildcraft/transport/PipeLogicStone.java +++ b/common/buildcraft/transport/pipes/PipeLogicStone.java @@ -7,9 +7,11 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.BuildCraftTransport; +import buildcraft.transport.Pipe; +import buildcraft.transport.TileGenericPipe; import net.minecraft.src.TileEntity; public class PipeLogicStone extends PipeLogic { diff --git a/common/buildcraft/transport/PipeLogicStripes.java b/common/buildcraft/transport/pipes/PipeLogicStripes.java similarity index 87% rename from common/buildcraft/transport/PipeLogicStripes.java rename to common/buildcraft/transport/pipes/PipeLogicStripes.java index 83afaa08..5c1d7a21 100644 --- a/common/buildcraft/transport/PipeLogicStripes.java +++ b/common/buildcraft/transport/pipes/PipeLogicStripes.java @@ -7,9 +7,11 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.BuildCraftTransport; +import buildcraft.transport.Pipe; +import buildcraft.transport.TileGenericPipe; import net.minecraft.src.TileEntity; public class PipeLogicStripes extends PipeLogic { diff --git a/common/buildcraft/transport/PipeLogicVoid.java b/common/buildcraft/transport/pipes/PipeLogicVoid.java similarity index 90% rename from common/buildcraft/transport/PipeLogicVoid.java rename to common/buildcraft/transport/pipes/PipeLogicVoid.java index cb559e06..54f36a7e 100644 --- a/common/buildcraft/transport/PipeLogicVoid.java +++ b/common/buildcraft/transport/pipes/PipeLogicVoid.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; public class PipeLogicVoid extends PipeLogic { diff --git a/common/buildcraft/transport/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java similarity index 92% rename from common/buildcraft/transport/PipeLogicWood.java rename to common/buildcraft/transport/pipes/PipeLogicWood.java index e2e6c22a..afcfd64b 100644 --- a/common/buildcraft/transport/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -7,16 +7,17 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.pipes; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Orientations; import buildcraft.api.liquids.ITankContainer; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.PipeManager; -import buildcraft.core.ProxyCore; -import buildcraft.core.Utils; -import buildcraft.transport.pipes.PipeLiquidsWood; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.Utils; +import buildcraft.transport.Pipe; +import buildcraft.transport.TileGenericPipe; import net.minecraft.src.EntityPlayer; import net.minecraft.src.IInventory; import net.minecraft.src.Item; @@ -82,7 +83,7 @@ public class PipeLogicWood extends PipeLogic { public void initialize() { super.initialize(); - if (!ProxyCore.proxy.isRemote(worldObj)) + if (!CoreProxy.proxy.isRemote(worldObj)) switchSourceIfNeeded(); } @@ -103,7 +104,7 @@ public class PipeLogicWood extends PipeLogic { public void onNeighborBlockChange(int blockId) { super.onNeighborBlockChange(blockId); - if (!ProxyCore.proxy.isRemote(worldObj)) + if (!CoreProxy.proxy.isRemote(worldObj)) switchSourceIfNeeded(); } diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index 8da012d2..927a61b2 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicGold; import buildcraft.transport.PipeTransportPower; public class PipePowerGold extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index 1b2ef8df..ead41025 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -11,7 +11,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicStone; import buildcraft.transport.PipeTransportPower; public class PipePowerStone extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 283035e5..6c191ac4 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -13,9 +13,8 @@ import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.core.DefaultProps; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicWood; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.TileGenericPipe; import net.minecraft.src.TileEntity; diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index 04021b06..8da2f95a 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -3,7 +3,6 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.core.DefaultProps; import buildcraft.transport.Pipe; -import buildcraft.transport.PipeLogicCobblestone; import buildcraft.transport.PipeTransportStructure; public class PipeStructureCobblestone extends Pipe { diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index e0701559..719c7b94 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; import buildcraft.transport.ItemFacade; import net.minecraft.src.Block; diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index a9e1a36b..229a666f 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -3,7 +3,7 @@ package buildcraft.transport.render; import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftTransport; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; import buildcraft.transport.ItemPipe; import net.minecraft.src.Block; diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 8ee69a5f..b81f8954 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -7,7 +7,7 @@ import buildcraft.api.core.Orientations; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe.WireColor; import buildcraft.core.DefaultProps; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeRenderState; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TransportProxyClient; diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index b27f90c1..37d2344c 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -37,9 +37,9 @@ import buildcraft.api.core.Orientations; import buildcraft.api.liquids.LiquidStack; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; -import buildcraft.core.Utils; import buildcraft.core.render.RenderEntityBlock; import buildcraft.core.render.RenderEntityBlock.BlockInterface; +import buildcraft.core.utils.Utils; import buildcraft.transport.EntityData; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/render/TileEntityPickupFX.java b/common/buildcraft/transport/render/TileEntityPickupFX.java index ee6d6957..6c168f16 100644 --- a/common/buildcraft/transport/render/TileEntityPickupFX.java +++ b/common/buildcraft/transport/render/TileEntityPickupFX.java @@ -20,7 +20,7 @@ import net.minecraft.src.World; import org.lwjgl.opengl.GL11; -import buildcraft.core.Utils; +import buildcraft.core.utils.Utils; public class TileEntityPickupFX extends EntityFX { diff --git a/common/buildcraft/transport/ActionEnergyPulser.java b/common/buildcraft/transport/triggers/ActionEnergyPulser.java similarity index 91% rename from common/buildcraft/transport/ActionEnergyPulser.java rename to common/buildcraft/transport/triggers/ActionEnergyPulser.java index 39415e67..380aea0a 100644 --- a/common/buildcraft/transport/ActionEnergyPulser.java +++ b/common/buildcraft/transport/triggers/ActionEnergyPulser.java @@ -1,4 +1,4 @@ -package buildcraft.transport; +package buildcraft.transport.triggers; import buildcraft.api.gates.Action; import buildcraft.core.DefaultProps; diff --git a/common/buildcraft/transport/ActionSignalOutput.java b/common/buildcraft/transport/triggers/ActionSignalOutput.java similarity index 96% rename from common/buildcraft/transport/ActionSignalOutput.java rename to common/buildcraft/transport/triggers/ActionSignalOutput.java index 028cf464..d401d701 100644 --- a/common/buildcraft/transport/ActionSignalOutput.java +++ b/common/buildcraft/transport/triggers/ActionSignalOutput.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.triggers; import buildcraft.api.gates.Action; import buildcraft.api.transport.IPipe; diff --git a/common/buildcraft/transport/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java similarity index 92% rename from common/buildcraft/transport/TriggerPipeContents.java rename to common/buildcraft/transport/triggers/TriggerPipeContents.java index 8da57bdd..61167943 100644 --- a/common/buildcraft/transport/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.triggers; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; @@ -15,6 +15,12 @@ import buildcraft.api.liquids.ILiquidTank; import buildcraft.api.liquids.LiquidManager; import buildcraft.api.liquids.LiquidStack; import buildcraft.core.DefaultProps; +import buildcraft.transport.EntityData; +import buildcraft.transport.ITriggerPipe; +import buildcraft.transport.Pipe; +import buildcraft.transport.PipeTransportItems; +import buildcraft.transport.PipeTransportLiquids; +import buildcraft.transport.PipeTransportPower; public class TriggerPipeContents extends Trigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java similarity index 94% rename from common/buildcraft/transport/TriggerPipeSignal.java rename to common/buildcraft/transport/triggers/TriggerPipeSignal.java index 011ea84b..2c45a948 100644 --- a/common/buildcraft/transport/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -7,12 +7,14 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.triggers; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.api.transport.IPipe; import buildcraft.core.DefaultProps; +import buildcraft.transport.ITriggerPipe; +import buildcraft.transport.Pipe; public class TriggerPipeSignal extends Trigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java similarity index 91% rename from common/buildcraft/transport/TriggerRedstoneInput.java rename to common/buildcraft/transport/triggers/TriggerRedstoneInput.java index 4d2cb740..7df9055f 100644 --- a/common/buildcraft/transport/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -7,11 +7,13 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport; +package buildcraft.transport.triggers; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; +import buildcraft.transport.ITriggerPipe; +import buildcraft.transport.Pipe; public class TriggerRedstoneInput extends Trigger implements ITriggerPipe {