Catch and report mixin registration errors as critical errors in the GUI

Mumfrey
1 parent a2a91d21
Showing 5 changed files with 91 additions and 18 deletions
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelLiteLoaderLog.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderMods.java
src/main/java/com/mumfrey/liteloader/interfaces/LoadableFile.java
src/main/java/com/mumfrey/liteloader/interfaces/MixinContainer.java
@@ -290,6 +290,9 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
         if (logLine.startsWith("tweakClass '")) return 0x5555FF;
         if (logLine.startsWith("baking listener list")) return 0x00AAAA;
         if (logLine.startsWith("generating new event handler")) return 0xFFFF55;
+        if (logLine.startsWith("resolving mods")) return 0xFFAA00;
+        if (logLine.startsWith("resolved artefact")) return 0x00AA00;
+        if (logLine.startsWith("evicting")) return 0xFFAA00;
         return 0xCCCCCC;
     }
@@ -121,7 +121,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
     private final FastIterableDeque<EnumerationObserver> observers = new HandlerList<EnumerationObserver>(EnumerationObserver.class);
     protected EnumeratorState state = EnumeratorState.INIT;
-
+    
     /**
      * @param environment
      * @param properties
@@ -143,7 +143,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
         // Initialise the shared mod list if we haven't already
         this.getSharedModList();
     }
-
+    
     /**
      * @param environment
      */
@@ -664,7 +664,15 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
                 if (config.endsWith(".json"))
                 {
                     LiteLoaderLogger.info(Verbosity.REDUCED, "Registering mixin config %s for %s", config, container.getName());
-                    Mixins.addConfiguration(config);
+                    try
+                    {
+                        Mixins.addConfiguration(config);
+                    }
+                    catch (Throwable th)
+                    {
+                        LiteLoaderLogger.severe(th, "Error registering mixin config %s for %s", config, container);
+                        container.registerMixinError(th);
+                    }
                 }
                 else if (config.contains(".json@"))
                 {
@@ -24,6 +24,7 @@ import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.interfaces.Loadable;
 import com.mumfrey.liteloader.interfaces.LoadableMod;
 import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
+import com.mumfrey.liteloader.interfaces.MixinContainer;
 import com.mumfrey.liteloader.interfaces.TweakContainer;
 import com.mumfrey.liteloader.launch.ClassTransformerManager;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
@@ -444,6 +445,12 @@ public class LiteLoaderMods
                 String identifier = mod.getIdentifier();
                 if (identifier == null || this.environment.getEnabledModsList().isEnabled(this.environment.getProfile(), identifier))
                 {
+                    if (!this.validateMixins(mod, container))
+                    {
+                        this.onModLoadFailed(container, identifier, "mixins for the specified mod encountered a startup error", null);
+                        continue;
+                    }
+                    
                     if (!this.enumerator.checkDependencies(container))
                     {
                         this.onModLoadFailed(container, identifier, "the mod was missing a required dependency", null);
@@ -474,6 +481,23 @@ public class LiteLoaderMods
             this.observers.all().onPostModLoaded(mod);
         }
     }
+    
+    private boolean validateMixins(ModInfo<?> mod, LoadableMod<?> container)
+    {
+        if (container instanceof MixinContainer)
+        {
+            @SuppressWarnings("unchecked")
+            Collection<Throwable> errors = ((MixinContainer<File>)container).getMixinErrors();
+            for (Throwable error : errors)
+            {
+                this.registerModStartupError(mod, error, true);
+            }
+            
+            return errors.size() == 0;
+        }
+        
+        return true;
+    }
     /**
      * @param identifier
@@ -697,26 +721,28 @@ public class LiteLoaderMods
         for (Mod mod : this.loadedMods)
         {
-            if (mod.hasClassTransformers())
+            if (!mod.hasClassTransformers())
             {
-                List<String> modTransformers = ((TweakContainer<?>)mod.getContainer()).getClassTransformerClassNames();
-                for (String modTransformer : modTransformers)
+                continue;
+            }
+            
+            List<String> modTransformers = ((TweakContainer<?>)mod.getContainer()).getClassTransformerClassNames();
+            for (String modTransformer : modTransformers)
+            {
+                if (!injectedTransformers.contains(modTransformer))
                 {
-                    if (!injectedTransformers.contains(modTransformer))
+                    List<Throwable> throwables = transformerManager.getTransformerStartupErrors(modTransformer);
+                    if (throwables != null)
                     {
-                        List<Throwable> throwables = transformerManager.getTransformerStartupErrors(modTransformer);
-                        if (throwables != null)
+                        for (Throwable th : throwables)
                         {
-                            for (Throwable th : throwables)
-                            {
-                                this.registerModStartupError(mod, th, true);
-                            }
-                        }
-                        else
-                        {
-                            this.registerModStartupError(mod, new RuntimeException("Missing class transformer " + modTransformer), true);
+                            this.registerModStartupError(mod, th, true);
                         }
                     }
+                    else
+                    {
+                        this.registerModStartupError(mod, new RuntimeException("Missing class transformer " + modTransformer), true);
+                    }
                 }
             }
         }
@@ -765,7 +791,11 @@ public class LiteLoaderMods
     private void registerModStartupError(ModInfo<?> mod, Throwable th, boolean critical)
     {
         this.startupErrorCount++;
-        if (critical) this.criticalErrorCount++;
+        if (critical)
+        {
+            this.criticalErrorCount++;
+        }
+        
         mod.registerStartupError(th);
         if (!this.loadedMods.contains(mod) && !this.disabledMods.contains(mod))
@@ -10,6 +10,8 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -97,6 +99,11 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
      * Mixin config resource names
      */
     protected Set<String> mixinConfigs = new HashSet<String>();
+    
+    /**
+     * Mixin errors 
+     */
+    protected List<Throwable> mixinErrors = new ArrayList<Throwable>();
     /**
      * Create a new tweak container wrapping the specified file
@@ -344,6 +351,18 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
     {
         return this.mixinConfigs;
     }
+    
+    @Override
+    public void registerMixinError(Throwable th)
+    {
+        this.mixinErrors.add(th);
+    }
+    
+    @Override
+    public Collection<Throwable> getMixinErrors()
+    {
+        return this.mixinErrors;
+    }
     @Override
     public boolean hasEventTransformers()
@@ -5,6 +5,7 @@
  */
 package com.mumfrey.liteloader.interfaces;
+import java.util.Collection;
 import java.util.Set;
 public interface MixinContainer<L> extends Loadable<L>, Injectable
@@ -19,5 +20,17 @@ public interface MixinContainer&lt;L&gt; extends Loadable&lt;L&gt;, Injectable
      * Get this mod's list of mixin configs
      */
     public abstract Set<String> getMixinConfigs();
+    
+    /**
+     * Register a mixin error with the container
+     * 
+     * @param th caught throwable
+     */
+    public abstract void registerMixinError(Throwable th);
+    
+    /**
+     * @return mixin errors
+     */
+    public abstract Collection<Throwable> getMixinErrors();
 }