diff --git a/common/net/minecraftforge/common/ForgeChunkManager.java b/common/net/minecraftforge/common/ForgeChunkManager.java index 1012da7eb..ca8a408e4 100644 --- a/common/net/minecraftforge/common/ForgeChunkManager.java +++ b/common/net/minecraftforge/common/ForgeChunkManager.java @@ -97,6 +97,8 @@ public class ForgeChunkManager private static Configuration config; private static int playerTicketLength; private static int dormantChunkCacheSize; + + private static Set warnedMods = Sets.newHashSet(); /** * All mods requiring chunkloading need to implement this to handle the * re-registration of chunk tickets at world loading time @@ -657,9 +659,10 @@ public class ForgeChunkManager int allowedCount = ticketConstraints.containsKey(modId) ? ticketConstraints.get(modId) : defaultMaxCount; - if (tickets.get(world).get(modId).size() >= allowedCount) + if (tickets.get(world).get(modId).size() >= allowedCount && !warnedMods.contains(modId)) { FMLLog.info("The mod %s has attempted to allocate a chunkloading ticket beyond it's currently allocated maximum : %d", modId, allowedCount); + warnedMods.add(modId); return null; } Ticket ticket = new Ticket(modId, type, world); diff --git a/common/net/minecraftforge/liquids/LiquidDictionary.java b/common/net/minecraftforge/liquids/LiquidDictionary.java index c76b8cba0..880899a62 100644 --- a/common/net/minecraftforge/liquids/LiquidDictionary.java +++ b/common/net/minecraftforge/liquids/LiquidDictionary.java @@ -67,13 +67,24 @@ public abstract class LiquidDictionary * Get an immutable list of the liquids defined * * @return the defined liquids + * @see LiquidDictionary#getLiquids() */ + @Deprecated public Map getDefinedLiquids() { - return ImmutableMap.copyOf(liquids); + return getLiquids(); } + /** + * Get an immutable list of the liquids defined + * + * @return the defined liquids + */ + public static Map getLiquids() + { + return ImmutableMap.copyOf(liquids); + } /** * Fired when a new liquid is created *