diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index f1f56718..892e4504 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -2,10 +2,11 @@ package crazypants.enderio.conduit.liquid; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -113,27 +114,28 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe } } - private static Map>> cache = new WeakHashMap>>(); + private static final Map>> cache = Collections + .synchronizedMap(new WeakHashMap<>()); public static List computeFluidOutlineToCache(CollidableComponent component, Fluid fluid, double scaleFactor, float outlineWidth) { Map> cache0 = cache.get(component); if (cache0 == null) { - cache0 = new HashMap>(); + cache0 = new ConcurrentHashMap<>(); cache.put(component, cache0); } List data = cache0.get(fluid); if (data != null) { return data; } - data = new ArrayList(); - cache0.put(fluid, data); + data = new ArrayList<>(); IIcon texture = fluid.getStillIcon(); if (texture == null) { texture = fluid.getIcon(); if (texture == null) { + cache0.put(fluid, data); return data; } } @@ -192,6 +194,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe } } } + cache0.put(fluid, data); return data; }