diff --git a/CHANGELOG.md b/CHANGELOG.md index fcd6f1956..32adab785 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ WIP **TODO** - Fix wrong quantity per craft -- New scheduling system in interface too - Textures - Update wiki diff --git a/src/main/java/refinedstorage/container/ContainerInterface.java b/src/main/java/refinedstorage/container/ContainerInterface.java index 7960cafea..7e65420a1 100755 --- a/src/main/java/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/refinedstorage/container/ContainerInterface.java @@ -3,7 +3,10 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; 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.tile.TileInterface; @@ -24,7 +27,7 @@ public class ContainerInterface extends ContainerBase { } 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); diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index 7ecbf1821..544987d49 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -12,8 +12,6 @@ import net.minecraft.util.text.ITextComponent; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerInterface; import refinedstorage.inventory.InventorySimple; -import refinedstorage.item.ItemUpgrade; -import refinedstorage.tile.autocrafting.CraftingPattern; import refinedstorage.tile.config.ICompareConfig; public class TileInterface extends TileMachine implements ICompareConfig, ISidedInventory { @@ -96,18 +94,6 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided 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) {