move mod list panel to separate class

Mumfrey
1 parent f6840e83
Showing 4 changed files with 298 additions and 234 deletions
java/client/com/mumfrey/liteloader/client/gui/GuiModInfoPanel.java
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/GuiModListEntry.java → java/client/com/mumfrey/liteloader/client/gui/ModListEntry.java
@@ -10,10 +10,12 @@ import com.mumfrey.liteloader.core.ModInfo;
 public class GuiModInfoPanel extends Gui
 {
-	private static final int TITLE_COLOUR       = GuiModListEntry.WHITE;
-	private static final int AUTHORS_COLOUR     = GuiModListEntry.WHITE;
-	private static final int DIVIDER_COLOUR     = GuiModListEntry.GREY;
-	private static final int DESCRIPTION_COLOUR = GuiModListEntry.WHITE;
+	private static final int TITLE_COLOUR       = GuiModListPanel.WHITE;
+	private static final int AUTHORS_COLOUR     = GuiModListPanel.WHITE;
+	private static final int DIVIDER_COLOUR     = GuiModListPanel.GREY;
+	private static final int DESCRIPTION_COLOUR = GuiModListPanel.WHITE;
+	
+	private final ModListEntry owner;
 	private final FontRenderer fontRenderer;
@@ -25,8 +27,9 @@ public class GuiModInfoPanel extends Gui
 	private boolean mouseOverPanel, mouseOverScrollBar;
-	public GuiModInfoPanel(FontRenderer fontRenderer, int brandColour, ModInfo<?> modInfo)
+	public GuiModInfoPanel(ModListEntry owner, FontRenderer fontRenderer, int brandColour, ModInfo<?> modInfo)
 	{
+		this.owner = owner;
 		this.fontRenderer = fontRenderer;
 		this.brandColour = brandColour;
 		this.modInfo = modInfo;
@@ -39,15 +42,15 @@ public class GuiModInfoPanel extends Gui
 		this.mouseOverPanel = this.isMouseOver(mouseX, mouseY, xPosition, yPos, width, height);
-		this.fontRenderer.drawString(this.modInfo.getDisplayName(), xPosition + 5, yPos, GuiModInfoPanel.TITLE_COLOUR); yPos += 10;
-		this.fontRenderer.drawString(I18n.format("gui.about.versiontext", this.modInfo.getVersion()), xPosition + 5, yPos, GuiModListEntry.VERSION_TEXT_COLOUR); yPos += 10;
+		this.fontRenderer.drawString(this.owner.getTitleText(), xPosition + 5, yPos, GuiModInfoPanel.TITLE_COLOUR); yPos += 10;
+		this.fontRenderer.drawString(this.owner.getVersionText(), xPosition + 5, yPos, GuiModListPanel.VERSION_TEXT_COLOUR); yPos += 10;
 		drawRect(xPosition + 5, yPos, xPosition + width, yPos + 1, GuiModInfoPanel.DIVIDER_COLOUR); yPos += 4; // divider
 		this.fontRenderer.drawString(I18n.format("gui.about.authors") + ": \2477" + this.modInfo.getAuthor(), xPosition + 5, yPos, GuiModInfoPanel.AUTHORS_COLOUR); yPos += 10;
 		if (!Strings.isNullOrEmpty(this.modInfo.getURL()))
 		{
-			this.fontRenderer.drawString(this.modInfo.getURL(), xPosition + 5, yPos, GuiModListEntry.BLEND_2THRDS & this.brandColour); yPos += 10;
+			this.fontRenderer.drawString(this.modInfo.getURL(), xPosition + 5, yPos, GuiModListPanel.BLEND_2THRDS & this.brandColour); yPos += 10;
 		}
 		drawRect(xPosition + 5, yPos, xPosition + width, yPos + 1, GuiModInfoPanel.DIVIDER_COLOUR); yPos += 4; // divider
+package com.mumfrey.liteloader.client.gui;
+
+import static com.mumfrey.liteloader.client.util.GLClippingPlanes.*;
+import static org.lwjgl.opengl.GL11.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+
+import com.mumfrey.liteloader.api.ModInfoDecorator;
+import com.mumfrey.liteloader.core.ModInfo;
+import com.mumfrey.liteloader.util.render.IconClickable;
+import com.mumfrey.liteloader.util.render.IconTextured;
+
+public class GuiModListPanel extends Gui
+{
+	static final int BLACK                     = 0xFF000000;
+	static final int DARK_GREY                 = 0xB0333333;
+	static final int GREY                      = 0xFF999999;
+	static final int WHITE                     = 0xFFFFFFFF;
+	
+	static final int BLEND_2THRDS              = 0xB0FFFFFF;
+	static final int BLEND_HALF                = 0x80FFFFFF;
+	
+	static final int API_COLOUR                = 0xFFAA00AA;
+	static final int EXTERNAL_ENTRY_COLOUR     = 0xFF47D1AA;
+	static final int MISSING_DEPENDENCY_COLOUR = 0xFFFFAA00;
+	static final int ERROR_COLOUR              = 0xFFFF5555;
+	static final int ERROR_GRADIENT_COLOUR     = 0xFFAA0000;
+	static final int ERROR_GRADIENT_COLOUR2    = 0xFF550000;
+	
+	static final int VERSION_TEXT_COLOUR       = GuiModListPanel.GREY;
+	static final int GRADIENT_COLOUR2          = GuiModListPanel.BLEND_2THRDS & GuiModListPanel.DARK_GREY;
+	static final int HANGER_COLOUR             = GuiModListPanel.GREY;
+	static final int HANGER_COLOUR_MOUSEOVER   = GuiModListPanel.WHITE;
+
+	static final int PANEL_HEIGHT              = 32;
+	static final int PANEL_SPACING             = 4;
+	
+	private ModListEntry owner;
+
+	/**
+	 * For text display
+	 */
+	private final FontRenderer fontRenderer;
+	
+	private final int brandColour;
+	
+	private final List<ModInfoDecorator> decorators;
+	
+	private final ModInfo<?> modInfo;
+
+	/**
+	 * True if the mouse was over this mod on the last render
+	 */
+	private boolean mouseOver;
+	
+	private IconClickable mouseOverIcon = null;
+	
+	private List<IconTextured> modIcons = new ArrayList<IconTextured>();
+
+	public GuiModListPanel(ModListEntry owner, FontRenderer fontRenderer, int brandColour, ModInfo<?> modInfo, List<ModInfoDecorator> decorators)
+	{
+		this.owner = owner;
+		this.fontRenderer = fontRenderer;
+		this.brandColour = brandColour;
+		this.modInfo = modInfo;
+		this.decorators = decorators;
+		
+		for (ModInfoDecorator decorator : this.decorators)
+		{
+			decorator.addIcons(modInfo, this.modIcons);
+		}
+	}
+
+	/**
+	 * Draw this list entry as a list item
+	 * 
+	 * @param mouseX
+	 * @param mouseY
+	 * @param partialTicks
+	 * @param xPosition
+	 * @param yPosition
+	 * @param width
+	 * @param selected
+	 * @return
+	 */
+	public int draw(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
+	{
+		int gradientColour = this.getGradientColour(selected);
+		int titleColour    = this.getTitleColour(selected);
+		int statusColour   = this.getStatusColour(selected);
+		
+		this.drawGradientRect(xPosition, yPosition, xPosition + width, yPosition + GuiModListPanel.PANEL_HEIGHT, gradientColour, GuiModListPanel.GRADIENT_COLOUR2);
+		
+		String titleText = this.owner.getTitleText();
+		String versionText = this.owner.getVersionText();
+		String statusText = this.owner.getStatusText();
+
+		for (ModInfoDecorator decorator : this.decorators)
+		{
+			String newStatusText = decorator.modifyStatusText(this.modInfo, statusText);
+			if (newStatusText != null) statusText = newStatusText;
+		}
+			
+		this.fontRenderer.drawString(titleText,   xPosition + 5, yPosition + 2,  titleColour);
+		this.fontRenderer.drawString(versionText, xPosition + 5, yPosition + 12, GuiModListPanel.VERSION_TEXT_COLOUR);
+		this.fontRenderer.drawString(statusText,  xPosition + 5, yPosition + 22, statusColour);
+		
+		this.mouseOver = this.isMouseOver(mouseX, mouseY, xPosition, yPosition, width, PANEL_HEIGHT); 
+		int hangerColour = this.mouseOver ? GuiModListPanel.HANGER_COLOUR_MOUSEOVER : GuiModListPanel.HANGER_COLOUR;
+		drawRect(xPosition, yPosition, xPosition + 1, yPosition + PANEL_HEIGHT, hangerColour);
+		
+		for (ModInfoDecorator decorator : this.decorators)
+		{
+			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)
+	{
+		xPosition += (width - 14);
+		yPosition += (GuiModListPanel.PANEL_HEIGHT - 14);
+		
+		this.mouseOverIcon = null;
+		
+		for (IconTextured icon : this.modIcons)
+		{
+			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)
+	{
+		glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(icon.getTextureResource());
+		
+		glEnable(GL_BLEND);
+		this.drawTexturedModalRect(xPosition, yPosition, icon.getUPos(), icon.getVPos(), icon.getIconWidth(), icon.getIconHeight());
+		glDisable(GL_BLEND);
+
+		if (mouseX >= xPosition && mouseX <= xPosition + 12 && mouseY >= yPosition && mouseY <= yPosition + 12)
+		{
+			String tooltipText = icon.getDisplayText();
+			if (tooltipText != null)
+			{
+				glDisableClipping();
+				GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, tooltipText, mouseX, mouseY, 4096, 4096, GuiModListPanel.WHITE, GuiModListPanel.BLEND_HALF & GuiModListPanel.BLACK);
+				glEnableClipping();
+			}
+			
+			if (icon instanceof IconClickable) this.mouseOverIcon = (IconClickable)icon;
+		}
+		
+		return xPosition - 14;
+	}
+
+	/**
+	 * @param external
+	 * @param selected
+	 * @return
+	 */
+	protected int getGradientColour(boolean selected)
+	{
+		return GuiModListPanel.BLEND_2THRDS & (this.owner.isErrored() ? (selected ? GuiModListPanel.ERROR_GRADIENT_COLOUR : GuiModListPanel.ERROR_GRADIENT_COLOUR2) : (selected ? (this.owner.isExternal() ? GuiModListPanel.EXTERNAL_ENTRY_COLOUR : this.brandColour) : GuiModListPanel.BLACK));
+	}
+
+	/**
+	 * @param missingDependencies
+	 * @param enabled
+	 * @param external
+	 * @param selected
+	 * @return
+	 */
+	protected int getTitleColour(boolean selected)
+	{
+		if (this.owner.isMissingDependencies()) return GuiModListPanel.MISSING_DEPENDENCY_COLOUR;
+		if (this.owner.isMissingAPIs()) return GuiModListPanel.API_COLOUR;
+		if (this.owner.isErrored()) return GuiModListPanel.ERROR_COLOUR;
+		if (!this.owner.isActive()) return GuiModListPanel.GREY;
+		return this.owner.isExternal() ? GuiModListPanel.EXTERNAL_ENTRY_COLOUR : GuiModListPanel.WHITE;
+	}
+
+	/**
+	 * @param external
+	 * @param selected
+	 * @return
+	 */
+	protected int getStatusColour(boolean selected)
+	{
+		return this.owner.isExternal() ? GuiModListPanel.EXTERNAL_ENTRY_COLOUR : this.brandColour;
+	}
+
+	public int getHeight()
+	{
+		return GuiModListPanel.PANEL_HEIGHT + GuiModListPanel.PANEL_SPACING;
+	}
+	
+	private boolean isMouseOver(int mouseX, int mouseY, int x, int y, int width, int height)
+	{
+		return mouseX > x && mouseX < x + width && mouseY > y && mouseY < y + height;
+	}
+	
+	public boolean isMouseOverIcon()
+	{
+		return this.mouseOver && this.mouseOverIcon != null;
+	}
+
+	public boolean isMouseOver()
+	{
+		return this.mouseOver;
+	}
+	
+	public void iconClick(Object source)
+	{
+		if (this.mouseOverIcon != null)
+		{
+			this.mouseOverIcon.onClicked(source, this);
+		}
+	}
+}
@@ -40,12 +40,12 @@ public class GuiPanelMods extends GuiPanel
 	/**
 	 * List of enumerated mods
 	 */
-	private List<GuiModListEntry> mods = new ArrayList<GuiModListEntry>();
+	private List<ModListEntry> mods = new ArrayList<ModListEntry>();
 	/**
 	 * Currently selected mod
 	 */
-	private GuiModListEntry selectedMod = null;
+	private ModListEntry selectedMod = null;
 	/**
 	 * Timer used to handle double-clicking on a mod
@@ -94,26 +94,26 @@ public class GuiPanelMods extends GuiPanel
 	private void populateModList(LiteLoaderMods mods, LoaderEnvironment environment, List<ModInfoDecorator> decorators)
 	{
 		// Add mods to this treeset first, in order to sort them
-		Map<String, GuiModListEntry> sortedMods = new TreeMap<String, GuiModListEntry>();
+		Map<String, ModListEntry> sortedMods = new TreeMap<String, ModListEntry>();
 		// Active mods
 		for (ModInfo<LoadableMod<?>> mod : mods.getLoadedMods())
 		{
-			GuiModListEntry modListEntry = new GuiModListEntry(mods, environment, this.mc.fontRendererObj, this.brandColour, decorators, mod);
+			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())
 		{
-			GuiModListEntry modListEntry = new GuiModListEntry(mods, environment, this.mc.fontRendererObj, this.brandColour, decorators, disabledMod);
+			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())
 		{
-			GuiModListEntry modListEntry = new GuiModListEntry(mods, environment, this.mc.fontRendererObj, this.brandColour, decorators, injectedTweak);
+			ModListEntry modListEntry = new ModListEntry(mods, environment, this.mc.fontRendererObj, this.brandColour, decorators, injectedTweak);
 			sortedMods.put(modListEntry.getKey(), modListEntry);
 		}
@@ -174,17 +174,17 @@ public class GuiPanelMods extends GuiPanel
 			if (mouseY > GuiLiteLoaderPanel.PANEL_TOP && mouseY < this.height - GuiLiteLoaderPanel.PANEL_BOTTOM)
 			{
-				GuiModListEntry lastSelectedMod = this.selectedMod;
+				ModListEntry lastSelectedMod = this.selectedMod;
-				for (GuiModListEntry mod : this.mods)
+				for (ModListEntry mod : this.mods)
 				{
-					if (mod.isMouseOver())
+					if (mod.getListPanel().isMouseOver())
 					{
 						this.selectMod(mod);
-						if (mod.isMouseOverIcon())
+						if (mod.getListPanel().isMouseOverIcon())
 						{
-							mod.iconClick(this.parentScreen);
+							mod.getListPanel().iconClick(this.parentScreen);
 						}
 						else
 						{
@@ -326,16 +326,16 @@ public class GuiPanelMods extends GuiPanel
 		mouseY -= (GuiLiteLoaderPanel.PANEL_TOP - this.scrollBar.getValue());
 		int yPos = 0;
-		for (GuiModListEntry mod : this.mods)
+		for (ModListEntry mod : this.mods)
 		{
 			// drawListEntry returns a value indicating the height of the item drawn
-			yPos += mod.draw(mouseX, mouseY, partialTicks, MARGIN, yPos, width - 6, mod == this.selectedMod);
+			yPos += mod.getListPanel().draw(mouseX, mouseY, partialTicks, MARGIN, yPos, width - 6, mod == this.selectedMod);
 		}
 		yPos = 0;
-		for (GuiModListEntry mod : this.mods)
+		for (ModListEntry mod : this.mods)
 		{
-			yPos += mod.postRenderListEntry(mouseX, mouseY, partialTicks, MARGIN, yPos, width - 6, mod == this.selectedMod);
+			yPos += mod.getListPanel().postRender(mouseX, mouseY, partialTicks, MARGIN, yPos, width - 6, mod == this.selectedMod);
 		}
 		glPopMatrix();
@@ -370,7 +370,7 @@ public class GuiPanelMods extends GuiPanel
 	 * @param mod
 	 * @return
 	 */
-	private void selectMod(GuiModListEntry mod)
+	private void selectMod(ModListEntry mod)
 	{
 		if (this.selectedMod != null)
 		{
@@ -407,10 +407,10 @@ public class GuiPanelMods extends GuiPanel
 		if (this.selectedMod == null) return;
 		int yPos = 0;
-		for (GuiModListEntry mod : this.mods)
+		for (ModListEntry mod : this.mods)
 		{
 			if (mod == this.selectedMod) break;
-			yPos += mod.getHeight();
+			yPos += mod.getListPanel().getHeight();
 		}
 		// Mod is above the top of the visible window
@@ -421,7 +421,7 @@ public class GuiPanelMods extends GuiPanel
 		}
 		int panelHeight = this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - GuiLiteLoaderPanel.PANEL_TOP;
-		int modHeight = this.selectedMod.getHeight();
+		int modHeight = this.selectedMod.getListPanel().getHeight();
 		// Mod is below the bottom of the visible window
 		if (yPos - this.scrollBar.getValue() + modHeight > panelHeight)
 package com.mumfrey.liteloader.client.gui;
-import static com.mumfrey.liteloader.client.util.GLClippingPlanes.*;
-import static org.lwjgl.opengl.GL11.*;
-
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
 import net.minecraft.client.resources.I18n;
 import com.mumfrey.liteloader.LiteMod;
@@ -19,8 +13,6 @@ 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.util.render.IconClickable;
-import com.mumfrey.liteloader.util.render.IconTextured;
 /**
  * Represents a mod in the mod info screen, keeps track of mod information and provides methods
@@ -28,44 +20,14 @@ import com.mumfrey.liteloader.util.render.IconTextured;
  *
  * @author Adam Mummery-Smith
  */
-public class GuiModListEntry extends Gui
+public class ModListEntry
 {
-	static final int BLACK                     = 0xFF000000;
-	static final int DARK_GREY                 = 0xB0333333;
-	static final int GREY                      = 0xFF999999;
-	static final int WHITE                     = 0xFFFFFFFF;
-	
-	static final int BLEND_2THRDS              = 0xB0FFFFFF;
-	static final int BLEND_HALF                = 0x80FFFFFF;
-	
-	static final int API_COLOUR                = 0xFFAA00AA;
-	static final int EXTERNAL_ENTRY_COLOUR     = 0xFF47D1AA;
-	static final int MISSING_DEPENDENCY_COLOUR = 0xFFFFAA00;
-	static final int ERROR_COLOUR              = 0xFFFF5555;
-	static final int ERROR_GRADIENT_COLOUR     = 0xFFAA0000;
-	static final int ERROR_GRADIENT_COLOUR2    = 0xFF550000;
-	
-	static final int VERSION_TEXT_COLOUR       = GuiModListEntry.GREY;
-	static final int GRADIENT_COLOUR2          = GuiModListEntry.BLEND_2THRDS & GuiModListEntry.DARK_GREY;
-	static final int HANGER_COLOUR             = GuiModListEntry.GREY;
-	static final int HANGER_COLOUR_MOUSEOVER   = GuiModListEntry.WHITE;
-
-	static final int PANEL_HEIGHT              = 32;
-	static final int PANEL_SPACING             = 4;
-	
-	/**
-	 * For text display
-	 */
-	private final FontRenderer fontRenderer;
-	
-	private final int brandColour;
-	
-	private final List<ModInfoDecorator> decorators;
-	
 	private final LiteLoaderMods mods;
 	private final ModInfo<?> modInfo;
+	private final GuiModListPanel listPanel;
+	
 	private final GuiModInfoPanel infoPanel;
 	/**
@@ -101,18 +63,9 @@ public class GuiModListEntry extends Gui
 	private boolean willBeEnabled;
 	/**
-	 * True if the mouse was over this mod on the last render
-	 */
-	private boolean mouseOver;
-	
-	private IconClickable mouseOverIcon = null;
-	
-	/**
 	 * True if this is not a mod but an external jar 
 	 */
-	private boolean external;
-	
-	private List<IconTextured> modIcons = new ArrayList<IconTextured>();
+	private boolean isExternal;
 	/**
 	 * Mod list entry for an ACTIVE mod
@@ -120,20 +73,15 @@ public class GuiModListEntry extends Gui
 	 * @param modInfo
 	 * @param enabledMods
 	 */
-	GuiModListEntry(LiteLoaderMods mods, LoaderEnvironment environment, FontRenderer fontRenderer, int brandColour, List<ModInfoDecorator> decorators, ModInfo<?> modInfo)
+	ModListEntry(LiteLoaderMods mods, LoaderEnvironment environment, FontRenderer fontRenderer, int brandColour, List<ModInfoDecorator> decorators, ModInfo<?> modInfo)
 	{
 		this.mods          = mods;
-		this.fontRenderer  = fontRenderer;
-		this.brandColour   = brandColour;
-		this.decorators    = decorators;
 		this.modInfo       = modInfo;
-		this.infoPanel     = new GuiModInfoPanel(fontRenderer, brandColour, modInfo);
-		
 		this.isActive      = modInfo.isActive();
 		this.canBeToggled  = modInfo.isToggleable() && mods.getEnabledModsList().saveAllowed();
 		this.willBeEnabled = mods.isModEnabled(this.modInfo.getIdentifier());;
-		this.external      = modInfo.getContainer().isExternalJar();
+		this.isExternal    = modInfo.getContainer().isExternalJar();
 		this.isErrored     = modInfo.getStartupErrors() != null && modInfo.getStartupErrors().size() > 0;
 		if (!modInfo.isActive())
@@ -151,97 +99,25 @@ public class GuiModListEntry extends Gui
 				this.isMissingAPIs         = this.missingAPIs.size() > 0;
 			}
 		}
-		
-		for (ModInfoDecorator decorator : this.decorators)
-		{
-			decorator.addIcons(modInfo, this.modIcons);
-		}
-	}
+		this.infoPanel = new GuiModInfoPanel(this, fontRenderer, brandColour, modInfo);
+		this.listPanel = new GuiModListPanel(this, fontRenderer, brandColour, modInfo, decorators);
+	}
+	
 	/**
-	 * Draw this list entry as a list item
-	 * 
-	 * @param mouseX
-	 * @param mouseY
-	 * @param partialTicks
-	 * @param xPosition
-	 * @param yPosition
-	 * @param width
-	 * @param selected
 	 * @return
 	 */
-	public int draw(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
+	protected String getTitleText()
 	{
-		int gradientColour = this.getGradientColour(selected);
-		int titleColour    = this.getTitleColour(selected);
-		int statusColour   = this.getStatusColour(selected);
-		
-		this.drawGradientRect(xPosition, yPosition, xPosition + width, yPosition + GuiModListEntry.PANEL_HEIGHT, gradientColour, GuiModListEntry.GRADIENT_COLOUR2);
-		
-		String titleText = this.modInfo.getDisplayName();
-		String versionText = I18n.format("gui.about.versiontext", this.modInfo.getVersion());
-		String statusText = this.getStatusText();
-
-		for (ModInfoDecorator decorator : this.decorators)
-		{
-			String newStatusText = decorator.modifyStatusText(this.modInfo, statusText);
-			if (newStatusText != null) statusText = newStatusText;
-		}
-			
-		this.fontRenderer.drawString(titleText,   xPosition + 5, yPosition + 2,  titleColour);
-		this.fontRenderer.drawString(versionText, xPosition + 5, yPosition + 12, GuiModListEntry.VERSION_TEXT_COLOUR);
-		this.fontRenderer.drawString(statusText,  xPosition + 5, yPosition + 22, statusColour);
-		
-		this.mouseOver = this.isMouseOver(mouseX, mouseY, xPosition, yPosition, width, PANEL_HEIGHT); 
-		int hangerColour = this.mouseOver ? GuiModListEntry.HANGER_COLOUR_MOUSEOVER : GuiModListEntry.HANGER_COLOUR;
-		drawRect(xPosition, yPosition, xPosition + 1, yPosition + PANEL_HEIGHT, hangerColour);
-		
-		for (ModInfoDecorator decorator : this.decorators)
-		{
-			decorator.onDrawListEntry(mouseX, mouseY, partialTicks, xPosition, yPosition, width, GuiModListEntry.PANEL_HEIGHT, selected, this.modInfo, gradientColour, titleColour, statusColour);
-		}
-		
-		return GuiModListEntry.PANEL_HEIGHT + GuiModListEntry.PANEL_SPACING;
-	}
-
-	public int postRenderListEntry(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, boolean selected)
-	{
-		xPosition += (width - 14);
-		yPosition += (GuiModListEntry.PANEL_HEIGHT - 14);
-		
-		this.mouseOverIcon = null;
-		
-		for (IconTextured icon : this.modIcons)
-		{
-			xPosition = this.drawPropertyIcon(xPosition, yPosition, icon, mouseX, mouseY);
-		}
-		
-		return GuiModListEntry.PANEL_HEIGHT + GuiModListEntry.PANEL_SPACING;
+		return this.modInfo.getDisplayName();
 	}
-	protected int drawPropertyIcon(int xPosition, int yPosition, IconTextured icon, int mouseX, int mouseY)
+	/**
+	 * @return
+	 */
+	protected String getVersionText()
 	{
-		glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		Minecraft.getMinecraft().getTextureManager().bindTexture(icon.getTextureResource());
-		
-		glEnable(GL_BLEND);
-		this.drawTexturedModalRect(xPosition, yPosition, icon.getUPos(), icon.getVPos(), icon.getIconWidth(), icon.getIconHeight());
-		glDisable(GL_BLEND);
-
-		if (mouseX >= xPosition && mouseX <= xPosition + 12 && mouseY >= yPosition && mouseY <= yPosition + 12)
-		{
-			String tooltipText = icon.getDisplayText();
-			if (tooltipText != null)
-			{
-				glDisableClipping();
-				GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, tooltipText, mouseX, mouseY, 4096, 4096, GuiModListEntry.WHITE, GuiModListEntry.BLEND_HALF & GuiModListEntry.BLACK);
-				glEnableClipping();
-			}
-			
-			if (icon instanceof IconClickable) this.mouseOverIcon = (IconClickable)icon;
-		}
-		
-		return xPosition - 14;
+		return I18n.format("gui.about.versiontext", this.modInfo.getVersion());
 	}
 	/**
@@ -249,7 +125,7 @@ public class GuiModListEntry extends Gui
 	 */
 	protected String getStatusText()
 	{
-		String statusText = this.external ? I18n.format("gui.status.loaded") : I18n.format("gui.status.active");
+		String statusText = this.isExternal ? I18n.format("gui.status.loaded") : I18n.format("gui.status.active");
 		if (this.isMissingAPIs)
 		{
@@ -276,61 +152,6 @@ public class GuiModListEntry extends Gui
 	}
 	/**
-	 * @param external
-	 * @param selected
-	 * @return
-	 */
-	protected int getGradientColour(boolean selected)
-	{
-		return GuiModListEntry.BLEND_2THRDS & (this.isErrored ? (selected ? GuiModListEntry.ERROR_GRADIENT_COLOUR : GuiModListEntry.ERROR_GRADIENT_COLOUR2) : (selected ? (this.external ? GuiModListEntry.EXTERNAL_ENTRY_COLOUR : this.brandColour) : GuiModListEntry.BLACK));
-	}
-
-	/**
-	 * @param missingDependencies
-	 * @param enabled
-	 * @param external
-	 * @param selected
-	 * @return
-	 */
-	protected int getTitleColour(boolean selected)
-	{
-		if (this.isMissingDependencies) return GuiModListEntry.MISSING_DEPENDENCY_COLOUR;
-		if (this.isMissingAPIs) return GuiModListEntry.API_COLOUR;
-		if (this.isErrored) return GuiModListEntry.ERROR_COLOUR;
-		if (!this.isActive) return GuiModListEntry.GREY;
-		return this.external ? GuiModListEntry.EXTERNAL_ENTRY_COLOUR : GuiModListEntry.WHITE;
-	}
-
-	/**
-	 * @param external
-	 * @param selected
-	 * @return
-	 */
-	protected int getStatusColour(boolean selected)
-	{
-		return this.external ? GuiModListEntry.EXTERNAL_ENTRY_COLOUR : this.brandColour;
-	}
-
-	public int getHeight()
-	{
-		return GuiModListEntry.PANEL_HEIGHT + GuiModListEntry.PANEL_SPACING;
-	}
-
-	/**
-	 * @param mouseX
-	 * @param mouseY
-	 * @param x
-	 * @param y
-	 * @param width
-	 * @param height
-	 * @return
-	 */
-	private boolean isMouseOver(int mouseX, int mouseY, int x, int y, int width, int height)
-	{
-		return mouseX > x && mouseX < x + width && mouseY > y && mouseY < y + height;
-	}
-	
-	/**
 	 * Toggle the enablement status of this mod, if supported
 	 */
 	public void toggleEnabled()
@@ -392,22 +213,34 @@ public class GuiModListEntry extends Gui
 		return this.willBeEnabled;
 	}
-	public boolean isMouseOverIcon()
+	public boolean isActive()
 	{
-		return this.mouseOver && this.mouseOverIcon != null;
+		return this.isActive;
 	}
-
-	public boolean isMouseOver()
+	
+	public boolean isErrored()
 	{
-		return this.mouseOver;
+		return this.isErrored;
 	}
-	public void iconClick(Object source)
+	public boolean isExternal()
 	{
-		if (this.mouseOverIcon != null)
-		{
-			this.mouseOverIcon.onClicked(source, this);
-		}
+		return this.isExternal;
+	}
+	
+	public boolean isMissingAPIs()
+	{
+		return this.isMissingAPIs;
+	}
+	
+	public boolean isMissingDependencies()
+	{
+		return this.isMissingDependencies;
+	}
+
+	public GuiModListPanel getListPanel()
+	{
+		return this.listPanel;
 	}
 	public GuiModInfoPanel getInfoPanel()