refactoring ModList to separate class

Mumfrey
1 parent 99fe86cb
Showing 6 changed files with 430 additions and 226 deletions
java/client/com/mumfrey/liteloader/client/gui/GuiModListPanel.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanelMods.java
java/client/com/mumfrey/liteloader/client/gui/ModList.java
java/client/com/mumfrey/liteloader/client/gui/ModListContainer.java
java/client/com/mumfrey/liteloader/client/gui/ModListEntry.java
java/common/com/mumfrey/liteloader/core/LiteLoaderMods.java
@@ -38,7 +38,7 @@ public class GuiModListPanel extends Gui
 	static final int HANGER_COLOUR_MOUSEOVER   = GuiModListPanel.WHITE;
 	static final int PANEL_HEIGHT              = 32;
-	static final int PANEL_SPACING             = 4;
+	static final int PANEL_SPACING             = 3;
 	private ModListEntry owner;
@@ -75,6 +75,18 @@ public class GuiModListPanel extends Gui
 			decorator.addIcons(modInfo, this.modIcons);
 		}
 	}
+	
+	public void draw(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected, int pass)
+	{
+		if (pass == 0)
+		{
+			this.render(mouseX, mouseY, partialTicks, xPosition, yPosition, width, selected);
+		}
+		else if (pass == 1)
+		{
+			this.postRender(mouseX, mouseY, partialTicks, xPosition, yPosition, width, selected);
+		}
+	}
 	/**
 	 * Draw this list entry as a list item
@@ -86,9 +98,8 @@ public class GuiModListPanel extends Gui
 	 * @param yPosition
 	 * @param width
 	 * @param selected
-	 * @return calculated height of this panel, used by the list view to calculate spacing
 	 */
