add more caps to ModInfoDecorator, change mod status text when errored

Mumfrey
1 parent f69d71c7
Showing 4 changed files with 65 additions and 3 deletions
java/client/com/mumfrey/liteloader/client/api/LiteLoaderModInfoDecorator.java
java/client/com/mumfrey/liteloader/client/gui/GuiModListEntry.java
java/common/com/mumfrey/liteloader/api/ModInfoDecorator.java
resources/assets/liteloader/lang/en_US.lang
@@ -54,4 +54,21 @@ public class LiteLoaderModInfoDecorator implements ModInfoDecorator
 			});
 		}
 	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.api.ModInfoDecorator#modifyStatusText(com.mumfrey.liteloader.core.ModInfo, java.lang.String)
+	 */
+	@Override
+	public String modifyStatusText(ModInfo<?> mod, String statusText)
+	{
+		return null;
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.api.ModInfoDecorator#onDrawListEntry(int, int, float, int, int, int, int, boolean, com.mumfrey.liteloader.core.ModInfo, int, int, int)
+	 */
+	@Override
+	public void onDrawListEntry(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, int height, boolean selected, ModInfo<?> mod, int gradientColour, int titleColour, int statusColour)
+	{
+	}
 }
@@ -219,13 +219,28 @@ public class GuiModListEntry extends Gui
 		this.drawGradientRect(xPosition, yPosition, xPosition + width, yPosition + GuiModListEntry.PANEL_HEIGHT, gradientColour, GuiModListEntry.GRADIENT_COLOUR2);
-		this.fontRenderer.drawString(this.getTitleText(),   xPosition + 5, yPosition + 2,  titleColour);
-		this.fontRenderer.drawString(this.getVersionText(), xPosition + 5, yPosition + 12, GuiModListEntry.VERSION_TEXT_COLOUR);
-		this.fontRenderer.drawString(this.getStatusText(),  xPosition + 5, yPosition + 22, statusColour);
+		String titleText = this.getTitleText();
+		String versionText = this.getVersionText();
+		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.mouseOverListEntry = this.isMouseOver(mouseX, mouseY, xPosition, yPosition, width, PANEL_HEIGHT); 
 		drawRect(xPosition, yPosition, xPosition + 1, yPosition + PANEL_HEIGHT, this.mouseOverListEntry ? GuiModListEntry.HANGER_COLOUR_MOUSEOVER : GuiModListEntry.HANGER_COLOUR);
+		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;
 	}
@@ -345,6 +360,10 @@ public class GuiModListEntry extends Gui
 			statusText = "\247e" + I18n.format("gui.status.missingdeps");
 			if (this.canBeToggled && !this.willBeEnabled) statusText = "\247c" + I18n.format("gui.status.pending.disabled");
 		}
+		else if (this.isErrored)
+		{
+			statusText = "\247c" + I18n.format("gui.status.startuperror");
+		}
 		else if (this.canBeToggled)
 		{
 			if (!this.enabled && !this.willBeEnabled) statusText = "\2477" + I18n.format("gui.status.disabled");
@@ -21,4 +21,29 @@ public interface ModInfoDecorator extends CustomisationProvider
 	 * @param icons
 	 */
 	public abstract void addIcons(ModInfo<?> mod, List<IconTextured> icons);
+
+	/**
+	 * Allows this decorator to modify the status text for the specified mod, return null if no modification required
+	 * 
+	 * @param statusText
+	 * @return
+	 */
+	public abstract String modifyStatusText(ModInfo<?> mod, String statusText);
+	
+	/**
+	 * Allow decorators to draw custom content on the mod list entries
+	 * 
+	 * @param mouseX Mouse X position
+	 * @param mouseY Mouse Y position
+	 * @param partialTicks
+	 * @param xPosition Panel X position
+	 * @param yPosition Panel Y position
+	 * @param width Panel width
+	 * @param selected Panel height
+	 * @param mod ModInfo
+	 * @param gradientColour
+	 * @param titleColour
+	 * @param statusColour
+	 */
+	public abstract void onDrawListEntry(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, int height, boolean selected, ModInfo<?> mod, int gradientColour, int titleColour, int statusColour);
 }
@@ -31,6 +31,7 @@ gui.status.pending.enabled=Enabled on next startup
 gui.status.pending.disabled=Disabled on next startup
 gui.status.missingdeps=Missing dependencies
 gui.status.missingapis=Missing required APIs
+gui.status.startuperror=Startup errors detected
 gui.description.missingdeps=Missing dependencies: %s
 gui.description.missingapis=Missing APIs: %s