switch everything possible to HandlerList

Mumfrey
1 parent 58a0b663
Showing 7 changed files with 78 additions and 122 deletions
java/client/com/mumfrey/liteloader/client/ClientEvents.java
java/common/com/mumfrey/liteloader/core/ClientPluginChannels.java
java/common/com/mumfrey/liteloader/core/Events.java
java/common/com/mumfrey/liteloader/core/LiteLoader.java
java/common/com/mumfrey/liteloader/core/LiteLoaderInterfaceManager.java
java/common/com/mumfrey/liteloader/core/PluginChannels.java
java/common/com/mumfrey/liteloader/core/ServerPluginChannels.java
@@ -28,6 +28,8 @@ import com.mumfrey.liteloader.core.Events;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.event.HandlerList;
+import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -82,22 +84,22 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	 */
 	private int worldHashCode = 0;
-	private HandlerList<Tickable>             tickListeners         = new HandlerList<Tickable>(Tickable.class);
-	private HandlerList<GameLoopListener>     loopListeners         = new HandlerList<GameLoopListener>(GameLoopListener.class);
-	private HandlerList<RenderListener>       renderListeners       = new HandlerList<RenderListener>(RenderListener.class);
-	private HandlerList<PostRenderListener>   postRenderListeners   = new HandlerList<PostRenderListener>(PostRenderListener.class);
-	private HandlerList<HUDRenderListener>    hudRenderListeners    = new HandlerList<HUDRenderListener>(HUDRenderListener.class);
-	private HandlerList<ChatRenderListener>   chatRenderListeners   = new HandlerList<ChatRenderListener>(ChatRenderListener.class);
-	private HandlerList<ChatListener>         chatListeners         = new HandlerList<ChatListener>(ChatListener.class);
-	private HandlerList<PostLoginListener>    postLoginListeners    = new HandlerList<PostLoginListener>(PostLoginListener.class);
-	private HandlerList<JoinGameListener>     joinGameListeners     = new HandlerList<JoinGameListener>(JoinGameListener.class);
-	private HandlerList<OutboundChatListener> outboundChatListeners = new HandlerList<OutboundChatListener>(OutboundChatListener.class);
-	private HandlerList<ViewportListener>     viewportListeners     = new HandlerList<ViewportListener>(ViewportListener.class);
-	private HandlerList<FrameBufferListener>  frameBufferListeners  = new HandlerList<FrameBufferListener>(FrameBufferListener.class);
-	private HandlerList<InitCompleteListener> initListeners         = new HandlerList<InitCompleteListener>(InitCompleteListener.class);
-	private HandlerList<ChatFilter>           chatFilters           = new HandlerList<ChatFilter>(ChatFilter.class);
-	private HandlerList<PreJoinGameListener>  preJoinGameListeners  = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class);
-	private HandlerList<OutboundChatFilter>   outboundChatFilters   = new HandlerList<OutboundChatFilter>(OutboundChatFilter.class);
+	private FastIterableDeque<Tickable>             tickListeners         = new HandlerList<Tickable>(Tickable.class);
+	private FastIterableDeque<GameLoopListener>     loopListeners         = new HandlerList<GameLoopListener>(GameLoopListener.class);
+	private FastIterableDeque<RenderListener>       renderListeners       = new HandlerList<RenderListener>(RenderListener.class);
+	private FastIterableDeque<PostRenderListener>   postRenderListeners   = new HandlerList<PostRenderListener>(PostRenderListener.class);
+	private FastIterableDeque<HUDRenderListener>    hudRenderListeners    = new HandlerList<HUDRenderListener>(HUDRenderListener.class);
+	private FastIterableDeque<ChatRenderListener>   chatRenderListeners   = new HandlerList<ChatRenderListener>(ChatRenderListener.class);
+	private FastIterableDeque<ChatListener>         chatListeners         = new HandlerList<ChatListener>(ChatListener.class);
+	private FastIterableDeque<PostLoginListener>    postLoginListeners    = new HandlerList<PostLoginListener>(PostLoginListener.class);
+	private FastIterableDeque<JoinGameListener>     joinGameListeners     = new HandlerList<JoinGameListener>(JoinGameListener.class);
+	private FastIterableDeque<OutboundChatListener> outboundChatListeners = new HandlerList<OutboundChatListener>(OutboundChatListener.class);
+	private FastIterableDeque<ViewportListener>     viewportListeners     = new HandlerList<ViewportListener>(ViewportListener.class);
+	private FastIterableDeque<FrameBufferListener>  frameBufferListeners  = new HandlerList<FrameBufferListener>(FrameBufferListener.class);
+	private FastIterableDeque<InitCompleteListener> initListeners         = new HandlerList<InitCompleteListener>(InitCompleteListener.class);
+	private FastIterableDeque<ChatFilter>           chatFilters           = new HandlerList<ChatFilter>(ChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+	private FastIterableDeque<PreJoinGameListener>  preJoinGameListeners  = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class, ReturnLogicOp.OR);
+	private FastIterableDeque<OutboundChatFilter>   outboundChatFilters   = new HandlerList<OutboundChatFilter>(OutboundChatFilter.class, ReturnLogicOp.AND);
 	@SuppressWarnings("cast")
 	public ClientEvents(LiteLoader loader, GameEngineClient engine, LoaderProperties properties)
