Intial stages of an cleanup of the inventory code, this commit is very broken.

This commit is contained in:
CovertJaguar committed 2014-11-30 17:19:16 -08:00
1 parent 3d765067cf
commit 034cdf2860
73 files changed
+606 -759

No files matched your search

@@ -35,8 +35,13 @@ import forestry.plugins.PluginMail;
public class PostRegistry implements IPostRegistry {
public static PostOffice cachedPostOffice;
<<<<<<< Updated upstream
public static final HashMap<IMailAddress, POBox> cachedPOBoxes = new HashMap<IMailAddress, POBox>();
public static final HashMap<IMailAddress, ITradeStation> cachedTradeStations = new HashMap<IMailAddress, ITradeStation>();
=======
public static Map<IMailAddress, POBox> cachedPOBoxes = new HashMap<IMailAddress, POBox>();
public static Map<IMailAddress, ITradeStation> cachedTradeStations = new HashMap<IMailAddress, ITradeStation>();
>>>>>>> Stashed changes
/**
* @param world the Minecraft world the PO box will be in