maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some things

Browse source
This commit is contained in:
modmuss50 2015-05-16 21:30:20 +01:00
parent d68c63a40d
commit 44a21fd13d
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/techreborn/api/recipe/RecipeCrafter.java
View file

@ -4,6 +4,9 @@ import ic2.api.energy.prefab.BasicSink;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import techreborn.packets.PacketHandler;
import techreborn.tiles.TileMachineBase;
import techreborn.util.Inventory;
import techreborn.util.ItemUtils;
@ -124,11 +127,7 @@ public class RecipeCrafter {
filledSlots.add(outputSlots[i]);
}
}
for (int i = 0; i < inputs; i++) {
if (!filledSlots.contains(inputSlots[i])) {
inventory.decrStackSize(inputSlots[i], currentRecipe.getInputs().get(i).stackSize);
}
}
useAllInputs();
currentRecipe = null;
currentTickTime = 0;
parentTile.syncWithAll();
@ -178,6 +177,19 @@ public class RecipeCrafter {
return true;
}
public void useAllInputs(){
if(currentRecipe == null){
return;
}
for(ItemStack input : currentRecipe.getInputs()){
for(int inputSlot : inputSlots){
if(ItemUtils.isItemEqual(input, inventory.getStackInSlot(inputSlot), true, true, true)){
inventory.decrStackSize(inputSlot, input.stackSize);
}
}
}
}
public boolean canFitStack(ItemStack stack, int slot) {
if (stack == null) {
return true;
@ -194,10 +206,6 @@ public class RecipeCrafter {
}
public void fitStack(ItemStack stack, int slot) {
//Don't do this on the client.
if (parentTile.getWorldObj().isRemote) {
return;
}
if (stack == null) {
return;
}