Version Bump
This commit is contained in:
parent
6ef0840fdb
commit
75bf4c9244
13 changed files with 170 additions and 179 deletions
|
@ -1 +1 @@
|
|||
0.1.5
|
||||
0.1.6
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
"modid" : "AssemblyLine",
|
||||
"name" : "Assembly Line",
|
||||
"version" : "0.1.5",
|
||||
"version" : "0.1.6",
|
||||
"url" : "http://calclavia.com/universalelectricity/?m=18",
|
||||
"credits" : "",
|
||||
"authors": [
|
||||
|
|
|
@ -5,12 +5,12 @@ import net.minecraft.tileentity.TileEntity;
|
|||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
|
||||
import assemblyline.client.model.ModelConveyorBelt;
|
||||
import assemblyline.common.AssemblyLine;
|
||||
import assemblyline.common.machine.belt.TileEntityConveyorBelt;
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderConveyorBelt extends TileEntitySpecialRenderer
|
||||
{
|
||||
|
|
|
@ -8,8 +8,6 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import assemblyline.common.block.TileEntityCrate;
|
||||
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
public class RenderCrate extends TileEntitySpecialRenderer
|
||||
{
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ public class RenderHelper implements ISimpleBlockRenderingHandler
|
|||
modelConveyorBelt.render(0.0625F, 0, false, false, false);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
else if (block.blockID == AssemblyLine.blockInteraction.blockID)
|
||||
else if (block.blockID == AssemblyLine.blockMulti.blockID)
|
||||
{
|
||||
if (metadata == MachineType.SORTER.metadata)
|
||||
{
|
||||
|
|
|
@ -44,7 +44,7 @@ public class AssemblyLine
|
|||
|
||||
public static final String NAME = "Assembly Line";
|
||||
|
||||
public static final String VERSION = "0.1.5";
|
||||
public static final String VERSION = "0.1.6";
|
||||
|
||||
public static final String CHANNEL = "AssemblyLine";
|
||||
|
||||
|
@ -59,7 +59,7 @@ public class AssemblyLine
|
|||
public static final int BLOCK_ID_PREFIX = 3030;
|
||||
|
||||
public static Block blockConveyorBelt;
|
||||
public static Block blockInteraction;
|
||||
public static Block blockMulti;
|
||||
public static Block blockArchitectTable;
|
||||
public static Block blockCrate;
|
||||
|
||||
|
@ -71,7 +71,7 @@ public class AssemblyLine
|
|||
|
||||
CONFIGURATION.load();
|
||||
blockConveyorBelt = new BlockConveyorBelt(CONFIGURATION.getBlock("Conveyor Belt", BLOCK_ID_PREFIX).getInt());
|
||||
blockInteraction = new BlockMulti(CONFIGURATION.getBlock("Machine", BLOCK_ID_PREFIX + 1).getInt());
|
||||
blockMulti = new BlockMulti(CONFIGURATION.getBlock("Machine", BLOCK_ID_PREFIX + 1).getInt());
|
||||
blockArchitectTable = new BlockArchitectTable(CONFIGURATION.getBlock("Architect's Table", BLOCK_ID_PREFIX + 2).getInt());
|
||||
blockCrate = new BlockCrate(CONFIGURATION.getBlock("Crate", BLOCK_ID_PREFIX + 3).getInt());
|
||||
CONFIGURATION.save();
|
||||
|
@ -80,7 +80,7 @@ public class AssemblyLine
|
|||
GameRegistry.registerBlock(blockConveyorBelt);
|
||||
GameRegistry.registerBlock(blockArchitectTable);
|
||||
GameRegistry.registerBlock(blockCrate, ItemBlockCrate.class);
|
||||
GameRegistry.registerBlock(blockInteraction, ItemBlockMulti.class);
|
||||
GameRegistry.registerBlock(blockMulti, ItemBlockMulti.class);
|
||||
|
||||
UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt");
|
||||
|
||||
|
@ -130,17 +130,17 @@ public class AssemblyLine
|
|||
// Add Names
|
||||
for (MachineType type : MachineType.values())
|
||||
{
|
||||
LanguageRegistry.addName(new ItemStack(blockInteraction, 1, type.metadata), type.name);
|
||||
LanguageRegistry.addName(new ItemStack(blockMulti, 1, type.metadata), type.name);
|
||||
}
|
||||
|
||||
// Conveyor Belt
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockConveyorBelt, 4), new Object[] { "III", "WMW", 'I', "ingotSteel", 'W', Block.wood, 'M', "motor" }));
|
||||
|
||||
// Rejector
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockInteraction, 1, MachineType.SORTER.metadata), new Object[] { "WPW", "@R@", '@', "plateSteel", 'R', Item.redstone, 'P', Block.pistonBase, 'C', "basicCircuit", 'W', "copperWire" }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockMulti, 1, MachineType.SORTER.metadata), new Object[] { "WPW", "@R@", '@', "plateSteel", 'R', Item.redstone, 'P', Block.pistonBase, 'C', "basicCircuit", 'W', "copperWire" }));
|
||||
|
||||
// Retriever
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockInteraction, 1, MachineType.MANIPULATOR.metadata), new Object[] { Block.dispenser, "basicCircuit" }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(blockMulti, 1, MachineType.MANIPULATOR.metadata), new Object[] { Block.dispenser, "basicCircuit" }));
|
||||
|
||||
UETab.setItemStack(new ItemStack(blockConveyorBelt));
|
||||
}
|
||||
|
|
|
@ -14,10 +14,8 @@ public class ArmHelper
|
|||
/**
|
||||
* Used to locate items in an area
|
||||
*
|
||||
* @param start
|
||||
* - start xyz
|
||||
* @param End
|
||||
* - end xyz
|
||||
* @param start - start xyz
|
||||
* @param End - end xyz
|
||||
* @return list of items
|
||||
*/
|
||||
public List<EntityItem> findItems(World world, Vector3 start, Vector3 end)
|
||||
|
|
|
@ -21,8 +21,7 @@ public abstract class Task
|
|||
/**
|
||||
* Called by the TaskManager to propagate tick updates
|
||||
*
|
||||
* @param ticks
|
||||
* The amount of ticks this task has been running
|
||||
* @param ticks The amount of ticks this task has been running
|
||||
* @return false if the task is finished and can be removed, true otherwise
|
||||
*/
|
||||
protected boolean doTask()
|
||||
|
|
|
@ -51,8 +51,8 @@ public class TaskManager
|
|||
}
|
||||
|
||||
/**
|
||||
* Used to register Tasks for a TileEntity, executes onTaskStart
|
||||
* for the Task after registering it
|
||||
* Used to register Tasks for a TileEntity, executes onTaskStart for the Task after registering
|
||||
* it
|
||||
*
|
||||
* @param tileEntity TE instance to register the task for
|
||||
* @param task Task instance to register
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package assemblyline.common.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
|
|
@ -63,7 +63,7 @@ public class BlockConveyorBelt extends BlockMachine
|
|||
/**
|
||||
* @author AtomicStryker
|
||||
*/
|
||||
//@Override
|
||||
// @Override
|
||||
public void onEntityCollidedWithBlockTest(World world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
TileEntityConveyorBelt tileEntity = (TileEntityConveyorBelt) world.getBlockTileEntity(x, y, z);
|
||||
|
|
|
@ -10,10 +10,9 @@ import net.minecraft.world.World;
|
|||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
/**
|
||||
* Paradigm: The Crafting Arm is made of *TO BE DETERMINED* jointed segments.
|
||||
* We do not save any of these. They are automatically 'created' by the Renderer
|
||||
* to connect the 'Claw' to the TileEntity fittingly. That's right they do not
|
||||
* actually exist. MAGIC.
|
||||
* Paradigm: The Crafting Arm is made of *TO BE DETERMINED* jointed segments. We do not save any of
|
||||
* these. They are automatically 'created' by the Renderer to connect the 'Claw' to the TileEntity
|
||||
* fittingly. That's right they do not actually exist. MAGIC.
|
||||
*/
|
||||
public class EntityCraftingArm extends Entity
|
||||
{
|
||||
|
@ -27,8 +26,8 @@ public class EntityCraftingArm extends Entity
|
|||
}
|
||||
|
||||
/**
|
||||
* Maximal extended length of the Crafting Arm, to abort grabbings if the target
|
||||
* moves out of range.
|
||||
* Maximal extended length of the Crafting Arm, to abort grabbings if the target moves out of
|
||||
* range.
|
||||
*/
|
||||
private static final float MAX_GRAB_DISTANCE = 3F;
|
||||
|
||||
|
@ -170,10 +169,9 @@ public class EntityCraftingArm extends Entity
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Deals with the Claw moving to and hitting the target Item Entity, also
|
||||
* aborts if that moves out of range.
|
||||
* Deals with the Claw moving to and hitting the target Item Entity, also aborts if that moves
|
||||
* out of range.
|
||||
*/
|
||||
private void updateClawMovement()
|
||||
{
|
||||
|
@ -206,9 +204,8 @@ public class EntityCraftingArm extends Entity
|
|||
}
|
||||
|
||||
/**
|
||||
* On serverside, writes the current local claw position into the dataWatchers.
|
||||
* On client, retrieves the current remote claw values.
|
||||
* Yes DataWatchers lack a Double getter method.
|
||||
* On serverside, writes the current local claw position into the dataWatchers. On client,
|
||||
* retrieves the current remote claw values. Yes DataWatchers lack a Double getter method.
|
||||
*/
|
||||
private void updateNetworkedClawPosition()
|
||||
{
|
||||
|
@ -233,6 +230,7 @@ public class EntityCraftingArm extends Entity
|
|||
|
||||
/**
|
||||
* Designate an Item Entity as target for the claw to go to and grab.
|
||||
*
|
||||
* @param entItem Item Entity instance to grab
|
||||
*/
|
||||
private void setTargetEntityItem(EntityItem entItem)
|
||||
|
@ -254,6 +252,7 @@ public class EntityCraftingArm extends Entity
|
|||
|
||||
/**
|
||||
* Displays particles and/or play's sounds to emphasize the claw having grabbed something
|
||||
*
|
||||
* @param posX coordinate of grab
|
||||
* @param posY coordinate of grab
|
||||
* @param posZ coordinate of grab
|
||||
|
|
|
@ -36,9 +36,7 @@ public class TaskArmSearch extends Task
|
|||
@Override
|
||||
public void onTaskStart()
|
||||
{
|
||||
List found = tileEntity.worldObj.getEntitiesWithinAABB(entityToInclude,
|
||||
AxisAlignedBB.getBoundingBox(tileEntity.xCoord - radius, tileEntity.yCoord - radius, tileEntity.zCoord - radius,
|
||||
tileEntity.xCoord + radius, tileEntity.yCoord + radius, tileEntity.zCoord + radius));
|
||||
List found = tileEntity.worldObj.getEntitiesWithinAABB(entityToInclude, AxisAlignedBB.getBoundingBox(tileEntity.xCoord - radius, tileEntity.yCoord - radius, tileEntity.zCoord - radius, tileEntity.xCoord + radius, tileEntity.yCoord + radius, tileEntity.zCoord + radius));
|
||||
if (found != null && !found.isEmpty())
|
||||
{
|
||||
foundEntity = (Entity) found.get(0);
|
||||
|
|
Loading…
Reference in a new issue