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

"Craft if needed" upgrade

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-05 10:32:08 +02:00
parent f5376c657c
commit ad173f2229
11 changed files with 83 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -6,7 +6,7 @@ WIP
**TODO**
- Saving crafting task state
- Cancelling crafting tasks
- "Craft if needed" upgrade on exporter, constructor and interface
- "Craft if needed" upgrade on constructor and interface
- Textures
- Update wiki

2
src/main/java/refinedstorage/container/ContainerExporter.java
View File

@@ -21,7 +21,7 @@ public class ContainerExporter extends ContainerBase {
addSlotToContainer(new SlotFiltered(exporter.getUpgradesInventory(), i, 187, 6 + (i * 18), new IItemValidator() {
@Override
public boolean isValid(ItemStack stack) {
return stack.getItem() == RefinedStorageItems.UPGRADE && stack.getMetadata() == ItemUpgrade.TYPE_SPEED;
return stack.getItem() == RefinedStorageItems.UPGRADE && (stack.getMetadata() == ItemUpgrade.TYPE_SPEED || stack.getMetadata() == ItemUpgrade.TYPE_CRAFTING);
}
}));
}

3
src/main/java/refinedstorage/item/ItemUpgrade.java
View File

@@ -9,6 +9,7 @@ import java.util.List;
public class ItemUpgrade extends ItemBase {
public static final int TYPE_RANGE = 1;
public static final int TYPE_SPEED = 2;
public static final int TYPE_CRAFTING = 3;
public ItemUpgrade() {
super("upgrade");
@@ -20,7 +21,7 @@ public class ItemUpgrade extends ItemBase {
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i <= 2; ++i) {
for (int i = 0; i <= 3; ++i) {
list.add(new ItemStack(item, 1, i));
}
}

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

@@ -260,6 +260,16 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
craftingTasksToAdd.add(task);
}
public boolean hasCraftingTaskWithPattern(CraftingPattern pattern, int flags) {
for (int i = 0; i < craftingTasks.size(); ++i) {
if (craftingTasks.get(i).getPattern().comparePattern(pattern, flags)) {
return true;
}
}
return false;
}
public void addCraftingTaskForPattern(CraftingPattern pattern) {
if (pattern.isProcessing()) {
addCraftingTask(new ProcessingCraftingTask(pattern));
@@ -273,9 +283,13 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
}
public CraftingPattern getPatternForItem(ItemStack stack) {
return getPatternForItem(stack, InventoryUtils.COMPARE_DAMAGE | InventoryUtils.COMPARE_NBT);
}
public CraftingPattern getPatternForItem(ItemStack stack, int flags) {
for (CraftingPattern pattern : getPatterns()) {
for (ItemStack output : pattern.getOutputs()) {
if (InventoryUtils.compareStackNoQuantity(output, stack)) {
if (InventoryUtils.compareStack(output, stack, flags)) {
return pattern;
}
}

7
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -9,6 +9,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityHopper;
import refinedstorage.container.ContainerExporter;
import refinedstorage.inventory.InventorySimple;
import refinedstorage.tile.autocrafting.CraftingPattern;
import refinedstorage.tile.config.ICompareConfig;
import refinedstorage.util.InventoryUtils;
@@ -48,6 +49,12 @@ public class TileExporter extends TileMachine implements ICompareConfig {
if (remaining != null) {
controller.push(remaining);
}
} else if (TileInterface.hasCrafting(upgradesInventory)) {
CraftingPattern pattern = controller.getPatternForItem(slot, compare);
if (pattern != null && !controller.hasCraftingTaskWithPattern(pattern, compare)) {
controller.addCraftingTaskForPattern(pattern);
}
}
}
}

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

@@ -11,6 +11,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.text.ITextComponent;
import refinedstorage.container.ContainerInterface;
import refinedstorage.inventory.InventorySimple;
import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.config.ICompareConfig;
import refinedstorage.util.InventoryUtils;
@@ -40,7 +41,7 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided
int upgrades = 0;
for (int i = 0; i < upgradesInventory.getSizeInventory(); ++i) {
if (upgradesInventory.getStackInSlot(i) != null) {
if (upgradesInventory.getStackInSlot(i) != null && upgradesInventory.getStackInSlot(i).getMetadata() == ItemUpgrade.TYPE_SPEED) {
upgrades++;
}
}
@@ -48,6 +49,16 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided
return 9 - (upgrades * 2);
}
public static boolean hasCrafting(InventorySimple upgradesInventory) {
for (int i = 0; i < upgradesInventory.getSizeInventory(); ++i) {
if (upgradesInventory.getStackInSlot(i) != null && upgradesInventory.getStackInSlot(i).getMetadata() == ItemUpgrade.TYPE_CRAFTING) {
return true;
}
}
return false;
}
@Override
public void updateMachine() {
if (currentSlot > 8) {
@@ -93,6 +104,7 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided
int needed = got == null ? wanted.stackSize : wanted.stackSize - got.stackSize;
if (needed > 0) {
ItemStack goingToTake = wanted.copy();
goingToTake.stackSize = needed;
@@ -106,6 +118,7 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided
}
}
}
}
} else if (got != null) {
if (controller.push(got)) {
inventory.setInventorySlotContents(i + 9, null);

2
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -49,7 +49,7 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven
} else if (newRecipe != recipe) {
boolean isSameItem = inventory.getStackInSlot(3) != null ? InventoryUtils.compareStackNoQuantity(inventory.getStackInSlot(3), newRecipe.getResult()) : false;
if (inventory.getStackInSlot(3) == null || (isSameItem && ((inventory.getStackInSlot(3).stackSize + newRecipe.getResult().stackSize) < inventory.getStackInSlot(3).getMaxStackSize()))) {
if (inventory.getStackInSlot(3) == null || (isSameItem && ((inventory.getStackInSlot(3).stackSize + newRecipe.getResult().stackSize) <= inventory.getStackInSlot(3).getMaxStackSize()))) {
recipe = newRecipe;
progress = 0;
working = true;

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

@@ -1,6 +1,7 @@
package refinedstorage.tile.autocrafting;
import net.minecraft.item.ItemStack;
import refinedstorage.util.InventoryUtils;
public class CraftingPattern {
private TileCrafter crafter;
@@ -30,4 +31,31 @@ public class CraftingPattern {
public ItemStack[] getOutputs() {
return outputs;
}
public boolean comparePattern(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().getPos().equals(crafter.getPos())) {
return false;
}
for (int i = 0; i < inputs.length; ++i) {
if (!InventoryUtils.compareStack(inputs[i], otherPattern.getInputs()[i], flags)) {
return false;
}
}
for (int i = 0; i < outputs.length; ++i) {
if (!InventoryUtils.compareStack(outputs[i], otherPattern.getOutputs()[i], flags)) {
return false;
}
}
return true;
}
}

3
src/main/java/refinedstorage/tile/solderer/SoldererRecipeUpgrade.java
View File

@@ -1,5 +1,6 @@
package refinedstorage.tile.solderer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import refinedstorage.RefinedStorageItems;
@@ -30,7 +31,7 @@ public class SoldererRecipeUpgrade implements ISoldererRecipe {
case ItemUpgrade.TYPE_RANGE:
return new ItemStack(Items.ender_pearl);
case ItemUpgrade.TYPE_SPEED:
return new ItemStack(Items.redstone);
return new ItemStack(Blocks.redstone_block);
}
return null;

1
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

@@ -132,3 +132,4 @@ item.refinedstorage:pattern.name=Pattern
item.refinedstorage:upgrade.0.name=Upgrade
item.refinedstorage:upgrade.1.name=Range Upgrade
item.refinedstorage:upgrade.2.name=Speed Upgrade
item.refinedstorage:upgrade.3.name=Crafting Upgrade

1
src/main/resources/assets/refinedstorage/lang/nl_NL.lang
View File

@@ -132,3 +132,4 @@ item.refinedstorage:pattern.name=Patroon
item.refinedstorage:upgrade.0.name=Upgrade
item.refinedstorage:upgrade.1.name=Afstand Upgrade
item.refinedstorage:upgrade.2.name=Snelheid Upgrade
item.refinedstorage:upgrade.3.name=Crafting Upgrade