dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue #43

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-14 23:31:17 +02:00
parent 010bdbb232
commit ea192d9f93
2 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java
View File

@@ -6,7 +6,6 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.item.ItemPattern;
public class CraftingPattern {
@@ -52,33 +51,6 @@ public class CraftingPattern {
return outputs;
}
public boolean comparePattern(World world, CraftingPattern otherPattern, int flags) {
if (otherPattern == this) {
return true;
}
if (otherPattern.getInputs().length != inputs.length ||
otherPattern.getOutputs().length != outputs.length ||
otherPattern.isProcessing() != processing ||
!otherPattern.getCrafter(world).getPos().equals(getCrafter(world).getPos())) {
return false;
}
for (int i = 0; i < inputs.length; ++i) {
if (!RefinedStorageUtils.compareStack(inputs[i], otherPattern.getInputs()[i], flags)) {
return false;
}
}
for (int i = 0; i < outputs.length; ++i) {
if (!RefinedStorageUtils.compareStack(outputs[i], otherPattern.getOutputs()[i], flags)) {
return false;
}
}
return true;
}
public void writeToNBT(NBTTagCompound tag) {
tag.setBoolean(ItemPattern.NBT_PROCESSING, processing);

20
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -119,14 +119,20 @@ public class TileGrid extends TileMachine implements IGrid {
public void onCrafted(ContainerGrid container) {
if (!worldObj.isRemote) {
for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) {
ItemStack slot = craftingInventory.getStackInSlot(i);
ItemStack[] remainder = CraftingManager.getInstance().func_180303_b(craftingInventory, worldObj);
if (slot != null) {
if (slot.stackSize == 1 && isConnected()) {
craftingInventory.setInventorySlotContents(i, controller.take(slot.copy()));
} else {
craftingInventory.decrStackSize(i, 1);
for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) {
if (remainder[i] != null) {
craftingInventory.setInventorySlotContents(i, remainder[i].copy());
} else {
ItemStack slot = craftingInventory.getStackInSlot(i);
if (slot != null) {
if (slot.stackSize == 1 && isConnected()) {
craftingInventory.setInventorySlotContents(i, controller.take(slot.copy()));
} else {
craftingInventory.decrStackSize(i, 1);
}
}
}
}