diff --git a/common/net/minecraft/src/buildcraft/builders/TileArchitect.java b/common/net/minecraft/src/buildcraft/builders/TileArchitect.java index e7c60d8f..20e73b62 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileArchitect.java +++ b/common/net/minecraft/src/buildcraft/builders/TileArchitect.java @@ -19,7 +19,6 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.core.Box; import net.minecraft.src.buildcraft.core.BptBase; import net.minecraft.src.buildcraft.core.BptBlueprint; @@ -28,6 +27,7 @@ import net.minecraft.src.buildcraft.core.BptTemplate; import net.minecraft.src.buildcraft.core.TileBuildCraft; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileArchitect extends TileBuildCraft implements IInventory { diff --git a/common/net/minecraft/src/buildcraft/builders/TileBuilder.java b/common/net/minecraft/src/buildcraft/builders/TileBuilder.java index a27e9d2a..f9922606 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileBuilder.java +++ b/common/net/minecraft/src/buildcraft/builders/TileBuilder.java @@ -24,7 +24,6 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; @@ -46,6 +45,7 @@ import net.minecraft.src.buildcraft.core.SurroundingInventory; import net.minecraft.src.buildcraft.core.TileBuildCraft; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IPowerReceptor, IMachine { diff --git a/common/net/minecraft/src/buildcraft/builders/TileFiller.java b/common/net/minecraft/src/buildcraft/builders/TileFiller.java index ddc2c25e..2511f8fd 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileFiller.java +++ b/common/net/minecraft/src/buildcraft/builders/TileFiller.java @@ -17,7 +17,6 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.filler.FillerManager; import net.minecraft.src.buildcraft.api.filler.IFillerPattern; import net.minecraft.src.buildcraft.api.gates.IAction; @@ -35,6 +34,7 @@ import net.minecraft.src.buildcraft.core.StackUtil; import net.minecraft.src.buildcraft.core.TileBuildCraft; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPowerReceptor, IMachine, IActionReceptor { diff --git a/common/net/minecraft/src/buildcraft/builders/TileMarker.java b/common/net/minecraft/src/buildcraft/builders/TileMarker.java index 3642f9dc..9d4744e3 100644 --- a/common/net/minecraft/src/buildcraft/builders/TileMarker.java +++ b/common/net/minecraft/src/buildcraft/builders/TileMarker.java @@ -17,11 +17,11 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.core.EntityBlock; import net.minecraft.src.buildcraft.core.TileBuildCraft; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileMarker extends TileBuildCraft implements IAreaProvider { diff --git a/common/net/minecraft/src/buildcraft/core/Box.java b/common/net/minecraft/src/buildcraft/core/Box.java index 32cb3306..b37a6ce9 100644 --- a/common/net/minecraft/src/buildcraft/core/Box.java +++ b/common/net/minecraft/src/buildcraft/core/Box.java @@ -19,7 +19,7 @@ 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.TileNetworkData; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class Box implements IBox { diff --git a/common/net/minecraft/src/buildcraft/core/ClassMapping.java b/common/net/minecraft/src/buildcraft/core/ClassMapping.java index 27fd1015..334e7236 100644 --- a/common/net/minecraft/src/buildcraft/core/ClassMapping.java +++ b/common/net/minecraft/src/buildcraft/core/ClassMapping.java @@ -15,7 +15,7 @@ import java.util.LinkedList; import java.util.TreeMap; import net.minecraft.src.BuildCraftCore; -import net.minecraft.src.buildcraft.api.TileNetworkData; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class ClassMapping { diff --git a/common/net/minecraft/src/buildcraft/api/TileNetworkData.java b/common/net/minecraft/src/buildcraft/core/network/TileNetworkData.java similarity index 92% rename from common/net/minecraft/src/buildcraft/api/TileNetworkData.java rename to common/net/minecraft/src/buildcraft/core/network/TileNetworkData.java index f6a95948..c71d985e 100644 --- a/common/net/minecraft/src/buildcraft/api/TileNetworkData.java +++ b/common/net/minecraft/src/buildcraft/core/network/TileNetworkData.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.core.network; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/common/net/minecraft/src/buildcraft/energy/Engine.java b/common/net/minecraft/src/buildcraft/energy/Engine.java index 6ebb5c8c..5efeb03d 100644 --- a/common/net/minecraft/src/buildcraft/energy/Engine.java +++ b/common/net/minecraft/src/buildcraft/energy/Engine.java @@ -14,8 +14,8 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.liquids.LiquidTank; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public abstract class Engine { diff --git a/common/net/minecraft/src/buildcraft/energy/TileEngine.java b/common/net/minecraft/src/buildcraft/energy/TileEngine.java index 1877a306..8f3aa466 100644 --- a/common/net/minecraft/src/buildcraft/energy/TileEngine.java +++ b/common/net/minecraft/src/buildcraft/energy/TileEngine.java @@ -23,7 +23,6 @@ import net.minecraft.src.buildcraft.api.APIProxy; import net.minecraft.src.buildcraft.api.IPipeConnection; import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.Position; -import net.minecraft.src.buildcraft.api.TileNetworkData; import net.minecraft.src.buildcraft.api.gates.IOverrideDefaultTriggers; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.gates.Trigger; @@ -38,6 +37,7 @@ import net.minecraft.src.buildcraft.api.power.PowerProvider; import net.minecraft.src.buildcraft.core.IBuilderInventory; import net.minecraft.src.buildcraft.core.TileBuildCraft; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; //TODO: All Engines need to take func_48081_b into account diff --git a/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java b/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java index 8d70cf39..ee3156d9 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java +++ b/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java @@ -14,7 +14,6 @@ import net.minecraft.src.TileEntity; import net.minecraft.src.mod_BuildCraftSilicon; import net.minecraft.src.buildcraft.api.IPipeConnection; import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.TileNetworkData; import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe; import net.minecraft.src.buildcraft.core.CoreProxy; import net.minecraft.src.buildcraft.core.DefaultProps; @@ -23,6 +22,7 @@ import net.minecraft.src.buildcraft.core.StackUtil; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.PacketIds; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; import net.minecraft.src.buildcraft.core.network.TilePacketWrapper; public class TileAssemblyTable extends TileEntity implements IMachine, IInventory, IPipeConnection { diff --git a/common/net/minecraft/src/buildcraft/factory/TilePump.java b/common/net/minecraft/src/buildcraft/factory/TilePump.java index 7c2891e1..a9c12a8f 100644 --- a/common/net/minecraft/src/buildcraft/factory/TilePump.java +++ b/common/net/minecraft/src/buildcraft/factory/TilePump.java @@ -21,7 +21,6 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.power.IPowerProvider; @@ -33,6 +32,7 @@ import net.minecraft.src.buildcraft.core.EntityBlock; import net.minecraft.src.buildcraft.core.IMachine; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TilePump extends TileMachine implements IMachine, IPowerReceptor { diff --git a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java index 16c8bd44..cd19807b 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java +++ b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java @@ -26,7 +26,6 @@ import net.minecraft.src.buildcraft.api.IAreaProvider; import net.minecraft.src.buildcraft.api.IPipeConnection; import net.minecraft.src.buildcraft.api.LaserKind; import net.minecraft.src.buildcraft.api.Orientations; -import net.minecraft.src.buildcraft.api.TileNetworkData; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; @@ -42,6 +41,7 @@ import net.minecraft.src.buildcraft.core.IMachine; import net.minecraft.src.buildcraft.core.StackUtil; import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileQuarry extends TileMachine implements IArmListener, IMachine, IPowerReceptor, IPipeConnection, IBuilderInventory { diff --git a/common/net/minecraft/src/buildcraft/factory/TileRefinery.java b/common/net/minecraft/src/buildcraft/factory/TileRefinery.java index a9c72661..14d8114d 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileRefinery.java +++ b/common/net/minecraft/src/buildcraft/factory/TileRefinery.java @@ -20,7 +20,6 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.liquids.ILiquidTank; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; @@ -31,6 +30,7 @@ import net.minecraft.src.buildcraft.api.power.PowerFramework; import net.minecraft.src.buildcraft.api.power.PowerProvider; import net.minecraft.src.buildcraft.api.recipes.RefineryRecipe; import net.minecraft.src.buildcraft.core.IMachine; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileRefinery extends TileMachine implements ITankContainer, IPowerReceptor, IInventory, IMachine { diff --git a/common/net/minecraft/src/buildcraft/factory/TileTank.java b/common/net/minecraft/src/buildcraft/factory/TileTank.java index 8ffa4edb..57f54ffe 100644 --- a/common/net/minecraft/src/buildcraft/factory/TileTank.java +++ b/common/net/minecraft/src/buildcraft/factory/TileTank.java @@ -17,13 +17,13 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.liquids.ILiquidTank; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.liquids.LiquidTank; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.TileBuildCraft; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileTank extends TileBuildCraft implements ITankContainer { diff --git a/common/net/minecraft/src/buildcraft/silicon/TileLaser.java b/common/net/minecraft/src/buildcraft/silicon/TileLaser.java index 1074719e..181d12b6 100644 --- a/common/net/minecraft/src/buildcraft/silicon/TileLaser.java +++ b/common/net/minecraft/src/buildcraft/silicon/TileLaser.java @@ -17,7 +17,6 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; @@ -25,6 +24,7 @@ import net.minecraft.src.buildcraft.api.power.PowerProvider; import net.minecraft.src.buildcraft.core.BlockIndex; import net.minecraft.src.buildcraft.core.EntityEnergyLaser; import net.minecraft.src.buildcraft.core.TileBuildCraft; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; import net.minecraft.src.buildcraft.factory.TileAssemblyTable; public class TileLaser extends TileBuildCraft implements IPowerReceptor { diff --git a/common/net/minecraft/src/buildcraft/transport/Pipe.java b/common/net/minecraft/src/buildcraft/transport/Pipe.java index bdb1ed2a..fb4d38b0 100644 --- a/common/net/minecraft/src/buildcraft/transport/Pipe.java +++ b/common/net/minecraft/src/buildcraft/transport/Pipe.java @@ -25,7 +25,6 @@ import net.minecraft.src.World; import net.minecraft.src.buildcraft.api.IPipe; import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.SafeTimeTracker; -import net.minecraft.src.buildcraft.api.TileNetworkData; import net.minecraft.src.buildcraft.api.gates.Action; import net.minecraft.src.buildcraft.api.gates.ActionManager; import net.minecraft.src.buildcraft.api.gates.IAction; @@ -40,6 +39,7 @@ import net.minecraft.src.buildcraft.core.Utils; import net.minecraft.src.buildcraft.core.network.IndexInPayload; import net.minecraft.src.buildcraft.core.network.PacketPayload; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; import net.minecraft.src.buildcraft.core.network.TilePacketWrapper; import net.minecraft.src.buildcraft.transport.Gate.GateConditional; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java b/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java index e4763cd6..f0050d72 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java @@ -20,7 +20,6 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory; import net.minecraft.src.buildcraft.core.CoreProxy; import net.minecraft.src.buildcraft.core.DefaultProps; @@ -28,6 +27,7 @@ import net.minecraft.src.buildcraft.core.GuiIds; import net.minecraft.src.buildcraft.core.network.PacketIds; import net.minecraft.src.buildcraft.core.network.PacketNBT; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; import net.minecraft.src.buildcraft.core.network.TilePacketWrapper; import net.minecraft.src.buildcraft.core.utils.SimpleInventory; diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java b/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java index e99f145b..abfd77ae 100644 --- a/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java +++ b/common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java @@ -16,13 +16,13 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.core.CoreProxy; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.IMachine; import net.minecraft.src.buildcraft.core.Utils; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class PipeTransportPower extends PipeTransport { diff --git a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java index 342b7f84..735a1826 100644 --- a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java +++ b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java @@ -26,7 +26,6 @@ import net.minecraft.src.buildcraft.api.IPipeTile; 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.TileNetworkData; import net.minecraft.src.buildcraft.api.gates.IOverrideDefaultTriggers; import net.minecraft.src.buildcraft.api.gates.ITrigger; import net.minecraft.src.buildcraft.api.gates.Trigger; @@ -46,6 +45,7 @@ import net.minecraft.src.buildcraft.core.network.PacketPayload; import net.minecraft.src.buildcraft.core.network.PacketPipeDescription; import net.minecraft.src.buildcraft.core.network.PacketTileUpdate; import net.minecraft.src.buildcraft.core.network.PacketUpdate; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITankContainer, IPipeEntry, IPipeTile, ISynchronizedTile, IOverrideDefaultTriggers, ITileBufferHolder, IPipeConnection, IDropControlInventory { diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java index f34c6915..7bea3091 100644 --- a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -14,12 +14,12 @@ 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.TileNetworkData; import net.minecraft.src.buildcraft.api.liquids.ITankContainer; import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.api.power.IPowerProvider; import net.minecraft.src.buildcraft.api.power.IPowerReceptor; import net.minecraft.src.buildcraft.api.power.PowerFramework; +import net.minecraft.src.buildcraft.core.network.TileNetworkData; import net.minecraft.src.buildcraft.transport.Pipe; import net.minecraft.src.buildcraft.transport.PipeLogicWood; import net.minecraft.src.buildcraft.transport.PipeTransportLiquids;