Skip to content

Optimize autocrafter with timestamp-based slot caching #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Distolfix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Optimize autocrafter with timestamp-based slot caching #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 68 additions & 8 deletions ...ugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,32 @@ public class ModuleAutoCrafting extends Module {
private static final Map<Hopper, ItemStack> CACHED_CRAFTING = new ConcurrentHashMap<>();
private static final ItemStack NO_CRAFT = new ItemStack(Material.AIR);

// Cache for last output slot to optimize stacking (lag-free with timestamp)
// Key: Hopper, Value: {slot index, material type, timestamp}
private static final Map<Hopper, LastOutputSlot> LAST_OUTPUT_SLOT = new ConcurrentHashMap<>();
private static final long OUTPUT_SLOT_CACHE_TTL = 60000; // 60 seconds timeout

private final boolean crafterEjection;

// Helper class to cache last output slot with timestamp
private static class LastOutputSlot {
final int slot;
final Material material;
final long timestamp;

LastOutputSlot(int slot, Material material) {
this.slot = slot;
this.material = material;
this.timestamp = System.currentTimeMillis();
}

boolean isValid(Material currentMaterial) {
// Cache is valid if material matches and not too old
return this.material == currentMaterial &&
(System.currentTimeMillis() - this.timestamp) < OUTPUT_SLOT_CACHE_TTL;
}
}

public ModuleAutoCrafting(SongodaPlugin plugin, GuiManager guiManager) {
super(plugin, guiManager);
this.crafterEjection = Settings.AUTOCRAFT_JAM_EJECT.getBoolean();
Expand Down Expand Up @@ -158,6 +182,7 @@ public void run(Hopper hopper, StorageContainerCache.Cache hopperCache) {
}

if (freeSlotAfterRemovingIngredients) {
// Remove ingredients
for (Map.Entry<Integer, Integer> entry : slotsToAlter.entrySet()) {
if (entry.getValue() <= 0) {
items[entry.getKey()] = null;
Expand All @@ -167,20 +192,55 @@ public void run(Hopper hopper, StorageContainerCache.Cache hopperCache) {
}

// 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 {
boolean outputAdded = false;
int outputSlot = -1;

// OPTIMIZATION: Check cached slot first (lag-free with timestamp)
LastOutputSlot cachedSlot = LAST_OUTPUT_SLOT.get(hopper);
if (cachedSlot != null && cachedSlot.isValid(recipe.result.getType())) {
int i = cachedSlot.slot;
if (i < items.length && items[i] != null &&
items[i].isSimilar(recipe.result) &&
items[i].getAmount() + recipe.result.getAmount() <= items[i].getMaxStackSize()) {
// Cached slot is still valid! Use it directly (no iteration needed)
items[i].setAmount(items[i].getAmount() + recipe.result.getAmount());
outputAdded = true;
outputSlot = i;
}
}

// If cached slot didn't work, do normal search
if (!outputAdded) {
// First pass: Look for existing stacks of the same item
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()) {
items[i].setAmount(items[i].getAmount() + recipe.result.getAmount());
outputAdded = true;
outputSlot = i;
break;
}
}

break;
// Second pass: Look for empty slots
if (!outputAdded) {
for (int i = 0; i < items.length; i++) {
if (items[i] == null) {
items[i] = recipe.result.clone();
outputAdded = true;
outputSlot = i;
break;
}
}
}
}

// Update cache with the slot we used
if (outputAdded && outputSlot >= 0) {
LAST_OUTPUT_SLOT.put(hopper, new LastOutputSlot(outputSlot, recipe.result.getType()));
}

hopperCache.setContents(items);
}
}
Expand Down