Auto-Sync
This commit is contained in:
parent
bab12f761d
commit
a127f663ff
43 changed files with 57 additions and 137 deletions
|
@ -1,11 +1,10 @@
|
|||
package dark.api.al;
|
||||
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
/**
|
||||
* Class used in the creation of servo based object
|
||||
* @author Rseifert
|
||||
|
||||
/** Class used in the creation of servo based object
|
||||
*
|
||||
*/
|
||||
* @author Rseifert */
|
||||
public interface IServo
|
||||
{
|
||||
/** Gets the rotation as a Vector2 (X - Yaw, Y - pitch) */
|
||||
|
|
|
@ -2,7 +2,6 @@ package dark.api.al;
|
|||
|
||||
import java.util.HashMap;
|
||||
|
||||
|
||||
/** Container like class to handle several servos in an object.
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package dark.api.al.coding;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ package dark.api.al.coding;
|
|||
|
||||
import java.util.HashMap;
|
||||
|
||||
|
||||
/** The IUseable inteface is used by the ArmBot so that it may interact with Tile Entities. onUse
|
||||
* will be called on the block an ArmBot is touching whenever the USE command is run on it.
|
||||
*
|
||||
|
|
|
@ -1,16 +1,7 @@
|
|||
package dark.api.al.coding;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import dan200.computer.api.IComputerAccess;
|
||||
import dan200.computer.api.ILuaContext;
|
||||
import dark.api.al.coding.args.ArgumentData;
|
||||
|
||||
/** Use to construct a basic task that can be used in any device that supports this interface.
|
||||
*
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package dark.api.al.coding;
|
||||
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
|
|
|
@ -3,11 +3,10 @@ package dark.api.al.coding;
|
|||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import dark.api.al.coding.args.ArgumentData;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
import dark.api.al.coding.args.ArgumentData;
|
||||
|
||||
/** @author DarkGuardsman */
|
||||
public interface ITask extends Cloneable
|
||||
|
|
|
@ -2,12 +2,10 @@ package dark.api.al.coding;
|
|||
|
||||
import java.util.HashMap;
|
||||
|
||||
import dark.api.al.coding.IProcessTask.ProcessReturn;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import dark.api.al.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
|
||||
|
|
|
@ -2,10 +2,8 @@ package dark.api.al.coding;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
/** Used to both register task and fake machines for the encoder to use to create new programs.
|
||||
*
|
||||
|
|
|
@ -2,7 +2,7 @@ package dark.api.al.coding.args;
|
|||
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
public class ArgumentEntityList extends ArgumentListData<Class< ? extends Entity>>
|
||||
public class ArgumentEntityList extends ArgumentListData<Class<? extends Entity>>
|
||||
{
|
||||
|
||||
public ArgumentEntityList(String name, Object defaultvalue, Class<? extends Entity>... object)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package dark.api.al.coding.args;
|
||||
|
||||
/** Used to create argument data for the encoder. Should only be used if the value needs to be clearly
|
||||
* limited inside the encoder display.
|
||||
/** Used to create argument data for the encoder. Should only be used if the value needs to be
|
||||
* clearly limited inside the encoder display.
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
public class ArgumentIntData extends ArgumentData
|
||||
|
|
|
@ -54,7 +54,7 @@ public class RenderArmbot extends TileEntitySpecialRenderer
|
|||
GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
|
||||
GL11.glScalef(1.0F, -1F, -1F);
|
||||
|
||||
MODEL.render(0.0625f, (float)((TileEntityArmbot) tileEntity).getRotation().x, (float)((TileEntityArmbot) tileEntity).getRotation().y);
|
||||
MODEL.render(0.0625f, (float) ((TileEntityArmbot) tileEntity).getRotation().x, (float) ((TileEntityArmbot) tileEntity).getRotation().y);
|
||||
|
||||
GL11.glPopMatrix();
|
||||
|
||||
|
|
|
@ -4,21 +4,6 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityBoat;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.item.EntityMinecart;
|
||||
import net.minecraft.entity.monster.EntityCreeper;
|
||||
import net.minecraft.entity.monster.EntityMob;
|
||||
import net.minecraft.entity.monster.EntitySkeleton;
|
||||
import net.minecraft.entity.monster.EntitySlime;
|
||||
import net.minecraft.entity.monster.EntitySpider;
|
||||
import net.minecraft.entity.monster.EntityZombie;
|
||||
import net.minecraft.entity.passive.EntityAnimal;
|
||||
import net.minecraft.entity.passive.EntityChicken;
|
||||
import net.minecraft.entity.passive.EntityCow;
|
||||
import net.minecraft.entity.passive.EntityPig;
|
||||
import net.minecraft.entity.passive.EntitySheep;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
public class GrabDictionary
|
||||
{
|
||||
|
@ -107,5 +92,4 @@ public class GrabDictionary
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -6,9 +6,7 @@ import java.util.List;
|
|||
import java.util.Map.Entry;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import dark.api.al.coding.IMemorySlot;
|
||||
import dark.api.al.coding.IProgram;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
|
|
|
@ -1,28 +1,12 @@
|
|||
package dark.assembly.common.armbot;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import dan200.computer.api.IComputerAccess;
|
||||
import dan200.computer.api.ILuaContext;
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProcessTask;
|
||||
import dark.api.al.coding.IMemorySlot;
|
||||
import dark.api.al.coding.IProgram;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.IProcessTask.ProcessReturn;
|
||||
import dark.api.al.coding.args.ArgumentData;
|
||||
import dark.core.prefab.helpers.NBTFileHelper;
|
||||
|
||||
/** Basic command prefab used by machines like an armbot. You are not required to use this in order
|
||||
* to make armbot commands but it does help. Delete this if you don't plan to use it. */
|
||||
|
|
|
@ -2,15 +2,15 @@ package dark.assembly.common.armbot.command;
|
|||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import com.builtbroken.common.Pair;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.Pair;
|
||||
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.ITask;
|
||||
import dark.assembly.common.armbot.TaskBaseArmbot;
|
||||
|
|
|
@ -15,7 +15,6 @@ import com.builtbroken.common.Pair;
|
|||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.args.ArgumentFloatData;
|
||||
import dark.assembly.common.armbot.TaskBaseArmbot;
|
||||
import dark.assembly.common.armbot.TaskBaseProcess;
|
||||
|
|
|
@ -7,7 +7,6 @@ import net.minecraft.block.Block;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
|
|
|
@ -8,10 +8,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.args.ArgumentData;
|
||||
import dark.api.al.coding.args.ArgumentListData;
|
||||
import dark.assembly.common.armbot.GrabDictionary;
|
||||
|
|
|
@ -6,13 +6,10 @@ import net.minecraft.block.Block;
|
|||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.args.ArgumentIntData;
|
||||
import dark.assembly.common.armbot.TaskBaseProcess;
|
||||
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
package dark.assembly.common.armbot.command;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import dark.api.al.IBelt;
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.assembly.common.armbot.TaskBaseArmbot;
|
||||
|
||||
/** Prefab for grab based commands
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package dark.assembly.common.armbot.command;
|
||||
|
||||
|
||||
/** Used by arms to break a specific block in a position.
|
||||
*
|
||||
* @author DarkGuardsman */
|
||||
|
|
|
@ -2,13 +2,10 @@ package dark.assembly.common.armbot.command;
|
|||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import universalelectricity.core.vector.Vector2;
|
||||
import dark.api.al.coding.ILogicTask;
|
||||
import dark.api.al.coding.IProcessTask;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.ITask;
|
||||
import dark.api.al.coding.args.ArgumentData;
|
||||
import dark.assembly.common.armbot.TaskBaseLogic;
|
||||
import dark.assembly.common.armbot.TaskBaseProcess;
|
||||
|
||||
/** @author DarkGuardsman */
|
||||
public class TaskIF extends TaskBaseLogic
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
package dark.assembly.common.armbot.command;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
package dark.assembly.common.armbot.command;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.args.ArgumentIntData;
|
||||
import dark.assembly.common.armbot.TaskBaseArmbot;
|
||||
import dark.assembly.common.armbot.TaskBaseProcess;
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
package dark.assembly.common.armbot.command;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.args.ArgumentIntData;
|
||||
import dark.assembly.common.armbot.TaskBaseArmbot;
|
||||
import dark.assembly.common.armbot.TaskBaseProcess;
|
||||
|
|
|
@ -7,14 +7,12 @@ import net.minecraft.block.Block;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.args.ArgumentIntData;
|
||||
import dark.assembly.common.armbot.TaskBaseArmbot;
|
||||
import dark.assembly.common.armbot.TaskBaseProcess;
|
||||
|
|
|
@ -3,15 +3,12 @@ package dark.assembly.common.armbot.command;
|
|||
import net.minecraft.block.Block;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import com.builtbroken.common.science.units.UnitHelper;
|
||||
|
||||
import dark.api.al.coding.IArmbot;
|
||||
import dark.api.al.coding.IArmbotUseable;
|
||||
import dark.api.al.coding.IProcessTask;
|
||||
import dark.api.al.coding.IProgrammableMachine;
|
||||
import dark.api.al.coding.args.ArgumentIntData;
|
||||
import dark.assembly.common.armbot.TaskBaseArmbot;
|
||||
import dark.assembly.common.armbot.TaskBaseProcess;
|
||||
|
|
|
@ -141,6 +141,7 @@ public class TileEntityEncoder extends TileEntityMachine implements ISidedInvent
|
|||
}
|
||||
|
||||
/** Sends a gui packet only to the given player */
|
||||
@Override
|
||||
public void sendGUIPacket(EntityPlayer entity)
|
||||
{
|
||||
if (entity != null)
|
||||
|
|
Loading…
Reference in a new issue