-	public int draw(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
+	protected void render(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
 	{
 		int gradientColour = this.getGradientColour(selected);
 		int titleColour    = this.getTitleColour(selected);
@@ -118,11 +129,9 @@ public class GuiModListPanel extends Gui
 		{
 			decorator.onDrawListEntry(mouseX, mouseY, partialTicks, xPosition, yPosition, width, GuiModListPanel.PANEL_HEIGHT, selected, this.modInfo, gradientColour, titleColour, statusColour);
 		}
-		
-		return GuiModListPanel.PANEL_HEIGHT + GuiModListPanel.PANEL_SPACING;
 	}
-
-	public int postRender(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
+	
+	protected void postRender(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
 	{
 		xPosition += (width - 14);
 		yPosition += (GuiModListPanel.PANEL_HEIGHT - 14);
@@ -133,8 +142,6 @@ public class GuiModListPanel extends Gui
 		{
 			xPosition = this.drawPropertyIcon(xPosition, yPosition, icon, mouseX, mouseY);
 		}
-		
-		return GuiModListPanel.PANEL_HEIGHT + GuiModListPanel.PANEL_SPACING;
 	}
 	protected int drawPropertyIcon(int xPosition, int yPosition, IconTextured icon, int mouseX, int mouseY)
@@ -190,8 +197,23 @@ public class GuiModListPanel extends Gui
 		return this.owner.isExternal() ? GuiModListPanel.EXTERNAL_ENTRY_COLOUR : this.brandColour;
 	}
+	public boolean isVisible()
+	{
+		return true;
+	}
+
+	public int getSpacing()
+	{
+		return GuiModListPanel.PANEL_SPACING;
+	}
+	
 	public int getHeight()
 	{
+		return GuiModListPanel.PANEL_HEIGHT;
+	}
+	
+	public int getTotalHeight()
+	{
 		return GuiModListPanel.PANEL_HEIGHT + GuiModListPanel.PANEL_SPACING;
 	}
@@ -3,10 +3,7 @@ package com.mumfrey.liteloader.client.gui;
 import static com.mumfrey.liteloader.gl.GL.*;
 import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -17,9 +14,6 @@ import org.lwjgl.input.Keyboard;
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.api.ModInfoDecorator;
 import com.mumfrey.liteloader.core.LiteLoaderMods;
-import com.mumfrey.liteloader.core.ModInfo;
-import com.mumfrey.liteloader.interfaces.Loadable;
-import com.mumfrey.liteloader.interfaces.LoadableMod;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
 import com.mumfrey.liteloader.modconfig.ConfigManager;
 import com.mumfrey.liteloader.modconfig.ConfigPanel;
@@ -29,7 +23,7 @@ import com.mumfrey.liteloader.modconfig.ConfigPanel;
  * 
  * @author Adam Mummery-Smith
  */
-public class GuiPanelMods extends GuiPanel
+public class GuiPanelMods extends GuiPanel implements ModListContainer
 {	
 	private static final int SCROLLBAR_WIDTH = 5;
@@ -40,17 +34,7 @@ public class GuiPanelMods extends GuiPanel
 	/**
 	 * List of enumerated mods
 	 */
-	private List<ModListEntry> mods = new ArrayList<ModListEntry>();
-	
-	/**
-	 * Currently selected mod
-	 */
-	private ModListEntry selectedMod = null;
-	
-	/**
-	 * Timer used to handle double-clicking on a mod
-	 */
-	private int doubleClickTime = 0;
+	private ModList modList;
 	/**
 	 * Enable / disable button
@@ -72,57 +56,38 @@ public class GuiPanelMods extends GuiPanel
 	 */
 	private GuiSimpleScrollBar scrollBar = new GuiSimpleScrollBar();
-	private int brandColour;
-
 	public GuiPanelMods(GuiLiteLoaderPanel parentScreen, Minecraft minecraft, LiteLoaderMods mods, LoaderEnvironment environment, ConfigManager configManager, int brandColour, List<ModInfoDecorator> decorators)
 	{
 		super(minecraft);
 		this.parentScreen = parentScreen;
 		this.configManager = configManager;
-		this.brandColour = brandColour;
-		this.populateModList(mods, environment, decorators);
+		this.modList = new ModList(this, minecraft, mods, environment, configManager, brandColour, decorators);
 	}
-	/**
-	 * Populate the mods list
-	 * 
-	 * @param mods
-	 * @param environment
-	 */
-	private void populateModList(LiteLoaderMods mods, LoaderEnvironment environment, List<ModInfoDecorator> decorators)
+	@Override
+	public GuiLiteLoaderPanel getParentScreen()
 	{
-		// Add mods to this treeset first, in order to sort them
-		Map<String, ModListEntry> sortedMods = new TreeMap<String, ModListEntry>();
-		
-		// Active mods
-		for (ModInfo<LoadableMod<?>> mod : mods.getLoadedMods())
-		{
-			ModListEntry modListEntry = new ModListEntry(mods, environment, this.mc.fontRendererObj, this.brandColour, decorators, mod);
-			sortedMods.put(modListEntry.getKey(), modListEntry);
-		}
-		
-		// Disabled mods
-		for (ModInfo<?> disabledMod : mods.getDisabledMods())
-		{
-			ModListEntry modListEntry = new ModListEntry(mods, environment, this.mc.fontRendererObj, this.brandColour, decorators, disabledMod);
-			sortedMods.put(modListEntry.getKey(), modListEntry);
-		}
-
-		// Injected tweaks
-		for (ModInfo<Loadable<?>> injectedTweak : mods.getInjectedTweaks())
-		{
-			ModListEntry modListEntry = new ModListEntry(mods, environment, this.mc.fontRendererObj, this.brandColour, decorators, injectedTweak);
-			sortedMods.put(modListEntry.getKey(), modListEntry);
-		}
-		
-		// Add the sorted mods to the mods list
-		this.mods.addAll(sortedMods.values());
-		
-		// Select the first mod in the list
-		if (this.mods.size() > 0)
-			this.selectedMod = this.mods.get(0);
+		return this.parentScreen;
+	}
+	
+	@Override
+	public void setConfigButtonVisible(boolean visible)
+	{
+		this.btnConfig.visible = visible;
+	}
+	
+	@Override
+	public void setEnableButtonVisible(boolean visible)
+	{
+		this.btnToggle.visible = visible;
+	}
+	
+	@Override
+	public void setEnableButtonText(String displayString)
+	{
+		this.btnToggle.displayString = displayString;
 	}
 	@Override
@@ -141,15 +106,14 @@ public class GuiPanelMods extends GuiPanel
 		this.controls.clear();
 		this.controls.add(this.btnToggle = new GuiButton(0, rightPanelLeftEdge, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - 24, 90, 20, I18n.format("gui.enablemod")));
 		this.controls.add(this.btnConfig = new GuiButton(1, rightPanelLeftEdge + 92, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - 24, 69, 20, I18n.format("gui.modsettings")));
-		
-		this.selectMod(this.selectedMod);
+
+		this.modList.setSize(width, height);
 	}
 	@Override
 	void onTick()
 	{
-		if (this.doubleClickTime > 0)
-			this.doubleClickTime--;
+		this.modList.onTick();
 	}
 	@Override
@@ -174,35 +138,7 @@ public class GuiPanelMods extends GuiPanel
 			if (mouseY > GuiLiteLoaderPanel.PANEL_TOP && mouseY < this.height - GuiLiteLoaderPanel.PANEL_BOTTOM)
 			{
-				ModListEntry lastSelectedMod = this.selectedMod;
-				
-				for (ModListEntry mod : this.mods)
-				{
-					if (mod.getListPanel().isMouseOver())
-					{
-						this.selectMod(mod);
-						
-						if (mod.getListPanel().isMouseOverIcon())
-						{
-							mod.getListPanel().iconClick(this.parentScreen);
-						}
-						else
-						{
-							// handle double-click
-							if (mod == lastSelectedMod && this.doubleClickTime > 0 && this.btnConfig.visible)
-							{
-								this.actionPerformed(this.btnConfig);
-							}
-						}
-						
-						this.doubleClickTime = 5;
-					}
-				}
-				
-				if (this.selectedMod != null && this.selectedMod == lastSelectedMod)
-				{
-					this.selectedMod.getInfoPanel().mousePressed();
-				}
+				this.modList.mousePressed(mouseX, mouseY, mouseButton);
 			}
 		}
@@ -217,21 +153,9 @@ public class GuiPanelMods extends GuiPanel
 			this.parentScreen.onToggled();
 			return;
 		}
-		else if (keyCode == Keyboard.KEY_UP)
-		{
-			int selectedIndex = this.mods.indexOf(this.selectedMod) - 1;
-			if (selectedIndex > -1) this.selectMod(this.mods.get(selectedIndex));
-			this.scrollSelectedModIntoView();
-		}
-		else if (keyCode == Keyboard.KEY_DOWN)
-		{
-			int selectedIndex = this.mods.indexOf(this.selectedMod);
-			if (selectedIndex > -1 && selectedIndex < this.mods.size() - 1) this.selectMod(this.mods.get(selectedIndex + 1));
-			this.scrollSelectedModIntoView();
-		}
-		else if (keyCode == Keyboard.KEY_SPACE || keyCode == Keyboard.KEY_RETURN || keyCode == Keyboard.KEY_NUMPADENTER || keyCode == Keyboard.KEY_RIGHT)
+		else if (this.modList.keyPressed(keyChar, keyCode))
 		{
-			this.toggleSelectedMod();
+			// Suppress further handling
 		}
 		else if (keyCode == Keyboard.KEY_F3)
 		{
@@ -254,37 +178,41 @@ public class GuiPanelMods extends GuiPanel
 		if (mouseButton == 0)
 		{
 			this.scrollBar.setDragging(false);
-			
-			if (this.selectedMod != null)
-			{
-				this.selectedMod.getInfoPanel().mouseReleased();
-			}
+			this.modList.mouseReleased(mouseX, mouseY, mouseButton);
 		}
 	}
 	@Override
 	void mouseWheelScrolled(int mouseWheelDelta)
 	{
-		if (this.selectedMod == null || !this.selectedMod.getInfoPanel().mouseWheelScrolled(mouseWheelDelta))
+		if (!this.modList.mouseWheelScrolled(mouseWheelDelta))
 		{
 			this.scrollBar.offsetValue(-mouseWheelDelta / 8);
 		}
 	}
 	@Override
+	public void showConfig()
+	{
+		this.actionPerformed(this.btnConfig);
+	}
+	
+	@Override
 	void actionPerformed(GuiButton control)
 	{
 		if (control.id == 0)
 		{
-			this.toggleSelectedMod();
+			this.modList.toggleSelectedMod();
 		}
 		if (control.id == 1)
 		{
-			if (this.selectedMod != null && this.selectedMod.getModClass() != null)
+			Class<? extends LiteMod> modClass = this.modList.getSelectedModClass();
+			
+			if (modClass != null)
 			{
-				ConfigPanel panel = this.configManager.getPanel(this.selectedMod.getModClass());
-				LiteMod mod = this.selectedMod.getModInstance();
+				ConfigPanel panel = this.configManager.getPanel(modClass);
+				LiteMod mod = this.modList.getSelectedModInstance();
 				this.parentScreen.openConfigPanel(panel, mod);
 			}
 		}
@@ -298,9 +226,17 @@ public class GuiPanelMods extends GuiPanel
 		int innerWidth = this.width - MARGIN - MARGIN - 4;
 		int panelWidth = innerWidth / 2;
 		int panelHeight = this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - GuiLiteLoaderPanel.PANEL_TOP;
-		
+
 		this.drawModsList(mouseX, mouseY, partialTicks, panelWidth, panelHeight);
-		this.drawSelectedMod(mouseX, mouseY, partialTicks, panelWidth, panelHeight);
+
+		int left = MARGIN + panelWidth;
+		int top = GuiLiteLoaderPanel.PANEL_TOP;
+		int spaceForButtons = (this.btnConfig.visible || this.btnToggle.visible ? 28 : 0);
+		int bottom = this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - spaceForButtons;
+		
+		glEnableClipping(left, this.width - MARGIN, top, bottom);
+		this.modList.drawModPanel(mouseX, mouseY, partialTicks, left, top, this.width - MARGIN - left, panelHeight - spaceForButtons);
+		glDisableClipping();
 		super.draw(mouseX, mouseY, partialTicks);
 	}
@@ -324,108 +260,30 @@ public class GuiPanelMods extends GuiPanel
 		glTranslatef(0.0F, GuiLiteLoaderPanel.PANEL_TOP - this.scrollBar.getValue(), 0.0F);
 		mouseY -= (GuiLiteLoaderPanel.PANEL_TOP - this.scrollBar.getValue());
-		
-		int yPos = 0;
-		for (ModListEntry mod : this.mods)
-		{
-			// drawListEntry returns a value indicating the height of the item drawn
-			yPos += mod.getListPanel().draw(mouseX, mouseY, partialTicks, MARGIN, yPos, width - 6, mod == this.selectedMod);
-		}
-		
-		yPos = 0;
-		for (ModListEntry mod : this.mods)
-		{
-			yPos += mod.getListPanel().postRender(mouseX, mouseY, partialTicks, MARGIN, yPos, width - 6, mod == this.selectedMod);
-		}
+
+		this.listHeight = this.modList.drawModList(mouseX, mouseY, partialTicks, MARGIN, 0, width - SCROLLBAR_WIDTH - 1, height);
+		this.scrollBar.setMaxValue(this.listHeight - height);
 		glPopMatrix();
 		glDisableClipping();
-		
-		this.listHeight = yPos;
-		this.scrollBar.setMaxValue(this.listHeight - height);
-	}
-
-	/**
-	 * @param mouseX
-	 * @param mouseY
-	 * @param partialTicks
-	 * @param width
-	 * @param height
-	 */
-	private void drawSelectedMod(int mouseX, int mouseY, float partialTicks, int width, int height)
-	{
-		if (this.selectedMod != null)
-		{
-			int left = MARGIN + width;
-			int right = this.width - MARGIN;
-			
-			int spaceForButtons = this.btnConfig.visible || this.btnToggle.visible ? 28 : 0;
-			glEnableClipping(left, right, GuiLiteLoaderPanel.PANEL_TOP, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - spaceForButtons);
-			this.selectedMod.getInfoPanel().draw(mouseX, mouseY, partialTicks, left, GuiLiteLoaderPanel.PANEL_TOP, right - left, height - spaceForButtons);
-			glDisableClipping();
-		}
-	}
-
-	/**
-	 * @param mod Mod list entry to select
-	 */
-	private void selectMod(ModListEntry mod)
-	{
-		if (this.selectedMod != null)
-		{
-			this.selectedMod.getInfoPanel().mouseReleased();
-		}
-		
-		this.selectedMod = mod;
-		this.btnToggle.visible = false;
-		this.btnConfig.visible = false;
-		
-		if (this.selectedMod != null && this.selectedMod.canBeToggled())
-		{
-			this.btnToggle.visible = true;
-			this.btnToggle.displayString = this.selectedMod.willBeEnabled() ? I18n.format("gui.disablemod") : I18n.format("gui.enablemod");
-			
-			this.btnConfig.visible = this.configManager.hasPanel(this.selectedMod.getModClass());
-		}
 	}
