diff --git a/src/com/builtbroken/assemblyline/api/coding/IArmbot.java b/src/com/builtbroken/assemblyline/api/IArmbot.java similarity index 94% rename from src/com/builtbroken/assemblyline/api/coding/IArmbot.java rename to src/com/builtbroken/assemblyline/api/IArmbot.java index 1e125e443..82853a306 100644 --- a/src/com/builtbroken/assemblyline/api/coding/IArmbot.java +++ b/src/com/builtbroken/assemblyline/api/IArmbot.java @@ -1,4 +1,6 @@ -package com.builtbroken.assemblyline.api.coding; +package com.builtbroken.assemblyline.api; + +import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector2; diff --git a/src/com/builtbroken/assemblyline/api/coding/IArmbotUseable.java b/src/com/builtbroken/assemblyline/api/IArmbotUseable.java similarity index 92% rename from src/com/builtbroken/assemblyline/api/coding/IArmbotUseable.java rename to src/com/builtbroken/assemblyline/api/IArmbotUseable.java index ad19cccbd..aae6fc059 100644 --- a/src/com/builtbroken/assemblyline/api/coding/IArmbotUseable.java +++ b/src/com/builtbroken/assemblyline/api/IArmbotUseable.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package com.builtbroken.assemblyline.api; import java.util.List; diff --git a/src/com/builtbroken/assemblyline/api/coding/TaskRegistry.java b/src/com/builtbroken/assemblyline/api/coding/TaskRegistry.java index bf9431365..e5df9238d 100644 --- a/src/com/builtbroken/assemblyline/api/coding/TaskRegistry.java +++ b/src/com/builtbroken/assemblyline/api/coding/TaskRegistry.java @@ -5,6 +5,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map.Entry; +import com.builtbroken.assemblyline.api.IArmbot; + /** Used to both register task and fake machines for the encoder to use to create new programs. * * @author DarkGuardsman */ diff --git a/src/com/builtbroken/assemblyline/api/FluidMasterList.java b/src/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java similarity index 97% rename from src/com/builtbroken/assemblyline/api/FluidMasterList.java rename to src/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java index 59890ec6f..a7c5a1cb8 100644 --- a/src/com/builtbroken/assemblyline/api/FluidMasterList.java +++ b/src/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api; +package com.builtbroken.assemblyline.api.fluid; import java.util.HashMap; diff --git a/src/com/builtbroken/assemblyline/api/FluidMixingEvent.java b/src/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java similarity index 97% rename from src/com/builtbroken/assemblyline/api/FluidMixingEvent.java rename to src/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java index f7dcc6517..6784b0512 100644 --- a/src/com/builtbroken/assemblyline/api/FluidMixingEvent.java +++ b/src/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api; +package com.builtbroken.assemblyline.api.fluid; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java b/src/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java index d18a92fbe..f2baedda3 100644 --- a/src/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java +++ b/src/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java @@ -1,6 +1,6 @@ package com.builtbroken.assemblyline.armbot; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; public abstract class TaskBaseArmbot extends TaskBaseProcess diff --git a/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java b/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java index 4c272402f..1d39e261e 100644 --- a/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java +++ b/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java @@ -19,7 +19,7 @@ import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.TranslationHelper; import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.IProgram; import com.builtbroken.assemblyline.api.coding.ProgramHelper; import com.builtbroken.assemblyline.machine.TileEntityAssembly; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java b/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java index a84d0717e..65644f27d 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import universalelectricity.core.vector.Vector3; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.ITask; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskDrop.java b/src/com/builtbroken/assemblyline/armbot/command/TaskDrop.java index a8d9ac3fa..fadbc4ec5 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskDrop.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskDrop.java @@ -1,6 +1,6 @@ package com.builtbroken.assemblyline.armbot.command; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskFire.java b/src/com/builtbroken/assemblyline/armbot/command/TaskFire.java index dd41c6970..fb38d27bc 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskFire.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskFire.java @@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import universalelectricity.core.vector.Vector3; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.args.ArgumentFloatData; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java b/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java index 05785a01c..10681ccb9 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java @@ -11,7 +11,7 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector2; import universalelectricity.core.vector.Vector3; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java index c8a2740e7..053d433a2 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java @@ -9,7 +9,7 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.args.ArgumentData; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.dark.helpers.EntityDictionary; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java index 990fea8a2..821a8a450 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java @@ -7,7 +7,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java index 9ece40f1a..4706346e2 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java @@ -1,7 +1,7 @@ package com.builtbroken.assemblyline.armbot.command; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.IBelt; -import com.builtbroken.assemblyline.api.coding.IArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import net.minecraft.tileentity.TileEntity; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskPlace.java b/src/com/builtbroken/assemblyline/armbot/command/TaskPlace.java index 73ff92d6c..e9ab365ab 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskPlace.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskPlace.java @@ -1,6 +1,6 @@ package com.builtbroken.assemblyline.armbot.command; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java index 2c2389263..ce9fa1ed4 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java @@ -5,7 +5,7 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import universalelectricity.core.vector.Vector2; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java index 0f65b12ec..22b2b5604 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java @@ -5,7 +5,7 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import universalelectricity.core.vector.Vector2; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java b/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java index 7f98da294..812e96eea 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java @@ -11,7 +11,7 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector2; import universalelectricity.core.vector.Vector3; -import com.builtbroken.assemblyline.api.coding.IArmbot; +import com.builtbroken.assemblyline.api.IArmbot; import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; import com.builtbroken.assemblyline.armbot.TaskBaseProcess; diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskUse.java b/src/com/builtbroken/assemblyline/armbot/command/TaskUse.java index ee482ab13..c79dc1da0 100644 --- a/src/com/builtbroken/assemblyline/armbot/command/TaskUse.java +++ b/src/com/builtbroken/assemblyline/armbot/command/TaskUse.java @@ -6,8 +6,8 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import com.builtbroken.assemblyline.api.coding.IArmbot; -import com.builtbroken.assemblyline.api.coding.IArmbotUseable; +import com.builtbroken.assemblyline.api.IArmbot; +import com.builtbroken.assemblyline.api.IArmbotUseable; import com.builtbroken.assemblyline.api.coding.IProcessTask; import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java index bf8becc26..f2d268422 100644 --- a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java +++ b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java @@ -23,7 +23,7 @@ import org.bouncycastle.util.Arrays; import universalelectricity.core.vector.Vector3; import com.builtbroken.assemblyline.FluidPartsMaterial; -import com.builtbroken.assemblyline.api.FluidMasterList; +import com.builtbroken.assemblyline.api.fluid.FluidMasterList; import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart; import com.builtbroken.assemblyline.fluid.network.NetworkFluidTiles; import com.dark.DarkCore; diff --git a/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java b/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java index 6b3119845..4c8586ff2 100644 --- a/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java +++ b/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java @@ -23,8 +23,8 @@ import universalelectricity.prefab.network.IPacketReceiver; import universalelectricity.prefab.tile.TileEntityAdvanced; import com.builtbroken.assemblyline.api.AutoCraftEvent; -import com.builtbroken.assemblyline.api.coding.IArmbot; -import com.builtbroken.assemblyline.api.coding.IArmbotUseable; +import com.builtbroken.assemblyline.api.IArmbot; +import com.builtbroken.assemblyline.api.IArmbotUseable; import com.builtbroken.assemblyline.api.coding.args.ArgumentData; import com.builtbroken.common.Pair; import com.dark.DarkCore;