change in core lib

This commit is contained in:
Robert 2013-12-20 02:30:20 -05:00
parent be4862063b
commit 89d1a839c8
28 changed files with 81 additions and 74 deletions

View file

@ -1,10 +1,10 @@
package com.builtbroken.assemblyline.api;
import com.builtbroken.assemblyline.api.coding.IProgrammableMachine;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.assemblyline.api.coding.IProgrammableMachine;
/** Should be used to interact with the armbot and not to create a new armbot */
public interface IArmbot extends Cloneable, IProgrammableMachine
{

View file

@ -2,12 +2,12 @@ package com.builtbroken.assemblyline.api.coding;
import java.util.HashMap;
import com.builtbroken.assemblyline.api.coding.IProcessTask.ProcessReturn;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.api.coding.IProcessTask.ProcessReturn;
/** Basic class to handle a machine like programs for any object that uses the IProgramable
* interface. Doesn't actually do much then tell the program to function, and stores the programs
* active run time memory.

View file

@ -26,7 +26,7 @@ import com.builtbroken.assemblyline.machine.TileEntityAssembly;
import com.builtbroken.assemblyline.machine.encoder.ItemDisk;
import com.builtbroken.common.Pair;
import com.dark.DarkCore;
import com.dark.helpers.ItemWorldHelper;
import com.dark.helpers.DarksHelper;
import com.dark.helpers.MathHelper;
import com.dark.interfaces.IMultiBlock;
import com.dark.network.PacketHandler;
@ -442,7 +442,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
if (object instanceof ItemStack && this.grabbedObject instanceof ItemStack)
{
Vector3 handPosition = this.getHandPos();
ItemWorldHelper.dropItemStack(worldObj, handPosition, (ItemStack) object, false);
DarksHelper.dropItemStack(worldObj, handPosition, (ItemStack) object, false);
}
this.grabbedObject = null;
return true;

View file

@ -14,7 +14,7 @@ import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import com.builtbroken.common.Pair;
import com.dark.helpers.ItemWorldHelper;
import com.dark.helpers.DarksHelper;
/** Used by arms to break a specific block in a position.
*
@ -51,7 +51,7 @@ public class TaskBreak extends TaskBaseArmbot
if (!this.keep || items.size() > 1)
{
ItemWorldHelper.dropBlockAsItem(location.left(), serachPosition);
DarksHelper.dropBlockAsItem(location.left(), serachPosition);
}
else
{

View file

@ -1,11 +1,11 @@
package com.builtbroken.assemblyline.armbot.command;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.assemblyline.api.IArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import universalelectricity.core.vector.Vector2;
public class TaskDrop extends TaskBaseArmbot
{
public TaskDrop()

View file

@ -3,13 +3,13 @@ package com.builtbroken.assemblyline.armbot.command;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.assemblyline.api.coding.IRedirectTask;
import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.armbot.TaskBase;
import net.minecraft.nbt.NBTTagCompound;
import universalelectricity.core.vector.Vector2;
/** @author DarkGuardsman */
public class TaskGOTO extends TaskBase implements IRedirectTask
{

View file

@ -1,14 +1,14 @@
package com.builtbroken.assemblyline.armbot.command;
import com.builtbroken.assemblyline.api.IArmbot;
import com.builtbroken.assemblyline.api.IBelt;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.api.IArmbot;
import com.builtbroken.assemblyline.api.IBelt;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
/** Prefab for grab based commands
*
* @author DarkGuardsman */

View file

@ -3,13 +3,13 @@ package com.builtbroken.assemblyline.armbot.command;
import java.util.ArrayList;
import java.util.List;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.assemblyline.api.coding.IProgrammableMachine;
import com.builtbroken.assemblyline.api.coding.ITask;
import com.builtbroken.assemblyline.api.coding.args.ArgumentData;
import com.builtbroken.assemblyline.armbot.TaskBaseLogic;
import universalelectricity.core.vector.Vector2;
/** @author DarkGuardsman */
public class TaskIF extends TaskBaseLogic
{

View file

@ -1,9 +1,5 @@
package com.builtbroken.assemblyline.armbot.command;
import com.builtbroken.assemblyline.api.IArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
@ -12,6 +8,10 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.IPlantable;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.api.IArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseArmbot;
import com.builtbroken.assemblyline.armbot.TaskBaseProcess;
/** Used by arms to break a specific block in a position.
*
* @author Calclavia */

View file

@ -1,5 +1,14 @@
package com.builtbroken.assemblyline.client;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.CommonProxy;
import com.builtbroken.assemblyline.client.gui.GuiEncoderCoder;
@ -31,14 +40,6 @@ import com.builtbroken.assemblyline.machine.TileEntityTank;
import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder;
import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;

View file

@ -1,9 +1,10 @@
package com.builtbroken.assemblyline.client;
import com.builtbroken.assemblyline.AssemblyLine;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import net.minecraftforge.event.ForgeSubscribe;
import com.builtbroken.assemblyline.AssemblyLine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -17,9 +17,10 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.machine.TileEntityCrate;
import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -7,11 +7,11 @@ import static com.builtbroken.assemblyline.client.model.ModelHelper.setTextureSu
import static org.lwjgl.opengl.GL11.glPopMatrix;
import static org.lwjgl.opengl.GL11.glPushMatrix;
import static org.lwjgl.opengl.GL11.glTranslated;
import net.minecraft.tileentity.TileEntity;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.client.model.ModelHelper;
import net.minecraft.tileentity.TileEntity;
import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -2,15 +2,16 @@ package com.builtbroken.assemblyline.client.render;
import java.util.ArrayList;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -2,13 +2,14 @@ package com.builtbroken.assemblyline.entities;
import java.awt.Color;
import com.builtbroken.assemblyline.AssemblyLine;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.passive.EntityChicken;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import com.builtbroken.assemblyline.AssemblyLine;
import cpw.mods.fml.common.registry.EntityRegistry;
/** Enum of different birds that can be spawned by an egg or in the world threw normal spawning

View file

@ -2,11 +2,6 @@ package com.builtbroken.assemblyline.fluid.pipes;
import java.util.List;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import com.builtbroken.assemblyline.machine.TileEntityTank;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -21,6 +16,11 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import com.builtbroken.assemblyline.machine.TileEntityTank;
public class ItemBlockPipe extends ItemBlock
{

View file

@ -1,9 +1,5 @@
package com.builtbroken.assemblyline.imprinter.prefab;
import com.builtbroken.assemblyline.api.IFilterable;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
@ -13,6 +9,10 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.api.IFilterable;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.machine.BlockAssembly;
/** Extend this block class if a filter is allowed to be placed inside of this block.
*
* @author Calclavia */

View file

@ -2,15 +2,15 @@ package com.builtbroken.assemblyline.imprinter.prefab;
import java.util.ArrayList;
import com.builtbroken.assemblyline.api.IFilterable;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.machine.TileEntityAssembly;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.tile.IRotatable;
import com.builtbroken.assemblyline.api.IFilterable;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.machine.TileEntityAssembly;
public abstract class TileEntityFilterable extends TileEntityAssembly implements IRotatable, IFilterable
{
private ItemStack filterItem;

View file

@ -1,7 +1,5 @@
package com.builtbroken.assemblyline.item;
import com.builtbroken.assemblyline.entities.EntityFarmEgg;
import net.minecraft.block.BlockDispenser;
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.dispenser.IBlockSource;
@ -12,6 +10,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.entities.EntityFarmEgg;
public class BehaviorDispenseEgg extends BehaviorDefaultDispenseItem
{
@Override

View file

@ -2,14 +2,15 @@ package com.builtbroken.assemblyline.item;
import java.util.List;
import com.builtbroken.assemblyline.AssemblyLine;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBucket;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import com.builtbroken.assemblyline.AssemblyLine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -1,13 +1,13 @@
package com.builtbroken.assemblyline.item;
import com.builtbroken.assemblyline.entities.EntityFarmEgg;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.entities.EntityFarmEgg;
public class ItemFarmEgg extends Item
{
public ItemFarmEgg(int par1)

View file

@ -19,7 +19,7 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.AssemblyLine;
import com.dark.DarkCore;
import com.dark.IExtraInfo.IExtraItemInfo;
import com.dark.helpers.ItemWorldHelper;
import com.dark.helpers.DarksHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -76,7 +76,7 @@ public class ItemFarmFood extends Item implements IExtraItemInfo
{
if (!player.inventory.addItemStackToInventory(re))
{
ItemWorldHelper.dropItemStack(player.worldObj, new Vector3(player), re, true);
DarksHelper.dropItemStack(player.worldObj, new Vector3(player), re, true);
}
}
}

View file

@ -20,7 +20,7 @@ import com.builtbroken.assemblyline.fluid.pipes.ItemBlockPipe;
import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import com.dark.helpers.ItemWorldHelper;
import com.dark.helpers.DarksHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -127,7 +127,7 @@ public class BlockTank extends BlockFM
}
else
{
ItemWorldHelper.dropItemStack(world, new Vector3(x, y, z), dropStack, false);
DarksHelper.dropItemStack(world, new Vector3(x, y, z), dropStack, false);
}
world.setBlockToAir(x, y, z);
}

View file

@ -2,8 +2,6 @@ package com.builtbroken.assemblyline.machine;
import java.util.Random;
import com.builtbroken.assemblyline.AssemblyLine;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -18,6 +16,9 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.block.IRotatableBlock;
import universalelectricity.prefab.tile.IRotatable;
import com.builtbroken.assemblyline.AssemblyLine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -1,7 +1,5 @@
package com.builtbroken.assemblyline.machine;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@ -9,6 +7,8 @@ import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
public class ContainerFilter extends Container
{
private TileEntityFilterable tileEntity;

View file

@ -10,7 +10,7 @@ import net.minecraftforge.fluids.IFluidHandler;
import com.builtbroken.assemblyline.api.fluid.INetworkPipe;
import com.builtbroken.assemblyline.fluid.network.NetworkPipes;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidDevice;
import com.dark.helpers.ConnectionHelper;
import com.dark.helpers.DarksHelper;
import com.dark.interfaces.IToolReadOut;
import com.dark.tilenetwork.ITileConnector;
@ -69,7 +69,7 @@ public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITi
public void refresh()
{
// cleanup
this.connected = ConnectionHelper.getSurroundingTileEntities(this);
this.connected = DarksHelper.getSurroundingTileEntities(this);
// read surroundings
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{

View file

@ -1,11 +1,11 @@
package com.builtbroken.assemblyline.machine.encoder;
import com.builtbroken.assemblyline.ALRecipeLoader;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import com.builtbroken.assemblyline.ALRecipeLoader;
public class SlotDisk extends Slot
{

View file

@ -10,8 +10,8 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable;
import com.dark.helpers.DarksHelper;
import com.dark.helpers.InvInteractionHelper;
import com.dark.helpers.ItemWorldHelper;
/** Advanced version of the hopper with features such as redstone control, sorting, filtering, and
* crate version.
@ -58,7 +58,7 @@ public class TileEntityAdvancedHopper extends TileEntityFilterable
public void grabItems()
{
Vector3 inputPos = this.getThisPos().clone().modifyPositionFromSide(ForgeDirection.UP);
List<EntityItem> itemsInBound = ItemWorldHelper.getEntitiesInDirection(worldObj, this.getThisPos(), ForgeDirection.UP);
List<EntityItem> itemsInBound = DarksHelper.getEntitiesInDirection(worldObj, this.getThisPos(), ForgeDirection.UP);
ItemStack itemStack = invHelper().tryGrabFromPosition(inputPos, ForgeDirection.UP, 1);
if (itemStack != null)
{