-
-	/**
-	 * Toggle the selected mod's enabled status
-	 */
-	private void toggleSelectedMod()
-	{
-		if (this.selectedMod != null)
-		{
-			this.selectedMod.toggleEnabled();
-			this.selectMod(this.selectedMod);
-		}
-	}
-
-	private void scrollSelectedModIntoView()
+	
+	@Override
+	public void scrollTo(int yPosTop, int yPosBottom)
 	{
-		if (this.selectedMod == null) return;
-		
-		int yPos = 0;
-		for (ModListEntry mod : this.mods)
-		{
-			if (mod == this.selectedMod) break;
-			yPos += mod.getListPanel().getHeight();
-		}
-		
 		// Mod is above the top of the visible window
-		if (yPos < this.scrollBar.getValue())
+		if (yPosTop < this.scrollBar.getValue())
 		{
-			this.scrollBar.setValue(yPos);
+			this.scrollBar.setValue(yPosTop);
 			return;
 		}
 		int panelHeight = this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - GuiLiteLoaderPanel.PANEL_TOP;
-		int modHeight = this.selectedMod.getListPanel().getHeight();
 		// Mod is below the bottom of the visible window
-		if (yPos - this.scrollBar.getValue() + modHeight > panelHeight)
+		if (yPosBottom - this.scrollBar.getValue() > panelHeight)
 		{
-			this.scrollBar.setValue(yPos - panelHeight + modHeight);
+			this.scrollBar.setValue(yPosBottom - panelHeight);
 		}
 	}
 }
