fix a mistake i made

which will cause a local skin file rendered as a cape
zlainsama · Feb 26, 2016 · b84bd90 · b84bd90
1 parent adf57d0
commit b84bd90
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 35 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-v8b"
+version = "1.7.10-v8c"
 group= "lain.mods.skinport"
 archivesBaseName = "SkinPort"
 

diff --git a/src/main/java/lain/mods/skinport/providers/CrafatarCachedCapeProvider.java b/src/main/java/lain/mods/skinport/providers/CrafatarCachedCapeProvider.java
@@ -8,8 +8,6 @@
 import java.net.Proxy;
 import java.net.URL;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.imageio.ImageIO;
 import lain.mods.skinport.PlayerUtils;
 import lain.mods.skinport.SkinData;
@@ -24,9 +22,6 @@
 public class CrafatarCachedCapeProvider implements ISkinProvider
 {
 
-    private static final ExecutorService pool = Executors.newCachedThreadPool();
-    private static final BufferedImage dummy = new BufferedImage(1, 1, 2);
-
     private File _workDir;
 
     public CrafatarCachedCapeProvider()
@@ -47,7 +42,7 @@ public ISkin getSkin(AbstractClientPlayer player)
         data.profile = player.getGameProfile();
         final boolean skipUUID = PlayerUtils.isOfflinePlayer(player);
         final UUID fbID = player.getUniqueID();
-        pool.execute(new Runnable()
+        Shared.pool.execute(new Runnable()
         {
 
             @Override
@@ -82,7 +77,7 @@ public void run()
                         }
                 }
 
-                if (image != null && image != dummy)
+                if (image != null && image != Shared.dummy)
                 {
                     data.put(image, "cape");
                 }
@@ -222,7 +217,7 @@ private BufferedImage readImageCached(File workDir, String local, URL remote, Pr
         }
         else if (code == 404)
         {
-            return dummy;
+            return Shared.dummy;
         }
 
         if (!file1.exists())

diff --git a/src/main/java/lain/mods/skinport/providers/CrafatarCachedSkinProvider.java b/src/main/java/lain/mods/skinport/providers/CrafatarCachedSkinProvider.java
@@ -8,8 +8,6 @@
 import java.net.Proxy;
 import java.net.URL;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.imageio.ImageIO;
 import lain.mods.skinport.LegacyConversion;
 import lain.mods.skinport.PlayerUtils;
@@ -25,9 +23,6 @@
 public class CrafatarCachedSkinProvider implements ISkinProvider
 {
 
-    private static final ExecutorService pool = Executors.newCachedThreadPool();
-    private static final BufferedImage dummy = new BufferedImage(1, 1, 2);
-
     private File _workDir;
 
     public CrafatarCachedSkinProvider()
@@ -48,7 +43,7 @@ public ISkin getSkin(AbstractClientPlayer player)
         data.profile = player.getGameProfile();
         final boolean skipUUID = PlayerUtils.isOfflinePlayer(player);
         final UUID fbID = player.getUniqueID();
-        pool.execute(new Runnable()
+        Shared.pool.execute(new Runnable()
         {
 
             @Override
@@ -83,7 +78,7 @@ public void run()
                         }
                 }
 
-                if (image != null && image != dummy)
+                if (image != null && image != Shared.dummy)
                 {
                     String type = SkinData.judgeSkinType(image);
                     if ("legacy".equals(type))
@@ -227,7 +222,7 @@ private BufferedImage readImageCached(File workDir, String local, URL remote, Pr
         }
         else if (code == 404)
         {
-            return dummy;
+            return Shared.dummy;
         }
 
         if (!file1.exists())

diff --git a/src/main/java/lain/mods/skinport/providers/MojangCachedCapeProvider.java b/src/main/java/lain/mods/skinport/providers/MojangCachedCapeProvider.java
@@ -9,8 +9,6 @@
 import java.net.URL;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.imageio.ImageIO;
 import lain.mods.skinport.PlayerUtils;
 import lain.mods.skinport.SkinData;
@@ -26,9 +24,6 @@
 public class MojangCachedCapeProvider implements ISkinProvider
 {
 
-    private static final ExecutorService pool = Executors.newCachedThreadPool();
-    private static final BufferedImage dummy = new BufferedImage(1, 1, 2);
-
     private File _workDir;
 
     public MojangCachedCapeProvider()
@@ -49,7 +44,7 @@ public ISkin getSkin(AbstractClientPlayer player)
         data.profile = player.getGameProfile();
         final boolean flag = PlayerUtils.isOfflinePlayer(player);
         final UUID fbID = player.getUniqueID();
-        pool.execute(new Runnable()
+        Shared.pool.execute(new Runnable()
         {
 
             @Override
@@ -77,7 +72,7 @@ public void run()
                         }
                 }
 
-                if (image != null && image != dummy)
+                if (image != null && image != Shared.dummy)
                 {
                     data.put(image, "cape");
                 }
@@ -217,7 +212,7 @@ private BufferedImage readImageCached(File workDir, String local, URL remote, Pr
         }
         else if (code == 404)
         {
-            return dummy;
+            return Shared.dummy;
         }
 
         if (!file1.exists())

diff --git a/src/main/java/lain/mods/skinport/providers/MojangCachedSkinProvider.java b/src/main/java/lain/mods/skinport/providers/MojangCachedSkinProvider.java
@@ -9,8 +9,6 @@
 import java.net.URL;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.imageio.ImageIO;
 import lain.mods.skinport.LegacyConversion;
 import lain.mods.skinport.PlayerUtils;
@@ -27,9 +25,6 @@
 public class MojangCachedSkinProvider implements ISkinProvider
 {
 
-    private static final ExecutorService pool = Executors.newCachedThreadPool();
-    private static final BufferedImage dummy = new BufferedImage(1, 1, 2);
-
     private File _workDir;
 
     public MojangCachedSkinProvider()
@@ -50,7 +45,7 @@ public ISkin getSkin(AbstractClientPlayer player)
         data.profile = player.getGameProfile();
         final boolean flag = PlayerUtils.isOfflinePlayer(player);
         final UUID fbID = player.getUniqueID();
-        pool.execute(new Runnable()
+        Shared.pool.execute(new Runnable()
         {
 
             @Override
@@ -78,7 +73,7 @@ public void run()
                         }
                 }
 
-                if (image != null && image != dummy)
+                if (image != null && image != Shared.dummy)
                 {
                     String type = SkinData.judgeSkinType(image);
                     if ("legacy".equals(type))
@@ -222,7 +217,7 @@ private BufferedImage readImageCached(File workDir, String local, URL remote, Pr
         }
         else if (code == 404)
         {
-            return dummy;
+            return Shared.dummy;
         }
 
         if (!file1.exists())

diff --git a/src/main/java/lain/mods/skinport/providers/Shared.java b/src/main/java/lain/mods/skinport/providers/Shared.java
@@ -0,0 +1,13 @@
+package lain.mods.skinport.providers;
+
+import java.awt.image.BufferedImage;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class Shared
+{
+
+    protected static final ExecutorService pool = Executors.newCachedThreadPool();
+    protected static final BufferedImage dummy = new BufferedImage(1, 1, 2);
+
+}
diff --git a/src/main/java/lain/mods/skinport/providers/UserManagedCapeProvider.java b/src/main/java/lain/mods/skinport/providers/UserManagedCapeProvider.java
@@ -29,9 +29,9 @@ public UserManagedCapeProvider()
     @Override
     public ISkin getSkin(AbstractClientPlayer player)
     {
-        BufferedImage image = readImage(String.format("skins/uuid/%s.png", ObjectUtils.defaultIfNull(player.getGameProfile().getId(), player.getUniqueID()).toString().replaceAll("-", "")));
+        BufferedImage image = readImage(String.format("capes/uuid/%s.png", ObjectUtils.defaultIfNull(player.getGameProfile().getId(), player.getUniqueID()).toString().replaceAll("-", "")));
         if (image == null)
-            image = readImage(String.format("skins/%s.png", ObjectUtils.defaultIfNull(player.getGameProfile().getName(), "")));
+            image = readImage(String.format("capes/%s.png", ObjectUtils.defaultIfNull(player.getGameProfile().getName(), "")));
         if (image == null)
             return null;
         SkinData data = new SkinData();