Skip to content
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

Fix some weird memory leak from changing dimensions #581

Closed
wants to merge 3 commits into from
+14 −13
Closed

Fix some weird memory leak from changing dimensions #581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bcd05f
Change to ItemStackMap
kuba6000 Dec 31, 2024
1d770b1
Spotless apply for branch fix for #581 (#582)
github-actions[bot] Dec 31, 2024
4e6fb00
Update StackInfo.java
kuba6000 Dec 31, 2024
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
27 changes: 14 additions & 13 deletions src/main/java/codechicken/nei/recipe/StackInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;

Expand All @@ -21,18 +20,12 @@

public class StackInfo {

private static final FluidStack NULL_FLUID = new FluidStack(FluidRegistry.WATER, 0);

public static final ArrayList<IStackStringifyHandler> stackStringifyHandlers = new ArrayList<>();
private static final HashMap<String, HashMap<String, String[]>> guidfilters = new HashMap<>();
private static final ItemStackMap<String> guidcache = new ItemStackMap<>();
private static final LinkedHashMap<ItemStack, FluidStack> fluidcache = new LinkedHashMap<>() {

private static final long serialVersionUID = 1042213947848622164L;

@Override
protected boolean removeEldestEntry(Map.Entry<ItemStack, FluidStack> eldest) {
return size() > 20;
}
};
private static final ItemStackMap<FluidStack> fluidcache = new ItemStackMap<>();

static {
stackStringifyHandlers.add(new DefaultStackStringifyHandler());
Expand Down Expand Up @@ -95,13 +88,21 @@ public static boolean equalItemAndNBT(ItemStack stackA, ItemStack stackB, boolea
public static FluidStack getFluid(ItemStack stack) {
FluidStack fluid = fluidcache.get(stack);

if (fluid == null && !fluidcache.containsKey(stack)) {
if (fluid == null) {

for (int i = stackStringifyHandlers.size() - 1; i >= 0 && fluid == null; i--) {
fluid = stackStringifyHandlers.get(i).getFluid(stack);
}

if (fluid == null) {
fluidcache.put(stack, NULL_FLUID);
return null;
}
fluidcache.put(stack, fluid);
return fluid;
}

if (fluid == NULL_FLUID) {
return null;
}

return fluid;
Expand Down