@@ -251,10 +253,7 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	 */
 	public void addChatFilter(ChatFilter chatFilter)
 	{
-		if (!this.chatFilters.contains(chatFilter))
-		{
-			this.chatFilters.add(chatFilter);
-		}
+		this.chatFilters.add(chatFilter);
 	}
 	/**
@@ -596,10 +595,9 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	 */
 	void onSendChatMessage(EventInfo<EntityClientPlayerMP> e, String message)
 	{
-		for (OutboundChatFilter outboundChatFilter : this.outboundChatFilters)
+		if (!this.outboundChatFilters.all().onSendChatMessage(message))
 		{
-			if (!outboundChatFilter.onSendChatMessage(message))
-				e.cancel();
+			e.cancel();
 		}
 	}
@@ -627,14 +625,7 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	 */
 	boolean onPreJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
 	{
-		boolean cancelled = false;
-		
-		for (PreJoinGameListener joinGameListener : this.preJoinGameListeners)
-		{
-			cancelled |= !joinGameListener.onPreJoinGame(netHandler, loginPacket);
-		}
-		
-		return !cancelled;
+		return !this.preJoinGameListeners.all().onPreJoinGame(netHandler, loginPacket);
 	}
 	/**
@@ -5,6 +5,8 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload;
 import com.mumfrey.liteloader.PluginChannelListener;
 import com.mumfrey.liteloader.api.Listener;
+import com.mumfrey.liteloader.core.event.HandlerList;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -19,8 +21,15 @@ public abstract class ClientPluginChannels extends PluginChannels&lt;PluginChannelL
 	protected ClientPluginChannels()
 	{
+		if (ClientPluginChannels.instance != null) throw new RuntimeException("Plugin Channels Startup Error", new InstantiationException("Only a single instance of ClientPluginChannels is allowed"));
 		ClientPluginChannels.instance = this;
 	}
+	
+	@Override
+	protected FastIterableDeque<PluginChannelListener> createHandlerList()
+	{
+		return new HandlerList<PluginChannelListener>(PluginChannelListener.class);
+	}
 	protected static ClientPluginChannels getInstance()
 	{
@@ -29,6 +29,8 @@ import com.mumfrey.liteloader.api.Listener;
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.event.HandlerList;
+import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
+import com.mumfrey.liteloader.interfaces.FastIterable;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -60,17 +62,17 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	/**
 	 * List of mods which can filter server chat
 	 */
