Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-09-19 03:21:21 +02:00
Code Issues Projects Releases Wiki Activity

Improve AutoCrafter-Ejection to use items not used for crafting

Browse Source 
I wrote some fallback code to eject an item used for crafting (use the ingredient and then eject) but it looks like it is not playing nice with the cachedInventory, so it is commented out.
Looks like the old ejection did have the same problems as mine but I don't use Streams in mine witch may have quit an over-head in this case.
This commit is contained in:
Christian Koop 2020-04-17 19:49:20 +02:00 committed by Brianna
parent c65ac98f71
commit 0afc6dc38e
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java
View File

@ -20,7 +20,6 @@ import org.bukkit.inventory.meta.ItemMeta;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
public class ModuleAutoCrafting extends Module {
@ -90,24 +89,50 @@ public class ModuleAutoCrafting extends Module {
boolean freeSlotAfterRemovingIngredients =
slotsToAlter.values().stream().anyMatch(iAmount -> iAmount <= 0) ||
Arrays.stream(items).anyMatch(Objects::isNull);
Arrays.stream(items).anyMatch(item -> item == null ||
(item.getAmount() + recipe.result.getAmount() <= item.getMaxStackSize() &&
recipe.result.isSimilar(item)));
// jam check: is this hopper gummed up?
if (crafterEjection && !freeSlotAfterRemovingIngredients) {
// TODO: Recode. Why specifically eject ingredients (allMaterials).
// And why not eject when we checked crafting is possible
final List<Material> allMaterials = getRecipes(toCraft).getPossibleIngredientTypes();
if (Stream.of(hopperCache.cachedInventory)
.allMatch(item -> item != null && allMaterials.stream().anyMatch(mat -> mat == item.getType()))) {
// Crafter can't function if there's nowhere to put the output
// ¯\_(ツ)_/¯
// forcibly open the last slot
ItemStack last = items[4];
items[4] = null;
freeSlotAfterRemovingIngredients = true;
// and yeet into space!
hopper.getWorld().dropItemNaturally(hopper.getLocation(), last);
// Crafter can't function if there's nowhere to put the output
// ¯\_(ツ)_/¯
for (int i = 0; i < items.length; i++) {
if (!slotsToAlter.containsKey(i)) {
// and yeet into space!
hopper.getWorld().dropItemNaturally(hopper.getLocation(), items[i]);
items[i] = null;
freeSlotAfterRemovingIngredients = true;
break;
}
}
// FIXME: In theory the code below should work. But if the last item is of the same type as the
// resulting item, the inventory won't update correctly
// (item is set correctly but reset to MaxStackSize)
// (CachedInventory doesn't like it's array to be edited?)
/*
// None of the slots can safely be freed. So we drop some leftover ingredients
if (!freeSlotAfterRemovingIngredients) {
int slot = items.length - 1; // Last slot
slotsToAlter.computeIfPresent(slot, (key, value) -> {
items[slot].setAmount(value);
return null;
});
// and yeet into space!
items[slot].setAmount(slotsToAlter.getOrDefault(slot, items[slot].getAmount()));
hopper.getWorld().dropItemNaturally(hopper.getLocation(), items[slot]);
items[slot] = null;
freeSlotAfterRemovingIngredients = true;
}
*/
}
if (freeSlotAfterRemovingIngredients) {