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

Removed handling of reusable items in autocrafting, to avoid problems. Fixes #1993

Browse Source
This commit is contained in:
raoulvdberge
2018-09-19 18:21:13 +02:00
parent 26b431d76c
commit 02b6d03c8b
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@
- Added a config option to configure the autocrafting calculation timeout in milliseconds (raoulvdberge) - Added a config option to configure the autocrafting calculation timeout in milliseconds (raoulvdberge)
- Fixed an autocrafting bug where it crashed when external inventories couldn't be filled (raoulvdberge) - Fixed an autocrafting bug where it crashed when external inventories couldn't be filled (raoulvdberge)
- Fixed a duplication bug with a disconnected Crafting Grid (raoulvdberge) - Fixed a duplication bug with a disconnected Crafting Grid (raoulvdberge)
- Removed handling of reusable items in autocrafting, to avoid problems (raoulvdberge)
### 1.6.5 ### 1.6.5
- Fixed Refined Storage silicon's oredict entry being registered too late (raoulvdberge) - Fixed Refined Storage silicon's oredict entry being registered too late (raoulvdberge)

34
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
View File

@@ -58,6 +58,8 @@ public class CraftingTask implements ICraftingTask {
private static final String NBT_PATTERN_STACK = "Stack"; private static final String NBT_PATTERN_STACK = "Stack";
private static final String NBT_PATTERN_CONTAINER_POS = "ContainerPos"; private static final String NBT_PATTERN_CONTAINER_POS = "ContainerPos";
private static final int DEFAULT_EXTRACT_FLAGS = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private INetwork network; private INetwork network;
@@ -329,10 +331,8 @@ public class CraftingTask implements ICraftingTask {
took.add(possibleInput); took.add(possibleInput);
int flags = getFlags(possibleInput); ItemStack fromSelf = results.get(possibleInput, DEFAULT_EXTRACT_FLAGS);
ItemStack fromNetwork = mutatedStorage.get(possibleInput, DEFAULT_EXTRACT_FLAGS);
ItemStack fromSelf = results.get(possibleInput, flags);
ItemStack fromNetwork = mutatedStorage.get(possibleInput, flags);
int remaining = possibleInput.getCount(); int remaining = possibleInput.getCount();
@@ -348,7 +348,7 @@ public class CraftingTask implements ICraftingTask {
took.set(took.size() - 1, ItemHandlerHelper.copyStackWithSize(fromSelf, possibleInput.getCount())); took.set(took.size() - 1, ItemHandlerHelper.copyStackWithSize(fromSelf, possibleInput.getCount()));
fromSelf = results.get(possibleInput, flags); fromSelf = results.get(possibleInput, DEFAULT_EXTRACT_FLAGS);
} else if (fromNetwork != null) { } else if (fromNetwork != null) {
int toTake = Math.min(remaining, fromNetwork.getCount()); int toTake = Math.min(remaining, fromNetwork.getCount());
@@ -362,7 +362,7 @@ public class CraftingTask implements ICraftingTask {
took.set(took.size() - 1, ItemHandlerHelper.copyStackWithSize(fromNetwork, possibleInput.getCount())); took.set(took.size() - 1, ItemHandlerHelper.copyStackWithSize(fromNetwork, possibleInput.getCount()));
fromNetwork = mutatedStorage.get(possibleInput, flags); fromNetwork = mutatedStorage.get(possibleInput, DEFAULT_EXTRACT_FLAGS);
toExtractInitial.add(took.get(took.size() - 1)); toExtractInitial.add(took.get(took.size() - 1));
} else { } else {
@@ -378,12 +378,12 @@ public class CraftingTask implements ICraftingTask {
return result; return result;
} }
fromSelf = results.get(possibleInput, flags); fromSelf = results.get(possibleInput, DEFAULT_EXTRACT_FLAGS);
if (fromSelf == null) { if (fromSelf == null) {
throw new IllegalStateException("Recursive calculation didn't yield anything"); throw new IllegalStateException("Recursive calculation didn't yield anything");
} }
fromNetwork = mutatedStorage.get(possibleInput, flags); fromNetwork = mutatedStorage.get(possibleInput, DEFAULT_EXTRACT_FLAGS);
subPatternChain.cycle(); subPatternChain.cycle();
} }
@@ -526,7 +526,7 @@ public class CraftingTask implements ICraftingTask {
List<ItemStack> toRemove = new ArrayList<>(); List<ItemStack> toRemove = new ArrayList<>();
for (ItemStack toExtract : toExtractInitial.getStacks()) { for (ItemStack toExtract : toExtractInitial.getStacks()) {
ItemStack result = network.extractItem(toExtract, toExtract.getCount(), getFlags(toExtract), Action.PERFORM); ItemStack result = network.extractItem(toExtract, toExtract.getCount(), DEFAULT_EXTRACT_FLAGS, Action.PERFORM);
if (result != null) { if (result != null) {
internalStorage.insert(toExtract, toExtract.getCount(), Action.PERFORM); internalStorage.insert(toExtract, toExtract.getCount(), Action.PERFORM);
@@ -577,7 +577,7 @@ public class CraftingTask implements ICraftingTask {
boolean hasAll = true; boolean hasAll = true;
for (ItemStack need : c.getToExtract().getStacks()) { for (ItemStack need : c.getToExtract().getStacks()) {
ItemStack result = this.internalStorage.extract(need, need.getCount(), getFlags(need), Action.SIMULATE); ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.SIMULATE);
if (result == null || result.getCount() != need.getCount()) { if (result == null || result.getCount() != need.getCount()) {
hasAll = false; hasAll = false;
@@ -588,7 +588,7 @@ public class CraftingTask implements ICraftingTask {
if (hasAll) { if (hasAll) {
for (ItemStack need : c.getToExtract().getStacks()) { for (ItemStack need : c.getToExtract().getStacks()) {
ItemStack result = this.internalStorage.extract(need, need.getCount(), getFlags(need), Action.PERFORM); ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.PERFORM);
if (result == null || result.getCount() != need.getCount()) { if (result == null || result.getCount() != need.getCount()) {
throw new IllegalStateException("Extractor check lied"); throw new IllegalStateException("Extractor check lied");
@@ -653,7 +653,7 @@ public class CraftingTask implements ICraftingTask {
if (p.getPattern().getContainer().getConnectedInventory() == null) { if (p.getPattern().getContainer().getConnectedInventory() == null) {
p.setState(ProcessingState.MACHINE_NONE); p.setState(ProcessingState.MACHINE_NONE);
} else { } else {
ItemStack result = this.internalStorage.extract(need, need.getCount(), getFlags(need), Action.SIMULATE); ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.SIMULATE);
if (result == null || result.getCount() != need.getCount()) { if (result == null || result.getCount() != need.getCount()) {
hasAll = false; hasAll = false;
@@ -695,7 +695,7 @@ public class CraftingTask implements ICraftingTask {
for (int i = 0; i < p.getItemsToPut().size(); ++i) { for (int i = 0; i < p.getItemsToPut().size(); ++i) {
ItemStack need = p.getItemsToPut().get(i); ItemStack need = p.getItemsToPut().get(i);
ItemStack result = this.internalStorage.extract(need, need.getCount(), getFlags(need), Action.PERFORM); ItemStack result = this.internalStorage.extract(need, need.getCount(), DEFAULT_EXTRACT_FLAGS, Action.PERFORM);
if (result == null || result.getCount() != need.getCount()) { if (result == null || result.getCount() != need.getCount()) {
throw new IllegalStateException("The internal crafting inventory reported that " + need + " was available but we got " + result); throw new IllegalStateException("The internal crafting inventory reported that " + need + " was available but we got " + result);
} }
@@ -847,14 +847,6 @@ public class CraftingTask implements ICraftingTask {
return qty; return qty;
} }
private static int getFlags(ItemStack stack) {
if (stack.getItem().isDamageable()) {
return IComparer.COMPARE_NBT;
}
return IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
}
@Override @Override
public ICraftingRequestInfo getRequested() { public ICraftingRequestInfo getRequested() {
return requested; return requested;