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

Processing fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-04 19:32:38 +02:00
parent 16a2e3fc53
commit d181d6f75e
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/gui/GuiCraftingSettings.java
View File

@@ -50,7 +50,7 @@ public class GuiCraftingSettings extends GuiBase {
@Override
public void drawForeground(int mouseX, int mouseY) {
drawString(53, 7, t("container.crafting"));
drawString((width - fontRendererObj.getStringWidth(t("container.crafting"))) / 2, 8, t("container.crafting"));
}
@Override

11
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -348,10 +348,13 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
syncItems();
for (ICraftingTask task : craftingTasks) {
if (task instanceof ProcessingCraftingTask) {
if (((ProcessingCraftingTask) task).onInserted(stack)) {
break;
// processing tasks accept 1-per
for (int i = 0; i < stack.stackSize; ++i) {
for (ICraftingTask task : craftingTasks) {
if (task instanceof ProcessingCraftingTask) {
if (((ProcessingCraftingTask) task).onInserted(stack)) {
break;
}
}
}
}

18
src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java
View File

@@ -27,16 +27,16 @@ public class ProcessingCraftingTask implements ICraftingTask {
@Override
public boolean update(TileController controller) {
for (int i = 0; i < inserted.length; ++i) {
if (!inserted[i]) {
ItemStack input = pattern.getInputs()[i];
ItemStack took = controller.take(input);
TileCrafter crafter = pattern.getCrafter();
TileEntity crafterFacing = crafter.getWorld().getTileEntity(crafter.getPos().offset(crafter.getDirection()));
if (took != null) {
TileCrafter crafter = pattern.getCrafter();
TileEntity crafterFacing = crafter.getWorld().getTileEntity(crafter.getPos().offset(crafter.getDirection()));
if (crafterFacing instanceof IInventory) {
for (int i = 0; i < inserted.length; ++i) {
if (!inserted[i]) {
ItemStack input = pattern.getInputs()[i];
ItemStack took = controller.take(input);
if (crafterFacing instanceof IInventory) {
if (took != null) {
ItemStack remaining = TileEntityHopper.putStackInInventoryAllSlots((IInventory) crafterFacing, took, crafter.getDirection().getOpposite());
if (remaining == null) {
@@ -60,7 +60,7 @@ public class ProcessingCraftingTask implements ICraftingTask {
public boolean onInserted(ItemStack inserted) {
for (int i = 0; i < pattern.getOutputs().length; ++i) {
if (!satisfied[i] && InventoryUtils.compareStack(inserted, pattern.getOutputs()[i])) {
if (!satisfied[i] && InventoryUtils.compareStackNoQuantity(inserted, pattern.getOutputs()[i])) {
satisfied[i] = true;
return true;