Set client brand with mixin instead of using reflection

Mumfrey
1 parent 611d0208
Showing 5 changed files with 39 additions and 54 deletions
src/client/java/com/mumfrey/liteloader/client/mixin/MixinClientBrandRetriever.java
src/client/resources/mixins.liteloader.client.json
src/main/java/com/mumfrey/liteloader/core/LiteLoader.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
src/main/resources/mixins.liteloader.core.json
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.client.ClientBrandRetriever;
+
+@Mixin(value = ClientBrandRetriever.class, remap = false)
+public abstract class MixinClientBrandRetriever
+{
+    private static final String BRANDING_VANILLA = "vanilla";
+    private static final String BRANDING_LITELOADER = "liteloader";
+
+    @Inject(method = "getClientModName", at = @At("RETURN"), cancellable = true)
+    private static void appendLiteLoaderBranding(CallbackInfoReturnable<String> cir)
+    {
+        String branding = cir.getReturnValue();
+        if (MixinClientBrandRetriever.BRANDING_VANILLA.equals(branding))
+        {
+            // If the branding is vanilla, just overwrite it 
+            cir.setReturnValue(MixinClientBrandRetriever.BRANDING_LITELOADER);
+        }
+        else
+        {
+            // Otherwise append it
+            cir.setReturnValue(branding + "," + MixinClientBrandRetriever.BRANDING_LITELOADER);
+        }
+    }
+}
 {
     "required": true,
-    "minVersion": "0.7",
+    "minVersion": "0.7.4",
     "compatibilityLevel": "JAVA_8",
     "target": "@env(DEFAULT)",
     "package": "com.mumfrey.liteloader.client.mixin",
@@ -24,6 +24,7 @@
         "MixinGuiTextField",
         "MixinIntIdentityHashBiMap",
         "MixinGuiOverlayDebug",
+        "MixinClientBrandRetriever",
         "IGuiButton",
         "IKeyBinding"
     ],
@@ -896,9 +896,6 @@ public final class LiteLoader
      */
     void onStartupComplete()
     {
-        // Set the loader branding in ClientBrandRetriever using reflection
-        LiteLoaderBootstrap.setBranding("LiteLoader");
-
         this.coreProviders.all().onStartupComplete();
         if (this.panelManager != null)
@@ -12,8 +12,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Properties;
@@ -43,7 +41,6 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity;
 import net.minecraft.launchwrapper.ITweaker;
-import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 /**
@@ -772,52 +769,6 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
         return this.branding;
     }
-    /**
-     * Set the brand in ClientBrandRetriever to the specified brand 
-     * 
-     * @param brand
-     */
-    static void setBranding(String brand)
-    {
-        try
-        {
-            Method mGetClientModName;
-
-            try
-            {
-                Class<?> cbrClass = Class.forName("net.minecraft.client.ClientBrandRetriever", false, Launch.classLoader);
-                mGetClientModName = cbrClass.getDeclaredMethod("getClientModName");
-            }
-            catch (ClassNotFoundException ex)
-            {
-                return;
-            }
-
-            String oldBrand = (String)mGetClientModName.invoke(null);
-
-            if ("vanilla".equals(oldBrand))
-            {
-                char[] newValue = brand.toCharArray();
-
-                Field stringValue = String.class.getDeclaredField("value");
-                stringValue.setAccessible(true);
-                stringValue.set(oldBrand, newValue);
-
-                try
-                {
-                    Field stringCount = String.class.getDeclaredField("count");
-                    stringCount.setAccessible(true);
-                    stringCount.set(oldBrand, newValue.length);
-                }
-                catch (NoSuchFieldException ex) {} // java 1.7 doesn't have this member
-            }
-        }
-        catch (Throwable th)
-        {
-            LiteLoaderLogger.warning(th, "Setting branding failed");
-        }
-    }
-
     /* (non-Javadoc)
      * @see com.mumfrey.liteloader.launch.LoaderBootstrap
      *      #getRequiredTransformers()
 {
     "required": true,
-    "minVersion": "0.7",
+    "minVersion": "0.7.4",
     "compatibilityLevel": "JAVA_8",
     "target": "@env(DEFAULT)",
     "package": "com.mumfrey.liteloader.common.mixin",