+package com.mumfrey.liteloader.client.gui;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
+import org.lwjgl.input.Keyboard;
+
+import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.api.ModInfoDecorator;
+import com.mumfrey.liteloader.core.LiteLoaderMods;
+import com.mumfrey.liteloader.core.ModInfo;
+import com.mumfrey.liteloader.interfaces.Loadable;
+import com.mumfrey.liteloader.interfaces.LoadableMod;
+import com.mumfrey.liteloader.launch.LoaderEnvironment;
+import com.mumfrey.liteloader.modconfig.ConfigManager;
+
+public class ModList
+{
+	private final ModListContainer container;
+	
+	private final ConfigManager configManager;
+
+	/**
+	 * List of enumerated mods
+	 */
+	private final List<ModListEntry> mods = new ArrayList<ModListEntry>();
+	
+	/**
+	 * Currently selected mod
+	 */
+	private ModListEntry selectedMod = null;
+	
+	private boolean hasConfig = false;
+
+	public ModList(ModListContainer container, Minecraft minecraft, LiteLoaderMods mods, LoaderEnvironment environment, ConfigManager configManager, int brandColour, List<ModInfoDecorator> decorators)
+	{
+		this.container = container;
+		this.configManager = configManager;
+		
+		this.populate(minecraft, mods, environment, brandColour, decorators);
+	}
+
+	/**
+	 * @param minecraft
+	 * @param mods
+	 * @param environment
+	 * @param brandColour
+	 * @param decorators
+	 */
+	protected void populate(Minecraft minecraft, LiteLoaderMods mods, LoaderEnvironment environment, int brandColour, List<ModInfoDecorator> decorators)
+	{
+		// Add mods to this treeset first, in order to sort them
+		Map<String, ModListEntry> sortedMods = new TreeMap<String, ModListEntry>();
+		
+		// Active mods
+		for (ModInfo<LoadableMod<?>> mod : mods.getLoadedMods())
+		{
+			ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, mod);
+			sortedMods.put(modListEntry.getKey(), modListEntry);
+		}
+		
+		// Disabled mods
+		for (ModInfo<?> disabledMod : mods.getDisabledMods())
+		{
+			ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, disabledMod);
+			sortedMods.put(modListEntry.getKey(), modListEntry);
+		}
+
+		// Injected tweaks
+		for (ModInfo<Loadable<?>> injectedTweak : mods.getInjectedTweaks())
+		{
+			ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, injectedTweak);
+			sortedMods.put(modListEntry.getKey(), modListEntry);
+		}
+		
+		// Add the sorted mods to the mods list
+		this.mods.addAll(sortedMods.values());
+		
+		// Select the first mod in the list
+		if (this.mods.size() > 0)
+			this.selectedMod = this.mods.get(0);
+	}
+	
+	public GuiLiteLoaderPanel getParentScreen()
+	{
+		return this.container.getParentScreen();
+	}
+	
+	public LiteMod getSelectedModInstance()
+	{
+		return this.selectedMod != null ? this.selectedMod.getModInstance() : null;
+	}
+	
+	public Class<? extends LiteMod> getSelectedModClass()
+	{
+		return this.selectedMod != null ? this.selectedMod.getModClass() : null;
+	}
+	
+	public void setSize(int width, int height)
+	{
+		this.selectMod(this.selectedMod);
+	}
+
+	public void onTick()
+	{
+		for (ModListEntry mod : this.mods)
+		{
+			mod.onTick();
+		}
+	}
+	
+	public void mousePressed(int mouseX, int mouseY, int mouseButton)
+	{
+		ModListEntry lastSelectedMod = this.selectedMod;
+		
+		for (ModListEntry mod : this.mods)
+		{
+			mod.mousePressed(mouseX, mouseY, mouseButton);
+		}
+		
+		if (this.selectedMod != null && this.selectedMod == lastSelectedMod)
+		{
+			this.selectedMod.getInfoPanel().mousePressed();
+		}
+	}
+
+	public boolean keyPressed(char keyChar, int keyCode)
+	{
+		if (keyCode == Keyboard.KEY_UP)
+		{
+			int selectedIndex = this.mods.indexOf(this.selectedMod) - 1;
+			if (selectedIndex > -1) this.selectMod(this.mods.get(selectedIndex));
+			this.scrollSelectedModIntoView();
+			return true;
+		}
+		else if (keyCode == Keyboard.KEY_DOWN)
+		{
+			int selectedIndex = this.mods.indexOf(this.selectedMod);
+			if (selectedIndex > -1 && selectedIndex < this.mods.size() - 1) this.selectMod(this.mods.get(selectedIndex + 1));
+			this.scrollSelectedModIntoView();
+			return true;
+		}
+		else if (keyCode == Keyboard.KEY_SPACE || keyCode == Keyboard.KEY_RETURN || keyCode == Keyboard.KEY_NUMPADENTER || keyCode == Keyboard.KEY_RIGHT)
+		{
+			this.toggleSelectedMod();
+			return true;
+		}
+
+		return false;
+	}
+
+	public void mouseReleased(int mouseX, int mouseY, int mouseButton)
+	{
+		if (this.selectedMod != null)
+		{
+			this.selectedMod.getInfoPanel().mouseReleased();
+		}
+	}
+
+	public boolean mouseWheelScrolled(int mouseWheelDelta)
+	{
+		return this.selectedMod != null && this.selectedMod.getInfoPanel().mouseWheelScrolled(mouseWheelDelta);
+	}
+
+	public int drawModList(int mouseX, int mouseY, float partialTicks, int left, int top, int width, int height)
+	{
+		this.drawModListPass(mouseX, mouseY, partialTicks, left, top, width, 0);
+		return this.drawModListPass(mouseX, mouseY, partialTicks, left, top, width, 1);
+	}
+
+	protected int drawModListPass(int mouseX, int mouseY, float partialTicks, int left, int top, int width, int pass)
+	{
+		int yPos = top;
+		for (ModListEntry mod : this.mods)
+		{
+			GuiModListPanel panel = mod.getListPanel();
+			if (panel.isVisible())
+			{
+				if (yPos > 0) yPos += panel.getSpacing();
+				panel.draw(mouseX, mouseY, partialTicks, left, yPos, width, mod == this.selectedMod, pass);
+				yPos += panel.getHeight();
+			}
+		}
+		return yPos;
+	}
+
+	public void drawModPanel(int mouseX, int mouseY, float partialTicks, int left, int top, int width, int height)
+	{
+		if (this.selectedMod != null)
+		{
+			this.selectedMod.getInfoPanel().draw(mouseX, mouseY, partialTicks, left, top, width, height);
+		}
+	}
+
+	/**
+	 * @param mod Mod list entry to select
+	 */
+	void selectMod(ModListEntry mod)
+	{
+		if (this.selectedMod != null)
+		{
+			this.selectedMod.getInfoPanel().mouseReleased();
+		}
+		
+		this.selectedMod = mod;
+		this.hasConfig = false;
+		this.container.setEnableButtonVisible(false);
+		this.container.setConfigButtonVisible(false);
+		
+		if (this.selectedMod != null && this.selectedMod.canBeToggled())
+		{
+			this.container.setEnableButtonVisible(true);
+			this.container.setEnableButtonText(this.selectedMod.willBeEnabled() ? I18n.format("gui.disablemod") : I18n.format("gui.enablemod"));
+			this.hasConfig = this.configManager.hasPanel(this.selectedMod.getModClass());
+			this.container.setConfigButtonVisible(this.hasConfig);
+		}
+	}
+
+	/**
+	 * Toggle the selected mod's enabled status
+	 */
+	public void toggleSelectedMod()
+	{
+		if (this.selectedMod != null)
+		{
+			this.selectedMod.toggleEnabled();
+			this.selectMod(this.selectedMod);
+		}
+	}
+
+	private void scrollSelectedModIntoView()
+	{
+		if (this.selectedMod == null) return;
+		
+		int yPos = 0;
+		for (ModListEntry mod : this.mods)
+		{
+			if (mod == this.selectedMod) break;
+			yPos += mod.getListPanel().getTotalHeight();
+		}
+		
+		int modHeight = this.selectedMod.getListPanel().getTotalHeight();
+		this.container.scrollTo(yPos, yPos + modHeight);
+	}
+
+	public void showConfig(ModListEntry modListEntry)
+	{
+		this.container.showConfig();
+	}
+}
+package com.mumfrey.liteloader.client.gui;
+
+public interface ModListContainer
+{
+	public abstract GuiLiteLoaderPanel getParentScreen();
+
+	public abstract void setEnableButtonVisible(boolean visible);
+
+	public abstract void setConfigButtonVisible(boolean visible);
+
+	public abstract void setEnableButtonText(String displayString);
+	
+	public abstract void showConfig();
+
+	public abstract void scrollTo(int yPos, int modHeight);
+}
@@ -22,13 +22,15 @@ import com.mumfrey.liteloader.launch.LoaderEnvironment;
  */
 public class ModListEntry
 {
+	private final ModList modList;
+	
 	private final LiteLoaderMods mods;
 	private final ModInfo<?> modInfo;
-	private final GuiModListPanel listPanel;
+	private GuiModListPanel listPanel;
-	private final GuiModInfoPanel infoPanel;
+	private GuiModInfoPanel infoPanel;
 	/**
 	 * Whether the mod is currently active
@@ -68,8 +70,12 @@ public class ModListEntry
 	private boolean isExternal;
 	/**
-	 * Mod list entry for an ACTIVE mod
-	 * 
+	 * Timer used to handle double-clicking on a mod
+	 */
+	private int doubleClickTime = 0;
+
+	/**
+	 * @param modList
 	 * @param mods
 	 * @param environment
 	 * @param fontRenderer
@@ -77,8 +83,9 @@ public class ModListEntry
 	 * @param decorators
 	 * @param modInfo
 	 */
-	ModListEntry(LiteLoaderMods mods, LoaderEnvironment environment, FontRenderer fontRenderer, int brandColour, List<ModInfoDecorator> decorators, ModInfo<?> modInfo)
+	ModListEntry(ModList modList, LiteLoaderMods mods, LoaderEnvironment environment, FontRenderer fontRenderer, int brandColour, List<ModInfoDecorator> decorators, ModInfo<?> modInfo)
 	{
+		this.modList       = modList;
 		this.mods          = mods;
 		this.modInfo       = modInfo;
@@ -104,10 +111,55 @@ public class ModListEntry
 			}
 		}
