From f2a3010fcad060a4d09b9c2ce187b4cc0d05f459 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 18 Dec 2014 11:56:04 +0100 Subject: [PATCH] fixes, optimizations, API changes for greater compatibility with pre-6.3.x mods --- .../api/core/render/ITextureStateManager.java | 7 +++++ .../api/core/render/ITextureStates.java | 3 +-- api/buildcraft/api/gates/IGate.java | 2 +- .../api/pipes/IPipePluggableContainer.java | 8 ------ api/buildcraft/api/pipes/package-info.java | 3 --- .../api/{pipes => transport}/IPipe.java | 2 +- .../{pipes => transport}/IPipeConnection.java | 6 ++--- .../{pipes => transport}/IPipeContainer.java | 12 +++++---- api/buildcraft/api/transport/IPipeTile.java | 5 ++++ .../{pipes => transport}/IStripesHandler.java | 2 +- .../{pipes => transport}/IStripesPipe.java | 2 +- .../api/{pipes => transport}/PipeManager.java | 4 +-- .../api/{pipes => transport}/PipeWire.java | 2 +- .../pluggable}/IPipePluggableItem.java | 3 ++- .../pluggable}/IPipePluggableRenderer.java | 3 ++- .../pluggable}/PipePluggable.java | 4 +-- common/buildcraft/BuildCraftTransport.java | 4 +-- common/buildcraft/core/TileBuffer.java | 3 ++- .../core/robots/AIRobotRecharge.java | 2 +- .../statements/DefaultActionProvider.java | 2 +- common/buildcraft/core/utils/BlockUtils.java | 10 +++++++ common/buildcraft/core/utils/Utils.java | 27 +++++++++++-------- .../buildcraft/energy/TileEnergyReceiver.java | 4 +-- common/buildcraft/energy/TileEngine.java | 6 ++--- common/buildcraft/energy/TileEngineWood.java | 5 ++-- common/buildcraft/factory/TileMiningWell.java | 4 +-- common/buildcraft/factory/TileQuarry.java | 4 +-- .../transport/BlockGenericPipe.java | 8 +++--- .../buildcraft/transport/FacadePluggable.java | 6 ++--- common/buildcraft/transport/Gate.java | 5 ++-- common/buildcraft/transport/ItemFacade.java | 11 +++----- .../buildcraft/transport/ItemGateCopier.java | 2 +- common/buildcraft/transport/ItemLens.java | 6 ++--- common/buildcraft/transport/ItemPipeWire.java | 2 +- common/buildcraft/transport/ItemPlug.java | 9 +++---- .../transport/ItemRobotStation.java | 11 +++----- .../buildcraft/transport/LensPluggable.java | 8 +++--- common/buildcraft/transport/Pipe.java | 10 +++---- .../transport/PipePluggableState.java | 5 ++-- .../buildcraft/transport/PipeTransport.java | 2 +- .../transport/PipeTransportFluids.java | 2 +- .../transport/PipeTransportItems.java | 2 +- .../transport/PipeTransportPower.java | 2 +- .../transport/PipeTransportStructure.java | 2 +- .../buildcraft/transport/PlugPluggable.java | 8 +++--- .../transport/RobotStationPluggable.java | 10 +++---- .../buildcraft/transport/TileGenericPipe.java | 12 ++++----- .../transport/gates/GatePluggable.java | 8 +++--- .../buildcraft/transport/gates/ItemGate.java | 10 +++---- .../transport/pipes/PipeFluidsWood.java | 4 +-- .../transport/pipes/PipeItemsClay.java | 2 +- .../transport/pipes/PipeItemsStripes.java | 8 +++--- .../transport/pipes/PipeItemsWood.java | 4 +-- .../transport/pipes/PipePowerWood.java | 2 +- .../recipes/AdvancedFacadeRecipe.java | 2 +- .../transport/render/PipeRendererTESR.java | 4 +-- .../transport/render/PipeRendererWorld.java | 4 +-- .../statements/ActionParameterSignal.java | 2 +- .../statements/ActionSignalOutput.java | 2 +- .../transport/statements/ActionValve.java | 2 +- .../statements/TriggerParameterSignal.java | 2 +- .../statements/TriggerPipeSignal.java | 2 +- .../stripes/StripesHandlerArrow.java | 4 +-- .../stripes/StripesHandlerBucket.java | 4 +-- .../stripes/StripesHandlerRightClick.java | 4 +-- .../stripes/StripesHandlerShears.java | 4 +-- .../transport/utils/WireMatrix.java | 2 +- 67 files changed, 165 insertions(+), 173 deletions(-) create mode 100644 api/buildcraft/api/core/render/ITextureStateManager.java delete mode 100644 api/buildcraft/api/pipes/IPipePluggableContainer.java delete mode 100644 api/buildcraft/api/pipes/package-info.java rename api/buildcraft/api/{pipes => transport}/IPipe.java (94%) rename api/buildcraft/api/{pipes => transport}/IPipeConnection.java (80%) rename api/buildcraft/api/{pipes => transport}/IPipeContainer.java (74%) create mode 100644 api/buildcraft/api/transport/IPipeTile.java rename api/buildcraft/api/{pipes => transport}/IStripesHandler.java (95%) rename api/buildcraft/api/{pipes => transport}/IStripesPipe.java (94%) rename api/buildcraft/api/{pipes => transport}/PipeManager.java (96%) rename api/buildcraft/api/{pipes => transport}/PipeWire.java (97%) rename api/buildcraft/api/{pipes => transport/pluggable}/IPipePluggableItem.java (72%) rename api/buildcraft/api/{pipes => transport/pluggable}/IPipePluggableRenderer.java (82%) rename api/buildcraft/api/{pipes => transport/pluggable}/PipePluggable.java (94%) diff --git a/api/buildcraft/api/core/render/ITextureStateManager.java b/api/buildcraft/api/core/render/ITextureStateManager.java new file mode 100644 index 00000000..8161d6b9 --- /dev/null +++ b/api/buildcraft/api/core/render/ITextureStateManager.java @@ -0,0 +1,7 @@ +package buildcraft.api.core.render; + +import net.minecraft.util.IIcon; + +public interface ITextureStateManager { + void set(IIcon icon); +} diff --git a/api/buildcraft/api/core/render/ITextureStates.java b/api/buildcraft/api/core/render/ITextureStates.java index 2499684b..3314982e 100644 --- a/api/buildcraft/api/core/render/ITextureStates.java +++ b/api/buildcraft/api/core/render/ITextureStates.java @@ -10,11 +10,10 @@ package buildcraft.api.core.render; import net.minecraft.block.Block; import net.minecraft.util.IIcon; -import buildcraft.transport.render.TextureStateManager; public interface ITextureStates extends ICullable { - TextureStateManager getTextureState(); + ITextureStateManager getTextureState(); IIcon getIcon(int side, int meta); diff --git a/api/buildcraft/api/gates/IGate.java b/api/buildcraft/api/gates/IGate.java index 45e7ef15..2d173833 100644 --- a/api/buildcraft/api/gates/IGate.java +++ b/api/buildcraft/api/gates/IGate.java @@ -10,7 +10,7 @@ package buildcraft.api.gates; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IPipe; +import buildcraft.api.transport.IPipe; public interface IGate { @Deprecated diff --git a/api/buildcraft/api/pipes/IPipePluggableContainer.java b/api/buildcraft/api/pipes/IPipePluggableContainer.java deleted file mode 100644 index a517eaf1..00000000 --- a/api/buildcraft/api/pipes/IPipePluggableContainer.java +++ /dev/null @@ -1,8 +0,0 @@ -package buildcraft.api.pipes; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IPipePluggableContainer { - PipePluggable getPipePluggable(ForgeDirection direction); - boolean hasPipePluggable(ForgeDirection direction); -} diff --git a/api/buildcraft/api/pipes/package-info.java b/api/buildcraft/api/pipes/package-info.java deleted file mode 100644 index d7b692f2..00000000 --- a/api/buildcraft/api/pipes/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|pipes") -package buildcraft.api.pipes; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/api/buildcraft/api/pipes/IPipe.java b/api/buildcraft/api/transport/IPipe.java similarity index 94% rename from api/buildcraft/api/pipes/IPipe.java rename to api/buildcraft/api/transport/IPipe.java index 83d0c7e0..cb4ebab8 100755 --- a/api/buildcraft/api/pipes/IPipe.java +++ b/api/buildcraft/api/transport/IPipe.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.IGate; diff --git a/api/buildcraft/api/pipes/IPipeConnection.java b/api/buildcraft/api/transport/IPipeConnection.java similarity index 80% rename from api/buildcraft/api/pipes/IPipeConnection.java rename to api/buildcraft/api/transport/IPipeConnection.java index b89d2732..5453f7d7 100644 --- a/api/buildcraft/api/pipes/IPipeConnection.java +++ b/api/buildcraft/api/transport/IPipeConnection.java @@ -6,12 +6,10 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IPipeContainer.PipeType; - public interface IPipeConnection { enum ConnectOverride { @@ -27,5 +25,5 @@ public interface IPipeConnection { * @return CONNECT to force a connection, DISCONNECT to force no connection, * and DEFAULT to let the pipe decide. */ - ConnectOverride overridePipeConnection(PipeType type, ForgeDirection with); + ConnectOverride overridePipeConnection(IPipeContainer.PipeType type, ForgeDirection with); } diff --git a/api/buildcraft/api/pipes/IPipeContainer.java b/api/buildcraft/api/transport/IPipeContainer.java similarity index 74% rename from api/buildcraft/api/pipes/IPipeContainer.java rename to api/buildcraft/api/transport/IPipeContainer.java index fc0b052f..b1c0e79a 100644 --- a/api/buildcraft/api/pipes/IPipeContainer.java +++ b/api/buildcraft/api/transport/IPipeContainer.java @@ -6,17 +6,16 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport; import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.core.EnumColor; -import buildcraft.api.transport.IInjectable; +import buildcraft.api.transport.pluggable.IPipePluggableContainer; +import buildcraft.api.transport.pluggable.PipePluggable; -public interface IPipeContainer extends IInjectable, IPipePluggableContainer { +public interface IPipeContainer extends IInjectable { public enum PipeType { @@ -46,4 +45,7 @@ public interface IPipeContainer extends IInjectable, IPipePluggableContainer { IPipe getNeighborPipe(ForgeDirection dir); IPipe getPipe(); + + PipePluggable getPipePluggable(ForgeDirection direction); + boolean hasPipePluggable(ForgeDirection direction); } diff --git a/api/buildcraft/api/transport/IPipeTile.java b/api/buildcraft/api/transport/IPipeTile.java new file mode 100644 index 00000000..387a748d --- /dev/null +++ b/api/buildcraft/api/transport/IPipeTile.java @@ -0,0 +1,5 @@ +package buildcraft.api.transport; + +@Deprecated +public interface IPipeTile extends IPipeContainer { +} diff --git a/api/buildcraft/api/pipes/IStripesHandler.java b/api/buildcraft/api/transport/IStripesHandler.java similarity index 95% rename from api/buildcraft/api/pipes/IStripesHandler.java rename to api/buildcraft/api/transport/IStripesHandler.java index dab27610..8ad66dfe 100644 --- a/api/buildcraft/api/pipes/IStripesHandler.java +++ b/api/buildcraft/api/transport/IStripesHandler.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/api/buildcraft/api/pipes/IStripesPipe.java b/api/buildcraft/api/transport/IStripesPipe.java similarity index 94% rename from api/buildcraft/api/pipes/IStripesPipe.java rename to api/buildcraft/api/transport/IStripesPipe.java index 04848898..f2159bf4 100644 --- a/api/buildcraft/api/pipes/IStripesPipe.java +++ b/api/buildcraft/api/transport/IStripesPipe.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; diff --git a/api/buildcraft/api/pipes/PipeManager.java b/api/buildcraft/api/transport/PipeManager.java similarity index 96% rename from api/buildcraft/api/pipes/PipeManager.java rename to api/buildcraft/api/transport/PipeManager.java index ec02614e..ac5975f5 100755 --- a/api/buildcraft/api/pipes/PipeManager.java +++ b/api/buildcraft/api/transport/PipeManager.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport; import java.util.ArrayList; import java.util.HashMap; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; import net.minecraft.world.World; -import buildcraft.api.transport.IExtractionHandler; +import buildcraft.api.transport.pluggable.PipePluggable; public abstract class PipeManager { diff --git a/api/buildcraft/api/pipes/PipeWire.java b/api/buildcraft/api/transport/PipeWire.java similarity index 97% rename from api/buildcraft/api/pipes/PipeWire.java rename to api/buildcraft/api/transport/PipeWire.java index 7c2edbeb..6f2fd504 100644 --- a/api/buildcraft/api/pipes/PipeWire.java +++ b/api/buildcraft/api/transport/PipeWire.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport; import java.util.Locale; diff --git a/api/buildcraft/api/pipes/IPipePluggableItem.java b/api/buildcraft/api/transport/pluggable/IPipePluggableItem.java similarity index 72% rename from api/buildcraft/api/pipes/IPipePluggableItem.java rename to api/buildcraft/api/transport/pluggable/IPipePluggableItem.java index dc62d7e8..d8505a9f 100644 --- a/api/buildcraft/api/pipes/IPipePluggableItem.java +++ b/api/buildcraft/api/transport/pluggable/IPipePluggableItem.java @@ -1,7 +1,8 @@ -package buildcraft.api.pipes; +package buildcraft.api.transport.pluggable; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IPipe; public interface IPipePluggableItem { PipePluggable createPipePluggable(IPipe pipe, ForgeDirection side, ItemStack stack); diff --git a/api/buildcraft/api/pipes/IPipePluggableRenderer.java b/api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java similarity index 82% rename from api/buildcraft/api/pipes/IPipePluggableRenderer.java rename to api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java index 1ae1d32b..35d945d0 100644 --- a/api/buildcraft/api/pipes/IPipePluggableRenderer.java +++ b/api/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java @@ -1,8 +1,9 @@ -package buildcraft.api.pipes; +package buildcraft.api.transport.pluggable; import net.minecraft.client.renderer.RenderBlocks; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.render.ITextureStates; +import buildcraft.api.transport.IPipe; public interface IPipePluggableRenderer { void renderPluggable(RenderBlocks renderblocks, IPipe pipe, ForgeDirection side, diff --git a/api/buildcraft/api/pipes/PipePluggable.java b/api/buildcraft/api/transport/pluggable/PipePluggable.java similarity index 94% rename from api/buildcraft/api/pipes/PipePluggable.java rename to api/buildcraft/api/transport/pluggable/PipePluggable.java index 0d4864fc..385c4560 100755 --- a/api/buildcraft/api/pipes/PipePluggable.java +++ b/api/buildcraft/api/transport/pluggable/PipePluggable.java @@ -6,10 +6,9 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -package buildcraft.api.pipes; +package buildcraft.api.transport.pluggable; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import cpw.mods.fml.relauncher.Side; @@ -17,6 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.INBTStoreable; import buildcraft.api.core.ISerializable; +import buildcraft.api.transport.IPipeContainer; /** * An IPipePluggable MUST have an empty constructor for client-side diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 55183187..75d0aef5 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -43,8 +43,8 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementManager; import buildcraft.api.transport.IExtractionHandler; -import buildcraft.api.pipes.PipeManager; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeManager; +import buildcraft.api.transport.PipeWire; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; diff --git a/common/buildcraft/core/TileBuffer.java b/common/buildcraft/core/TileBuffer.java index 1331ddb2..655121f5 100644 --- a/common/buildcraft/core/TileBuffer.java +++ b/common/buildcraft/core/TileBuffer.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.SafeTimeTracker; +import buildcraft.core.utils.BlockUtils; public final class TileBuffer { @@ -47,7 +48,7 @@ public final class TileBuffer { block = world.getBlock(x, y, z); if (block != null && block.hasTileEntity(world.getBlockMetadata(x, y, z))) { - tile = world.getTileEntity(x, y, z); + tile = BlockUtils.getTileEntity(world, x, y, z); } } diff --git a/common/buildcraft/core/robots/AIRobotRecharge.java b/common/buildcraft/core/robots/AIRobotRecharge.java index 189e22a0..304127b1 100755 --- a/common/buildcraft/core/robots/AIRobotRecharge.java +++ b/common/buildcraft/core/robots/AIRobotRecharge.java @@ -10,7 +10,7 @@ package buildcraft.core.robots; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.transport.PipeTransportPower; public class AIRobotRecharge extends AIRobot { diff --git a/common/buildcraft/core/statements/DefaultActionProvider.java b/common/buildcraft/core/statements/DefaultActionProvider.java index f58f9a91..856d34bb 100644 --- a/common/buildcraft/core/statements/DefaultActionProvider.java +++ b/common/buildcraft/core/statements/DefaultActionProvider.java @@ -20,7 +20,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.tiles.IControllable; -import buildcraft.api.pipes.IPipeContainer; +import buildcraft.api.transport.IPipeContainer; public class DefaultActionProvider implements IActionProvider { diff --git a/common/buildcraft/core/utils/BlockUtils.java b/common/buildcraft/core/utils/BlockUtils.java index f0ed1436..72e0bcd0 100644 --- a/common/buildcraft/core/utils/BlockUtils.java +++ b/common/buildcraft/core/utils/BlockUtils.java @@ -19,10 +19,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S27PacketExplosion; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.ChunkPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraft.world.chunk.Chunk; import cpw.mods.fml.common.FMLCommonHandler; @@ -221,4 +223,12 @@ public final class BlockUtils { public static int computeBlockBreakEnergy(World world, int x, int y, int z) { return (int) Math.floor(BuilderAPI.BREAK_ENERGY * BuildCraftFactory.miningMultiplier * ((world.getBlock(x, y, z).getBlockHardness(world, x, y, z) + 1) * 2)); } + + public static TileEntity getTileEntity(World world, int x, int y, int z) { + if (world.blockExists(x, y, z)) { + return world.getChunkFromBlockCoords(x, z).getTileEntityUnsafe(x & 15, y, z & 15); + } else { + return null; + } + } } diff --git a/common/buildcraft/core/utils/Utils.java b/common/buildcraft/core/utils/Utils.java index 8079488f..a1130062 100644 --- a/common/buildcraft/core/utils/Utils.java +++ b/common/buildcraft/core/utils/Utils.java @@ -40,8 +40,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.Position; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.DefaultProps; import buildcraft.core.EntityBlock; import buildcraft.core.IDropControlInventory; @@ -85,7 +85,7 @@ public final class Utils { Position pos = new Position(x, y, z, orientation); pos.moveForwards(1.0); - TileEntity tileInventory = world.getTileEntity((int) pos.x, (int) pos.y, (int) pos.z); + TileEntity tileInventory = BlockUtils.getTileEntity(world, (int) pos.x, (int) pos.y, (int) pos.z); ITransactor transactor = Transactor.getTransactorFor(tileInventory); if (transactor != null && !(tileInventory instanceof TileEngine) && transactor.add(stack, orientation.getOpposite(), false).stackSize > 0) { return transactor.add(stack, orientation.getOpposite(), true).stackSize; @@ -161,7 +161,7 @@ public final class Utils { pos.moveForwards(1.0); - TileEntity tile = world.getTileEntity((int) pos.x, (int) pos.y, (int) pos.z); + TileEntity tile = BlockUtils.getTileEntity(world, (int) pos.x, (int) pos.y, (int) pos.z); if (tile instanceof IPipeContainer) { IPipeContainer pipe = (IPipeContainer) tile; @@ -192,37 +192,42 @@ public final class Utils { tmp.orientation = step; tmp.moveForwards(1.0); - return world.getTileEntity((int) tmp.x, (int) tmp.y, (int) tmp.z); + return BlockUtils.getTileEntity(world, (int) tmp.x, (int) tmp.y, (int) tmp.z); } public static IAreaProvider getNearbyAreaProvider(World world, int i, int j, int k) { - TileEntity a1 = world.getTileEntity(i + 1, j, k); - TileEntity a2 = world.getTileEntity(i - 1, j, k); - TileEntity a3 = world.getTileEntity(i, j, k + 1); - TileEntity a4 = world.getTileEntity(i, j, k - 1); - TileEntity a5 = world.getTileEntity(i, j + 1, k); - TileEntity a6 = world.getTileEntity(i, j - 1, k); + TileEntity a1 = BlockUtils.getTileEntity(world, i + 1, j, k); if (a1 instanceof IAreaProvider) { return (IAreaProvider) a1; } + TileEntity a2 = BlockUtils.getTileEntity(world, i - 1, j, k); + if (a2 instanceof IAreaProvider) { return (IAreaProvider) a2; } + TileEntity a3 = BlockUtils.getTileEntity(world, i, j, k + 1); + if (a3 instanceof IAreaProvider) { return (IAreaProvider) a3; } + TileEntity a4 = BlockUtils.getTileEntity(world, i, j, k - 1); + if (a4 instanceof IAreaProvider) { return (IAreaProvider) a4; } + TileEntity a5 = BlockUtils.getTileEntity(world, i, j + 1, k); + if (a5 instanceof IAreaProvider) { return (IAreaProvider) a5; } + TileEntity a6 = BlockUtils.getTileEntity(world, i, j - 1, k); + if (a6 instanceof IAreaProvider) { return (IAreaProvider) a6; } diff --git a/common/buildcraft/energy/TileEnergyReceiver.java b/common/buildcraft/energy/TileEnergyReceiver.java index 151cd84c..a51cfdea 100644 --- a/common/buildcraft/energy/TileEnergyReceiver.java +++ b/common/buildcraft/energy/TileEnergyReceiver.java @@ -16,8 +16,8 @@ import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; -import buildcraft.api.pipes.IPipeConnection; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeConnection; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.TileBuffer; import buildcraft.core.TileBuildCraft; diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index e1a9baf7..e241d7d3 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -22,9 +22,9 @@ import buildcraft.BuildCraftEnergy; import buildcraft.api.power.IEngine; import buildcraft.api.tiles.IHeatable; import buildcraft.api.tools.IToolWrench; -import buildcraft.api.pipes.IPipeConnection; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeConnection; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.DefaultProps; import buildcraft.core.TileBuildCraft; import buildcraft.core.utils.MathUtils; diff --git a/common/buildcraft/energy/TileEngineWood.java b/common/buildcraft/energy/TileEngineWood.java index 8cf27269..e9b0edad 100644 --- a/common/buildcraft/energy/TileEngineWood.java +++ b/common/buildcraft/energy/TileEngineWood.java @@ -11,10 +11,9 @@ package buildcraft.energy; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.api.power.IRedstoneEngineReceiver; -import buildcraft.factory.TilePump; public class TileEngineWood extends TileEngine { diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 2d4a3e1f..7eef580b 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -14,8 +14,8 @@ import buildcraft.BuildCraftFactory; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IHasWork; -import buildcraft.api.pipes.IPipeConnection; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeConnection; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.RFBattery; import buildcraft.core.TileBuildCraft; import buildcraft.core.utils.BlockUtils; diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 2feec67f..d092f79b 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -37,8 +37,8 @@ import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.filler.FillerManager; import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IHasWork; -import buildcraft.api.pipes.IPipeConnection; -import buildcraft.api.pipes.IPipeContainer; +import buildcraft.api.transport.IPipeConnection; +import buildcraft.api.transport.IPipeContainer; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.CoreConstants; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 7c6facd2..73ef5ba2 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -52,11 +52,11 @@ import buildcraft.api.events.PipePlacedEvent; import buildcraft.api.events.RobotPlacementEvent; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.pipes.IPipePluggableItem; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.tools.IToolWrench; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.core.BlockBuildCraft; import buildcraft.core.CoreConstants; import buildcraft.core.CreativeTabBuildCraft; @@ -68,9 +68,7 @@ import buildcraft.core.robots.EntityRobot; import buildcraft.core.utils.MatrixTranformations; import buildcraft.core.utils.Utils; import buildcraft.transport.gates.GateDefinition; -import buildcraft.transport.gates.GateFactory; import buildcraft.transport.gates.GatePluggable; -import buildcraft.transport.gates.ItemGate; import buildcraft.transport.render.PipeRendererWorld; public class BlockGenericPipe extends BlockBuildCraft { diff --git a/common/buildcraft/transport/FacadePluggable.java b/common/buildcraft/transport/FacadePluggable.java index 16fd8e8d..d009e65d 100644 --- a/common/buildcraft/transport/FacadePluggable.java +++ b/common/buildcraft/transport/FacadePluggable.java @@ -7,9 +7,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipePluggableRenderer; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.pluggable.IPipePluggableRenderer; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.utils.MatrixTranformations; public class FacadePluggable extends PipePluggable { diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index d2da4fb7..9e3cf2ab 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -35,12 +35,11 @@ import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementManager; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.PipeWire; import buildcraft.core.GuiIds; import buildcraft.transport.gates.GateDefinition.GateLogic; import buildcraft.transport.gates.GateDefinition.GateMaterial; -import buildcraft.transport.gates.GatePluggable; import buildcraft.transport.gates.ItemGate; import buildcraft.transport.gates.StatementSlot; import buildcraft.transport.gui.ContainerGateInterface; diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index be346482..3ea122f8 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -25,7 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -33,15 +32,13 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.JavaTools; -import buildcraft.api.core.Position; import buildcraft.api.facades.FacadeType; import buildcraft.api.facades.IFacadeItem; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipePluggableItem; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.api.recipes.BuildcraftRecipeRegistry; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.core.BlockSpring; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; diff --git a/common/buildcraft/transport/ItemGateCopier.java b/common/buildcraft/transport/ItemGateCopier.java index 7ce75666..aecfcd64 100644 --- a/common/buildcraft/transport/ItemGateCopier.java +++ b/common/buildcraft/transport/ItemGateCopier.java @@ -11,7 +11,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.ItemBuildCraft; import buildcraft.core.utils.NBTUtils; import buildcraft.transport.BlockGenericPipe.Part; diff --git a/common/buildcraft/transport/ItemLens.java b/common/buildcraft/transport/ItemLens.java index 7d14a1b6..72c3288e 100755 --- a/common/buildcraft/transport/ItemLens.java +++ b/common/buildcraft/transport/ItemLens.java @@ -19,9 +19,9 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipePluggableItem; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.ItemBuildCraft; import buildcraft.core.utils.ColorUtils; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/ItemPipeWire.java b/common/buildcraft/transport/ItemPipeWire.java index ee16b510..7a893aa2 100644 --- a/common/buildcraft/transport/ItemPipeWire.java +++ b/common/buildcraft/transport/ItemPipeWire.java @@ -20,7 +20,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.core.ItemBuildCraft; public class ItemPipeWire extends ItemBuildCraft { diff --git a/common/buildcraft/transport/ItemPlug.java b/common/buildcraft/transport/ItemPlug.java index 1811adb3..b7099bbe 100755 --- a/common/buildcraft/transport/ItemPlug.java +++ b/common/buildcraft/transport/ItemPlug.java @@ -11,7 +11,6 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -19,11 +18,9 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.BuildCraftTransport; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipePluggableItem; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.ItemBuildCraft; public class ItemPlug extends ItemBuildCraft implements IPipePluggableItem { diff --git a/common/buildcraft/transport/ItemRobotStation.java b/common/buildcraft/transport/ItemRobotStation.java index 0143d417..5b7fa9ce 100755 --- a/common/buildcraft/transport/ItemRobotStation.java +++ b/common/buildcraft/transport/ItemRobotStation.java @@ -11,7 +11,6 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -19,15 +18,11 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.BuildCraftTransport; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipePluggableItem; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.RobotRegistry; public class ItemRobotStation extends ItemBuildCraft implements IPipePluggableItem { diff --git a/common/buildcraft/transport/LensPluggable.java b/common/buildcraft/transport/LensPluggable.java index 2c448b7f..e0e813d1 100644 --- a/common/buildcraft/transport/LensPluggable.java +++ b/common/buildcraft/transport/LensPluggable.java @@ -11,10 +11,10 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.core.render.ITextureStates; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipePluggableRenderer; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.pluggable.IPipePluggableRenderer; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.utils.ColorUtils; import buildcraft.core.utils.MatrixTranformations; import buildcraft.transport.pipes.events.PipeEventItem; diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 6801f1f9..6478e27b 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -8,13 +8,10 @@ */ package buildcraft.transport; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Random; import net.minecraft.entity.Entity; @@ -33,15 +30,14 @@ import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.IGate; import buildcraft.api.statements.ActionState; import buildcraft.api.statements.IActionInternal; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.PipeWire; import buildcraft.core.IDropControlInventory; import buildcraft.core.inventory.InvUtils; import buildcraft.core.utils.Utils; import buildcraft.transport.gates.GateFactory; import buildcraft.transport.gates.StatementSlot; -import buildcraft.transport.pipes.events.PipeEvent; import buildcraft.transport.statements.ActionValve.ValveState; public abstract class Pipe implements IDropControlInventory, IPipe { diff --git a/common/buildcraft/transport/PipePluggableState.java b/common/buildcraft/transport/PipePluggableState.java index 81cb65c7..42309afd 100644 --- a/common/buildcraft/transport/PipePluggableState.java +++ b/common/buildcraft/transport/PipePluggableState.java @@ -3,9 +3,8 @@ package buildcraft.transport; import io.netty.buffer.ByteBuf; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.ISerializable; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.PipeManager; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.PipeManager; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.transport.utils.ConnectionMatrix; public class PipePluggableState implements ISerializable { diff --git a/common/buildcraft/transport/PipeTransport.java b/common/buildcraft/transport/PipeTransport.java index e1316bdc..39af9110 100644 --- a/common/buildcraft/transport/PipeTransport.java +++ b/common/buildcraft/transport/PipeTransport.java @@ -17,7 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.utils.BitSetUtils; public abstract class PipeTransport { diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java index ff01c882..93c1a793 100644 --- a/common/buildcraft/transport/PipeTransportFluids.java +++ b/common/buildcraft/transport/PipeTransportFluids.java @@ -25,7 +25,7 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.SafeTimeTracker; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.DefaultProps; import buildcraft.core.utils.MathUtils; import buildcraft.transport.network.PacketFluidUpdate; diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index ed138490..21e57fb7 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -28,7 +28,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; import buildcraft.api.core.Position; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.DefaultProps; import buildcraft.core.inventory.Transactor; import buildcraft.core.utils.BlockUtils; diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 94a45b67..95f7e335 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -22,7 +22,7 @@ import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.power.IEngine; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer.PipeType; import buildcraft.core.DefaultProps; import buildcraft.core.TileBuildCraft; import buildcraft.transport.network.PacketPowerUpdate; diff --git a/common/buildcraft/transport/PipeTransportStructure.java b/common/buildcraft/transport/PipeTransportStructure.java index 0734cfc6..1d59b86d 100644 --- a/common/buildcraft/transport/PipeTransportStructure.java +++ b/common/buildcraft/transport/PipeTransportStructure.java @@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IPipeContainer.PipeType; +import buildcraft.api.transport.IPipeContainer.PipeType; public class PipeTransportStructure extends PipeTransport { diff --git a/common/buildcraft/transport/PlugPluggable.java b/common/buildcraft/transport/PlugPluggable.java index 64c6b088..1dd4888a 100644 --- a/common/buildcraft/transport/PlugPluggable.java +++ b/common/buildcraft/transport/PlugPluggable.java @@ -10,10 +10,10 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipePluggableRenderer; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.pluggable.IPipePluggableRenderer; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.utils.MatrixTranformations; public class PlugPluggable extends PipePluggable { diff --git a/common/buildcraft/transport/RobotStationPluggable.java b/common/buildcraft/transport/RobotStationPluggable.java index c12ccf00..83efa0de 100644 --- a/common/buildcraft/transport/RobotStationPluggable.java +++ b/common/buildcraft/transport/RobotStationPluggable.java @@ -10,11 +10,11 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipePluggableItem; -import buildcraft.api.pipes.IPipePluggableRenderer; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.IPipePluggableRenderer; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.robots.DockingStation; import buildcraft.core.robots.RobotRegistry; import buildcraft.core.utils.MatrixTranformations; diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 9f6f705f..54ab9861 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -37,12 +37,12 @@ import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipeConnection; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.PipeManager; -import buildcraft.api.pipes.PipePluggable; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.IPipeConnection; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.PipeManager; +import buildcraft.api.transport.pluggable.PipePluggable; +import buildcraft.api.transport.PipeWire; import buildcraft.core.DefaultProps; import buildcraft.core.IDropControlInventory; import buildcraft.core.ITileBufferHolder; diff --git a/common/buildcraft/transport/gates/GatePluggable.java b/common/buildcraft/transport/gates/GatePluggable.java index d5bc9155..1f43be36 100644 --- a/common/buildcraft/transport/gates/GatePluggable.java +++ b/common/buildcraft/transport/gates/GatePluggable.java @@ -1,6 +1,5 @@ package buildcraft.transport.gates; -import java.util.HashSet; import java.util.Set; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; @@ -11,11 +10,10 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.GateExpansions; -import buildcraft.api.gates.IGate; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.IPipePluggableRenderer; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.pluggable.IPipePluggableRenderer; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; import buildcraft.core.utils.MatrixTranformations; import buildcraft.transport.Gate; diff --git a/common/buildcraft/transport/gates/ItemGate.java b/common/buildcraft/transport/gates/ItemGate.java index 6c4ea9f9..230ad49b 100755 --- a/common/buildcraft/transport/gates/ItemGate.java +++ b/common/buildcraft/transport/gates/ItemGate.java @@ -13,7 +13,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import io.netty.buffer.ByteBuf; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -31,18 +30,15 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.pipes.IPipe; -import buildcraft.api.pipes.IPipePluggableItem; -import buildcraft.api.pipes.IPipePluggableRenderer; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.pluggable.IPipePluggableItem; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.api.statements.StatementManager; -import buildcraft.api.pipes.IPipeContainer; import buildcraft.core.ItemBuildCraft; import buildcraft.core.inventory.InvUtils; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; -import buildcraft.transport.TileGenericPipe; import buildcraft.transport.gates.GateDefinition.GateLogic; import buildcraft.transport.gates.GateDefinition.GateMaterial; diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index 3f0974f2..016ac598 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -25,8 +25,8 @@ import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.PipeManager; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.PipeManager; import buildcraft.core.RFBattery; import buildcraft.api.core.ISerializable; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsClay.java b/common/buildcraft/transport/pipes/PipeItemsClay.java index e7126204..136cc0e5 100644 --- a/common/buildcraft/transport/pipes/PipeItemsClay.java +++ b/common/buildcraft/transport/pipes/PipeItemsClay.java @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; -import buildcraft.api.pipes.IPipeContainer; +import buildcraft.api.transport.IPipeContainer; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index c875b9d0..01013af9 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -23,10 +23,10 @@ import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; -import buildcraft.api.pipes.IStripesHandler; -import buildcraft.api.pipes.IStripesHandler.StripesHandlerType; -import buildcraft.api.pipes.IStripesPipe; -import buildcraft.api.pipes.PipeManager; +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesHandler.StripesHandlerType; +import buildcraft.api.transport.IStripesPipe; +import buildcraft.api.transport.PipeManager; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; import buildcraft.transport.BlockGenericPipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 482918f6..5217b57c 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -25,8 +25,8 @@ import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; -import buildcraft.api.pipes.IPipeContainer; -import buildcraft.api.pipes.PipeManager; +import buildcraft.api.transport.IPipeContainer; +import buildcraft.api.transport.PipeManager; import buildcraft.core.RFBattery; import buildcraft.core.inventory.InvUtils; import buildcraft.core.inventory.InventoryWrapper; diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index efac8789..daff644b 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; -import buildcraft.api.pipes.IPipeContainer; +import buildcraft.api.transport.IPipeContainer; import buildcraft.core.RFBattery; import buildcraft.transport.IPipeTransportPowerHook; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java index 885846c6..6f42bbf6 100644 --- a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java +++ b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java @@ -15,7 +15,7 @@ import buildcraft.api.core.JavaTools; import buildcraft.api.facades.FacadeType; import buildcraft.api.facades.IFacadeItem; import buildcraft.api.recipes.CraftingResult; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.silicon.ItemRedstoneChipset; import buildcraft.silicon.TileIntegrationTable; import buildcraft.transport.ItemFacade; diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java index f698b09b..e2c9a050 100644 --- a/common/buildcraft/transport/render/PipeRendererTESR.java +++ b/common/buildcraft/transport/render/PipeRendererTESR.java @@ -37,8 +37,8 @@ import buildcraft.BuildCraftCore.RenderMode; import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.pipes.IPipeContainer.PipeType; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.IPipeContainer.PipeType; +import buildcraft.api.transport.PipeWire; import buildcraft.core.CoreConstants; import buildcraft.core.DefaultProps; import buildcraft.core.render.RenderEntityBlock; diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index 326c0f80..0e1a09c1 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -17,8 +17,8 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.render.ITextureStates; -import buildcraft.api.pipes.IPipePluggableRenderer; -import buildcraft.api.pipes.PipePluggable; +import buildcraft.api.transport.pluggable.IPipePluggableRenderer; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; import buildcraft.core.utils.ColorUtils; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index e3c11ac4..6aee70b2 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -18,7 +18,7 @@ import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.core.utils.StringUtils; public class ActionParameterSignal implements IStatementParameter { diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index 710207e2..f4936783 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -14,7 +14,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Gate; diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index 6082630c..a446839f 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -15,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.pipes.IPipe; +import buildcraft.api.transport.IPipe; import buildcraft.core.statements.BCStatement; import buildcraft.core.statements.StatementParameterDirection; import buildcraft.core.utils.StringUtils; diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index b7186301..361abb39 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -18,7 +18,7 @@ import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.core.utils.StringUtils; public class TriggerParameterSignal implements IStatementParameter { diff --git a/common/buildcraft/transport/statements/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java index 67e4da31..7612de0e 100644 --- a/common/buildcraft/transport/statements/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -15,7 +15,7 @@ import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/stripes/StripesHandlerArrow.java b/common/buildcraft/transport/stripes/StripesHandlerArrow.java index 90e0e063..ec1c2e2d 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerArrow.java +++ b/common/buildcraft/transport/stripes/StripesHandlerArrow.java @@ -6,8 +6,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IStripesHandler; -import buildcraft.api.pipes.IStripesPipe; +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; public class StripesHandlerArrow implements IStripesHandler { diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index 4c124cb3..2c7edfbd 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -12,8 +12,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; -import buildcraft.api.pipes.IStripesHandler; -import buildcraft.api.pipes.IStripesPipe; +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; public class StripesHandlerBucket implements IStripesHandler { private static final ItemStack emptyBucket = new ItemStack(Items.bucket, 1); diff --git a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java index d7853ce8..4be16121 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java +++ b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java @@ -6,8 +6,8 @@ import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IStripesHandler; -import buildcraft.api.pipes.IStripesPipe; +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; public class StripesHandlerRightClick implements IStripesHandler { diff --git a/common/buildcraft/transport/stripes/StripesHandlerShears.java b/common/buildcraft/transport/stripes/StripesHandlerShears.java index 2c80a072..eb88b487 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerShears.java +++ b/common/buildcraft/transport/stripes/StripesHandlerShears.java @@ -7,8 +7,8 @@ import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.IStripesHandler; -import buildcraft.api.pipes.IStripesPipe; +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; public class StripesHandlerShears implements IStripesHandler { diff --git a/common/buildcraft/transport/utils/WireMatrix.java b/common/buildcraft/transport/utils/WireMatrix.java index af096fdb..7b84d8f3 100644 --- a/common/buildcraft/transport/utils/WireMatrix.java +++ b/common/buildcraft/transport/utils/WireMatrix.java @@ -14,7 +14,7 @@ import io.netty.buffer.ByteBuf; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.pipes.PipeWire; +import buildcraft.api.transport.PipeWire; public class WireMatrix {