From 10c6e5e35384aeb4810490cde328db38637f013e Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sun, 14 Jul 2013 13:31:13 -0400
Subject: [PATCH] Fix logo handling. no more NPE if the logo can't be found.
 Also, fix location of mcp logo now.

---
 fml/build.xml                                 |  4 +-
 .../cpw/mods/fml/client/GuiModList.java       | 52 +++++++++++--------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/fml/build.xml b/fml/build.xml
index 6cadbf6d9..446de7932 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -170,7 +170,7 @@
       <zipfileset dir="${basedir}" includes="fmlversion.properties" />
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
       <zipfileset dir="${common.src.dir}" includes="mcpmod.info" />
-      <zipfileset dir="${client.src.dir}" includes="mcp.png" />
+      <zipfileset dir="${client.src.dir}" includes="mcplogo.png" />
       <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt" />
       <zipfileset dir="${common.src.dir}" includes="*.cfg" />
       <mappedresources>
@@ -198,7 +198,7 @@
     <tstamp>
       <format property="current.time" pattern="yyyy-MM-dd'T'HH:mm:ssZ" />
     </tstamp>
-  
+
     <delete file="${basedir}/installer_base.jar" />
     <delete file="${basedir}/install_profile.json" />
     <get src="http://files.minecraftforge.net/installer/forge-installer-1.0.jar" dest="${basedir}/installer_base.jar" />
diff --git a/fml/client/cpw/mods/fml/client/GuiModList.java b/fml/client/cpw/mods/fml/client/GuiModList.java
index 518e70d15..b5cf30bfc 100644
--- a/fml/client/cpw/mods/fml/client/GuiModList.java
+++ b/fml/client/cpw/mods/fml/client/GuiModList.java
@@ -17,6 +17,7 @@ package cpw.mods.fml.client;
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 
 import javax.imageio.ImageIO;
@@ -134,37 +135,44 @@ public class GuiModList extends GuiScreen
                     ResourcePack pack = FMLClientHandler.instance().getResourcePackFor(selectedMod.getModId());
                     try
                     {
-                        BufferedImage logo;
+                        BufferedImage logo = null;
                         if (pack!=null)
                         {
                             logo = pack.func_110586_a();
                         }
                         else
                         {
-                            logo = ImageIO.read(getClass().getResourceAsStream(logoFile));
+                            InputStream logoResource = getClass().getResourceAsStream(logoFile);
+                            if (logoResource != null)
+                            {
+                                logo = ImageIO.read(logoResource);
+                            }
                         }
-                        ResourceLocation rl = tm.func_110578_a("modlogo", new DynamicTexture(logo));
-                        this.field_73882_e.field_71446_o.func_110577_a(rl);
-                        Dimension dim = new Dimension(logo.getWidth(), logo.getHeight());
-                        double scaleX = dim.width / 200.0;
-                        double scaleY = dim.height / 65.0;
-                        double scale = 1.0;
-                        if (scaleX > 1 || scaleY > 1)
+                        if (logo != null)
                         {
-                            scale = 1.0 / Math.max(scaleX, scaleY);
-                        }
-                        dim.width *= scale;
-                        dim.height *= scale;
-                        int top = 32;
-                        Tessellator tess = Tessellator.field_78398_a;
-                        tess.func_78382_b();
-                        tess.func_78374_a(offset,             top + dim.height, field_73735_i, 0, 1);
-                        tess.func_78374_a(offset + dim.width, top + dim.height, field_73735_i, 1, 1);
-                        tess.func_78374_a(offset + dim.width, top,              field_73735_i, 1, 0);
-                        tess.func_78374_a(offset,             top,              field_73735_i, 0, 0);
-                        tess.func_78381_a();
+                            ResourceLocation rl = tm.func_110578_a("modlogo", new DynamicTexture(logo));
+                            this.field_73882_e.field_71446_o.func_110577_a(rl);
+                            Dimension dim = new Dimension(logo.getWidth(), logo.getHeight());
+                            double scaleX = dim.width / 200.0;
+                            double scaleY = dim.height / 65.0;
+                            double scale = 1.0;
+                            if (scaleX > 1 || scaleY > 1)
+                            {
+                                scale = 1.0 / Math.max(scaleX, scaleY);
+                            }
+                            dim.width *= scale;
+                            dim.height *= scale;
+                            int top = 32;
+                            Tessellator tess = Tessellator.field_78398_a;
+                            tess.func_78382_b();
+                            tess.func_78374_a(offset,             top + dim.height, field_73735_i, 0, 1);
+                            tess.func_78374_a(offset + dim.width, top + dim.height, field_73735_i, 1, 1);
+                            tess.func_78374_a(offset + dim.width, top,              field_73735_i, 1, 0);
+                            tess.func_78374_a(offset,             top,              field_73735_i, 0, 0);
+                            tess.func_78381_a();
 
-                        shifty += 65;
+                            shifty += 65;
+                        }
                     }
                     catch (IOException e)
                     {