Fix applying brand when loading as a forge mod

Mumfrey
1 parent 0b584ff1
Showing 5 changed files with 60 additions and 7 deletions
src/client/resources/mixins.liteloader.client.preinit.json
src/main/java/com/mumfrey/liteloader/core/LiteLoader.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
src/main/java/com/mumfrey/liteloader/crashreport/CrashSectionLiteLoaderBrand.java
src/main/java/com/mumfrey/liteloader/crashreport/CrashSectionLiteLoaderMods.java
 {
-    "required": true,
+    "required": false,
     "minVersion": "0.7.4",
     "compatibilityLevel": "JAVA_8",
     "target": "@env(PREINIT)",
@@ -7,8 +7,5 @@
     "refmap": "mixins.liteloader.client.refmap.json",
     "mixins": [
         "MixinClientBrandRetriever"
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    }
+    ]
 }
 \ No newline at end of file
@@ -896,6 +896,8 @@ public final class LiteLoader
      */
     void onStartupComplete()
     {
+        LiteLoaderBootstrap.onStartupComplete();
+        
         this.coreProviders.all().onStartupComplete();
         if (this.panelManager != null)
@@ -12,7 +12,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import org.apache.commons.io.Charsets;
@@ -22,6 +24,7 @@ import org.apache.logging.log4j.core.appender.FileAppender;
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.spongepowered.asm.mixin.MixinEnvironment;
+import com.google.common.collect.ImmutableMap;
 import com.mumfrey.liteloader.api.LiteAPI;
 import com.mumfrey.liteloader.api.manager.APIAdapter;
 import com.mumfrey.liteloader.api.manager.APIProvider;
@@ -40,6 +43,7 @@ import com.mumfrey.liteloader.util.ObfuscationUtilities;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity;
+import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.launchwrapper.ITweaker;
 import net.minecraft.launchwrapper.LaunchClassLoader;
@@ -768,6 +772,56 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
     {
         return this.branding;
     }
+    
+    /**
+     * Check that the branding was applied and if not, attempt to set it in the
+     * fml branding directly using reflection
+     */
+    @SuppressWarnings("unchecked")
+    static void onStartupComplete()
+    {
+        try
+        {
+            // If this field exists, the mixin was successfully applied so we can stop
+            
+            try
+            {
+                ClientBrandRetriever.class.getDeclaredField("BRANDING_LITELOADER");
+                return;
+            }
+            catch (NoSuchFieldException ex)
+            {
+                // Field doesn't exist so the mixin was not applied
+            }
+            
+            // Get loader
+            Class<?> clLoader = Class.forName("net.minecraftforge.fml.common.Loader");
+            
+            // Get instance
+            Object instance = clLoader.getMethod("instance").invoke(null);
+            
+            // Get branding properties
+            Map<String, String> properties = (Map<String, String>)clLoader.getMethod("getFMLBrandingProperties").invoke(instance);
+            
+            // Retrieve the current snooper branding
+            String branding = properties.get("snooperbranding");
+            
+            // If it's blank, set ourself, if it's already set then append ourself
+            branding = branding == null ? "LiteLoader" : branding + ",LiteLoader";
+            
+            // Find the field in Loader
+            Field fdProperties = clLoader.getDeclaredField("fmlBrandingProperties");
+            fdProperties.setAccessible(true);
+            
+            // Set new properties into field
+            fdProperties.set(instance, ImmutableMap.<String, String>builder().putAll(properties).put("snooperbranding", branding).build());
+        }
+        catch (Exception ex)
+        {
+            // Oh well, we tried
+            ex.printStackTrace();
+        }
+    }
     /* (non-Javadoc)
      * @see com.mumfrey.liteloader.launch.LoaderBootstrap
@@ -31,7 +31,7 @@ public class CrashSectionLiteLoaderBrand
         }
         catch (Exception ex)
         {
-            brand = "LiteLoader startup failed";
+            brand = "LiteLoader startup incomplete";
         }
         return brand == null ? "Unknown / None" : brand;
     }
@@ -30,7 +30,7 @@ public class CrashSectionLiteLoaderMods
         }
         catch (Exception ex)
         {
-            return "LiteLoader startup failed";
+            return "LiteLoader startup incomplete";
         }
     }
 }