+		this.initPanels(fontRenderer, brandColour, decorators, modInfo);
+	}
+
+	/**
+	 * @param fontRenderer
+	 * @param brandColour
+	 * @param decorators
+	 * @param modInfo
+	 */
+	protected void initPanels(FontRenderer fontRenderer, int brandColour, List<ModInfoDecorator> decorators, ModInfo<?> modInfo)
+	{
 		this.infoPanel = new GuiModInfoPanel(this, fontRenderer, brandColour, modInfo);
 		this.listPanel = new GuiModListPanel(this, fontRenderer, brandColour, modInfo, decorators);
 	}
-	
+
+	public void onTick()
+	{
+		if (this.doubleClickTime > 0)
+			this.doubleClickTime--;
+	}
+
+	public void mousePressed(int mouseX, int mouseY, int mouseButton)
+	{
+		if (this.getListPanel().isMouseOver())
+		{
+			this.modList.selectMod(this);
+			
+			if (this.getListPanel().isMouseOverIcon())
+			{
+				this.getListPanel().iconClick(this.modList.getParentScreen());
+			}
+			else
+			{
+				// handle double-click
+				if (this.doubleClickTime > 0)
+				{
+					this.onDoubleClicked();
+				}
+			}
+			
+			this.doubleClickTime = 5;
+		}
+	}
+
+	protected void onDoubleClicked()
+	{
+		this.modList.showConfig(this);
+	}
+
 	protected String getTitleText()
 	{
 		return this.modInfo.getDisplayName();
@@ -163,6 +215,11 @@ public class ModListEntry
 		return (this.isErrored ? "0000" : "") + this.modInfo.getIdentifier() + Integer.toHexString(this.hashCode());
 	}
+	public ModInfo<?> getModInfo()
+	{
+		return this.modInfo;
+	}
+	
 	public LiteMod getModInstance()
 	{
 		return this.modInfo.getMod();
@@ -8,8 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.activity.InvalidActivityException;
-
 import net.minecraft.client.resources.IResourcePack;
 import com.mumfrey.liteloader.LiteMod;
@@ -268,10 +266,8 @@ public class LiteLoaderMods
 	 * @param modNameOrId
 	 * @param metaDataKey
 	 * @param defaultValue
-	 * @throws InvalidActivityException Thrown by getMod if init is not complete 
-	 * @throws IllegalArgumentException Thrown by getMod if argument is null
 	 */
-	public String getModMetaData(String modNameOrId, String metaDataKey, String defaultValue) throws InvalidActivityException, IllegalArgumentException
+	public String getModMetaData(String modNameOrId, String metaDataKey, String defaultValue) throws IllegalArgumentException
 	{
 		return this.getModMetaData(this.getMod(modNameOrId), metaDataKey, defaultValue);
 	}