From fe12687ec11721619a5b6ac52419049686edd131 Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Sat, 29 Sep 2018 20:47:47 -0400
Subject: [PATCH] Branding fixup.

---
 .../client/ClientBrandRetriever.java.patch     |  10 ++++++++++
 .../server/MinecraftServer.java.patch          |   2 +-
 .../net/minecraftforge/common/ForgeHooks.java  |   6 ------
 .../minecraftforge/fml/BrandingControl.java    |   9 ++++-----
 .../{fml => forge}/textures/gui/forge.png      | Bin
 .../{fml => forge}/textures/gui/icons.png      | Bin
 src/main/resources/mcpmod.info                 |  17 -----------------
 7 files changed, 15 insertions(+), 29 deletions(-)
 create mode 100644 patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
 rename src/main/resources/assets/{fml => forge}/textures/gui/forge.png (100%)
 rename src/main/resources/assets/{fml => forge}/textures/gui/icons.png (100%)
 delete mode 100644 src/main/resources/mcpmod.info

diff --git a/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch b/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
new file mode 100644
index 000000000..66abfb624
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
@@ -0,0 +1,10 @@
+--- a/net/minecraft/client/ClientBrandRetriever.java
++++ b/net/minecraft/client/ClientBrandRetriever.java
+@@ -6,6 +6,6 @@
+ @OnlyIn(Dist.CLIENT)
+ public class ClientBrandRetriever {
+    public static String getClientModName() {
+-      return "vanilla";
++      return net.minecraftforge.fml.BrandingControl.getClientBranding();
+    }
+ }
diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
index 2a619f840..8aec88d8f 100644
--- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
+++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
@@ -182,7 +182,7 @@
  
     public String getServerModName() {
 -      return "vanilla";
-+      return net.minecraftforge.common.ForgeHooks.getServerModName();
++      return net.minecraftforge.fml.BrandingControl.getServerBranding();
     }
  
     public CrashReport func_71230_b(CrashReport p_71230_1_) {
diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index 98a25c7b5..4d9eb6ebe 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -1277,12 +1277,6 @@ public class ForgeHooks
         return false;
     }
 
-    public static String getServerModName()
-    {
-        //TODO: Branding Properties: snooperbranding
-        return "forge";
-    }
-
     private static TriConsumer<Block, ToolType, Integer> blockToolSetter;
     //Internal use only Modders, this is specifically hidden from you, as you shouldn't be editing other people's blocks.
     public static void setBlockToolSetter(TriConsumer<Block, ToolType, Integer> setter)
diff --git a/src/main/java/net/minecraftforge/fml/BrandingControl.java b/src/main/java/net/minecraftforge/fml/BrandingControl.java
index 5e972b4c7..8d80fe4a2 100644
--- a/src/main/java/net/minecraftforge/fml/BrandingControl.java
+++ b/src/main/java/net/minecraftforge/fml/BrandingControl.java
@@ -51,7 +51,7 @@ public class BrandingControl
         }
     }
 
-    public static List<String> getBrandings(boolean includeMC, boolean reverse)
+    private static List<String> getBrandings(boolean includeMC, boolean reverse)
     {
         computeBranding();
         if (includeMC) {
@@ -65,13 +65,12 @@ public class BrandingControl
         final List<String> brandings = getBrandings(includeMC, reverse);
         IntStream.range(0, brandings.size()).boxed().forEachOrdered(idx -> lineConsumer.accept(idx, brandings.get(idx)));
     }
-    private static final List<String> defaultClientBranding = Stream.of("fml", "forge").collect(Collectors.toList());
+
     public static String getClientBranding() {
-        return String.join(",", defaultClientBranding);
+        return "forge";
     }
 
-    public static final List<String> defaultServerBranding = Arrays.asList("fml", "forge");
     public static String getServerBranding() {
-        return String.join(",", defaultServerBranding);
+        return "forge";
     }
 }
diff --git a/src/main/resources/assets/fml/textures/gui/forge.png b/src/main/resources/assets/forge/textures/gui/forge.png
similarity index 100%
rename from src/main/resources/assets/fml/textures/gui/forge.png
rename to src/main/resources/assets/forge/textures/gui/forge.png
diff --git a/src/main/resources/assets/fml/textures/gui/icons.png b/src/main/resources/assets/forge/textures/gui/icons.png
similarity index 100%
rename from src/main/resources/assets/fml/textures/gui/icons.png
rename to src/main/resources/assets/forge/textures/gui/icons.png
diff --git a/src/main/resources/mcpmod.info b/src/main/resources/mcpmod.info
deleted file mode 100644
index 600543865..000000000
--- a/src/main/resources/mcpmod.info
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-{
-  "modid": "mcp",
-  "name": "Minecraft Coder Pack",
-  "description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.",
-  "version": "9.42",
-  "mcversion": "1.12.2",
-  "logoFile": "/mcplogo.png",
-  "url": "http://www.modcoderpack.com/website/",
-  "updateUrl": "",
-  "authors": ["Searge", "ProfMobius", "IngisKahn", "Fesh0r", "ZeuX", "R4wk", "LexManos", "Bspkrs", "Others"],
-  "credits": "Made by the MCP team",
-  "parent": "",
-  "screenshots": [],
-  "dependencies": []
-}
-]