From 6589f16ea9a51164bb2e590249e3babf35649fb5 Mon Sep 17 00:00:00 2001 From: SirSengir Date: Wed, 25 Jul 2012 12:17:22 +0200 Subject: [PATCH] Moved common API to seperate subpackage. --- .../net/minecraft/src/buildcraft/energy/RenderEngine.java | 2 +- .../net/minecraft/src/buildcraft/factory/GuiRefinery.java | 2 +- .../src/buildcraft/transport/PipeWorldRenderer.java | 2 +- .../minecraft/src/buildcraft/transport/RenderPipe.java | 2 +- .../net/minecraft/src/mod_BuildCraftSilicon.java | 2 +- common/net/minecraft/src/BuildCraftCore.java | 2 +- common/net/minecraft/src/BuildCraftEnergy.java | 2 +- common/net/minecraft/src/BuildCraftTransport.java | 2 +- .../src/buildcraft/api/blueprints/BlueprintManager.java | 2 +- .../minecraft/src/buildcraft/api/blueprints/BptBlock.java | 2 +- .../src/buildcraft/api/blueprints/IBptContext.java | 4 ++-- .../src/buildcraft/api/bptblocks/BptBlockSign.java | 2 +- .../src/buildcraft/api/{ => core}/BuildCraftAPI.java | 3 ++- .../src/buildcraft/api/{ => core}/IAreaProvider.java | 2 +- .../net/minecraft/src/buildcraft/api/{ => core}/IBox.java | 2 +- .../src/buildcraft/api/{ => core}/LaserKind.java | 2 +- .../src/buildcraft/api/{ => core}/Orientations.java | 2 +- .../minecraft/src/buildcraft/api/{ => core}/Position.java | 2 +- .../src/buildcraft/api/{ => core}/SafeTimeTracker.java | 2 +- .../src/buildcraft/api/filler/IFillerPattern.java | 2 +- .../src/buildcraft/api/fuels/IronEngineFuel.java | 2 +- .../src/buildcraft/api/inventory/ISecuredInventory.java | 2 +- .../src/buildcraft/api/inventory/ISelectiveInventory.java | 2 +- .../src/buildcraft/api/inventory/ISpecialInventory.java | 2 +- .../minecraft/src/buildcraft/api/liquids/ILiquidTank.java | 2 +- .../src/buildcraft/api/liquids/ITankContainer.java | 2 +- .../minecraft/src/buildcraft/api/liquids/LiquidData.java | 2 +- .../src/buildcraft/api/power/IPowerProvider.java | 4 ++-- .../minecraft/src/buildcraft/api/power/PowerProvider.java | 4 ++-- .../src/buildcraft/api/transport/IPipeConnection.java | 2 +- .../src/buildcraft/api/transport/IPipeEntry.java | 2 +- .../src/buildcraft/api/transport/IPipedItem.java | 6 +++--- .../minecraft/src/buildcraft/builders/BlockArchitect.java | 4 ++-- .../minecraft/src/buildcraft/builders/BlockBuilder.java | 4 ++-- .../minecraft/src/buildcraft/builders/BptBlockFiller.java | 4 ++-- .../minecraft/src/buildcraft/builders/FillerFillAll.java | 2 +- .../src/buildcraft/builders/FillerFillPyramid.java | 2 +- .../src/buildcraft/builders/FillerFillStairs.java | 2 +- .../src/buildcraft/builders/FillerFillWalls.java | 2 +- .../src/buildcraft/builders/FillerFlattener.java | 4 ++-- .../minecraft/src/buildcraft/builders/FillerPattern.java | 4 ++-- .../minecraft/src/buildcraft/builders/FillerRemover.java | 2 +- .../minecraft/src/buildcraft/builders/TileArchitect.java | 6 +++--- .../minecraft/src/buildcraft/builders/TileBuilder.java | 6 +++--- .../net/minecraft/src/buildcraft/builders/TileFiller.java | 6 +++--- .../net/minecraft/src/buildcraft/builders/TileMarker.java | 6 +++--- .../minecraft/src/buildcraft/builders/TilePathMarker.java | 2 +- common/net/minecraft/src/buildcraft/core/Box.java | 8 ++++---- .../net/minecraft/src/buildcraft/core/BptBuilderBase.java | 2 +- .../src/buildcraft/core/BptBuilderBlueprint.java | 2 +- .../minecraft/src/buildcraft/core/BptBuilderTemplate.java | 2 +- common/net/minecraft/src/buildcraft/core/BptContext.java | 4 ++-- .../src/buildcraft/core/DefaultAreaProvider.java | 2 +- .../minecraft/src/buildcraft/core/EntityEnergyLaser.java | 2 +- common/net/minecraft/src/buildcraft/core/EntityLaser.java | 2 +- .../minecraft/src/buildcraft/core/EntityPassiveItem.java | 6 +++--- common/net/minecraft/src/buildcraft/core/EntityRobot.java | 4 ++-- .../minecraft/src/buildcraft/core/ITileBufferHolder.java | 2 +- common/net/minecraft/src/buildcraft/core/StackUtil.java | 4 ++-- .../src/buildcraft/core/SurroundingInventory.java | 4 ++-- common/net/minecraft/src/buildcraft/core/TileBuffer.java | 2 +- .../src/buildcraft/core/TriggerLiquidContainer.java | 2 +- common/net/minecraft/src/buildcraft/core/Utils.java | 8 ++++---- .../core/network/PacketPipeTransportContent.java | 2 +- .../src/buildcraft/core/utils/SidedInventoryAdapter.java | 2 +- .../net/minecraft/src/buildcraft/energy/BlockEngine.java | 2 +- .../minecraft/src/buildcraft/energy/BptBlockEngine.java | 2 +- common/net/minecraft/src/buildcraft/energy/Engine.java | 2 +- .../net/minecraft/src/buildcraft/energy/EngineIron.java | 4 ++-- .../net/minecraft/src/buildcraft/energy/TileEngine.java | 4 ++-- .../minecraft/src/buildcraft/energy/TilePollution.java | 2 +- .../minecraft/src/buildcraft/factory/BlockMiningWell.java | 4 ++-- .../net/minecraft/src/buildcraft/factory/BlockQuarry.java | 4 ++-- .../minecraft/src/buildcraft/factory/BlockRefinery.java | 6 +++--- .../net/minecraft/src/buildcraft/factory/BlockTank.java | 4 ++-- .../src/buildcraft/factory/BptBlockRefinery.java | 2 +- .../src/buildcraft/factory/TileAssemblyTable.java | 2 +- .../src/buildcraft/factory/TileAutoWorkbench.java | 4 ++-- .../net/minecraft/src/buildcraft/factory/TileHopper.java | 2 +- .../minecraft/src/buildcraft/factory/TileMiningWell.java | 2 +- common/net/minecraft/src/buildcraft/factory/TilePump.java | 6 +++--- .../net/minecraft/src/buildcraft/factory/TileQuarry.java | 8 ++++---- .../minecraft/src/buildcraft/factory/TileRefinery.java | 6 +++--- common/net/minecraft/src/buildcraft/factory/TileTank.java | 6 +++--- .../net/minecraft/src/buildcraft/silicon/BlockLaser.java | 2 +- .../net/minecraft/src/buildcraft/silicon/TileLaser.java | 6 +++--- .../src/buildcraft/transport/BptItemPipeDiamond.java | 2 +- .../src/buildcraft/transport/BptItemPipeIron.java | 2 +- .../src/buildcraft/transport/BptItemPipeWodden.java | 2 +- .../src/buildcraft/transport/CraftingGateInterface.java | 6 +++--- .../minecraft/src/buildcraft/transport/EnergyPulser.java | 2 +- .../minecraft/src/buildcraft/transport/EntityData.java | 2 +- .../src/buildcraft/transport/IPipeTransportItemsHook.java | 4 ++-- .../buildcraft/transport/IPipeTransportLiquidsHook.java | 2 +- .../src/buildcraft/transport/IPipeTransportPowerHook.java | 2 +- .../minecraft/src/buildcraft/transport/ItemFacade.java | 2 +- common/net/minecraft/src/buildcraft/transport/Pipe.java | 6 +++--- .../net/minecraft/src/buildcraft/transport/PipeLogic.java | 2 +- .../src/buildcraft/transport/PipeLogicDiamond.java | 4 ++-- .../minecraft/src/buildcraft/transport/PipeLogicIron.java | 2 +- .../minecraft/src/buildcraft/transport/PipeLogicWood.java | 2 +- .../minecraft/src/buildcraft/transport/PipeTransport.java | 2 +- .../src/buildcraft/transport/PipeTransportItems.java | 4 ++-- .../src/buildcraft/transport/PipeTransportLiquids.java | 6 +++--- .../src/buildcraft/transport/PipeTransportPower.java | 4 ++-- .../src/buildcraft/transport/TileGenericPipe.java | 6 +++--- .../buildcraft/transport/network/PacketLiquidUpdate.java | 2 +- .../buildcraft/transport/pipes/PipeItemsCobblestone.java | 2 +- .../src/buildcraft/transport/pipes/PipeItemsDiamond.java | 4 ++-- .../src/buildcraft/transport/pipes/PipeItemsGold.java | 4 ++-- .../src/buildcraft/transport/pipes/PipeItemsIron.java | 2 +- .../src/buildcraft/transport/pipes/PipeItemsObsidian.java | 4 ++-- .../buildcraft/transport/pipes/PipeItemsSandstone.java | 2 +- .../src/buildcraft/transport/pipes/PipeItemsStone.java | 4 ++-- .../src/buildcraft/transport/pipes/PipeItemsStripes.java | 6 +++--- .../src/buildcraft/transport/pipes/PipeItemsVoid.java | 2 +- .../src/buildcraft/transport/pipes/PipeItemsWood.java | 4 ++-- .../transport/pipes/PipeLiquidsCobblestone.java | 2 +- .../src/buildcraft/transport/pipes/PipeLiquidsGold.java | 2 +- .../src/buildcraft/transport/pipes/PipeLiquidsIron.java | 2 +- .../buildcraft/transport/pipes/PipeLiquidsSandstone.java | 2 +- .../src/buildcraft/transport/pipes/PipeLiquidsStone.java | 2 +- .../src/buildcraft/transport/pipes/PipeLiquidsVoid.java | 2 +- .../src/buildcraft/transport/pipes/PipeLiquidsWood.java | 6 +++--- .../src/buildcraft/transport/pipes/PipePowerGold.java | 2 +- .../src/buildcraft/transport/pipes/PipePowerStone.java | 2 +- .../src/buildcraft/transport/pipes/PipePowerWood.java | 2 +- .../transport/pipes/PipeStructureCobblestone.java | 2 +- .../src/buildcraft/transport/utils/ConnectionMatrix.java | 2 +- .../src/buildcraft/transport/utils/FacadeMatrix.java | 2 +- .../src/buildcraft/transport/utils/TextureMatrix.java | 2 +- .../src/buildcraft/transport/utils/WireMatrix.java | 2 +- 132 files changed, 203 insertions(+), 202 deletions(-) rename common/net/minecraft/src/buildcraft/api/{ => core}/BuildCraftAPI.java (96%) rename common/net/minecraft/src/buildcraft/api/{ => core}/IAreaProvider.java (93%) rename common/net/minecraft/src/buildcraft/api/{ => core}/IBox.java (92%) rename common/net/minecraft/src/buildcraft/api/{ => core}/LaserKind.java (87%) rename common/net/minecraft/src/buildcraft/api/{ => core}/Orientations.java (95%) rename common/net/minecraft/src/buildcraft/api/{ => core}/Position.java (98%) rename common/net/minecraft/src/buildcraft/api/{ => core}/SafeTimeTracker.java (95%) diff --git a/buildcraft_client/net/minecraft/src/buildcraft/energy/RenderEngine.java b/buildcraft_client/net/minecraft/src/buildcraft/energy/RenderEngine.java index 95b5b85c..a37ae96a 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/energy/RenderEngine.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/energy/RenderEngine.java @@ -15,7 +15,7 @@ import net.minecraft.src.ModelBase; import net.minecraft.src.ModelRenderer; import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntitySpecialRenderer; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.IInventoryRenderer; import net.minecraft.src.buildcraft.energy.Engine.EnergyStage; diff --git a/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java b/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java index cc5657d5..944c7324 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.factory; import net.minecraft.src.InventoryPlayer; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.api.liquids.LiquidManager; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.recipes.RefineryRecipe; diff --git a/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java b/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java index afd22c9d..90982b3f 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java @@ -13,7 +13,7 @@ import net.minecraft.src.Item; import net.minecraft.src.ItemBlock; import net.minecraft.src.ItemStack; import net.minecraft.src.RenderBlocks; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.transport.IPipe; import net.minecraft.src.buildcraft.api.transport.IPipe.WireColor; import net.minecraft.src.buildcraft.core.DefaultProps; diff --git a/buildcraft_client/net/minecraft/src/buildcraft/transport/RenderPipe.java b/buildcraft_client/net/minecraft/src/buildcraft/transport/RenderPipe.java index 4ea4984c..3a289463 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/transport/RenderPipe.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/transport/RenderPipe.java @@ -26,7 +26,7 @@ import net.minecraft.src.Tessellator; import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.ILiquidTank; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.transport.IPipedItem; diff --git a/buildcraft_client/net/minecraft/src/mod_BuildCraftSilicon.java b/buildcraft_client/net/minecraft/src/mod_BuildCraftSilicon.java index 309aa1be..48c497c2 100644 --- a/buildcraft_client/net/minecraft/src/mod_BuildCraftSilicon.java +++ b/buildcraft_client/net/minecraft/src/mod_BuildCraftSilicon.java @@ -9,7 +9,7 @@ package net.minecraft.src; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.forge.NetworkMod; diff --git a/common/net/minecraft/src/BuildCraftCore.java b/common/net/minecraft/src/BuildCraftCore.java index 4218868c..a0523c09 100644 --- a/common/net/minecraft/src/BuildCraftCore.java +++ b/common/net/minecraft/src/BuildCraftCore.java @@ -11,7 +11,7 @@ package net.minecraft.src; import java.io.File; import java.util.TreeMap; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.api.gates.Action; import net.minecraft.src.buildcraft.api.gates.ActionManager; import net.minecraft.src.buildcraft.api.gates.Trigger; diff --git a/common/net/minecraft/src/BuildCraftEnergy.java b/common/net/minecraft/src/BuildCraftEnergy.java index 1e2c4b46..bccc2e20 100644 --- a/common/net/minecraft/src/BuildCraftEnergy.java +++ b/common/net/minecraft/src/BuildCraftEnergy.java @@ -11,7 +11,7 @@ package net.minecraft.src; import java.util.Random; import java.util.TreeMap; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.api.fuels.IronEngineCoolant; import net.minecraft.src.buildcraft.api.fuels.IronEngineFuel; import net.minecraft.src.buildcraft.api.gates.Trigger; diff --git a/common/net/minecraft/src/BuildCraftTransport.java b/common/net/minecraft/src/BuildCraftTransport.java index 19a01933..7a6dc98f 100644 --- a/common/net/minecraft/src/BuildCraftTransport.java +++ b/common/net/minecraft/src/BuildCraftTransport.java @@ -13,7 +13,7 @@ import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.api.gates.Action; import net.minecraft.src.buildcraft.api.gates.ActionManager; import net.minecraft.src.buildcraft.api.gates.Trigger; diff --git a/common/net/minecraft/src/buildcraft/api/blueprints/BlueprintManager.java b/common/net/minecraft/src/buildcraft/api/blueprints/BlueprintManager.java index e0ffba81..a4809801 100644 --- a/common/net/minecraft/src/buildcraft/api/blueprints/BlueprintManager.java +++ b/common/net/minecraft/src/buildcraft/api/blueprints/BlueprintManager.java @@ -3,7 +3,7 @@ package net.minecraft.src.buildcraft.api.blueprints; import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; public class BlueprintManager { diff --git a/common/net/minecraft/src/buildcraft/api/blueprints/BptBlock.java b/common/net/minecraft/src/buildcraft/api/blueprints/BptBlock.java index 625fae82..42d76687 100644 --- a/common/net/minecraft/src/buildcraft/api/blueprints/BptBlock.java +++ b/common/net/minecraft/src/buildcraft/api/blueprints/BptBlock.java @@ -17,7 +17,7 @@ import net.minecraft.src.BlockContainer; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; /** * This class allow to specify specific behavior for blocks stored in diff --git a/common/net/minecraft/src/buildcraft/api/blueprints/IBptContext.java b/common/net/minecraft/src/buildcraft/api/blueprints/IBptContext.java index 2537b378..c573328a 100644 --- a/common/net/minecraft/src/buildcraft/api/blueprints/IBptContext.java +++ b/common/net/minecraft/src/buildcraft/api/blueprints/IBptContext.java @@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.api.blueprints; import net.minecraft.src.ItemStack; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.IBox; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.IBox; +import net.minecraft.src.buildcraft.api.core.Position; /** * This interface provide contextual information when building or initializing diff --git a/common/net/minecraft/src/buildcraft/api/bptblocks/BptBlockSign.java b/common/net/minecraft/src/buildcraft/api/bptblocks/BptBlockSign.java index 6ba9902d..2762d7a5 100644 --- a/common/net/minecraft/src/buildcraft/api/bptblocks/BptBlockSign.java +++ b/common/net/minecraft/src/buildcraft/api/bptblocks/BptBlockSign.java @@ -14,11 +14,11 @@ import java.util.LinkedList; import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.blueprints.BlockSignature; import net.minecraft.src.buildcraft.api.blueprints.BptBlock; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; +import net.minecraft.src.buildcraft.api.core.Orientations; public class BptBlockSign extends BptBlock { diff --git a/common/net/minecraft/src/buildcraft/api/BuildCraftAPI.java b/common/net/minecraft/src/buildcraft/api/core/BuildCraftAPI.java similarity index 96% rename from common/net/minecraft/src/buildcraft/api/BuildCraftAPI.java rename to common/net/minecraft/src/buildcraft/api/core/BuildCraftAPI.java index f877525a..57f3ed29 100644 --- a/common/net/minecraft/src/buildcraft/api/BuildCraftAPI.java +++ b/common/net/minecraft/src/buildcraft/api/core/BuildCraftAPI.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package net.minecraft.src.buildcraft.api; +package net.minecraft.src.buildcraft.api.core; import java.util.HashMap; import java.util.LinkedList; @@ -16,6 +16,7 @@ import net.minecraft.src.Block; import net.minecraft.src.EntityPlayer; import net.minecraft.src.TileEntity; import net.minecraft.src.World; +import net.minecraft.src.buildcraft.api.APIProxy; import net.minecraft.src.buildcraft.api.blueprints.BlueprintManager; import net.minecraft.src.buildcraft.api.blueprints.BptBlock; import net.minecraft.src.buildcraft.api.gates.Action; diff --git a/common/net/minecraft/src/buildcraft/api/IAreaProvider.java b/common/net/minecraft/src/buildcraft/api/core/IAreaProvider.java similarity index 93% rename from common/net/minecraft/src/buildcraft/api/IAreaProvider.java rename to common/net/minecraft/src/buildcraft/api/core/IAreaProvider.java index dbe7989d..1e040dca 100644 --- a/common/net/minecraft/src/buildcraft/api/IAreaProvider.java +++ b/common/net/minecraft/src/buildcraft/api/core/IAreaProvider.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package net.minecraft.src.buildcraft.api; +package net.minecraft.src.buildcraft.api.core; /** * To be implemented by TileEntities able to provide a square area on the world, diff --git a/common/net/minecraft/src/buildcraft/api/IBox.java b/common/net/minecraft/src/buildcraft/api/core/IBox.java similarity index 92% rename from common/net/minecraft/src/buildcraft/api/IBox.java rename to common/net/minecraft/src/buildcraft/api/core/IBox.java index 8a19843a..9df014c3 100644 --- a/common/net/minecraft/src/buildcraft/api/IBox.java +++ b/common/net/minecraft/src/buildcraft/api/core/IBox.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package net.minecraft.src.buildcraft.api; +package net.minecraft.src.buildcraft.api.core; import net.minecraft.src.World; diff --git a/common/net/minecraft/src/buildcraft/api/LaserKind.java b/common/net/minecraft/src/buildcraft/api/core/LaserKind.java similarity index 87% rename from common/net/minecraft/src/buildcraft/api/LaserKind.java rename to common/net/minecraft/src/buildcraft/api/core/LaserKind.java index d6c166a6..a43e104a 100644 --- a/common/net/minecraft/src/buildcraft/api/LaserKind.java +++ b/common/net/minecraft/src/buildcraft/api/core/LaserKind.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package net.minecraft.src.buildcraft.api; +package net.minecraft.src.buildcraft.api.core; public enum LaserKind { Red, Blue, Stripes diff --git a/common/net/minecraft/src/buildcraft/api/Orientations.java b/common/net/minecraft/src/buildcraft/api/core/Orientations.java similarity index 95% rename from common/net/minecraft/src/buildcraft/api/Orientations.java rename to common/net/minecraft/src/buildcraft/api/core/Orientations.java index 550dab66..e57fb964 100644 --- a/common/net/minecraft/src/buildcraft/api/Orientations.java +++ b/common/net/minecraft/src/buildcraft/api/core/Orientations.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package net.minecraft.src.buildcraft.api; +package net.minecraft.src.buildcraft.api.core; public enum Orientations { YNeg, // 0 diff --git a/common/net/minecraft/src/buildcraft/api/Position.java b/common/net/minecraft/src/buildcraft/api/core/Position.java similarity index 98% rename from common/net/minecraft/src/buildcraft/api/Position.java rename to common/net/minecraft/src/buildcraft/api/core/Position.java index f7522b15..917d9dee 100644 --- a/common/net/minecraft/src/buildcraft/api/Position.java +++ b/common/net/minecraft/src/buildcraft/api/core/Position.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package net.minecraft.src.buildcraft.api; +package net.minecraft.src.buildcraft.api.core; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; diff --git a/common/net/minecraft/src/buildcraft/api/SafeTimeTracker.java b/common/net/minecraft/src/buildcraft/api/core/SafeTimeTracker.java similarity index 95% rename from common/net/minecraft/src/buildcraft/api/SafeTimeTracker.java rename to common/net/minecraft/src/buildcraft/api/core/SafeTimeTracker.java index cb5d6a38..4ba761ca 100644 --- a/common/net/minecraft/src/buildcraft/api/SafeTimeTracker.java +++ b/common/net/minecraft/src/buildcraft/api/core/SafeTimeTracker.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package net.minecraft.src.buildcraft.api; +package net.minecraft.src.buildcraft.api.core; import net.minecraft.src.World; diff --git a/common/net/minecraft/src/buildcraft/api/filler/IFillerPattern.java b/common/net/minecraft/src/buildcraft/api/filler/IFillerPattern.java index 35f902e6..17468121 100644 --- a/common/net/minecraft/src/buildcraft/api/filler/IFillerPattern.java +++ b/common/net/minecraft/src/buildcraft/api/filler/IFillerPattern.java @@ -2,7 +2,7 @@ package net.minecraft.src.buildcraft.api.filler; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.IBox; public interface IFillerPattern { diff --git a/common/net/minecraft/src/buildcraft/api/fuels/IronEngineFuel.java b/common/net/minecraft/src/buildcraft/api/fuels/IronEngineFuel.java index 970ca0c5..4007d1ef 100644 --- a/common/net/minecraft/src/buildcraft/api/fuels/IronEngineFuel.java +++ b/common/net/minecraft/src/buildcraft/api/fuels/IronEngineFuel.java @@ -12,7 +12,7 @@ package net.minecraft.src.buildcraft.api.fuels; import java.util.HashMap; import java.util.LinkedList; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; public class IronEngineFuel { diff --git a/common/net/minecraft/src/buildcraft/api/inventory/ISecuredInventory.java b/common/net/minecraft/src/buildcraft/api/inventory/ISecuredInventory.java index ed1de442..55169bf3 100644 --- a/common/net/minecraft/src/buildcraft/api/inventory/ISecuredInventory.java +++ b/common/net/minecraft/src/buildcraft/api/inventory/ISecuredInventory.java @@ -1,6 +1,6 @@ package net.minecraft.src.buildcraft.api.inventory; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface ISecuredInventory { diff --git a/common/net/minecraft/src/buildcraft/api/inventory/ISelectiveInventory.java b/common/net/minecraft/src/buildcraft/api/inventory/ISelectiveInventory.java index 49c36d86..522bd110 100644 --- a/common/net/minecraft/src/buildcraft/api/inventory/ISelectiveInventory.java +++ b/common/net/minecraft/src/buildcraft/api/inventory/ISelectiveInventory.java @@ -1,7 +1,7 @@ package net.minecraft.src.buildcraft.api.inventory; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface ISelectiveInventory extends ISpecialInventory { /** diff --git a/common/net/minecraft/src/buildcraft/api/inventory/ISpecialInventory.java b/common/net/minecraft/src/buildcraft/api/inventory/ISpecialInventory.java index 0c5ae8f0..88eb962f 100644 --- a/common/net/minecraft/src/buildcraft/api/inventory/ISpecialInventory.java +++ b/common/net/minecraft/src/buildcraft/api/inventory/ISpecialInventory.java @@ -2,7 +2,7 @@ package net.minecraft.src.buildcraft.api.inventory; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface ISpecialInventory extends IInventory { diff --git a/common/net/minecraft/src/buildcraft/api/liquids/ILiquidTank.java b/common/net/minecraft/src/buildcraft/api/liquids/ILiquidTank.java index aa1874fc..3cdd7f20 100644 --- a/common/net/minecraft/src/buildcraft/api/liquids/ILiquidTank.java +++ b/common/net/minecraft/src/buildcraft/api/liquids/ILiquidTank.java @@ -1,6 +1,6 @@ package net.minecraft.src.buildcraft.api.liquids; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface ILiquidTank { diff --git a/common/net/minecraft/src/buildcraft/api/liquids/ITankContainer.java b/common/net/minecraft/src/buildcraft/api/liquids/ITankContainer.java index 4da2b1db..a464e4c0 100644 --- a/common/net/minecraft/src/buildcraft/api/liquids/ITankContainer.java +++ b/common/net/minecraft/src/buildcraft/api/liquids/ITankContainer.java @@ -1,6 +1,6 @@ package net.minecraft.src.buildcraft.api.liquids; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface ITankContainer { diff --git a/common/net/minecraft/src/buildcraft/api/liquids/LiquidData.java b/common/net/minecraft/src/buildcraft/api/liquids/LiquidData.java index ccff9e5c..7dc3ca0b 100644 --- a/common/net/minecraft/src/buildcraft/api/liquids/LiquidData.java +++ b/common/net/minecraft/src/buildcraft/api/liquids/LiquidData.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.api.liquids; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; public class LiquidData { diff --git a/common/net/minecraft/src/buildcraft/api/power/IPowerProvider.java b/common/net/minecraft/src/buildcraft/api/power/IPowerProvider.java index 642b48b0..e4cb5692 100644 --- a/common/net/minecraft/src/buildcraft/api/power/IPowerProvider.java +++ b/common/net/minecraft/src/buildcraft/api/power/IPowerProvider.java @@ -1,8 +1,8 @@ package net.minecraft.src.buildcraft.api.power; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; public interface IPowerProvider { diff --git a/common/net/minecraft/src/buildcraft/api/power/PowerProvider.java b/common/net/minecraft/src/buildcraft/api/power/PowerProvider.java index e98fa357..a681764a 100644 --- a/common/net/minecraft/src/buildcraft/api/power/PowerProvider.java +++ b/common/net/minecraft/src/buildcraft/api/power/PowerProvider.java @@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.api.power; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; public abstract class PowerProvider implements IPowerProvider { diff --git a/common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java b/common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java index 53c2e043..59098a39 100644 --- a/common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java +++ b/common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java @@ -9,7 +9,7 @@ package net.minecraft.src.buildcraft.api.transport; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface IPipeConnection { diff --git a/common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java b/common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java index c7b59894..02004176 100644 --- a/common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java +++ b/common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java @@ -9,7 +9,7 @@ package net.minecraft.src.buildcraft.api.transport; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; /** * Interface used to put objects into pipes, implemented by pipe tile entities. diff --git a/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java b/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java index 9d5a4b82..059acff4 100644 --- a/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java +++ b/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java @@ -5,9 +5,9 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; public interface IPipedItem { diff --git a/common/net/minecraft/src/buildcraft/builders/BlockArchitect.java b/common/net/minecraft/src/buildcraft/builders/BlockArchitect.java index 56aa2f0d..5394e928 100644 --- a/common/net/minecraft/src/buildcraft/builders/BlockArchitect.java +++ b/common/net/minecraft/src/buildcraft/builders/BlockArchitect.java @@ -22,8 +22,8 @@ import net.minecraft.src.TileEntity; import net.minecraft.src.World; import net.minecraft.src.mod_BuildCraftBuilders; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.tools.IToolWrench; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.GuiIds; diff --git a/common/net/minecraft/src/buildcraft/builders/BlockBuilder.java b/common/net/minecraft/src/buildcraft/builders/BlockBuilder.java index 11537f77..77ae95e4 100644 --- a/common/net/minecraft/src/buildcraft/builders/BlockBuilder.java +++ b/common/net/minecraft/src/buildcraft/builders/BlockBuilder.java @@ -21,8 +21,8 @@ import net.minecraft.src.TileEntity; import net.minecraft.src.World; import net.minecraft.src.mod_BuildCraftBuilders; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.tools.IToolWrench; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.GuiIds; diff --git a/common/net/minecraft/src/buildcraft/builders/BptBlockFiller.java b/common/net/minecraft/src/buildcraft/builders/BptBlockFiller.java index 72483707..068d1798 100644 --- a/common/net/minecraft/src/buildcraft/builders/BptBlockFiller.java +++ b/common/net/minecraft/src/buildcraft/builders/BptBlockFiller.java @@ -14,12 +14,12 @@ import java.util.LinkedList; import net.minecraft.src.BuildCraftBuilders; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Position; import net.minecraft.src.buildcraft.api.blueprints.BptBlock; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; import net.minecraft.src.buildcraft.api.bptblocks.BptBlockUtils; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.core.Box; public class BptBlockFiller extends BptBlock { diff --git a/common/net/minecraft/src/buildcraft/builders/FillerFillAll.java b/common/net/minecraft/src/buildcraft/builders/FillerFillAll.java index e3781e0f..4abf8aad 100644 --- a/common/net/minecraft/src/buildcraft/builders/FillerFillAll.java +++ b/common/net/minecraft/src/buildcraft/builders/FillerFillAll.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.IBox; import net.minecraft.src.buildcraft.core.DefaultProps; public class FillerFillAll extends FillerPattern { diff --git a/common/net/minecraft/src/buildcraft/builders/FillerFillPyramid.java b/common/net/minecraft/src/buildcraft/builders/FillerFillPyramid.java index 42f892e4..0b507510 100644 --- a/common/net/minecraft/src/buildcraft/builders/FillerFillPyramid.java +++ b/common/net/minecraft/src/buildcraft/builders/FillerFillPyramid.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.IBox; import net.minecraft.src.buildcraft.core.DefaultProps; public class FillerFillPyramid extends FillerPattern { diff --git a/common/net/minecraft/src/buildcraft/builders/FillerFillStairs.java b/common/net/minecraft/src/buildcraft/builders/FillerFillStairs.java index b2aeb3c6..8c55ee29 100644 --- a/common/net/minecraft/src/buildcraft/builders/FillerFillStairs.java +++ b/common/net/minecraft/src/buildcraft/builders/FillerFillStairs.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.IBox; import net.minecraft.src.buildcraft.core.DefaultProps; public class FillerFillStairs extends FillerPattern { diff --git a/common/net/minecraft/src/buildcraft/builders/FillerFillWalls.java b/common/net/minecraft/src/buildcraft/builders/FillerFillWalls.java index eda4ce2f..e0d81162 100644 --- a/common/net/minecraft/src/buildcraft/builders/FillerFillWalls.java +++ b/common/net/minecraft/src/buildcraft/builders/FillerFillWalls.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.IBox; import net.minecraft.src.buildcraft.core.DefaultProps; public class FillerFillWalls extends FillerPattern { diff --git a/common/net/minecraft/src/buildcraft/builders/FillerFlattener.java b/common/net/minecraft/src/buildcraft/builders/FillerFlattener.java index 554f82eb..377c26be 100644 --- a/common/net/minecraft/src/buildcraft/builders/FillerFlattener.java +++ b/common/net/minecraft/src/buildcraft/builders/FillerFlattener.java @@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.builders; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.IBox; import net.minecraft.src.buildcraft.core.DefaultProps; public class FillerFlattener extends FillerPattern { diff --git a/common/net/minecraft/src/buildcraft/builders/FillerPattern.java b/common/net/minecraft/src/buildcraft/builders/FillerPattern.java index 97e5e04a..f6355d6c 100644 --- a/common/net/minecraft/src/buildcraft/builders/FillerPattern.java +++ b/common/net/minecraft/src/buildcraft/builders/FillerPattern.java @@ -14,8 +14,8 @@ import net.minecraft.src.BuildCraftBuilders; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.IBox; import net.minecraft.src.buildcraft.api.filler.IFillerPattern; public abstract class FillerPattern implements IFillerPattern { diff --git a/common/net/minecraft/src/buildcraft/builders/FillerRemover.java b/common/net/minecraft/src/buildcraft/builders/FillerRemover.java index a9fda57d..c007cccd 100644 --- a/common/net/minecraft/src/buildcraft/builders/FillerRemover.java +++ b/common/net/minecraft/src/buildcraft/builders/FillerRemover.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.IBox; +import net.minecraft.src.buildcraft.api.core.IBox; import net.minecraft.src.buildcraft.core.DefaultProps; public class FillerRemover extends FillerPattern { diff --git a/common/net/minecraft/src/buildcraft/builders/TileArchitect.java b/common/net/minecraft/src/buildcraft/builders/TileArchitect.java index 20e73b62..b2924e56 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileArchitect.java +++ b/common/net/minecraft/src/buildcraft/builders/TileArchitect.java @@ -16,9 +16,9 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.NBTTagList; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.IAreaProvider; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.Box; import net.minecraft.src.buildcraft.core.BptBase; import net.minecraft.src.buildcraft.core.BptBlueprint; diff --git a/common/net/minecraft/src/buildcraft/builders/TileBuilder.java b/common/net/minecraft/src/buildcraft/builders/TileBuilder.java index f9922606..47a1511c 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileBuilder.java +++ b/common/net/minecraft/src/buildcraft/builders/TileBuilder.java @@ -21,9 +21,9 @@ import net.minecraft.src.NBTTagCompound; import net.minecraft.src.NBTTagList; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; diff --git a/common/net/minecraft/src/buildcraft/builders/TileFiller.java b/common/net/minecraft/src/buildcraft/builders/TileFiller.java index 2511f8fd..b64a296b 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileFiller.java +++ b/common/net/minecraft/src/buildcraft/builders/TileFiller.java @@ -14,9 +14,9 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.IAreaProvider; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.filler.FillerManager; import net.minecraft.src.buildcraft.api.filler.IFillerPattern; import net.minecraft.src.buildcraft.api.gates.IAction; diff --git a/common/net/minecraft/src/buildcraft/builders/TileMarker.java b/common/net/minecraft/src/buildcraft/builders/TileMarker.java index 9d4744e3..352099d3 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileMarker.java +++ b/common/net/minecraft/src/buildcraft/builders/TileMarker.java @@ -14,9 +14,9 @@ import net.minecraft.src.NBTTagCompound; import net.minecraft.src.Packet; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.IAreaProvider; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.core.EntityBlock; import net.minecraft.src.buildcraft.core.TileBuildCraft; import net.minecraft.src.buildcraft.core.Utils; diff --git a/common/net/minecraft/src/buildcraft/builders/TilePathMarker.java b/common/net/minecraft/src/buildcraft/builders/TilePathMarker.java index e2738730..031455e8 100644 --- a/common/net/minecraft/src/buildcraft/builders/TilePathMarker.java +++ b/common/net/minecraft/src/buildcraft/builders/TilePathMarker.java @@ -7,7 +7,7 @@ import java.util.TreeSet; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.core.BlockIndex; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.EntityLaser; diff --git a/common/net/minecraft/src/buildcraft/core/Box.java b/common/net/minecraft/src/buildcraft/core/Box.java index b37a6ce9..3662c1f5 100644 --- a/common/net/minecraft/src/buildcraft/core/Box.java +++ b/common/net/minecraft/src/buildcraft/core/Box.java @@ -15,10 +15,10 @@ import java.util.List; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.IAreaProvider; -import net.minecraft.src.buildcraft.api.IBox; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.IBox; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class Box implements IBox { diff --git a/common/net/minecraft/src/buildcraft/core/BptBuilderBase.java b/common/net/minecraft/src/buildcraft/core/BptBuilderBase.java index 9807978e..1ddd56c5 100644 --- a/common/net/minecraft/src/buildcraft/core/BptBuilderBase.java +++ b/common/net/minecraft/src/buildcraft/core/BptBuilderBase.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.core; import net.minecraft.src.AxisAlignedBB; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; public abstract class BptBuilderBase implements IAreaProvider { diff --git a/common/net/minecraft/src/buildcraft/core/BptBuilderBlueprint.java b/common/net/minecraft/src/buildcraft/core/BptBuilderBlueprint.java index d3ad5629..d5c47f24 100644 --- a/common/net/minecraft/src/buildcraft/core/BptBuilderBlueprint.java +++ b/common/net/minecraft/src/buildcraft/core/BptBuilderBlueprint.java @@ -18,7 +18,7 @@ import net.minecraft.src.Block; import net.minecraft.src.ItemStack; import net.minecraft.src.ModLoader; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.core.BptSlot.Mode; public class BptBuilderBlueprint extends BptBuilderBase { diff --git a/common/net/minecraft/src/buildcraft/core/BptBuilderTemplate.java b/common/net/minecraft/src/buildcraft/core/BptBuilderTemplate.java index 4163d575..9b33c37c 100644 --- a/common/net/minecraft/src/buildcraft/core/BptBuilderTemplate.java +++ b/common/net/minecraft/src/buildcraft/core/BptBuilderTemplate.java @@ -13,7 +13,7 @@ import java.util.LinkedList; import net.minecraft.src.ItemStack; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.core.BptSlot.Mode; public class BptBuilderTemplate extends BptBuilderBase { diff --git a/common/net/minecraft/src/buildcraft/core/BptContext.java b/common/net/minecraft/src/buildcraft/core/BptContext.java index d7df880e..20e31571 100644 --- a/common/net/minecraft/src/buildcraft/core/BptContext.java +++ b/common/net/minecraft/src/buildcraft/core/BptContext.java @@ -11,9 +11,9 @@ package net.minecraft.src.buildcraft.core; import net.minecraft.src.ItemStack; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.IBox; -import net.minecraft.src.buildcraft.api.Position; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; +import net.minecraft.src.buildcraft.api.core.IBox; +import net.minecraft.src.buildcraft.api.core.Position; public class BptContext implements IBptContext { diff --git a/common/net/minecraft/src/buildcraft/core/DefaultAreaProvider.java b/common/net/minecraft/src/buildcraft/core/DefaultAreaProvider.java index 7947a2c5..5a0dc360 100644 --- a/common/net/minecraft/src/buildcraft/core/DefaultAreaProvider.java +++ b/common/net/minecraft/src/buildcraft/core/DefaultAreaProvider.java @@ -9,7 +9,7 @@ package net.minecraft.src.buildcraft.core; -import net.minecraft.src.buildcraft.api.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; public class DefaultAreaProvider implements IAreaProvider { diff --git a/common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java b/common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java index c8a79280..6138b8c7 100644 --- a/common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java +++ b/common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java @@ -10,7 +10,7 @@ package net.minecraft.src.buildcraft.core; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Position; public class EntityEnergyLaser extends EntityLaser { diff --git a/common/net/minecraft/src/buildcraft/core/EntityLaser.java b/common/net/minecraft/src/buildcraft/core/EntityLaser.java index ed95e05b..6450a5eb 100644 --- a/common/net/minecraft/src/buildcraft/core/EntityLaser.java +++ b/common/net/minecraft/src/buildcraft/core/EntityLaser.java @@ -17,7 +17,7 @@ import net.minecraft.src.Entity; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.forge.ISpawnHandler; public class EntityLaser extends Entity implements ISpawnHandler { diff --git a/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java b/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java index a27185eb..45720484 100644 --- a/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java +++ b/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java @@ -20,9 +20,9 @@ import net.minecraft.src.NBTTagList; import net.minecraft.src.TileEntity; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.transport.IPassiveItemContribution; import net.minecraft.src.buildcraft.api.transport.IPipedItem; import net.minecraft.src.buildcraft.api.transport.PipeManager; diff --git a/common/net/minecraft/src/buildcraft/core/EntityRobot.java b/common/net/minecraft/src/buildcraft/core/EntityRobot.java index 3ae5a901..74b96b33 100644 --- a/common/net/minecraft/src/buildcraft/core/EntityRobot.java +++ b/common/net/minecraft/src/buildcraft/core/EntityRobot.java @@ -21,9 +21,9 @@ import net.minecraft.src.ModLoader; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Position; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.core.BptSlot.Mode; import net.minecraft.src.forge.ISpawnHandler; diff --git a/common/net/minecraft/src/buildcraft/core/ITileBufferHolder.java b/common/net/minecraft/src/buildcraft/core/ITileBufferHolder.java index 99fceb84..0bf1066c 100644 --- a/common/net/minecraft/src/buildcraft/core/ITileBufferHolder.java +++ b/common/net/minecraft/src/buildcraft/core/ITileBufferHolder.java @@ -10,7 +10,7 @@ package net.minecraft.src.buildcraft.core; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface ITileBufferHolder { diff --git a/common/net/minecraft/src/buildcraft/core/StackUtil.java b/common/net/minecraft/src/buildcraft/core/StackUtil.java index 1d8bff53..27ceb7cd 100644 --- a/common/net/minecraft/src/buildcraft/core/StackUtil.java +++ b/common/net/minecraft/src/buildcraft/core/StackUtil.java @@ -15,8 +15,8 @@ import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory; import net.minecraft.src.forge.ISidedInventory; diff --git a/common/net/minecraft/src/buildcraft/core/SurroundingInventory.java b/common/net/minecraft/src/buildcraft/core/SurroundingInventory.java index 7dc1c568..900888db 100644 --- a/common/net/minecraft/src/buildcraft/core/SurroundingInventory.java +++ b/common/net/minecraft/src/buildcraft/core/SurroundingInventory.java @@ -16,8 +16,8 @@ import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; public class SurroundingInventory implements IInventory, IBuilderInventory { diff --git a/common/net/minecraft/src/buildcraft/core/TileBuffer.java b/common/net/minecraft/src/buildcraft/core/TileBuffer.java index 3ef56a12..15939028 100644 --- a/common/net/minecraft/src/buildcraft/core/TileBuffer.java +++ b/common/net/minecraft/src/buildcraft/core/TileBuffer.java @@ -13,7 +13,7 @@ import net.minecraft.src.Block; import net.minecraft.src.BlockContainer; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; public class TileBuffer { diff --git a/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java b/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java index 6ee6ab51..ab5b041a 100644 --- a/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java +++ b/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java @@ -10,7 +10,7 @@ package net.minecraft.src.buildcraft.core; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; import net.minecraft.src.buildcraft.api.gates.ITriggerParameter; import net.minecraft.src.buildcraft.api.gates.Trigger; import net.minecraft.src.buildcraft.api.liquids.ILiquidTank; diff --git a/common/net/minecraft/src/buildcraft/core/Utils.java b/common/net/minecraft/src/buildcraft/core/Utils.java index 87fa7aa6..5785d7e2 100644 --- a/common/net/minecraft/src/buildcraft/core/Utils.java +++ b/common/net/minecraft/src/buildcraft/core/Utils.java @@ -25,10 +25,10 @@ import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntityChest; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.IAreaProvider; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.liquids.ILiquid; import net.minecraft.src.buildcraft.api.transport.IPipeConnection; import net.minecraft.src.buildcraft.api.transport.IPipeEntry; diff --git a/common/net/minecraft/src/buildcraft/core/network/PacketPipeTransportContent.java b/common/net/minecraft/src/buildcraft/core/network/PacketPipeTransportContent.java index 02c10c81..1f876a86 100644 --- a/common/net/minecraft/src/buildcraft/core/network/PacketPipeTransportContent.java +++ b/common/net/minecraft/src/buildcraft/core/network/PacketPipeTransportContent.java @@ -1,6 +1,6 @@ package net.minecraft.src.buildcraft.core.network; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.transport.IPipedItem; public class PacketPipeTransportContent extends PacketUpdate { diff --git a/common/net/minecraft/src/buildcraft/core/utils/SidedInventoryAdapter.java b/common/net/minecraft/src/buildcraft/core/utils/SidedInventoryAdapter.java index 9d899d7f..d0cb2eaa 100644 --- a/common/net/minecraft/src/buildcraft/core/utils/SidedInventoryAdapter.java +++ b/common/net/minecraft/src/buildcraft/core/utils/SidedInventoryAdapter.java @@ -3,7 +3,7 @@ package net.minecraft.src.buildcraft.core.utils; import net.minecraft.src.EntityPlayer; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.forge.ISidedInventory; /** diff --git a/common/net/minecraft/src/buildcraft/energy/BlockEngine.java b/common/net/minecraft/src/buildcraft/energy/BlockEngine.java index 2de3b5af..34fe5179 100644 --- a/common/net/minecraft/src/buildcraft/energy/BlockEngine.java +++ b/common/net/minecraft/src/buildcraft/energy/BlockEngine.java @@ -22,7 +22,7 @@ import net.minecraft.src.TileEntity; import net.minecraft.src.World; import net.minecraft.src.mod_BuildCraftEnergy; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.tools.IToolWrench; import net.minecraft.src.buildcraft.core.GuiIds; import net.minecraft.src.buildcraft.core.IItemPipe; diff --git a/common/net/minecraft/src/buildcraft/energy/BptBlockEngine.java b/common/net/minecraft/src/buildcraft/energy/BptBlockEngine.java index eabd5615..1d25e812 100644 --- a/common/net/minecraft/src/buildcraft/energy/BptBlockEngine.java +++ b/common/net/minecraft/src/buildcraft/energy/BptBlockEngine.java @@ -11,11 +11,11 @@ package net.minecraft.src.buildcraft.energy; import net.minecraft.src.Block; import net.minecraft.src.mod_BuildCraftEnergy; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.blueprints.BlockSignature; import net.minecraft.src.buildcraft.api.blueprints.BptBlock; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; +import net.minecraft.src.buildcraft.api.core.Orientations; public class BptBlockEngine extends BptBlock { diff --git a/common/net/minecraft/src/buildcraft/energy/Engine.java b/common/net/minecraft/src/buildcraft/energy/Engine.java index 5efeb03d..68186920 100644 --- a/common/net/minecraft/src/buildcraft/energy/Engine.java +++ b/common/net/minecraft/src/buildcraft/energy/Engine.java @@ -13,7 +13,7 @@ import net.minecraft.src.ICrafting; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.LiquidTank; import net.minecraft.src.buildcraft.core.network.TileNetworkData; diff --git a/common/net/minecraft/src/buildcraft/energy/EngineIron.java b/common/net/minecraft/src/buildcraft/energy/EngineIron.java index 8029cda8..eee97db4 100644 --- a/common/net/minecraft/src/buildcraft/energy/EngineIron.java +++ b/common/net/minecraft/src/buildcraft/energy/EngineIron.java @@ -13,8 +13,8 @@ import net.minecraft.src.Block; import net.minecraft.src.ICrafting; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.fuels.IronEngineCoolant; import net.minecraft.src.buildcraft.api.fuels.IronEngineFuel; import net.minecraft.src.buildcraft.api.liquids.LiquidManager; diff --git a/common/net/minecraft/src/buildcraft/energy/TileEngine.java b/common/net/minecraft/src/buildcraft/energy/TileEngine.java index 2206f564..2bfaf33f 100644 --- a/common/net/minecraft/src/buildcraft/energy/TileEngine.java +++ b/common/net/minecraft/src/buildcraft/energy/TileEngine.java @@ -20,8 +20,8 @@ import net.minecraft.src.NBTTagCompound; import net.minecraft.src.Packet; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.gates.IOverrideDefaultTriggers; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.gates.Trigger; diff --git a/common/net/minecraft/src/buildcraft/energy/TilePollution.java b/common/net/minecraft/src/buildcraft/energy/TilePollution.java index be7a5a54..8b9c0341 100644 --- a/common/net/minecraft/src/buildcraft/energy/TilePollution.java +++ b/common/net/minecraft/src/buildcraft/energy/TilePollution.java @@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.energy; import net.minecraft.src.BuildCraftEnergy; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.core.BlockIndex; public class TilePollution extends TileEntity { diff --git a/common/net/minecraft/src/buildcraft/factory/BlockMiningWell.java b/common/net/minecraft/src/buildcraft/factory/BlockMiningWell.java index b3b41bfb..187de7c4 100644 --- a/common/net/minecraft/src/buildcraft/factory/BlockMiningWell.java +++ b/common/net/minecraft/src/buildcraft/factory/BlockMiningWell.java @@ -16,8 +16,8 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.Material; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.forge.ITextureProvider; diff --git a/common/net/minecraft/src/buildcraft/factory/BlockQuarry.java b/common/net/minecraft/src/buildcraft/factory/BlockQuarry.java index 022f9c92..5c0f73b0 100644 --- a/common/net/minecraft/src/buildcraft/factory/BlockQuarry.java +++ b/common/net/minecraft/src/buildcraft/factory/BlockQuarry.java @@ -18,8 +18,8 @@ import net.minecraft.src.Material; import net.minecraft.src.TileEntity; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.core.Box; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; diff --git a/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java b/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java index 705d2b52..15d918e5 100644 --- a/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java +++ b/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java @@ -22,9 +22,9 @@ import net.minecraft.src.TileEntity; import net.minecraft.src.World; import net.minecraft.src.mod_BuildCraftFactory; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.liquids.LiquidManager; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.tools.IToolWrench; diff --git a/common/net/minecraft/src/buildcraft/factory/BlockTank.java b/common/net/minecraft/src/buildcraft/factory/BlockTank.java index 1527cd2a..f3db1d1b 100644 --- a/common/net/minecraft/src/buildcraft/factory/BlockTank.java +++ b/common/net/minecraft/src/buildcraft/factory/BlockTank.java @@ -19,10 +19,10 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.Material; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.LiquidManager; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.forge.ITextureProvider; diff --git a/common/net/minecraft/src/buildcraft/factory/BptBlockRefinery.java b/common/net/minecraft/src/buildcraft/factory/BptBlockRefinery.java index 3441756a..8083d83f 100644 --- a/common/net/minecraft/src/buildcraft/factory/BptBlockRefinery.java +++ b/common/net/minecraft/src/buildcraft/factory/BptBlockRefinery.java @@ -8,10 +8,10 @@ package net.minecraft.src.buildcraft.factory; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.blueprints.BptBlock; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; +import net.minecraft.src.buildcraft.api.core.Orientations; public class BptBlockRefinery extends BptBlock { diff --git a/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java b/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java index 267e82a7..fbeed1a2 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java +++ b/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java @@ -12,7 +12,7 @@ import net.minecraft.src.NBTTagCompound; import net.minecraft.src.NBTTagList; import net.minecraft.src.TileEntity; import net.minecraft.src.mod_BuildCraftSilicon; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe; import net.minecraft.src.buildcraft.api.transport.IPipeConnection; import net.minecraft.src.buildcraft.core.CoreProxy; diff --git a/common/net/minecraft/src/buildcraft/factory/TileAutoWorkbench.java b/common/net/minecraft/src/buildcraft/factory/TileAutoWorkbench.java index 0116e550..1fae01e5 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileAutoWorkbench.java +++ b/common/net/minecraft/src/buildcraft/factory/TileAutoWorkbench.java @@ -19,8 +19,8 @@ import net.minecraft.src.InventoryCrafting; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory; import net.minecraft.src.buildcraft.core.StackUtil; import net.minecraft.src.buildcraft.core.Utils; diff --git a/common/net/minecraft/src/buildcraft/factory/TileHopper.java b/common/net/minecraft/src/buildcraft/factory/TileHopper.java index c6a1512e..82d1b8ca 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileHopper.java +++ b/common/net/minecraft/src/buildcraft/factory/TileHopper.java @@ -6,7 +6,7 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory; import net.minecraft.src.buildcraft.core.TileBuildCraft; import net.minecraft.src.buildcraft.core.utils.InventoryUtil; diff --git a/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java b/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java index 9872092c..9486c14e 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java +++ b/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java @@ -17,7 +17,7 @@ import net.minecraft.src.BuildCraftFactory; import net.minecraft.src.EntityItem; import net.minecraft.src.ItemStack; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; diff --git a/common/net/minecraft/src/buildcraft/factory/TilePump.java b/common/net/minecraft/src/buildcraft/factory/TilePump.java index a9c12a8f..9561aed2 100644 --- a/common/net/minecraft/src/buildcraft/factory/TilePump.java +++ b/common/net/minecraft/src/buildcraft/factory/TilePump.java @@ -18,9 +18,9 @@ import net.minecraft.src.BuildCraftCore; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.power.IPowerProvider; diff --git a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java index af8fcc30..9c0d2f81 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java +++ b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java @@ -21,10 +21,10 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.IAreaProvider; -import net.minecraft.src.buildcraft.api.LaserKind; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.IAreaProvider; +import net.minecraft.src.buildcraft.api.core.LaserKind; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; diff --git a/common/net/minecraft/src/buildcraft/factory/TileRefinery.java b/common/net/minecraft/src/buildcraft/factory/TileRefinery.java index 14d8114d..6eccfaca 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileRefinery.java +++ b/common/net/minecraft/src/buildcraft/factory/TileRefinery.java @@ -17,9 +17,9 @@ import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.liquids.ILiquidTank; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; diff --git a/common/net/minecraft/src/buildcraft/factory/TileTank.java b/common/net/minecraft/src/buildcraft/factory/TileTank.java index 57f54ffe..b7726236 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileTank.java +++ b/common/net/minecraft/src/buildcraft/factory/TileTank.java @@ -14,9 +14,9 @@ import net.minecraft.src.BuildCraftFactory; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.liquids.ILiquidTank; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; diff --git a/common/net/minecraft/src/buildcraft/silicon/BlockLaser.java b/common/net/minecraft/src/buildcraft/silicon/BlockLaser.java index 28451352..27e7accb 100644 --- a/common/net/minecraft/src/buildcraft/silicon/BlockLaser.java +++ b/common/net/minecraft/src/buildcraft/silicon/BlockLaser.java @@ -17,7 +17,7 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.Material; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.forge.ITextureProvider; diff --git a/common/net/minecraft/src/buildcraft/silicon/TileLaser.java b/common/net/minecraft/src/buildcraft/silicon/TileLaser.java index 181d12b6..bb30fe2c 100644 --- a/common/net/minecraft/src/buildcraft/silicon/TileLaser.java +++ b/common/net/minecraft/src/buildcraft/silicon/TileLaser.java @@ -14,9 +14,9 @@ import java.util.LinkedList; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; diff --git a/common/net/minecraft/src/buildcraft/transport/BptItemPipeDiamond.java b/common/net/minecraft/src/buildcraft/transport/BptItemPipeDiamond.java index 5d110da4..05e2bd8c 100644 --- a/common/net/minecraft/src/buildcraft/transport/BptItemPipeDiamond.java +++ b/common/net/minecraft/src/buildcraft/transport/BptItemPipeDiamond.java @@ -13,10 +13,10 @@ import java.util.LinkedList; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; import net.minecraft.src.buildcraft.api.bptblocks.BptBlockUtils; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.BptItem; public class BptItemPipeDiamond extends BptItem { diff --git a/common/net/minecraft/src/buildcraft/transport/BptItemPipeIron.java b/common/net/minecraft/src/buildcraft/transport/BptItemPipeIron.java index a999c160..01d021d9 100644 --- a/common/net/minecraft/src/buildcraft/transport/BptItemPipeIron.java +++ b/common/net/minecraft/src/buildcraft/transport/BptItemPipeIron.java @@ -12,9 +12,9 @@ package net.minecraft.src.buildcraft.transport; import java.util.LinkedList; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.BptItem; public class BptItemPipeIron extends BptItem { diff --git a/common/net/minecraft/src/buildcraft/transport/BptItemPipeWodden.java b/common/net/minecraft/src/buildcraft/transport/BptItemPipeWodden.java index e7b5414a..1b768ba3 100644 --- a/common/net/minecraft/src/buildcraft/transport/BptItemPipeWodden.java +++ b/common/net/minecraft/src/buildcraft/transport/BptItemPipeWodden.java @@ -12,9 +12,9 @@ package net.minecraft.src.buildcraft.transport; import java.util.LinkedList; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo; import net.minecraft.src.buildcraft.api.blueprints.IBptContext; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.BptItem; public class BptItemPipeWodden extends BptItem { diff --git a/common/net/minecraft/src/buildcraft/transport/CraftingGateInterface.java b/common/net/minecraft/src/buildcraft/transport/CraftingGateInterface.java index 7739744a..8e98b7f4 100644 --- a/common/net/minecraft/src/buildcraft/transport/CraftingGateInterface.java +++ b/common/net/minecraft/src/buildcraft/transport/CraftingGateInterface.java @@ -19,9 +19,9 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.Slot; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.gates.Action; import net.minecraft.src.buildcraft.api.gates.ActionManager; import net.minecraft.src.buildcraft.api.gates.IAction; diff --git a/common/net/minecraft/src/buildcraft/transport/EnergyPulser.java b/common/net/minecraft/src/buildcraft/transport/EnergyPulser.java index 0f2c0057..c6984d99 100644 --- a/common/net/minecraft/src/buildcraft/transport/EnergyPulser.java +++ b/common/net/minecraft/src/buildcraft/transport/EnergyPulser.java @@ -1,7 +1,7 @@ package net.minecraft.src.buildcraft.transport; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; public class EnergyPulser { diff --git a/common/net/minecraft/src/buildcraft/transport/EntityData.java b/common/net/minecraft/src/buildcraft/transport/EntityData.java index 6f353de1..42a22b2b 100644 --- a/common/net/minecraft/src/buildcraft/transport/EntityData.java +++ b/common/net/minecraft/src/buildcraft/transport/EntityData.java @@ -1,6 +1,6 @@ package net.minecraft.src.buildcraft.transport; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.transport.IPipedItem; public class EntityData { diff --git a/common/net/minecraft/src/buildcraft/transport/IPipeTransportItemsHook.java b/common/net/minecraft/src/buildcraft/transport/IPipeTransportItemsHook.java index b344a6d8..d40dae63 100644 --- a/common/net/minecraft/src/buildcraft/transport/IPipeTransportItemsHook.java +++ b/common/net/minecraft/src/buildcraft/transport/IPipeTransportItemsHook.java @@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.transport; import java.util.LinkedList; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.transport.IPipedItem; public interface IPipeTransportItemsHook { diff --git a/common/net/minecraft/src/buildcraft/transport/IPipeTransportLiquidsHook.java b/common/net/minecraft/src/buildcraft/transport/IPipeTransportLiquidsHook.java index 521fb49d..74f9f349 100644 --- a/common/net/minecraft/src/buildcraft/transport/IPipeTransportLiquidsHook.java +++ b/common/net/minecraft/src/buildcraft/transport/IPipeTransportLiquidsHook.java @@ -9,7 +9,7 @@ package net.minecraft.src.buildcraft.transport; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; public interface IPipeTransportLiquidsHook { diff --git a/common/net/minecraft/src/buildcraft/transport/IPipeTransportPowerHook.java b/common/net/minecraft/src/buildcraft/transport/IPipeTransportPowerHook.java index b628463d..7669cb27 100644 --- a/common/net/minecraft/src/buildcraft/transport/IPipeTransportPowerHook.java +++ b/common/net/minecraft/src/buildcraft/transport/IPipeTransportPowerHook.java @@ -9,7 +9,7 @@ package net.minecraft.src.buildcraft.transport; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public interface IPipeTransportPowerHook { diff --git a/common/net/minecraft/src/buildcraft/transport/ItemFacade.java b/common/net/minecraft/src/buildcraft/transport/ItemFacade.java index 65c5be6f..14bf762d 100644 --- a/common/net/minecraft/src/buildcraft/transport/ItemFacade.java +++ b/common/net/minecraft/src/buildcraft/transport/ItemFacade.java @@ -14,7 +14,7 @@ import net.minecraft.src.ItemBlock; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe; import net.minecraft.src.buildcraft.core.ItemBuildCraft; diff --git a/common/net/minecraft/src/buildcraft/transport/Pipe.java b/common/net/minecraft/src/buildcraft/transport/Pipe.java index 1bf09ad8..bb1450a1 100644 --- a/common/net/minecraft/src/buildcraft/transport/Pipe.java +++ b/common/net/minecraft/src/buildcraft/transport/Pipe.java @@ -23,9 +23,9 @@ import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.gates.Action; import net.minecraft.src.buildcraft.api.gates.ActionManager; import net.minecraft.src.buildcraft.api.gates.IAction; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogic.java b/common/net/minecraft/src/buildcraft/transport/PipeLogic.java index a7c94980..ce41a801 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeLogic.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeLogic.java @@ -13,7 +13,7 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.IDropControlInventory; public class PipeLogic implements IDropControlInventory { diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java b/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java index 5368035f..8846748c 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java @@ -16,8 +16,8 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.mod_BuildCraftTransport; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory; import net.minecraft.src.buildcraft.core.CoreProxy; import net.minecraft.src.buildcraft.core.DefaultProps; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java b/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java index 2c6c5122..403dfc72 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java @@ -13,7 +13,7 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.IInventory; import net.minecraft.src.Item; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.tools.IToolWrench; import net.minecraft.src.buildcraft.api.transport.IPipeEntry; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogicWood.java b/common/net/minecraft/src/buildcraft/transport/PipeLogicWood.java index dbcac92f..00488321 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeLogicWood.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeLogicWood.java @@ -16,7 +16,7 @@ import net.minecraft.src.IInventory; import net.minecraft.src.Item; import net.minecraft.src.TileEntity; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.tools.IToolWrench; import net.minecraft.src.buildcraft.core.Utils; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransport.java b/common/net/minecraft/src/buildcraft/transport/PipeTransport.java index 70cae52a..1bd3b221 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeTransport.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeTransport.java @@ -12,7 +12,7 @@ package net.minecraft.src.buildcraft.transport; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.transport.IPipedItem; public abstract class PipeTransport { diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java b/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java index df3accc5..8c9dc365 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java @@ -26,8 +26,8 @@ import net.minecraft.src.Packet; import net.minecraft.src.TileEntity; import net.minecraft.src.mod_BuildCraftTransport; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.transport.IPipeEntry; import net.minecraft.src.buildcraft.api.transport.IPipedItem; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java b/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java index 337b9f54..f13de948 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java @@ -14,9 +14,9 @@ import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.mod_BuildCraftCore; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.liquids.ILiquidTank; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java b/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java index 38d7e025..0a574ff7 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java @@ -14,8 +14,8 @@ import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.mod_BuildCraftCore; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.core.CoreProxy; diff --git a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java index 7a80204b..9121dc23 100644 --- a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java +++ b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java @@ -20,9 +20,9 @@ import net.minecraft.src.Packet; import net.minecraft.src.TileEntity; import net.minecraft.src.mod_BuildCraftCore; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; -import net.minecraft.src.buildcraft.api.SafeTimeTracker; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; +import net.minecraft.src.buildcraft.api.core.SafeTimeTracker; import net.minecraft.src.buildcraft.api.gates.IOverrideDefaultTriggers; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.gates.Trigger; diff --git a/common/net/minecraft/src/buildcraft/transport/network/PacketLiquidUpdate.java b/common/net/minecraft/src/buildcraft/transport/network/PacketLiquidUpdate.java index 7a694d95..afb1d4ef 100644 --- a/common/net/minecraft/src/buildcraft/transport/network/PacketLiquidUpdate.java +++ b/common/net/minecraft/src/buildcraft/transport/network/PacketLiquidUpdate.java @@ -4,7 +4,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.core.network.PacketCoordinates; import net.minecraft.src.buildcraft.core.network.PacketIds; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsCobblestone.java index ad267607..198517a3 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicCobblestone; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsDiamond.java index 12b1d133..aefb739e 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -13,8 +13,8 @@ import java.util.LinkedList; import net.minecraft.src.BuildCraftTransport; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.transport.IPipedItem; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.IPipeTransportItemsHook; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsGold.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsGold.java index c3c467d1..0b51c37a 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsGold.java @@ -12,8 +12,8 @@ import java.util.LinkedList; import net.minecraft.src.BuildCraftTransport; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.transport.IPipedItem; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsIron.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsIron.java index c491ff2f..17351cd1 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsIron.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicIron; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsObsidian.java index 38b9aaf5..3082d666 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -19,8 +19,8 @@ import net.minecraft.src.IInventory; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import net.minecraft.src.buildcraft.api.APIProxy; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java index fc25e4ab..ec5edb23 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -9,7 +9,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicSandstone; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStone.java index 1159a65f..ce055a3c 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStone.java @@ -10,8 +10,8 @@ package net.minecraft.src.buildcraft.transport.pipes; import java.util.LinkedList; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.transport.IPipedItem; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStripes.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStripes.java index 8f9db849..4e440c7b 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStripes.java @@ -15,9 +15,9 @@ import net.minecraft.src.BuildCraftBlockUtil; import net.minecraft.src.BuildCraftTransport; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java index cb555413..8c7b63db 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java @@ -10,7 +10,7 @@ package net.minecraft.src.buildcraft.transport.pipes; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.EntityData; import net.minecraft.src.buildcraft.transport.IItemTravelingHook; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java index 115fd510..a5b39ba9 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java @@ -13,8 +13,8 @@ import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.power.IPowerProvider; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsCobblestone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsCobblestone.java index 58857fb1..a0d95405 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsCobblestone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsCobblestone.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicCobblestone; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsGold.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsGold.java index c81df347..5400277b 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsGold.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsGold.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicGold; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsIron.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsIron.java index dc78af81..b465df52 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsIron.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsIron.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicIron; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java index 9f04b451..4bec16bf 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -9,8 +9,8 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.transport.IPipeTransportLiquidsHook; import net.minecraft.src.buildcraft.transport.Pipe; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsStone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsStone.java index fc193d9a..7ca43d02 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsStone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsStone.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicStone; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java index fd32fd13..33d9f16f 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java @@ -9,8 +9,8 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.transport.IPipeTransportLiquidsHook; import net.minecraft.src.buildcraft.transport.Pipe; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java index 112625d4..9b8bb476 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -11,9 +11,9 @@ package net.minecraft.src.buildcraft.transport.pipes; import net.minecraft.src.Block; import net.minecraft.src.TileEntity; import net.minecraft.src.World; -import net.minecraft.src.buildcraft.api.BuildCraftAPI; -import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.core.BuildCraftAPI; +import net.minecraft.src.buildcraft.api.core.Orientations; +import net.minecraft.src.buildcraft.api.core.Position; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.power.IPowerProvider; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerGold.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerGold.java index 613447ff..2983cc6a 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerGold.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicGold; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerStone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerStone.java index a7b74d49..661d6084 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerStone.java @@ -8,7 +8,7 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicStone; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java index d5a044e1..56463522 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java @@ -9,7 +9,7 @@ package net.minecraft.src.buildcraft.transport.pipes; import net.minecraft.src.TileEntity; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeStructureCobblestone.java index c6e1f36a..9f3e19b7 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -1,6 +1,6 @@ package net.minecraft.src.buildcraft.transport.pipes; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicCobblestone; diff --git a/common/net/minecraft/src/buildcraft/transport/utils/ConnectionMatrix.java b/common/net/minecraft/src/buildcraft/transport/utils/ConnectionMatrix.java index 4f589b6d..b86fb032 100644 --- a/common/net/minecraft/src/buildcraft/transport/utils/ConnectionMatrix.java +++ b/common/net/minecraft/src/buildcraft/transport/utils/ConnectionMatrix.java @@ -4,7 +4,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public class ConnectionMatrix { diff --git a/common/net/minecraft/src/buildcraft/transport/utils/FacadeMatrix.java b/common/net/minecraft/src/buildcraft/transport/utils/FacadeMatrix.java index c71b44f6..550b29c3 100644 --- a/common/net/minecraft/src/buildcraft/transport/utils/FacadeMatrix.java +++ b/common/net/minecraft/src/buildcraft/transport/utils/FacadeMatrix.java @@ -4,7 +4,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public class FacadeMatrix extends ConnectionMatrix { private String[] _textureFiles = new String[Orientations.dirs().length]; diff --git a/common/net/minecraft/src/buildcraft/transport/utils/TextureMatrix.java b/common/net/minecraft/src/buildcraft/transport/utils/TextureMatrix.java index 1b829cef..e988e554 100644 --- a/common/net/minecraft/src/buildcraft/transport/utils/TextureMatrix.java +++ b/common/net/minecraft/src/buildcraft/transport/utils/TextureMatrix.java @@ -4,7 +4,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; public class TextureMatrix { diff --git a/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java b/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java index 6a5a530e..c6f1695e 100644 --- a/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java +++ b/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java @@ -4,7 +4,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.core.Orientations; import net.minecraft.src.buildcraft.api.transport.IPipe; public class WireMatrix {