LiteLoader 1.6.4_02 - experimental - "Configurable" interface for mods that want…

… to provide a config panel in the mod info GUI

LiteLoader 1.6.4_02 - experimental - "Configurable" interface for mods that want…
… to provide a config panel in the mod info GUI
Mumfrey
1 parent ad12632b
Showing 9 changed files with 763 additions and 54 deletions
java/com/mumfrey/liteloader/Configurable.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/gui/GuiConfigPanelContainer.java
java/com/mumfrey/liteloader/gui/GuiModListEntry.java
java/com/mumfrey/liteloader/gui/GuiScreenModInfo.java
java/com/mumfrey/liteloader/modconfig/ConfigPanel.java
java/com/mumfrey/liteloader/modconfig/ConfigPanelHost.java
java/com/mumfrey/liteloader/modconfig/ConfigPanelManager.java
java/com/mumfrey/liteloader/permissions/PermissionsManagerClient.java
+package com.mumfrey.liteloader;
+
+import com.mumfrey.liteloader.modconfig.ConfigPanel;
+
+/**
+ * Interface for mods which want to provide a configuration panel inside the "mod info" screen
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface Configurable
+{
+	/**
+	 * Get the class of the configuration panel to use, the returned class must have a 
+	 * default (no-arg) constructor
+	 * 
+	 * @return configuration panel class
+	 */
+	public abstract Class<? extends ConfigPanel> getConfigPanelClass();
+}
@@ -39,6 +39,7 @@ import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods;
 import com.mumfrey.liteloader.gui.GuiControlsPaginated;
 import com.mumfrey.liteloader.gui.GuiScreenModInfo;
+import com.mumfrey.liteloader.modconfig.ConfigPanelManager;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 import com.mumfrey.liteloader.util.PrivateFields;
@@ -163,6 +164,11 @@ public final class LiteLoader
 	private final PermissionsManagerClient permissionsManager = PermissionsManagerClient.getInstance();
 	/**
+	 * Configuration panel manager/registry
+	 */
+	private final ConfigPanelManager configPanelManager;
+	
+	/**
 	 * Flag which keeps track of whether late initialisation has been done
 	 */
 	private boolean postInitStarted, startupComplete;
@@ -266,6 +272,8 @@ public final class LiteLoader
 		this.enabledModsList = EnabledModsList.createFrom(this.enabledModsFile);
 		this.enabledModsList.processModsList(bootstrap.getProfile(), modNameFilter);
