Fix display bug with errored mods, add copy error to clipboard button

Mumfrey
1 parent 180c08e5
Showing 4 changed files with 23 additions and 3 deletions
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelError.java
src/client/java/com/mumfrey/liteloader/client/gui/modlist/ModList.java
src/main/java/com/mumfrey/liteloader/modconfig/ConfigManager.java
src/main/resources/assets/liteloader/lang/en_us.lang
@@ -12,10 +12,12 @@ import java.util.List;
 import org.lwjgl.input.Keyboard;
+import com.google.common.base.Joiner;
 import com.mumfrey.liteloader.core.ModInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 public class GuiPanelError extends GuiPanel implements ScrollPanelContent
@@ -98,6 +100,7 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
         this.scrollPane.setSizeAndPosition(MARGIN, TOP, this.width - (MARGIN * 2), this.height - TOP - BOTTOM);
         this.controls.add(new GuiButton(0, this.width - 59 - MARGIN, this.height - BOTTOM + 9, 60, 20, I18n.format("gui.done")));
+        this.controls.add(new GuiButton(1, this.width - 204 - MARGIN, this.height - BOTTOM + 9, 140, 20, I18n.format("gui.error.copytoclipboard")));
     }
     @Override
@@ -131,7 +134,10 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
     @Override
     void keyPressed(char keyChar, int keyCode)
     {
-        if (keyCode == Keyboard.KEY_ESCAPE) this.close();
+        if (keyCode == Keyboard.KEY_ESCAPE)
+        {
+            this.close();
+        }
     }
     @Override
@@ -161,6 +167,14 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
     @Override
     void actionPerformed(GuiButton control)
     {
-        if (control.id == 0) this.close();
+        if (control.id == 0)
+        {
+            this.close();
+        }
+        
+        if (control.id == 1)
+        {
+            GuiScreen.setClipboardString(Joiner.on('\n').join(this.scrollPaneContent));
+        }
     }
 }
@@ -76,7 +76,7 @@ public class ModList
         // Disabled mods
         for (ModInfo<?> disabledMod : mods.getDisabledMods())
         {
-            if (environment.getEnabledModsList().getEnabled(environment.getProfile(), disabledMod.getIdentifier()) == Enabled.DISABLED)
+            if (environment.getEnabledModsList().getEnabled(environment.getProfile(), disabledMod.getIdentifier()) != Enabled.FILTERED)
             {
                 ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, disabledMod);
             sortedMods.put(modListEntry.getKey(), modListEntry);
@@ -17,6 +17,7 @@ import com.google.common.collect.Maps;
 import com.google.common.io.Files;
 import com.mumfrey.liteloader.Configurable;
 import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
  * Registry where we keep the mod config panel classes and config file writers
@@ -165,6 +166,10 @@ public class ConfigManager
             }
             catch (InstantiationException ex) {}
             catch (IllegalAccessException ex) {}
+            catch (Exception ex)
+            {
+                LiteLoaderLogger.severe("Error creating mod configuration panel <%s> for mod %s", this.configPanels.get(modClass), modClass);
+            }
             // If instantiation fails, remove the panel
             this.configPanels.remove(modClass);
@@ -86,6 +86,7 @@ gui.log.uploadsuccess=Upload succeeded, log available at
 gui.log.closedialog=Close
 gui.error.title=Startup errors for %s
+gui.error.copytoclipboard=Copy error to clipboard
 gui.error.tooltip=%d mod startup error(s) detected (%d critical)