From d446ef38637b0fec2fe53659856f356deb59a668 Mon Sep 17 00:00:00 2001 From: xfl03 Date: Sat, 20 Jun 2015 20:37:01 +0800 Subject: [PATCH] Support optifine --- .../idv/jlchntoz/CustomSkinLoader.java | 19 +++++++++++++------ .../src/ThreadDownloadImageData.java | 2 ++ .../idv/jlchntoz/CustomSkinLoader.java | 19 +++++++++++++------ .../idv/jlchntoz/CustomSkinLoader.java | 19 +++++++++++++------ .../renderer/ThreadDownloadImageData.java | 2 ++ .../idv/jlchntoz/CustomSkinLoader.java | 19 +++++++++++++------ .../renderer/ThreadDownloadImageData.java | 4 +++- 7 files changed, 59 insertions(+), 25 deletions(-) diff --git a/1.6.4-mcp811/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.6.4-mcp811/src/minecraft/idv/jlchntoz/CustomSkinLoader.java index 6bab90a..36f718c 100644 --- a/1.6.4-mcp811/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ b/1.6.4-mcp811/src/minecraft/idv/jlchntoz/CustomSkinLoader.java @@ -10,17 +10,19 @@ import java.util.regex.*; /** * Custom skin loader mod for Minecraft. * - * @version 12th Revision 2nd Subversion 2015.6.7 + * @version 12th Revision 3rd Subversion 2015.6.20 * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2015 */ public class CustomSkinLoader { - public final static String VERSION="12.2"; + public final static String VERSION="12.3"; public final static String DefaultSkinURL = "http://skins.minecraft.net/MinecraftSkins/*.png"; public final static String DefaultCloakURL = "http://skins.minecraft.net/MinecraftCloaks/*.png"; + private final static Pattern newResPattern = Pattern.compile("^http://textures.minecraft.net/texture/(.*?)?(Skin|Cloak)=(.*?)$"), newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); + oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"), + optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); private final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"); private final static File SKIN_DIR=new File(DATA_DIR,"skins"); @@ -29,7 +31,9 @@ public class CustomSkinLoader { private static String[] cloakURLs = null, skinURLs = null; private HttpURLConnection C = null; + private boolean loadFromCache=false; + private boolean cacheSelfOnly=false; public InputStream getPlayerSkinStream(String path) { if(!DATA_DIR.exists()) @@ -48,11 +52,14 @@ public class CustomSkinLoader { }else{ m = newResPattern.matcher(path); if(m.matches()){ - logger.info("Matches"); if (m.group(2).contains("Skin")) // Skin return getPlayerSkinStream(false, m.group(3)); else if (m.group(2).contains("Cloak")) // Cloak return getPlayerSkinStream(true, m.group(3)); + }else{ + m = optifineCapeURLPattern.matcher(path); + if(m.matches())//Optifine Cape + return null;//Not Load This } } return getStream(path, false); // Neither skin nor cloak... @@ -79,7 +86,7 @@ public class CustomSkinLoader { } S = getStream(loc, true,last); if(loadFromCache){ - logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + "will be load from cache."); + logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + " will be load from cache."); break; } if (S == null){ @@ -110,7 +117,7 @@ public class CustomSkinLoader { } }else{ String user= Minecraft.getMinecraft().getSession().getUsername(); - if(user.equalsIgnoreCase(playerName)){//Only save user's skin + if(!cacheSelfOnly||user.equalsIgnoreCase(playerName)){//Only save user's skin or cache everyone logger.info("Try save local " + (isCloak ? "cloak" : "skin") + " to " + temp.getAbsolutePath()); FileOutputStream fs=null; int times=0; diff --git a/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageData.java b/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageData.java index 3f458b4..9dfd440 100644 --- a/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageData.java +++ b/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageData.java @@ -11,6 +11,8 @@ public class ThreadDownloadImageData extends AbstractTexture private Thread imageThread; private SimpleTexture imageLocation; private boolean textureUploaded; + + public boolean enabled;//For Optifine public ThreadDownloadImageData(String par1Str, ResourceLocation par2ResourceLocation, IImageBuffer par3IImageBuffer) { diff --git a/1.7.10-mcp908/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.7.10-mcp908/src/minecraft/idv/jlchntoz/CustomSkinLoader.java index 6d5a31d..972e8cb 100644 --- a/1.7.10-mcp908/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ b/1.7.10-mcp908/src/minecraft/idv/jlchntoz/CustomSkinLoader.java @@ -10,17 +10,19 @@ import java.util.regex.*; /** * Custom skin loader mod for Minecraft. * - * @version 12th Revision 2nd Subversion 2015.6.7 + * @version 12th Revision 3rd Subversion 2015.6.20 * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2015 */ public class CustomSkinLoader { - public final static String VERSION="12.2"; + public final static String VERSION="12.3"; public final static String DefaultSkinURL = "http://skins.minecraft.net/MinecraftSkins/*.png"; public final static String DefaultCloakURL = "http://skins.minecraft.net/MinecraftCloaks/*.png"; + private final static Pattern newResPattern = Pattern.compile("^http://textures.minecraft.net/texture/(.*?)?(Skin|Cloak)=(.*?)$"), newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); + oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"), + optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); private final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"); private final static File SKIN_DIR=new File(DATA_DIR,"skins"); @@ -29,7 +31,9 @@ public class CustomSkinLoader { private static String[] cloakURLs = null, skinURLs = null; private HttpURLConnection C = null; + private boolean loadFromCache=false; + private boolean cacheSelfOnly=false; public InputStream getPlayerSkinStream(String path) { if(!DATA_DIR.exists()) @@ -48,11 +52,14 @@ public class CustomSkinLoader { }else{ m = newResPattern.matcher(path); if(m.matches()){ - logger.info("Matches"); if (m.group(2).contains("Skin")) // Skin return getPlayerSkinStream(false, m.group(3)); else if (m.group(2).contains("Cloak")) // Cloak return getPlayerSkinStream(true, m.group(3)); + }else{ + m = optifineCapeURLPattern.matcher(path); + if(m.matches())//Optifine Cape + return null;//Not Load This } } return getStream(path, false); // Neither skin nor cloak... @@ -79,7 +86,7 @@ public class CustomSkinLoader { } S = getStream(loc, true,last); if(loadFromCache){ - logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + "will be load from cache."); + logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + " will be load from cache."); break; } if (S == null){ @@ -110,7 +117,7 @@ public class CustomSkinLoader { } }else{ String user= Minecraft.getMinecraft().getSession().getUsername(); - if(user.equalsIgnoreCase(playerName)){//Only save user's skin + if(!cacheSelfOnly||user.equalsIgnoreCase(playerName)){//Only save user's skin or cache everyone logger.info("Try save local " + (isCloak ? "cloak" : "skin") + " to " + temp.getAbsolutePath()); FileOutputStream fs=null; int times=0; diff --git a/1.7.2-mcp903/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.7.2-mcp903/src/minecraft/idv/jlchntoz/CustomSkinLoader.java index 6d5a31d..972e8cb 100644 --- a/1.7.2-mcp903/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ b/1.7.2-mcp903/src/minecraft/idv/jlchntoz/CustomSkinLoader.java @@ -10,17 +10,19 @@ import java.util.regex.*; /** * Custom skin loader mod for Minecraft. * - * @version 12th Revision 2nd Subversion 2015.6.7 + * @version 12th Revision 3rd Subversion 2015.6.20 * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2015 */ public class CustomSkinLoader { - public final static String VERSION="12.2"; + public final static String VERSION="12.3"; public final static String DefaultSkinURL = "http://skins.minecraft.net/MinecraftSkins/*.png"; public final static String DefaultCloakURL = "http://skins.minecraft.net/MinecraftCloaks/*.png"; + private final static Pattern newResPattern = Pattern.compile("^http://textures.minecraft.net/texture/(.*?)?(Skin|Cloak)=(.*?)$"), newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); + oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"), + optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); private final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"); private final static File SKIN_DIR=new File(DATA_DIR,"skins"); @@ -29,7 +31,9 @@ public class CustomSkinLoader { private static String[] cloakURLs = null, skinURLs = null; private HttpURLConnection C = null; + private boolean loadFromCache=false; + private boolean cacheSelfOnly=false; public InputStream getPlayerSkinStream(String path) { if(!DATA_DIR.exists()) @@ -48,11 +52,14 @@ public class CustomSkinLoader { }else{ m = newResPattern.matcher(path); if(m.matches()){ - logger.info("Matches"); if (m.group(2).contains("Skin")) // Skin return getPlayerSkinStream(false, m.group(3)); else if (m.group(2).contains("Cloak")) // Cloak return getPlayerSkinStream(true, m.group(3)); + }else{ + m = optifineCapeURLPattern.matcher(path); + if(m.matches())//Optifine Cape + return null;//Not Load This } } return getStream(path, false); // Neither skin nor cloak... @@ -79,7 +86,7 @@ public class CustomSkinLoader { } S = getStream(loc, true,last); if(loadFromCache){ - logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + "will be load from cache."); + logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + " will be load from cache."); break; } if (S == null){ @@ -110,7 +117,7 @@ public class CustomSkinLoader { } }else{ String user= Minecraft.getMinecraft().getSession().getUsername(); - if(user.equalsIgnoreCase(playerName)){//Only save user's skin + if(!cacheSelfOnly||user.equalsIgnoreCase(playerName)){//Only save user's skin or cache everyone logger.info("Try save local " + (isCloak ? "cloak" : "skin") + " to " + temp.getAbsolutePath()); FileOutputStream fs=null; int times=0; diff --git a/1.7.2-mcp903/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java b/1.7.2-mcp903/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java index f887f0e..950cf40 100644 --- a/1.7.2-mcp903/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java +++ b/1.7.2-mcp903/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java @@ -27,6 +27,8 @@ public class ThreadDownloadImageData extends SimpleTexture private boolean textureUploaded; private static final String __OBFID = "CL_00001049"; public CustomSkinLoader customSkinLoader=new CustomSkinLoader(); + + public boolean enabled;//For Optifine public ThreadDownloadImageData(String par1Str, ResourceLocation par2ResourceLocation, IImageBuffer par3IImageBuffer) { diff --git a/1.8-mcp910/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.8-mcp910/src/minecraft/idv/jlchntoz/CustomSkinLoader.java index 6d5a31d..972e8cb 100644 --- a/1.8-mcp910/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ b/1.8-mcp910/src/minecraft/idv/jlchntoz/CustomSkinLoader.java @@ -10,17 +10,19 @@ import java.util.regex.*; /** * Custom skin loader mod for Minecraft. * - * @version 12th Revision 2nd Subversion 2015.6.7 + * @version 12th Revision 3rd Subversion 2015.6.20 * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2015 */ public class CustomSkinLoader { - public final static String VERSION="12.2"; + public final static String VERSION="12.3"; public final static String DefaultSkinURL = "http://skins.minecraft.net/MinecraftSkins/*.png"; public final static String DefaultCloakURL = "http://skins.minecraft.net/MinecraftCloaks/*.png"; + private final static Pattern newResPattern = Pattern.compile("^http://textures.minecraft.net/texture/(.*?)?(Skin|Cloak)=(.*?)$"), newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); + oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"), + optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); private final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"); private final static File SKIN_DIR=new File(DATA_DIR,"skins"); @@ -29,7 +31,9 @@ public class CustomSkinLoader { private static String[] cloakURLs = null, skinURLs = null; private HttpURLConnection C = null; + private boolean loadFromCache=false; + private boolean cacheSelfOnly=false; public InputStream getPlayerSkinStream(String path) { if(!DATA_DIR.exists()) @@ -48,11 +52,14 @@ public class CustomSkinLoader { }else{ m = newResPattern.matcher(path); if(m.matches()){ - logger.info("Matches"); if (m.group(2).contains("Skin")) // Skin return getPlayerSkinStream(false, m.group(3)); else if (m.group(2).contains("Cloak")) // Cloak return getPlayerSkinStream(true, m.group(3)); + }else{ + m = optifineCapeURLPattern.matcher(path); + if(m.matches())//Optifine Cape + return null;//Not Load This } } return getStream(path, false); // Neither skin nor cloak... @@ -79,7 +86,7 @@ public class CustomSkinLoader { } S = getStream(loc, true,last); if(loadFromCache){ - logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + "will be load from cache."); + logger.info("" + (isCloak ? "Cloak" : "Skin") + " in " + loc + " will be load from cache."); break; } if (S == null){ @@ -110,7 +117,7 @@ public class CustomSkinLoader { } }else{ String user= Minecraft.getMinecraft().getSession().getUsername(); - if(user.equalsIgnoreCase(playerName)){//Only save user's skin + if(!cacheSelfOnly||user.equalsIgnoreCase(playerName)){//Only save user's skin or cache everyone logger.info("Try save local " + (isCloak ? "cloak" : "skin") + " to " + temp.getAbsolutePath()); FileOutputStream fs=null; int times=0; diff --git a/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java b/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java index 4860bc2..d11de3b 100644 --- a/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java +++ b/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java @@ -30,6 +30,8 @@ public class ThreadDownloadImageData extends SimpleTexture private Thread imageThread; private boolean textureUploaded; private static final String __OBFID = "CL_00001049"; + + public Boolean imageFound = null; //For Optifine public ThreadDownloadImageData(File p_i1049_1_, String p_i1049_2_, ResourceLocation p_i1049_3_, IImageBuffer p_i1049_4_) { @@ -116,7 +118,7 @@ public class ThreadDownloadImageData extends SimpleTexture { CustomSkinLoader loader=new CustomSkinLoader(); //HttpURLConnection var1 = null; - ThreadDownloadImageData.logger.debug("Downloading http texture from {} to {}", new Object[] {ThreadDownloadImageData.this.imageUrl, ThreadDownloadImageData.this.field_152434_e}); + ThreadDownloadImageData.logger.info("Downloading http texture from {} to {}", new Object[] {ThreadDownloadImageData.this.imageUrl, ThreadDownloadImageData.this.field_152434_e}); try {