Merge remote-tracking branch 'slprime/fix_nei_loading' into dev

# Conflicts:
#	src/main/java/codechicken/nei/NEIClientConfig.java

Author: Dream-Master

src/main/java/codechicken/nei/NEIClientConfig.java

@@ -723,21 +723,25 @@ public static OptionList getOptionList() {
 
     public static void loadWorld(String worldPath) {
         unloadWorld();
-        NEIClientConfig.worldPath = worldPath;
-
         setInternalEnabled(true);
-        logger.debug("Loading " + (Minecraft.getMinecraft().isSingleplayer() ? "Local" : "Remote") + " World");
 
-        final File specificDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
-        final boolean newWorld = !specificDir.exists();
+        if (!worldPath.equals(NEIClientConfig.worldPath)) {
+            NEIClientConfig.worldPath = worldPath;
 
-        if (newWorld) {
-            specificDir.mkdirs();
-        }
+            logger.debug("Loading " + (Minecraft.getMinecraft().isSingleplayer() ? "Local" : "Remote") + " World");
+
+            final File specificDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
+            final boolean newWorld = !specificDir.exists();
+
+            if (newWorld) {
+                specificDir.mkdirs();
+            }
 
-        world = new ConfigSet(new File(specificDir, "NEI.dat"), new ConfigFile(new File(specificDir, "NEI.cfg")));
-        bootNEI(ClientUtils.getWorld());
-        onWorldLoad(newWorld);
+            world = new ConfigSet(new File(specificDir, "NEI.dat"), new ConfigFile(new File(specificDir, "NEI.cfg")));
+            bootNEI(ClientUtils.getWorld());
+            onWorldLoad(newWorld);
+            ItemPanels.bookmarkPanel.load();
+        }
     }
 
     public static String getWorldPath() {
@@ -838,9 +842,8 @@ public void run() {
                     });
 
                     RecipeCatalysts.loadCatalystInfo();
-                    ItemPanels.bookmarkPanel.load();
-                    SubsetWidget.loadHidden();
                     CollapsibleItems.load();
+                    SubsetWidget.loadHidden();
                     ItemSorter.loadConfig();
 
                     // Set pluginNEIConfigLoaded here before posting the NEIConfigsLoadedEvent. This used to be the
@@ -854,10 +857,6 @@ public void run() {
                     ItemList.loadItems.restart();
                 }
             }.start();
-        } else {
-            ItemPanels.bookmarkPanel.load();
-            SubsetWidget.loadHidden();
-            ItemList.loadItems.restart();
         }
     }
 

src/main/java/codechicken/nei/recipe/StackInfo.java

@@ -10,6 +10,7 @@
 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;
 
@@ -21,6 +22,7 @@
 
 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<>();
@@ -30,7 +32,7 @@ public class StackInfo {
 
         @Override
         protected boolean removeEldestEntry(Map.Entry<ItemStack, FluidStack> eldest) {
-            return size() > 20;
+            return size() > 200;
         }
     };
 
@@ -92,7 +94,7 @@ public static boolean equalItemAndNBT(ItemStack stackA, ItemStack stackB, boolea
         return true;
     }
 
-    public static FluidStack getFluid(ItemStack stack) {
+    public static synchronized FluidStack getFluid(ItemStack stack) {
         FluidStack fluid = fluidcache.get(stack);
 
         if (fluid == null && !fluidcache.containsKey(stack)) {
@@ -101,10 +103,10 @@ public static FluidStack getFluid(ItemStack stack) {
                 fluid = stackStringifyHandlers.get(i).getFluid(stack);
             }
 
-            fluidcache.put(stack, fluid);
+            fluidcache.put(stack, fluid == null ? NULL_FLUID : fluid);
         }
 
-        return fluid;
+        return fluid == NULL_FLUID ? null : fluid;
     }
 
     public static boolean isFluidContainer(ItemStack stack) {