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

Assembly Line 0.2.0 Release

Browse source
This commit is contained in:
Henry Mao 2012-12-29 17:50:53 +08:00
parent 0d553f03ed
commit 07d7759e8f
4 changed files with 48 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildnumber.txt
View file

@ -1 +1 @@
37
38

70
info.txt
View file

@ -1,34 +1,36 @@
@ AssemblyLine_v0.0.6.1.jar
@ AssemblyLine_v0.0.6.2.jar
@ AssemblyLine_v0.0.6.3.jar
* AssemblyLine_v0.0.6.5.jar
@ AssemblyLine_v0.0.6.6.jar
@ AssemblyLine_v0.0.6.7.jar
@ AssemblyLine_v0.0.6.8.jar AssemblyLine_v0.0.6.8_api.zip
@ AssemblyLine_v0.0.6.10.jar AssemblyLine_v0.0.6.10_api.zip
Minecraft 1.3.2
* AssemblyLine_v0.1.2.10.jar AssemblyLine_v0.1.2.10_api.zip
Minecraft 1.4.2
@ AssemblyLine_v0.1.3.11.jar AssemblyLine_v0.1.3.11_api.zip
* AssemblyLine_v0.1.3.13.jar AssemblyLine_v0.1.3.13_api.zip
* AssemblyLine_v0.1.4.14.jar AssemblyLine_v0.1.4.14_api.zip
* AssemblyLine_v0.1.5.18.jar AssemblyLine_v0.1.5.18_api.zip
@ AssemblyLine_v0.1.6.19.jar AssemblyLine_v0.1.6.19_api.zip
@ AssemblyLine_v0.1.6.20.jar AssemblyLine_v0.1.6.20_api.zip
@ AssemblyLine_v0.1.6.21.jar AssemblyLine_v0.1.6.21_api.zip
x AssemblyLine_v0.1.6.22.jar AssemblyLine_v0.1.6.22_api.zip
x AssemblyLine_v0.1.6.23.jar AssemblyLine_v0.1.6.23_api.zip
* AssemblyLine_v0.1.6.24.jar AssemblyLine_v0.1.6.24_api.zip
@ AssemblyLine_v0.1.7.25.jar AssemblyLine_v0.1.7.25_api.zip
* AssemblyLine_v0.1.7.26.jar AssemblyLine_v0.1.7.26_api.zip
* AssemblyLine_v0.1.7.27.jar AssemblyLine_v0.1.7.27_api.zip
Minecraft 1.4.5
@ AssemblyLine_v0.1.8.28.jar AssemblyLine_v0.1.8.28_api.zip
@ AssemblyLine_v0.1.8.29.jar AssemblyLine_v0.1.8.29_api.zip
* AssemblyLine_v0.1.8.30.jar AssemblyLine_v0.1.8.30_api.zip
@ AssemblyLine_v0.1.8.31.jar AssemblyLine_v0.1.8.31_api.zip
@ AssemblyLine_v0.1.9.32.jar AssemblyLine_v0.1.9.32_api.zip
@ AssemblyLine_v0.1.9.33.jar AssemblyLine_v0.1.9.33_api.zip
@ AssemblyLine_v0.1.9.34.jar AssemblyLine_v0.1.9.34_api.zip
* AssemblyLine_v0.1.9.35.jar AssemblyLine_v0.1.9.35_api.zip
@ AssemblyLine_v0.1.9.36.jar AssemblyLine_v0.1.9.36_api.zip
@ AssemblyLine_v0.0.6.1.jar
@ AssemblyLine_v0.0.6.2.jar
@ AssemblyLine_v0.0.6.3.jar
* AssemblyLine_v0.0.6.5.jar
@ AssemblyLine_v0.0.6.6.jar
@ AssemblyLine_v0.0.6.7.jar
@ AssemblyLine_v0.0.6.8.jar AssemblyLine_v0.0.6.8_api.zip
@ AssemblyLine_v0.0.6.10.jar AssemblyLine_v0.0.6.10_api.zip
Minecraft 1.3.2
* AssemblyLine_v0.1.2.10.jar AssemblyLine_v0.1.2.10_api.zip
Minecraft 1.4.2
@ AssemblyLine_v0.1.3.11.jar AssemblyLine_v0.1.3.11_api.zip
* AssemblyLine_v0.1.3.13.jar AssemblyLine_v0.1.3.13_api.zip
* AssemblyLine_v0.1.4.14.jar AssemblyLine_v0.1.4.14_api.zip
* AssemblyLine_v0.1.5.18.jar AssemblyLine_v0.1.5.18_api.zip
@ AssemblyLine_v0.1.6.19.jar AssemblyLine_v0.1.6.19_api.zip
@ AssemblyLine_v0.1.6.20.jar AssemblyLine_v0.1.6.20_api.zip
@ AssemblyLine_v0.1.6.21.jar AssemblyLine_v0.1.6.21_api.zip
x AssemblyLine_v0.1.6.22.jar AssemblyLine_v0.1.6.22_api.zip
x AssemblyLine_v0.1.6.23.jar AssemblyLine_v0.1.6.23_api.zip
* AssemblyLine_v0.1.6.24.jar AssemblyLine_v0.1.6.24_api.zip
@ AssemblyLine_v0.1.7.25.jar AssemblyLine_v0.1.7.25_api.zip
* AssemblyLine_v0.1.7.26.jar AssemblyLine_v0.1.7.26_api.zip
* AssemblyLine_v0.1.7.27.jar AssemblyLine_v0.1.7.27_api.zip
Minecraft 1.4.5
@ AssemblyLine_v0.1.8.28.jar AssemblyLine_v0.1.8.28_api.zip
@ AssemblyLine_v0.1.8.29.jar AssemblyLine_v0.1.8.29_api.zip
* AssemblyLine_v0.1.8.30.jar AssemblyLine_v0.1.8.30_api.zip
@ AssemblyLine_v0.1.8.31.jar AssemblyLine_v0.1.8.31_api.zip
@ AssemblyLine_v0.1.9.32.jar AssemblyLine_v0.1.9.32_api.zip
@ AssemblyLine_v0.1.9.33.jar AssemblyLine_v0.1.9.33_api.zip
@ AssemblyLine_v0.1.9.34.jar AssemblyLine_v0.1.9.34_api.zip
* AssemblyLine_v0.1.9.35.jar AssemblyLine_v0.1.9.35_api.zip
@ AssemblyLine_v0.1.9.36.jar AssemblyLine_v0.1.9.36_api.zip
@ AssemblyLine_v0.2.0.38.jar AssemblyLine_v0.2.0.38_api.zip
* AssemblyLine_v0.2.0.38.jar AssemblyLine_v0.2.0.38_api.zip