-	private HandlerList<ServerChatFilter> serverChatFilters = new HandlerList<ServerChatFilter>(ServerChatFilter.class);
+	private FastIterable<ServerChatFilter> serverChatFilters = new HandlerList<ServerChatFilter>(ServerChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
 	/**
 	 * List of mods which provide server commands
 	 */
-	private HandlerList<ServerCommandProvider> serverCommandProviders = new HandlerList<ServerCommandProvider>(ServerCommandProvider.class);
+	private FastIterable<ServerCommandProvider> serverCommandProviders = new HandlerList<ServerCommandProvider>(ServerCommandProvider.class);
 	/**
 	 * List of mods which monitor server player events
 	 */
-	private HandlerList<ServerPlayerListener> serverPlayerListeners = new HandlerList<ServerPlayerListener>(ServerPlayerListener.class);
+	private FastIterable<ServerPlayerListener> serverPlayerListeners = new HandlerList<ServerPlayerListener>(ServerPlayerListener.class);
 	/**
 	 * Package private ctor
@@ -157,10 +159,7 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	 */
 	public void addServerChatFilter(ServerChatFilter serverChatFilter)
 	{
-		if (!this.serverChatFilters.contains(serverChatFilter))
-		{
-			this.serverChatFilters.add(serverChatFilter);
-		}
+		this.serverChatFilters.add(serverChatFilter);
 	}
 	/**
@@ -196,15 +195,7 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	{
 		EntityPlayerMP player = netHandler instanceof NetHandlerPlayServer ? ((NetHandlerPlayServer)netHandler).playerEntity : null;
-		for (ServerChatFilter chatFilter : this.serverChatFilters)
-		{
-			if (!chatFilter.onChat(player, chatPacket, chatPacket.func_149439_c()))
-			{
-				return false;
-			}
-		}
-
-		return true;
+		return this.serverChatFilters.all().onChat(player, chatPacket, chatPacket.func_149439_c());
 	}
 	/**
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import javax.activity.InvalidActivityException;
@@ -35,9 +34,11 @@ import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.api.LiteLoaderCoreAPI;
 import com.mumfrey.liteloader.core.event.EventProxy;
+import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.crashreport.CallableLaunchWrapper;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.interfaces.Loadable;
 import com.mumfrey.liteloader.interfaces.LoadableMod;
 import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
@@ -128,27 +129,11 @@ public final class LiteLoader
 	/**
 	 * Core providers
 	 */
-	private final List<CoreProvider> coreProviders = new LinkedList<CoreProvider>();
-	
-	/**
-	 * 
-	 */
-	private final List<TickObserver> tickObservers = new LinkedList<TickObserver>();
-	
-	/**
-	 * 
-	 */
-	private final List<WorldObserver> worldObservers = new LinkedList<WorldObserver>();
-	
-	/**
-	 * 
-	 */
-	private final List<ShutdownObserver> shutdownObservers = new LinkedList<ShutdownObserver>();
-	
-	/**
-	 * 
-	 */
-	private final List<PostRenderObserver> postRenderObservers = new LinkedList<PostRenderObserver>();
+	private final FastIterableDeque<CoreProvider> coreProviders = new HandlerList<CoreProvider>(CoreProvider.class);
+	private final FastIterableDeque<TickObserver> tickObservers = new HandlerList<TickObserver>(TickObserver.class);
+	private final FastIterableDeque<WorldObserver> worldObservers = new HandlerList<WorldObserver>(WorldObserver.class);
+	private final FastIterableDeque<ShutdownObserver> shutdownObservers = new HandlerList<ShutdownObserver>(ShutdownObserver.class);
+	private final FastIterableDeque<PostRenderObserver> postRenderObservers = new HandlerList<PostRenderObserver>(PostRenderObserver.class);
 	/**
 	 * Mod panel manager, deliberately raw
@@ -245,10 +230,7 @@ public final class LiteLoader
 			this.shutdownObservers.addAll(this.apiAdapter.getAllObservers(ShutdownObserver.class));
 			this.postRenderObservers.addAll(this.apiAdapter.getAllObservers(PostRenderObserver.class));
-			for (CoreProvider coreProvider : this.coreProviders)
-			{
-				coreProvider.onInit();
-			}
+			this.coreProviders.all().onInit();
 			this.enumerator.onInit();
 			this.mods.init(this.apiAdapter.getAllObservers(ModLoadObserver.class));
@@ -273,10 +255,7 @@ public final class LiteLoader
 		// Spawn mod instances and initialise them
 		this.loadAndInitMods();
-		for (CoreProvider coreProvider : this.coreProviders)
-		{
-			coreProvider.onPostInitComplete(this.mods);
-		}
+		this.coreProviders.all().onPostInitComplete(this.mods);
 		// Save stuff
 		this.properties.writeProperties();
@@ -884,10 +863,7 @@ public final class LiteLoader
 	 */
 	private void postInitCoreProviders()
 	{
-		for (CoreProvider coreProvider : this.coreProviders)
-		{
-			coreProvider.onPostInit(this.engine);
-		}
+		this.coreProviders.all().onPostInit(this.engine);
 		this.interfaceManager.registerInterfaces();
 	}
@@ -950,10 +926,7 @@ public final class LiteLoader
 	{
 		this.permissionsManagerClient.onJoinGame(netHandler, loginPacket);
-		for (CoreProvider coreProvider : this.coreProviders)
-		{
-			coreProvider.onJoinGame(netHandler, loginPacket);
-		}
+		this.coreProviders.all().onJoinGame(netHandler, loginPacket);
 	}
 	/**
@@ -969,10 +942,7 @@ public final class LiteLoader
 			this.permissionsManagerClient.scheduleRefresh();
 		}
-		for (WorldObserver worldObserver : this.worldObservers)
-		{
-			worldObserver.onWorldChanged(world);
-		}
+		this.worldObservers.all().onWorldChanged(world);
 	}
 	/**
@@ -983,12 +953,7 @@ public final class LiteLoader
 	void onPostRender(int mouseX, int mouseY, float partialTicks)
 	{
 		this.profiler.startSection("core");
-		
-		for (PostRenderObserver postRenderObserver : this.postRenderObservers)
-		{
-			postRenderObserver.onPostRender(mouseX, mouseY, partialTicks);
-		}
-		
+		this.postRenderObservers.all().onPostRender(mouseX, mouseY, partialTicks);
 		this.profiler.endSection();
 	}
@@ -1020,10 +985,7 @@ public final class LiteLoader
 		this.profiler.startSection("observers");
-		for (TickObserver tickObserver : this.tickObservers)
-		{
-			tickObserver.onTick(clock, partialTicks, inGame);
-		}
+		this.tickObservers.all().onTick(clock, partialTicks, inGame);
 		this.profiler.endSection();
 	}
@@ -1032,10 +994,7 @@ public final class LiteLoader
 	{
 		LiteLoaderLogger.info("LiteLoader is shutting down, shutting down core providers and syncing configuration");
-		for (ShutdownObserver lifeCycleObserver : this.shutdownObservers)
-		{
-			lifeCycleObserver.onShutDown();
-		}
+		this.shutdownObservers.all().onShutDown();
 		this.configManager.syncConfig();
 	}
@@ -4,7 +4,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -15,6 +14,8 @@ import com.mumfrey.liteloader.api.LiteAPI;
 import com.mumfrey.liteloader.api.Observer;
 import com.mumfrey.liteloader.api.exceptions.InvalidProviderException;
 import com.mumfrey.liteloader.api.manager.APIAdapter;
+import com.mumfrey.liteloader.core.event.HandlerList;
+import com.mumfrey.liteloader.interfaces.FastIterable;
 import com.mumfrey.liteloader.interfaces.InterfaceRegistry;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -152,10 +153,7 @@ public class LiteLoaderInterfaceManager implements InterfaceRegistry
 					this.registeredListeners.add(listener);
-					for (InterfaceObserver observer : LiteLoaderInterfaceManager.this.observers)
-					{
-						observer.onRegisterListener(this.provider, this.interfaceType, listener);
-					}
+					LiteLoaderInterfaceManager.this.observers.all().onRegisterListener(this.provider, this.interfaceType, listener);
 					return true;
 				}
@@ -197,7 +195,7 @@ public class LiteLoaderInterfaceManager implements InterfaceRegistry
 	/**
 	 * Interface observers
 	 */
-	protected final List<InterfaceObserver> observers = new LinkedList<InterfaceObserver>();
+	protected final FastIterable<InterfaceObserver> observers = new HandlerList<InterfaceObserver>(InterfaceObserver.class);
 	/**
 	 * True once the initial init phase (in which all registered providers are initialised) is completed, we
@@ -321,10 +319,7 @@ public class LiteLoaderInterfaceManager implements InterfaceRegistry
 	 */
 	public void registerObserver(InterfaceObserver observer)
 	{
-		if (!this.observers.contains(observer))
-		{
-			this.observers.add(observer);
-		}
+		this.observers.add(observer);
 	}
 	/* (non-Javadoc)
@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.Set;
 import com.mumfrey.liteloader.api.InterfaceProvider;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import net.minecraft.network.INetHandler;
@@ -34,31 +35,37 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 	/**
 	 * Mapping of plugin channel names to listeners
 	 */
-	protected HashMap<String, LinkedList<L>> pluginChannels = new HashMap<String, LinkedList<L>>();
+	protected final HashMap<String, LinkedList<L>> pluginChannels = new HashMap<String, LinkedList<L>>();
 	/**
 	 * List of mods which implement PluginChannelListener interface
 	 */
-	protected LinkedList<L> pluginChannelListeners = new LinkedList<L>();
+	protected final FastIterableDeque<L> pluginChannelListeners;
 	/**
 	 * Plugin channels that we know the server supports
 	 */
-	protected Set<String> remotePluginChannels = new HashSet<String>();
+	protected final Set<String> remotePluginChannels = new HashSet<String>();
 	/**
 	 * Keep track of faulting listeners so that we can periodically log a message if a listener is throwing LOTS of exceptions
 	 */
-	protected Map<L, Integer> faultingPluginChannelListeners = new HashMap<L, Integer>();
+	protected final Map<L, Integer> faultingPluginChannelListeners = new HashMap<L, Integer>();
 	/**
 	 * Package private
 	 */
 	PluginChannels()
 	{
+		this.pluginChannelListeners = this.createHandlerList();
 	}
 	/**
+	 * @return
+	 */
+	protected abstract FastIterableDeque<L> createHandlerList();
+
+	/**
 	 * Get the current set of registered client-side channels
 	 */
 	public Set<String> getLocalChannels()
@@ -90,10 +97,7 @@ public abstract class PluginChannels&lt;L extends CommonPluginChannelListener&gt; impl
 	 */
 	protected void addPluginChannelListener(L pluginChannelListener)
 	{
-		if (!this.pluginChannelListeners.contains(pluginChannelListener))
-		{
-			this.pluginChannelListeners.add(pluginChannelListener);
-		}
+		this.pluginChannelListeners.add(pluginChannelListener);
 	}
 	/**
@@ -8,7 +8,9 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload;
 import com.mumfrey.liteloader.ServerPluginChannelListener;
 import com.mumfrey.liteloader.api.Listener;
+import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.core.exceptions.UnregisteredChannelException;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.permissions.PermissionsManagerServer;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -24,10 +26,15 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
 	public ServerPluginChannels()
 	{
 		if (ServerPluginChannels.instance != null) throw new RuntimeException("Plugin Channels Startup Error", new InstantiationException("Only a single instance of ServerPluginChannels is allowed"));
-		
 		ServerPluginChannels.instance = this;
 	}
+	@Override
+	protected FastIterableDeque<ServerPluginChannelListener> createHandlerList()
+	{
+		return new HandlerList<ServerPluginChannelListener>(ServerPluginChannelListener.class);
+	}
+	
 	public static ServerPluginChannels getInstance()
 	{
 		return instance;