+		
+		this.configPanelManager = new ConfigPanelManager();
 	}
 	/**
@@ -899,10 +907,11 @@ public final class LiteLoader
 		// add the mod to all relevant listener queues
 		this.events.addListener(mod);
-		if (mod instanceof Permissible)
-		{
-			this.permissionsManager.registerPermissible((Permissible)mod);
-		}
+		// add mod to permissions manager if permissible
+		this.permissionsManager.registerMod(mod);
+		
+		// register mod config panel if configurable
+		this.configPanelManager.registerMod(mod);
 		this.loadedMods.add(mod);
 		this.loadedModsList += String.format("\n          - %s version %s", mod.getName(), mod.getVersion());
@@ -1023,7 +1032,7 @@ public final class LiteLoader
 			// If we're at the main menu, prepare the overlay
 			if (this.modInfoScreen == null || this.modInfoScreen.getMenu() != this.minecraft.currentScreen)
 			{
-				this.modInfoScreen = new GuiScreenModInfo(this.minecraft, (GuiMainMenu)this.minecraft.currentScreen, this, this.enabledModsList);
+				this.modInfoScreen = new GuiScreenModInfo(this.minecraft, (GuiMainMenu)this.minecraft.currentScreen, this, this.enabledModsList, this.configPanelManager);
 			}
 			this.modInfoScreen.drawScreen(mouseX, mouseY, partialTicks);
@@ -1036,7 +1045,7 @@ public final class LiteLoader
 		}
 		else if (this.minecraft.currentScreen instanceof GuiMainMenu && Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_TAB))
 		{
-			this.minecraft.displayGuiScreen(new GuiScreenModInfo(this.minecraft, (GuiMainMenu)this.minecraft.currentScreen, this, this.enabledModsList));
+			this.minecraft.displayGuiScreen(new GuiScreenModInfo(this.minecraft, (GuiMainMenu)this.minecraft.currentScreen, this, this.enabledModsList, this.configPanelManager));
 		}			
 	}
+package com.mumfrey.liteloader.gui;
+
+import static org.lwjgl.opengl.GL11.*;
+import static com.mumfrey.liteloader.gui.GuiScreenModInfo.glEnableClipping;
+import static com.mumfrey.liteloader.gui.GuiScreenModInfo.glDisableClipping;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import net.minecraft.src.Gui;
+import net.minecraft.src.GuiButton;
+import net.minecraft.src.Minecraft;
+
+import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.modconfig.ConfigPanel;
+import com.mumfrey.liteloader.modconfig.ConfigPanelHost;
+
+/**
+ * Config panel container, this handles drawing the configuration panel chrome and also hosts the
+ * configuration panels themselves to support scrolling and stuff
+ *
+ * @author Adam Mummery-Smith
+ */
+public class GuiConfigPanelContainer extends Gui implements ConfigPanelHost
+{
+	private static final int TOP    = 26;
+	private static final int BOTTOM = 40;
+	private static final int MARGIN = 12;
+	
+	/**
+	 * Parent screen
+	 */
+	private GuiScreenModInfo parent;
+	
+	/**
+	 * Minecraft
+	 */
+	private Minecraft mc;
+	
+	/**
+	 * Panel we are hosting
+	 */
+	private ConfigPanel panel;
+	
+	/**
+	 * Mod being configured, the panel may want a reference to it
+	 */
+	private LiteMod mod;
+	
+	/**
+	 * Buttons
+	 */
+	private List<GuiButton> controls = new LinkedList<GuiButton>();
+
+	/**
+	 * Scroll bar for the panel
+	 */
+	private GuiSimpleScrollBar scrollBar = new GuiSimpleScrollBar();
+	
+	/**
+	 * Current available width
+	 */
+	private int width = 0;
+	
+	/**
+	 * Current available height
+	 */
+	private int height = 0;
+	
+	/**
+	 * Current panel width (width - margins)
+	 */
+	private int panelWidth = 0;
+	
+	/**
+	 * Current panel visible height (height - chrome)
+	 */
+	private int panelHeight = 0;
+	
+	/**
+	 * Panel's internal height (for scrolling)
+	 */
+	private int totalHeight = -1;
+	
+	/**
+	 * Panel Y position (for scroll)
+	 */
+	private int panelTop = TOP;
+	
+	/**
+	 * @param parent
+	 * @param minecraft
+	 * @param panel
+	 * @param mod
+	 */
+	GuiConfigPanelContainer(GuiScreenModInfo parent, Minecraft minecraft, ConfigPanel panel, LiteMod mod)
+	{
+		this.parent = parent;
+		this.mc     = minecraft;
+		this.panel  = panel;
+		this.mod    = mod;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.modconfig.ConfigPanelHost#getMod()
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public <ModClass extends LiteMod> ModClass getMod()
+	{
+		return (ModClass)this.mod;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.modconfig.ConfigPanelHost#getWidth()
+	 */
+	@Override
+	public int getWidth()
+	{
+		return this.panelWidth;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.modconfig.ConfigPanelHost#getHeight()
+	 */
+	@Override
+	public int getHeight()
+	{
+		return this.panelHeight;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.modconfig.ConfigPanelHost#close()
+	 */
+	@Override
+	public void close()
+	{
+		this.parent.closeConfigPanel(this);
+	}
+	
+	/**
+	 * Callback from parent screen when window is resized
+	 * 
+	 * @param width
+	 * @param height
+	 */
+	void setSize(int width, int height)
+	{
+		this.width = width;
+		this.height = height;
+		
+		this.panelHeight = this.height - TOP - BOTTOM;
+		this.panelWidth = this.width - (MARGIN * 2) - 6;
+		
+		this.panel.onPanelResize(this);
+		
+		this.controls.clear();
+		this.controls.add(new GuiButton(0, this.width - 99 - MARGIN, this.height - BOTTOM + 9, 100, 20, "Save & Close"));
+	}
+	
+	/**
+	 * Callback from parent screen when panel is displayed
+	 */
+	void onShown()
+	{
+		this.panel.onPanelShown(this);
+	}
+	
+	/**
+	 * Callback from parent screen when panel is hidden
+	 */
+	void onHidden()
+	{
+		this.panel.onPanelHidden();
+	}
+	
+	/**
+	 * Callback from parent screen every tick
+	 */
+	void onTick()
+	{
+		this.panel.onTick(this);
+	}
+	
+	/**
+	 * Draw the panel and chrome
+	 * 
+	 * @param mouseX
+	 * @param mouseY
+	 * @param partialTicks
+	 */
+	void draw(int mouseX, int mouseY, float partialTicks)
+	{
+		// Scroll position
+		this.panelTop = TOP - this.scrollBar.getValue();
+	
+		// Draw panel title
+		String panelTitle = this.panel.getPanelTitle();
+		if (panelTitle != null)
+		{
+			this.mc.fontRenderer.drawString(panelTitle, MARGIN, TOP - 14, 0xFFFFFFFF);
+		}
+		
+		// Draw top and bottom horizontal bars
+		drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999);
+		drawRect(MARGIN, this.height - BOTTOM + 2, this.width - MARGIN, this.height - BOTTOM + 3, 0xFF999999);
+
+		// Clip rect
+		glEnableClipping(MARGIN, this.width - MARGIN - 6, TOP, this.height - BOTTOM);
+		
+		// Offset by scroll
+		glPushMatrix();
+		glTranslatef(MARGIN, this.panelTop, 0.0F);
+		
+		// Draw panel contents
+		this.panel.drawPanel(this, mouseX - MARGIN, mouseY - this.panelTop, partialTicks);
+		glClear(GL_DEPTH_BUFFER_BIT);
+		
+		// Disable clip rect
+		glDisableClipping();
+		
+		// Restore transform
+		glPopMatrix();
+		
+		// Get total scroll height from panel
+		this.totalHeight = Math.max(-1, this.panel.getContentHeight());
+		
+		// Update and draw scroll bar
+		this.scrollBar.setMaxValue(this.totalHeight - this.panelHeight);
+		this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, this.width - MARGIN - 5, TOP, 5, this.panelHeight, Math.max(this.panelHeight, this.totalHeight));
+		
+		// Draw other buttons
+		for (GuiButton control : this.controls)
+			control.drawButton(this.mc, mouseX, mouseY);
+	}
+
+	/**
+	 * @param control
+	 */
+	private void actionPerformed(GuiButton control)
+	{
+		if (control.id == 0) this.close();
+	}
+
+	/**
+	 * @param mouseWheelDelta
+	 */
+	public void mouseWheelScrolled(int mouseWheelDelta)
+	{
+		this.scrollBar.offsetValue(-mouseWheelDelta / 8);
+	}
+
+	/**
+	 * @param mouseX
+	 * @param mouseY
+	 * @param mouseButton
+	 */
+	void mousePressed(int mouseX, int mouseY, int mouseButton)
+	{
+		if (mouseButton == 0)
+		{
+			if (this.scrollBar.wasMouseOver())
+				this.scrollBar.setDragging(true);
+			
+			for (GuiButton control : this.controls)
+			{
+				if (control.mousePressed(this.mc, mouseX, mouseY))
+				{
+					this.mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
+					this.actionPerformed(control);
+				}
+			}
+		}
+		
+		this.panel.mousePressed(this, mouseX - MARGIN, mouseY - this.panelTop, mouseButton);
+	}
+	
+	/**
+	 * @param mouseX
+	 * @param mouseY
+	 * @param mouseButton
+	 */
+	void mouseReleased(int mouseX, int mouseY, int mouseButton)
+	{
+		if (mouseButton == 0)
+		{
+			this.scrollBar.setDragging(false);
+		}
+		
+		this.panel.mouseReleased(this, mouseX - MARGIN, mouseY - this.panelTop, mouseButton);
+	}
+	
+	/**
+	 * @param mouseX
+	 * @param mouseY
+	 */
+	void mouseMoved(int mouseX, int mouseY)
+	{
+		this.panel.mouseMoved(this, mouseX - MARGIN, mouseY - this.panelTop);
+	}
+	
+	/**
+	 * @param keyChar
+	 * @param keyCode
+	 */
+	void keyPressed(char keyChar, int keyCode)
+	{
+		this.panel.keyPressed(this, keyChar, keyCode);
+	}
+}
@@ -24,6 +24,10 @@ public class GuiModListEntry extends Gui
 	 * For text display
 	 */
 	private FontRenderer fontRenderer;
+	
+	private LiteMod modInstance;
+	
+	private Class<? extends LiteMod> modClass;
 	/**
 	 * The metadata name (id) of the mod, used as the enablement/disablement key
@@ -82,17 +86,19 @@ public class GuiModListEntry extends Gui
 	 * @param loader
 	 * @param enabledMods
 	 * @param fontRenderer
-	 * @param mod
+	 * @param modInstance
 	 */
-	GuiModListEntry(LiteLoader loader, EnabledModsList enabledMods, FontRenderer fontRenderer, LiteMod mod)
+	GuiModListEntry(LiteLoader loader, EnabledModsList enabledMods, FontRenderer fontRenderer, LiteMod modInstance)
 	{
 		this.fontRenderer    = fontRenderer;
-		this.metaName        = loader.getModMetaName(mod.getClass());
-		this.name            = mod.getName();
-		this.version         = mod.getVersion();
-		this.author          = loader.getModMetaData(mod.getClass(), "author", "Unknown");
-		this.url             = loader.getModMetaData(mod.getClass(), "url", null);
-		this.description     = loader.getModMetaData(mod.getClass(), "description", "");
+		this.modInstance     = modInstance;
+		this.modClass        = modInstance.getClass();
+		this.metaName        = loader.getModMetaName(this.modClass);
+		this.name            = modInstance.getName();
+		this.version         = modInstance.getVersion();
+		this.author          = loader.getModMetaData(this.modClass, "author", "Unknown");
+		this.url             = loader.getModMetaData(this.modClass, "url", null);
+		this.description     = loader.getModMetaData(this.modClass, "description", "");
 		this.enabled         = true;
 		this.canBeToggled    = this.metaName != null && enabledMods.saveAllowed();
 		this.willBeEnabled   = true;
@@ -204,6 +210,16 @@ public class GuiModListEntry extends Gui
 		return this.metaName + Integer.toHexString(this.hashCode());
 	}
+	public LiteMod getModInstance()
+	{
+		return this.modInstance;
+	}
+	
+	public Class<? extends LiteMod> getModClass()
+	{
+		return this.modClass;
+	}
+	
 	public String getName()
 	{
 		return this.name;
@@ -19,6 +19,8 @@ import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.core.EnabledModsList;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.ModFile;
+import com.mumfrey.liteloader.modconfig.ConfigPanel;
+import com.mumfrey.liteloader.modconfig.ConfigPanelManager;
 import net.minecraft.src.DynamicTexture;
 import net.minecraft.src.GuiButton;
@@ -39,12 +41,14 @@ import net.minecraft.src.Tessellator;
  */
 public class GuiScreenModInfo extends GuiScreen
 {
-	private static final int LEFT_EDGE    = 80;
-	private static final int TAB_WIDTH    = 20;
-	private static final int TAB_HEIGHT   = 40;
-	private static final int TAB_TOP      = 20;
-	private static final int PANEL_TOP    = 83;
-	private static final int PANEL_BOTTOM = 26;
+	private static final int LEFT_EDGE       = 80;
+	private static final int MARGIN          = 12;
+	private static final int TAB_WIDTH       = 20;
+	private static final int TAB_HEIGHT      = 40;
+	private static final int TAB_TOP         = 20;
+	private static final int PANEL_TOP       = 83;
+	private static final int PANEL_BOTTOM    = 26;
+	private static final int SCROLLBAR_WIDTH = 5;
 	private static final double TWEEN_RATE = 0.08;
@@ -83,6 +87,11 @@ public class GuiScreenModInfo extends GuiScreen
 	private boolean mouseDown, toggled;
 	/**
+	 * Timer used to handle double-clicking on a mod
+	 */
+	private int doubleClickTime = 0;
+	
+	/**
 	 * Hover opacity for the tab
 	 */
 	private float tabOpacity = 0.0F;
@@ -118,20 +127,33 @@ public class GuiScreenModInfo extends GuiScreen
 	private GuiButton btnToggle;
 	/**
+	 * Config button 
+	 */
+	private GuiButton btnConfig;
+	
+	/**
 	 * Enable the mod info tab checkbox
 	 */
 	private GuiCheckbox chkEnabled;
+	private ConfigPanelManager configPanelManager;
+	
+	/**
+	 * Configuration panel
+	 */
+	private GuiConfigPanelContainer configPanel;
+	
 	/**
 	 * @param minecraft
 	 * @param mainMenu
 	 * @param loader
 	 * @param enabledModsList
 	 */
-	public GuiScreenModInfo(Minecraft minecraft, GuiMainMenu mainMenu, LiteLoader loader, EnabledModsList enabledModsList)
+	public GuiScreenModInfo(Minecraft minecraft, GuiMainMenu mainMenu, LiteLoader loader, EnabledModsList enabledModsList, ConfigPanelManager configPanelManager)
 	{
 		this.mc = minecraft;
 		this.mainMenu = mainMenu;
+		this.configPanelManager = configPanelManager;
 		// Spawn the texture resource if we haven't already
 		if (aboutTexture == null)
@@ -206,11 +228,17 @@ public class GuiScreenModInfo extends GuiScreen
 	@Override
 	public void initGui()
 	{
-		int left = LEFT_EDGE + 16 + (this.width - LEFT_EDGE - 28) / 2;
+		if (this.configPanel != null)
+		{
+			this.configPanel.setSize(this.width - LEFT_EDGE, this.height);
+		}
+		
+		int left = LEFT_EDGE + MARGIN + 4 + (this.width - LEFT_EDGE - MARGIN - MARGIN - 4) / 2;
 		this.buttonList.clear();
-		this.buttonList.add(this.btnToggle = new GuiButton(0, left, this.height - PANEL_BOTTOM - 24, 100, 20, "Enable mod"));
-		this.buttonList.add(this.chkEnabled = new GuiCheckbox(1, LEFT_EDGE + 12, this.height - PANEL_BOTTOM + 9, "Show LiteLoader tab on main menu"));
+		this.buttonList.add(this.btnToggle = new GuiButton(0, left, this.height - PANEL_BOTTOM - 24, 90, 20, "Enable mod"));
+		this.buttonList.add(this.btnConfig = new GuiButton(1, left + 92, this.height - PANEL_BOTTOM - 24, 60, 20, "Config"));
+		this.buttonList.add(this.chkEnabled = new GuiCheckbox(2, LEFT_EDGE + MARGIN, this.height - PANEL_BOTTOM + 9, "Show LiteLoader tab on main menu"));
 		this.selectMod(this.selectedMod);
 	}
@@ -236,6 +264,11 @@ public class GuiScreenModInfo extends GuiScreen
 	@Override
 	public void updateScreen()
 	{
+		if (this.configPanel != null)
+		{
+			this.configPanel.onTick();
+		}
+		
 		this.tickNumber++;
 		if (this.mc.currentScreen == this)
@@ -248,6 +281,9 @@ public class GuiScreenModInfo extends GuiScreen
 		{
 			this.onToggled();
 		}
+		
+		if (this.doubleClickTime > 0)
+			this.doubleClickTime--;
 	}
 	/* (non-Javadoc)
@@ -311,28 +347,55 @@ public class GuiScreenModInfo extends GuiScreen
 		// Only draw the panel contents if we are actually open
 		if (this.tweenAmount > 0.0)
 		{
-			// Draw the header pieces
-			glDrawTexturedRect(LEFT_EDGE + 12, 12, 128, 40, 0, 0, 256, 80, 1.0F); // liteloader logo
-			glDrawTexturedRect(this.width - 32 - 12, 12, 32, 45, 0, 80, 64, 170, 1.0F); // chicken
-			
-			// Draw header text
-			this.fontRenderer.drawString("Version " + LiteLoader.getVersion(), LEFT_EDGE + 12 + 38, 50, 0xFFFFFFFF);
-			this.fontRenderer.drawString(this.activeModText, LEFT_EDGE + 12 + 38, 60, 0xFFAAAAAA);
-
-			// Draw top and bottom horizontal rules
-			drawRect(LEFT_EDGE + 12, 80, this.width - 12, 81, 0xFF999999);
-			drawRect(LEFT_EDGE + 12, this.height - PANEL_BOTTOM + 2, this.width - 12, this.height - PANEL_BOTTOM + 3, 0xFF999999);
+			if (this.configPanel != null)
+			{
+				this.drawConfigPanel(mouseX, mouseY, partialTicks);
+			}
+			else
+			{
+				// Draw the header pieces
+				glDrawTexturedRect(LEFT_EDGE + MARGIN, 12, 128, 40, 0, 0, 256, 80, 1.0F); // liteloader logo
+				glDrawTexturedRect(this.width - 32 - MARGIN, 12, 32, 45, 0, 80, 64, 170, 1.0F); // chicken
+				
+				// Draw header text
+				this.fontRenderer.drawString("Version " + LiteLoader.getVersion(), LEFT_EDGE + MARGIN + 38, 50, 0xFFFFFFFF);
+				this.fontRenderer.drawString(this.activeModText, LEFT_EDGE + MARGIN + 38, 60, 0xFFAAAAAA);
+				
+				// Draw top and bottom horizontal rules
+				drawRect(LEFT_EDGE + MARGIN, 80, this.width - MARGIN, 81, 0xFF999999);
+				drawRect(LEFT_EDGE + MARGIN, this.height - PANEL_BOTTOM + 2, this.width - MARGIN, this.height - PANEL_BOTTOM + 3, 0xFF999999);
+				
+				int innerWidth = this.width - LEFT_EDGE - MARGIN - MARGIN - 4;
+				int panelWidth = innerWidth / 2;
+				int panelHeight = this.height - PANEL_BOTTOM - PANEL_TOP;
+				
+				this.drawModsList(mouseX, mouseY, partialTicks, panelWidth, panelHeight);
+				this.drawSelectedMod(mouseX, mouseY, partialTicks, panelWidth, panelHeight);
+				
+				// Draw other controls inside the transform so that they slide properly
+				super.drawScreen(mouseX, mouseY, partialTicks);
+			}
+		}
+		else if (this.configPanel != null)
+		{
+			this.closeConfigPanel(this.configPanel);
+		}
-			int innerWidth = this.width - LEFT_EDGE - 24 - 4;
-			int panelWidth = innerWidth / 2;
-			int panelHeight = this.height - PANEL_BOTTOM - PANEL_TOP;
-
-			this.drawModsList(mouseX, mouseY, partialTicks, panelWidth, panelHeight);
-			this.drawSelectedMod(mouseX, mouseY, partialTicks, panelWidth, panelHeight);
+		
+		glPopMatrix();
+	}
-			// Draw other controls inside the transform so that they slide properly
-			super.drawScreen(mouseX, mouseY, partialTicks);
-		}
+	/**
+	 * @param mouseX
+	 * @param mouseY
+	 * @param partialTicks
+	 */
+	public void drawConfigPanel(int mouseX, int mouseY, float partialTicks)
+	{
+		glPushMatrix();
+		glTranslatef(LEFT_EDGE, 0, 0);
+		
+		this.configPanel.draw(mouseX - LEFT_EDGE, mouseY, partialTicks);
 		glPopMatrix();
 	}
@@ -346,10 +409,10 @@ public class GuiScreenModInfo extends GuiScreen
 	 */
 	public void drawModsList(int mouseX, int mouseY, float partialTicks, int width, int height)
 	{
-		this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, LEFT_EDGE + 12 + width - 5, PANEL_TOP, 5, height, this.listHeight);
+		this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, LEFT_EDGE + MARGIN + width - SCROLLBAR_WIDTH, PANEL_TOP, SCROLLBAR_WIDTH, height, this.listHeight);
 		// clip outside of scroll area
-		glEnableClipping(LEFT_EDGE + 12, LEFT_EDGE + 12 + width - 6, PANEL_TOP, this.height - PANEL_BOTTOM);
+		glEnableClipping(LEFT_EDGE + MARGIN, LEFT_EDGE + MARGIN + width - SCROLLBAR_WIDTH - 1, PANEL_TOP, this.height - PANEL_BOTTOM);
 		// handle scrolling
 		glPushMatrix();
@@ -361,7 +424,7 @@ public class GuiScreenModInfo extends GuiScreen
 		for (GuiModListEntry mod : this.mods)
 		{
 			// drawListEntry returns a value indicating the height of the item drawn
-			yPos += mod.drawListEntry(mouseX, mouseY, partialTicks, LEFT_EDGE + 12, yPos, width - 6, mod == this.selectedMod);
+			yPos += mod.drawListEntry(mouseX, mouseY, partialTicks, LEFT_EDGE + MARGIN, yPos, width - 6, mod == this.selectedMod);
 		}
 		glPopMatrix();
@@ -382,8 +445,8 @@ public class GuiScreenModInfo extends GuiScreen
 	{
 		if (this.selectedMod != null)
 		{
-			int left = LEFT_EDGE + 12 + width;
-			int right = this.width - 12;
+			int left = LEFT_EDGE + MARGIN + width;
+			int right = this.width - MARGIN;
 			glEnableClipping(left, right, PANEL_TOP, this.height - PANEL_BOTTOM - 28);
 			this.selectedMod.drawInfo(mouseX, mouseY, partialTicks, left, PANEL_TOP, right - left);
@@ -399,11 +462,14 @@ public class GuiScreenModInfo extends GuiScreen
 	{
 		this.selectedMod = mod;
 		this.btnToggle.drawButton = false;
+		this.btnConfig.drawButton = false;
 		if (this.selectedMod != null && this.selectedMod.canBeToggled())
 		{
 			this.btnToggle.drawButton = true;
 			this.btnToggle.displayString = this.selectedMod.willBeEnabled() ? "Disable mod" : "Enable mod";
+			
+			this.btnConfig.drawButton = this.configPanelManager.hasPanel(this.selectedMod.getModClass());
 		}
 	}
@@ -421,6 +487,11 @@ public class GuiScreenModInfo extends GuiScreen
 		if (button.id == 1)
 		{
+			this.openConfigPanel();
+		}
+		
+		if (button.id == 2)
+		{
 			this.chkEnabled.checked = !this.chkEnabled.checked;
 			LiteLoader.getInstance().setDisplayModInfoScreenTab(this.chkEnabled.checked);
@@ -437,6 +508,12 @@ public class GuiScreenModInfo extends GuiScreen
 	@Override
 	protected void keyTyped(char keyChar, int keyCode)
 	{
+		if (this.configPanel != null)
+		{
+			this.configPanel.keyPressed(keyChar, keyCode);
+			return;
+		}
+		
 		if (keyCode == Keyboard.KEY_ESCAPE)
 		{
 			this.onToggled();
@@ -450,6 +527,12 @@ public class GuiScreenModInfo extends GuiScreen
 	@Override
 	protected void mouseClicked(int mouseX, int mouseY, int button)
 	{
+		if (this.configPanel != null)
+		{
+			this.configPanel.mousePressed(mouseX - LEFT_EDGE, mouseY, button);
+			return;
+		}
+		
 		if (button == 0)
 		{
 			if (this.scrollBar.wasMouseOver())
@@ -459,9 +542,22 @@ public class GuiScreenModInfo extends GuiScreen
 			if (mouseY > PANEL_TOP && mouseY < this.height - PANEL_BOTTOM)
 			{
+				GuiModListEntry lastSelectedMod = this.selectedMod;
+				
 				for (GuiModListEntry mod : this.mods)
 				{
-					if (mod.mouseWasOver()) this.selectMod(mod); 
+					if (mod.mouseWasOver())
+					{
+						this.selectMod(mod);
+						
+						// handle double-click
+						if (mod == lastSelectedMod && this.doubleClickTime > 0 && this.btnConfig.drawButton)
+						{
+							this.actionPerformed(this.btnConfig);
+						}
+						
+						this.doubleClickTime = 5;
+					}
 				}
 			}
 		}
@@ -475,6 +571,16 @@ public class GuiScreenModInfo extends GuiScreen
 	@Override
 	protected void mouseMovedOrUp(int mouseX, int mouseY, int button)
 	{
+		if (this.configPanel != null)
+		{
+			if (button == -1)
+				this.configPanel.mouseMoved(mouseX - LEFT_EDGE, mouseY);
+			else
+				this.configPanel.mouseReleased(mouseX - LEFT_EDGE, mouseY, button);
+			
+			return;
+		}
+		
 		if (button == 0)
 		{
 			this.scrollBar.setDragging(false);
@@ -490,10 +596,12 @@ public class GuiScreenModInfo extends GuiScreen
 	public void handleMouseInput()
 	{
 		int mouseWheelDelta = Mouse.getEventDWheel();
-		
 		if (mouseWheelDelta != 0)
 		{
-			this.scrollBar.offsetValue(-mouseWheelDelta / 8);
+			if (this.configPanel != null)
+				this.configPanel.mouseWheelScrolled(mouseWheelDelta);
+			else
+				this.scrollBar.offsetValue(-mouseWheelDelta / 8);
 		}
 		super.handleMouseInput();
@@ -550,6 +658,40 @@ public class GuiScreenModInfo extends GuiScreen
 	}
 	/**
+	 * Callback for the "config" button, display the config panel for the currently selected mod
+	 */
+	private void openConfigPanel()
+	{
+		if (this.selectedMod != null && this.selectedMod.getModClass() != null)
+		{
+			ConfigPanel panel = this.configPanelManager.getPanel(this.selectedMod.getModClass());
+			if (panel != null)
+			{
+				if (this.configPanel != null)
+				{
+					this.configPanel.onHidden();
+				}
+				
+				this.configPanel = new GuiConfigPanelContainer(this, this.mc, panel, this.selectedMod.getModInstance());
+				this.configPanel.setSize(this.width - LEFT_EDGE, this.height);
+				this.configPanel.onShown();
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.modconfig.ConfigPanelHost#close()
+	 */
+	void closeConfigPanel(GuiConfigPanelContainer container)
+	{
+		if (this.configPanel != null && (container == null || this.configPanel == container))
+		{
+			this.configPanel.onHidden();
+			this.configPanel = null;
+		}
+	}
+	
+	/**
 	 * @param x
 	 * @param y
 	 * @param width
@@ -590,7 +732,7 @@ public class GuiScreenModInfo extends GuiScreen
 	 * @param yTop Top edge clip or -1 to not use this plane
 	 * @param yBottom Bottom edge clip or -1 to not use this plane
 	 */
-	private final static void glEnableClipping(int xLeft, int xRight, int yTop, int yBottom)
+	final static void glEnableClipping(int xLeft, int xRight, int yTop, int yBottom)
 	{
 		// Apply left edge clipping if specified
 		if (xLeft != -1)
@@ -632,7 +774,7 @@ public class GuiScreenModInfo extends GuiScreen
 	/**
 	 * Disable OpenGL clipping planes (uses planes 2, 3, 4 and 5)
 	 */
-	private final static void glDisableClipping()
+	final static void glDisableClipping()
 	{
 		glDisable(GL_CLIP_PLANE5);
 		glDisable(GL_CLIP_PLANE4);
+package com.mumfrey.liteloader.modconfig;
+
+/**
+ * Interface for mod config panels to implement
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface ConfigPanel
+{
+	/**
+	 * Panels should return the text to display at the top of the config panel window
+	 */
+	public abstract String getPanelTitle();
+	
+	/**
+	 * Get the height of the content area for scrolling purposes, return -1 to disable scrolling
+	 */
+	public abstract int getContentHeight();
+	
+	/**
+	 * Called when the panel is displayed, initialise the panel (read settings, etc)
+	 * 
+	 * @param host panel host
+	 */
+	public abstract void onPanelShown(ConfigPanelHost host);
+	
+	/**
+	 * Called when the window is resized whilst the panel is active
+	 * 
+	 * @param host panel host
+	 */
+	public abstract void onPanelResize(ConfigPanelHost host);
+	
+	/**
+	 * Called when the panel is closed, panel should save settings
+	 */
+	public abstract void onPanelHidden();
+	
+	/**
+	 * Called every tick
+	 */
+	public abstract void onTick(ConfigPanelHost host);
+	
+	/**
+	 * Draw the configuration panel
+	 * 
+	 * @param host
+	 * @param mouseX
+	 * @param mouseY
+	 * @param partialTicks
+	 */
+	public abstract void drawPanel(ConfigPanelHost host, int mouseX, int mouseY, float partialTicks);
+	
+	/**
+	 * Called when a mouse button is pressed
+	 * 
+	 * @param host
+	 * @param mouseX
+	 * @param mouseY
+	 * @param mouseButton
+	 */
+	public abstract void mousePressed(ConfigPanelHost host, int mouseX, int mouseY, int mouseButton);
+	
+	/**
+	 * Called when a mouse button is released
+	 * 
+	 * @param host
+	 * @param mouseX
+	 * @param mouseY
+	 * @param mouseButton
+	 */
+	public abstract void mouseReleased(ConfigPanelHost host, int mouseX, int mouseY, int mouseButton);
+	
+	/**
+	 * Called when the mouse is moved
+	 * 
+	 * @param host
+	 * @param mouseX
+	 * @param mouseY
+	 */
+	public abstract void mouseMoved(ConfigPanelHost host, int mouseX, int mouseY);
+	
+	/**
+	 * Called when a key is pressed
+	 * 
+	 * @param host
+	 * @param keyChar
+	 * @param keyCode
+	 */
+	public abstract void keyPressed(ConfigPanelHost host, char keyChar, int keyCode);
+}
+package com.mumfrey.liteloader.modconfig;
+
+import com.mumfrey.liteloader.LiteMod;
+
+/**
+ * Interface for object which can host configuration panels
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface ConfigPanelHost
+{
+	/**
+	 * Get the mod instance which owns the panel
+	 */
+	public abstract <ModClass extends LiteMod> ModClass getMod();
+	
+	/**
+	 * Get the width of the configuration panel area
+	 */
+	public abstract int getWidth();
+	
+	/**
+	 * Get the height of the configuration panel area
+	 */
+	public abstract int getHeight();
+	
+	/**
+	 * Notify the panel host that the panel wishes to close
+	 */
+	public abstract void close();
+	
+	/**
+	 * Notify the panel host that the panel wishes to advance to the next panel
+	 */
+//	public abstract void next();
+	
+	/**
+	 * Notify the panel host that the panel wishes to go back to the previous panel
+	 */
+//	public abstract void previous();
+}
+package com.mumfrey.liteloader.modconfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.mumfrey.liteloader.Configurable;
+import com.mumfrey.liteloader.LiteMod;
+
+/**
+ * Registry where we keep the mod config panel classes
+ *
+ * @author Adam Mummery-Smith
+ */
+public class ConfigPanelManager
+{
+	/**
+	 * Mod config panel classes
+	 */
+	private Map<Class<? extends LiteMod>, Class<? extends ConfigPanel>> configPanels = new HashMap<Class<? extends LiteMod>, Class<? extends ConfigPanel>>();
+	
+	/**
+	 * Register a mod, adds the config panel class to the map if the mod implements Configurable
+	 */
+	public void registerMod(LiteMod mod)
+	{
+		if (mod instanceof Configurable)
+		{
+			Class<? extends ConfigPanel> panelClass = ((Configurable)mod).getConfigPanelClass();
+			if (panelClass != null) this.configPanels.put(mod.getClass(), panelClass);
+		}
+	}
+	
+	/**
+	 * Check whether a config panel is available for the specified class
+	 * 
+	 * @param modClass
+	 * @return
+	 */
+	public boolean hasPanel(Class<? extends LiteMod> modClass)
+	{
+		return modClass != null && this.configPanels.containsKey(modClass);
+	}
+	
+	/**
+	 * Instance a new config panel for the specified mod class if one is available
+	 * 
+	 * @param modClass
+	 * @return
+	 */
+	public ConfigPanel getPanel(Class<? extends LiteMod> modClass)
+	{
+		if (modClass != null && this.configPanels.containsKey(modClass))
+		{
+			try
+			{
+				return this.configPanels.get(modClass).newInstance();
+			}
+			catch (InstantiationException ex) {}
+			catch (IllegalAccessException ex) {}
+			
+			// If instantiation fails, remove the panel
+			this.configPanels.remove(modClass);
+		}
+		
+		return null;
+	}
+}
@@ -14,6 +14,7 @@ import net.minecraft.src.Minecraft;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.Packet1Login;
+import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.Permissible;
 import com.mumfrey.liteloader.PluginChannelListener;
 import com.mumfrey.liteloader.core.PluginChannels;
@@ -127,6 +128,19 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 		ServerPermissions modPermissions = this.serverPermissions.get(modName);
 		return modPermissions != null ? modPermissions.getReplicationTime() : 0;
 	}
+	
+	/**
+	 * Register a new mod, if permissible
+	 * 
+	 * @param mod
+	 */
+	public void registerMod(LiteMod mod)
+	{
+		if (mod instanceof Permissible)
+		{
+			this.registerPermissible((Permissible)mod);
+		}
+	}
 	/* (non-Javadoc)
 	 * @see net.eq2online.permissions.PermissionsManager#registerListener(net.eq2online.permissions.PermissionsListener)