From d3e8804dbfd6c46cb4ffa275b0facf321ab672b7 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 27 May 2019 19:13:55 -0700
Subject: [PATCH] Include new library in installer json. Change order of
 versions on main menu, to prevent overlap with default window size. Fix Forge
 update not displaying version info.

---
 build.gradle                                                  | 1 +
 src/main/java/net/minecraftforge/fml/BrandingControl.java     | 4 ++--
 .../java/net/minecraftforge/versions/forge/ForgeVersion.java  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 47659a55f..4cb799c50 100644
--- a/build.gradle
+++ b/build.gradle
@@ -327,6 +327,7 @@ project(':forge') {
         installer 'org.ow2.asm:asm-commons:6.2'
         installer 'org.ow2.asm:asm-tree:6.2'
         installer 'cpw.mods:modlauncher:2.1.+'
+        installer 'cpw.mods:grossjava9hacks:1.1.+'
         installer 'net.minecraftforge:accesstransformers:0.16.+:shadowed'
         installer 'net.minecraftforge:eventbus:0.9.+:service'
         installer 'net.minecraftforge:forgespi:0.13.+'
diff --git a/src/main/java/net/minecraftforge/fml/BrandingControl.java b/src/main/java/net/minecraftforge/fml/BrandingControl.java
index d62ecac8f..728ffb870 100644
--- a/src/main/java/net/minecraftforge/fml/BrandingControl.java
+++ b/src/main/java/net/minecraftforge/fml/BrandingControl.java
@@ -43,9 +43,9 @@ public class BrandingControl
         if (brandings == null)
         {
             ImmutableList.Builder<String> brd = ImmutableList.builder();
+            brd.add("Forge " + ForgeVersion.getVersion());
             brd.add("Minecraft " + MCPVersion.getMCVersion());
             brd.add("MCP " + MCPVersion.getMCPVersion());
-            brd.add("Forge " + ForgeVersion.getVersion());
             int tModCount = ModList.get().size();
             brd.add(ForgeI18n.parseMessage("fml.menu.loadingmods", tModCount));
             brandings = brd.build();
@@ -75,7 +75,7 @@ public class BrandingControl
     public static String getServerBranding() {
         return "forge";
     }
-    
+
     public static void clearCaches(IResourceManager resourceManager, Predicate<IResourceType> resourcePredicate) {
         if (resourcePredicate.test(VanillaResourceType.LANGUAGES)) {
             brandings = null;
diff --git a/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java b/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java
index a9478233c..9f2a4a067 100644
--- a/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java
+++ b/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java
@@ -70,7 +70,8 @@ public class ForgeVersion
     @Nullable
     public static String getTarget()
     {
-        return "";
+        VersionChecker.CheckResult res = VersionChecker.getResult(ModList.get().getModFileById(MOD_ID).getMods().get(0));
+        return res.target == null ? "" : res.target.toString();
     }
 
     public static String getSpec() {