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

Remove crafting schedule from interface

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-09 19:03:37 +02:00
parent 7dcb77eabc
commit 012a2c19dd
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,7 +5,6 @@ WIP
**TODO** **TODO**
- Fix wrong quantity per craft - Fix wrong quantity per craft
- New scheduling system in interface too
- Textures - Textures
- Update wiki - Update wiki

7
src/main/java/refinedstorage/container/ContainerInterface.java
View File

@@ -3,7 +3,10 @@ package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import refinedstorage.container.slot.*; import refinedstorage.container.slot.SlotFiltered;
import refinedstorage.container.slot.SlotOutput;
import refinedstorage.container.slot.SlotSpecimen;
import refinedstorage.container.slot.UpgradeItemValidator;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.TileInterface; import refinedstorage.tile.TileInterface;
@@ -24,7 +27,7 @@ public class ContainerInterface extends ContainerBase {
} }
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotFiltered(tile.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING))); addSlotToContainer(new SlotFiltered(tile.getUpgradesInventory(), i, 187, 6 + (i * 18), new UpgradeItemValidator(ItemUpgrade.TYPE_SPEED)));
} }
addPlayerInventory(8, 134); addPlayerInventory(8, 134);

14
src/main/java/refinedstorage/tile/TileInterface.java
View File

@@ -12,8 +12,6 @@ import net.minecraft.util.text.ITextComponent;
import refinedstorage.RefinedStorageUtils; import refinedstorage.RefinedStorageUtils;
import refinedstorage.container.ContainerInterface; import refinedstorage.container.ContainerInterface;
import refinedstorage.inventory.InventorySimple; import refinedstorage.inventory.InventorySimple;
import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.autocrafting.CraftingPattern;
import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.ICompareConfig;
public class TileInterface extends TileMachine implements ICompareConfig, ISidedInventory { public class TileInterface extends TileMachine implements ICompareConfig, ISidedInventory {
@@ -96,18 +94,6 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided
got.stackSize += took.stackSize; got.stackSize += took.stackSize;
} }
} }
if (RefinedStorageUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) {
CraftingPattern pattern = controller.getPattern(wanted, compare);
if (pattern != null && (took == null || took.stackSize != needed)) {
int tasksToCreate = needed - controller.getCraftingTaskCount(pattern, compare);
for (int j = 0; j < tasksToCreate; ++j) {
controller.addCraftingTask(pattern);
}
}
}
} }
} }
} else if (got != null) { } else if (got != null) {