Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/calclavia/Assembly-Line

Browse source
This commit is contained in:
Brian Ricketts 2013-01-29 23:37:15 -06:00
commit e3d824a091
9 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/assemblyline/common/machine/TileEntityManipulator.java
View file

@ -115,7 +115,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota
* Try top first, then bottom, then the sides to see if it is possible to insert the
* item into a inventory.
*/
ItemStack remainingStack = entity.func_92014_d().copy();
ItemStack remainingStack = entity.getEntityItem().copy();
if (this.getFilter() == null || this.isFiltering(remainingStack))
{

2
src/minecraft/assemblyline/common/machine/TileEntityRejector.java
View file

@ -113,7 +113,7 @@ public class TileEntityRejector extends TileEntityFilterable
if (entity instanceof EntityItem)
{
EntityItem entityItem = (EntityItem) entity;
ItemStack itemStack = entityItem.func_92014_d();
ItemStack itemStack = entityItem.getEntityItem();
return this.isFiltering(itemStack);
}

2
src/minecraft/assemblyline/common/machine/armbot/ArmHelper.java
View file

@ -42,7 +42,7 @@ public class ArmHelper
List<EntityItem> itemsList = world.getEntitiesWithinAABB(EntityItem.class, bounds);
for (EntityItem item : itemsList)
{
ItemStack stackItem = item.func_92014_d();
ItemStack stackItem = item.getEntityItem();
if (stackItem.itemID != stack.itemID || stackItem.getItemDamage() != stack.getItemDamage())
{
itemsList.remove(item);

8
src/minecraft/assemblyline/common/machine/command/CommandFire.java
View file

@ -70,13 +70,13 @@ public class CommandFire extends Command
if (held instanceof EntityItem)
{
EntityItem item = (EntityItem) held;
ItemStack stack = item.func_92014_d();
ItemStack stack = item.getEntityItem();
ItemStack thrown = stack.copy();
thrown.stackSize = 1;
if (item.func_92014_d().stackSize > 0)
if (item.getEntityItem().stackSize > 0)
{
stack.stackSize--;
item.func_92013_a(stack);
item.func_92058_a(stack);
}
else
{
@ -84,7 +84,7 @@ public class CommandFire extends Command
if (!this.world.isRemote)
this.world.removeEntity(held);
}
if (item.func_92014_d().itemID == Item.arrow.itemID)
if (item.getEntityItem().itemID == Item.arrow.itemID)
{
EntityArrow arrow = new EntityArrow(world, this.tileEntity.getHandPosition().x, this.tileEntity.getHandPosition().y, this.tileEntity.getHandPosition().z);
arrow.motionX = this.finalVelocity.x;

2
src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java
View file

@ -38,7 +38,7 @@ public class TileEntityDetector extends TileEntityFilterable
for (int i = 0; i < entities.size(); i++)
{
EntityItem e = (EntityItem) entities.get(i);
ItemStack itemStack = e.func_92014_d();
ItemStack itemStack = e.getEntityItem();
powerCheck = this.isFiltering(itemStack);
}

2
src/minecraft/assemblyline/common/machine/imprinter/TileEntityImprinter.java
View file

@ -434,7 +434,7 @@ public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInv
{
if (heldEntity instanceof EntityItem)
{
ItemStack stack = ((EntityItem) heldEntity).func_92014_d();
ItemStack stack = ((EntityItem) heldEntity).getEntityItem();
if (this.getStackInSlot(3) == null && stack != null && stack.itemID == AssemblyLine.itemImprint.itemID) // no
// crafting
// imprint

19
src/minecraft/assemblyline/common/machine/quarry/BlockCraneParts.java Normal file
View file

@ -0,0 +1,19 @@
package assemblyline.common.machine.quarry;
import assemblyline.common.TabAssemblyLine;
import universalelectricity.prefab.BlockMachine;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class BlockCraneParts extends BlockMachine
{
public static final int RAIL_META = 0;
public BlockCraneParts(int id)
{
super("CraneParts", id, Material.iron, TabAssemblyLine.INSTANCE);
}
}

14
src/minecraft/assemblyline/common/machine/quarry/ItemCraneParts.java Normal file
View file

@ -0,0 +1,14 @@
package assemblyline.common.machine.quarry;
import net.minecraft.item.ItemBlock;
public class ItemCraneParts extends ItemBlock
{
public ItemCraneParts(int par1)
{
super(par1);
this.setHasSubtypes(true);
}
}

2
src/minecraft/universalelectricity/prefab/BlockMachine.java
View file

@ -205,7 +205,7 @@ public abstract class BlockMachine extends BlockContainer implements ISneakUseWr
if (var7.hasTagCompound())
{
var12.func_92014_d().setTagCompound((NBTTagCompound) var7.getTagCompound().copy());
var12.getEntityItem().setTagCompound((NBTTagCompound) var7.getTagCompound().copy());
}
float var13 = 0.05F;