Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-11-23 02:35:18 +01:00
Code Issues Projects Releases Wiki Activity

Fix hacky fix of 2cf3c6

Browse Source 
Only modify inventory array when it's changes will be applied (The cachedInventory is not a deep clone and should not be modified as I did expect because of Player#getInventory()#getContents()
This commit is contained in:
Christian Koop 2020-04-17 16:35:06 +02:00 committed by Brianna
parent 58fa0cbe61
commit e77d89173f
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,30 +45,8 @@ public class ModuleAutoCrafting extends Module {
if (hopper == null || (toCraft = getAutoCrafting(hopper)) == null || toCraft.getType() == Material.AIR) if (hopper == null || (toCraft = getAutoCrafting(hopper)) == null || toCraft.getType() == Material.AIR)
return; return;
// jam check: is this hopper gummed up?
if (crafterEjection) {
// TODO: Recode. Why specifically eject ingredients (allMaterials).
// And why not eject when we checked crafting is possible
final List<Material> allMaterials = getRecipes(toCraft).getAllMaterials();
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 = hopperCache.cachedInventory[4];
hopperCache.setItem(4, null);
// and yeet into space!
hopper.getWorld().dropItemNaturally(hopper.getLocation(), last);
}
}
synchronized (hopperCache) { //TODO: Check if this is required synchronized (hopperCache) { //TODO: Check if this is required
ItemStack[] items = new ItemStack[hopperCache.cachedInventory.length]; ItemStack[] items = hopperCache.cachedInventory;
// TODO: Don't use that hacky workaround. Just don't modify it, if not meant to
for (int i = 0; i < hopperCache.cachedInventory.length; i++) {
items[i] = hopperCache.cachedInventory[i].clone();
}
for (SimpleRecipe recipe : getRecipes(toCraft).recipes) { for (SimpleRecipe recipe : getRecipes(toCraft).recipes) {
// key=indexForItemsArray, value=amountAfterCrafting // key=indexForItemsArray, value=amountAfterCrafting
@ -110,32 +88,52 @@ public class ModuleAutoCrafting extends Module {
// Not enough ingredients for this recipe // Not enough ingredients for this recipe
if (amount != 0) continue; if (amount != 0) continue;
for (Map.Entry<Integer, Integer> entry : slotsToAlter.entrySet()) { boolean freeSlotAfterRemovingIngredients =
if (entry.getValue() <= 0) { slotsToAlter.values().stream().anyMatch(iAmount -> iAmount <= 0) ||
items[entry.getKey()] = null; Arrays.stream(items).anyMatch(Objects::isNull);
} else {
items[entry.getKey()].setAmount(entry.getValue()); // 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).getAllMaterials();
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);
} }
} }
// Add the resulting item into the inventory - Just making sure there actually is enough space if (freeSlotAfterRemovingIngredients) {
boolean success = false; for (Map.Entry<Integer, Integer> entry : slotsToAlter.entrySet()) {
for (int i = 0; i < items.length; i++) { if (entry.getValue() <= 0) {
if (items[i] == null || items[entry.getKey()] = null;
(items[i].isSimilar(recipe.result)
&& items[i].getAmount() + recipe.result.getAmount() <= items[i].getMaxStackSize())) {
if (items[i] == null) {
items[i] = recipe.result.clone();
} else { } else {
items[i].setAmount(items[i].getAmount() + recipe.result.getAmount()); items[entry.getKey()].setAmount(entry.getValue());
}
}
// Add the resulting item into the inventory - Just making sure there actually is enough space
for (int i = 0; i < items.length; i++) {
if (items[i] == null ||
(items[i].isSimilar(recipe.result)
&& items[i].getAmount() + recipe.result.getAmount() <= items[i].getMaxStackSize())) {
if (items[i] == null) {
items[i] = recipe.result.clone();
} else {
items[i].setAmount(items[i].getAmount() + recipe.result.getAmount());
}
break;
} }
success = true;
break;
} }
}
if (success) {
hopperCache.setContents(items); hopperCache.setContents(items);
} }
} }