2
recommendedversion.txt
View file

@ -1 +1 @@
0.1.9
0.2.0

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

@ -125,7 +125,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
*/
ItemStack remainingStack = entity.func_92014_d().copy();
if (!this.isFiltering(remainingStack))
if (this.getFilter() == null || this.isFiltering(remainingStack))
{
remainingStack = this.tryPlaceInPosition(remainingStack, outputUp, ForgeDirection.DOWN);
@ -390,6 +390,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
for (int i = startIndex; i < startIndex + inventory.getSizeInventorySide(direction); i++)
{
ItemStack itemStack = this.removeStackFromInventory(i, inventory);
if (itemStack != null)
{
returnStack = itemStack;
@ -413,8 +414,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
}
}
if (!this.isFiltering(returnStack)) { return returnStack; }
return null;
return returnStack;
}
public ItemStack removeStackFromInventory(int slotIndex, IInventory inventory)
@ -422,9 +422,13 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
if (inventory.getStackInSlot(slotIndex) != null)
{
ItemStack itemStack = inventory.getStackInSlot(slotIndex).copy();
itemStack.stackSize = 1;
inventory.decrStackSize(slotIndex, 1);
return itemStack;
if (this.getFilter() == null || this.isFiltering(itemStack))
{
itemStack.stackSize = 1;
inventory.decrStackSize(slotIndex, 1);
return itemStack;
}
}
return null;