diff --git a/1.6.4-mcp811/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.6.4-mcp811/src/minecraft/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 0fe1704..0000000 --- a/1.6.4-mcp811/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,357 +0,0 @@ -package idv.jlchntoz; - -import net.minecraft.src.Minecraft; - -import java.io.*; -import java.math.BigInteger; -import java.net.*; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 12th Revision 9th Subversion 2016.2.10 - * - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2016 - */ -public class CustomSkinLoader { - public final static String VERSION="12.9"; - - 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$"), - optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); - - public final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"), - CACHE_DIR=new File(DATA_DIR,"caches"), - LOG_FILE=new File(DATA_DIR,"CustomSkinLoader.log"), - SKIN_URL_FILE=new File(DATA_DIR,"skinurls.txt"), - CAPE_URL_FILE=new File(DATA_DIR,"capeurls.txt"); - public final static MainLogger logger = getLogger(LOG_FILE); - - public final static String[] DEFAULT_SKIN_URLS={ - "http://skins.minecraft.net/MinecraftSkins/*.png", - "http://minecrack.fr.nf/mc/skinsminecrackd/*.png", - "http://www.skinme.cc/MinecraftSkins/*.png"}; - public final static String[] DEFAULT_CAPE_URLS={ - "http://skins.minecraft.net/MinecraftCloaks/*.png", - "http://s.optifine.net/capes/*.png", - "http://minecrack.fr.nf/mc/cloaksminecrackd/*.png", - "http://www.skinme.cc/MinecraftCloaks/*.png"}; - - private static String[] cloakURLs = null, skinURLs = null; - private HttpURLConnection C = null; - - //Entrance - public InputStream getPlayerSkinStream(String path) { - if(!DATA_DIR.exists()) - DATA_DIR.mkdir(); - if(!CACHE_DIR.exists()) - CACHE_DIR.mkdir(); - logger.info("Get a request: "+path); - if(path.contains("NOCSL"))//Not to use CSL to load, prepared for json api - return getStream(path, false); - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//May be old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - }else{ - m = newResPattern.matcher(path); - if(m.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 - logger.info("Ignore Optifine Cape."); - return null;//Not Load This - } - } - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if ((skinURLs == null|| skinURLs.length <= 0) && (cloakURLs == null || cloakURLs.length <= 0)) - refreshSkinURL(); // If the list is blank or null, try to load again. - InputStream S=null; - - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - S = getStream(loc, true); - - if (S == null){ - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") + " found in " + loc); - }else{ - logger.info("Succeessfully load " + (isCloak ? "cloak" : "skin") + " in " + loc); - return S; - } - } - - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - boolean success=false; - File cacheFile=new File(CACHE_DIR,MD5(URL)); - boolean alreadyCached=false; - if(cacheFile.exists()&&cacheFile.length()>1){ - alreadyCached=true; - logger.info("Cache File Found (LastModified: "+cacheFile.lastModified()+" , Size: "+cacheFile.length()+")"); - } - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setReadTimeout(15000); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - logger.info("Response Code: "+C.getResponseCode()); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful to get skin. - if(C.getContentLength()<=0){//Nothing got - logger.info("Nothing got."); - return null; - } - logger.info("Successfully Get Resource (LastModified: "+C.getLastModified()+" , ContentLength: "+C.getContentLength()+")"); - if(alreadyCached && C.getLastModified()==cacheFile.lastModified() && C.getContentLength()==cacheFile.length()){ - logger.info("Not Modified."); - return getStreamFromCache(cacheFile); - } - InputStream IS=new BufferedInputStream(C.getInputStream()); - if (!CheckPNG){ // If no need to check PNG header, just skip it. - success=true; - saveToCache(IS,cacheFile); - return IS; - } - //logger.info(C.getContentLength()+" "+IS.available()); - IS.mark(C.getContentLength()+10); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - success=true; - saveToCache(IS,cacheFile); - return IS; - } - } - } catch (Exception ex) { - success=false; - logger.log(Level.WARNING, ex.getMessage()); - if(alreadyCached) - return getStreamFromCache(cacheFile); - }finally{ - if(!success) - disconnect(); - } - return null; - } - private InputStream getStreamFromCache(File cacheFile) { - try{ - logger.info("Try load local cache in " + cacheFile.getAbsolutePath()); - InputStream in = new FileInputStream(cacheFile); - BufferedInputStream bis=new BufferedInputStream(in); - if(bis.available()<=0){ - logger.info("Cannot load local cache in " + cacheFile.getAbsolutePath()); - return null; - }else{ - logger.info("Successfully load cache in " + cacheFile.getAbsolutePath()); - return bis; - } - }catch(Exception e){ - logger.log(Level.WARNING, e.getMessage()); - return null; - } - } - private void saveToCache(InputStream is,File to){ - logger.info("Try save local cache to " + to.getAbsolutePath()); - FileOutputStream fs=null; - int times=0; - try{//Save to Local Skin File - if(to.exists()){ - to.delete(); - } - fs = new FileOutputStream(to); - int byteRead = 0; - byte[] buffer = new byte[1024]; - while (( byteRead = is.read(buffer)) != -1) { - times+=byteRead; - fs.write(buffer, 0, byteRead); - if(times>=C.getContentLength()){ - //logger.info(times+" "+C.getContentLength()); - break; - } - } - - if(to.length()>1){ - to.setLastModified(C.getLastModified()); - logger.info("Cache saved to " + to.getAbsolutePath()+" (LastModified: "+to.lastModified()+" , Size: "+to.length()+")"); - }else{ - to.delete(); - logger.info("Cannot save local cache to " + to.getAbsolutePath()); - } - }catch(Exception e){ - logger.warning(e.getMessage()); - }finally{ - try { - if(fs!=null) - fs.close(); - is.reset(); - } catch (IOException e) { - logger.warning(e.getMessage()); - } - } - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - if(!SKIN_URL_FILE.exists()){ - logger.log(Level.INFO, "SKIN config not found, create a new one."); - SKIN_URL_FILE.createNewFile(); - } - if(!CAPE_URL_FILE.exists()){ - logger.log(Level.INFO, "CAPE config not found, create a new one."); - CAPE_URL_FILE.createNewFile(); - } - skinURLs = readAllLines(SKIN_URL_FILE); - cloakURLs = readAllLines(CAPE_URL_FILE); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - if(skinURLs.length==0&&cloakURLs.length==0){ - logger.info("No skinURLs and cloak URLS found, try to init and use default settings."); - initSkinURL(); - refreshSkinURL(); - }else{ - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - } - private static void initSkinURL(){ - //Init URL List - skinURLs=DEFAULT_SKIN_URLS; - writeToFile(new File(DATA_DIR,"skinurls.txt"),parseArrayToText(skinURLs)); - cloakURLs=DEFAULT_CAPE_URLS; - writeToFile(new File(DATA_DIR,"capeurls.txt"),parseArrayToText(cloakURLs)); - } - - private static String[] readAllLines(File F) { - try { - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i=LOWEST_DISPLAY_LEVEL) - System.out.println(msg); - try { - writer.write("["); - writer.write(DATE_FORMAT.format(new Date())); - writer.write(" "); - writer.write(Thread.currentThread().getName()); - writer.write(" "); - writer.write(level.getName()); - writer.write("] "); - writer.write(msg); - writer.write("\r\n"); - writer.flush(); - } catch (Exception e) { - e.printStackTrace(); - } - } - public void info(String msg){ - log(Level.INFO,msg); - } - public void warning(String msg){ - log(Level.WARNING,msg); - } - public void warning(Exception e){ - log(Level.WARNING,"Exception occurs while running: "+e.getMessage()); - StackTraceElement[] stes=e.getStackTrace(); - for(StackTraceElement ste : stes){ - log(Level.WARNING,ste.toString()); - } - log(Level.WARNING,""); - } -} diff --git a/1.6.4-mcp811/src/minecraft/net/minecraft/src/ImageBufferDownload.java b/1.6.4-mcp811/src/minecraft/net/minecraft/src/ImageBufferDownload.java deleted file mode 100644 index 1317bc9..0000000 --- a/1.6.4-mcp811/src/minecraft/net/minecraft/src/ImageBufferDownload.java +++ /dev/null @@ -1,98 +0,0 @@ -package net.minecraft.src; - -import java.awt.Graphics; -import java.awt.image.BufferedImage; -import java.awt.image.DataBufferInt; -import java.awt.image.ImageObserver; - -public class ImageBufferDownload implements IImageBuffer -{ - private int[] imageData; - private int imageWidth; - private int imageHeight; - - public BufferedImage parseUserSkin(BufferedImage par1BufferedImage) - { - if (par1BufferedImage == null) - { - return null; - } - else - { - this.imageWidth = par1BufferedImage.getWidth();//Default: 64 - this.imageHeight = par1BufferedImage.getHeight();//Default: 32 - BufferedImage var2 = new BufferedImage(this.imageWidth, this.imageWidth / 2, 2); - Graphics var3 = var2.getGraphics(); - if(imageWidth == imageHeight){ - var3.drawImage(par1BufferedImage, 0, 0, this.imageWidth, this.imageWidth / 2, 0, 0, this.imageWidth, this.imageWidth / 2, (ImageObserver)null); - var3.drawImage(par1BufferedImage, 0, this.imageWidth / 4, this.imageWidth, this.imageWidth / 2, 0, this.imageWidth / 2 , this.imageWidth, this.imageWidth / 4 * 3, (ImageObserver)null); - imageHeight/=2; - }else{ - var3.drawImage(par1BufferedImage, 0, 0, (ImageObserver)null); - } - var3.dispose(); - this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData(); - //this.setAreaOpaque(0, 0, 32, 16); - //this.setAreaTransparent(32, 0, 64, 32); - //this.setAreaOpaque(0, 16, 64, 32); - this.setAreaOpaque(0, 0, imageWidth / 2, imageHeight / 2); - this.setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight); - this.setAreaOpaque(0, imageHeight / 2, imageWidth, imageHeight); - return var2; - } - } - - /** - * Makes the given area of the image transparent if it was previously completely opaque (used to remove the outer - * layer of a skin around the head if it was saved all opaque; this would be redundant so it's assumed that the skin - * maker is just using an image editor without an alpha channel) - */ - private void setAreaTransparent(int par1, int par2, int par3, int par4) - { - if (!this.hasTransparency(par1, par2, par3, par4)) - { - for (int var5 = par1; var5 < par3; ++var5) - { - for (int var6 = par2; var6 < par4; ++var6) - { - this.imageData[var5 + var6 * this.imageWidth] &= 16777215; - } - } - } - } - - /** - * Makes the given area of the image opaque - */ - private void setAreaOpaque(int par1, int par2, int par3, int par4) - { - for (int var5 = par1; var5 < par3; ++var5) - { - for (int var6 = par2; var6 < par4; ++var6) - { - this.imageData[var5 + var6 * this.imageWidth] |= -16777216; - } - } - } - - /** - * Returns true if the given area of the image contains transparent pixels - */ - private boolean hasTransparency(int par1, int par2, int par3, int par4) - { - for (int var5 = par1; var5 < par3; ++var5) - { - for (int var6 = par2; var6 < par4; ++var6) - { - int var7 = this.imageData[var5 + var6 * this.imageWidth]; - - if ((var7 >> 24 & 255) < 128) - { - return true; - } - } - } - - return false; - } -} 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 deleted file mode 100644 index 9dfd440..0000000 --- a/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageData.java +++ /dev/null @@ -1,81 +0,0 @@ -package net.minecraft.src; - -import java.awt.image.BufferedImage; -import java.io.IOException; - -public class ThreadDownloadImageData extends AbstractTexture -{ - private final String imageUrl; - private final IImageBuffer imageBuffer; - private BufferedImage bufferedImage; - private Thread imageThread; - private SimpleTexture imageLocation; - private boolean textureUploaded; - - public boolean enabled;//For Optifine - - public ThreadDownloadImageData(String par1Str, ResourceLocation par2ResourceLocation, IImageBuffer par3IImageBuffer) - { - this.imageUrl = par1Str; - this.imageBuffer = par3IImageBuffer; - this.imageLocation = par2ResourceLocation != null ? new SimpleTexture(par2ResourceLocation) : null; - } - - public int getGlTextureId() - { - int var1 = super.getGlTextureId(); - - if (!this.textureUploaded && this.bufferedImage != null) - { - TextureUtil.uploadTextureImage(var1, this.bufferedImage); - this.textureUploaded = true; - } - - return var1; - } - - public void getBufferedImage(BufferedImage par1BufferedImage) - { - this.bufferedImage = par1BufferedImage; - } - - public void loadTexture(ResourceManager par1ResourceManager) throws IOException - { - if (this.bufferedImage == null) - { - if (this.imageLocation != null) - { - this.imageLocation.loadTexture(par1ResourceManager); - this.glTextureId = this.imageLocation.getGlTextureId(); - } - } - else - { - TextureUtil.uploadTextureImage(this.getGlTextureId(), this.bufferedImage); - } - - if (this.imageThread == null) - { - this.imageThread = new ThreadDownloadImageDataINNER1(this); - this.imageThread.setDaemon(true); - //this.imageThread.setName("Skin downloader: " + this.imageUrl); - this.imageThread.start(); - } - } - - public boolean isTextureUploaded() - { - this.getGlTextureId(); - return this.textureUploaded; - } - - static String getImageUrl(ThreadDownloadImageData par0ThreadDownloadImageData) - { - return par0ThreadDownloadImageData.imageUrl; - } - - static IImageBuffer getImageBuffer(ThreadDownloadImageData par0ThreadDownloadImageData) - { - return par0ThreadDownloadImageData.imageBuffer; - } -} diff --git a/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageDataINNER1.java b/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageDataINNER1.java deleted file mode 100644 index 71c36b5..0000000 --- a/1.6.4-mcp811/src/minecraft/net/minecraft/src/ThreadDownloadImageDataINNER1.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.minecraft.src; - -import idv.jlchntoz.CustomSkinLoader; - -import java.awt.image.BufferedImage; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; - -class ThreadDownloadImageDataINNER1 extends Thread -{ - final ThreadDownloadImageData theThreadDownloadImageData; - - ThreadDownloadImageDataINNER1(ThreadDownloadImageData par1ThreadDownloadImageData) - { - this.theThreadDownloadImageData = par1ThreadDownloadImageData; - } - - public void run() - { - - //HttpURLConnection var1 = null; - CustomSkinLoader loader=new CustomSkinLoader(); - try - { - /* - var1 = (HttpURLConnection)(new URL(ThreadDownloadImageData.getImageUrl(this.theThreadDownloadImageData))).openConnection(Minecraft.getMinecraft().getProxy()); - var1.setDoInput(true); - var1.setDoOutput(false); - var1.connect(); - - if (var1.getResponseCode() / 100 != 2) - { - return; - } - - BufferedImage var2 = ImageIO.read(var1.getInputStream()); - */ - BufferedImage var2 = ImageIO.read(loader.getPlayerSkinStream( - ThreadDownloadImageData.getImageUrl(this.theThreadDownloadImageData))); - if (ThreadDownloadImageData.getImageBuffer(this.theThreadDownloadImageData) != null) - { - var2 = ThreadDownloadImageData.getImageBuffer(this.theThreadDownloadImageData).parseUserSkin(var2); - } - - this.theThreadDownloadImageData.getBufferedImage(var2); - } - catch (Exception var6) - { - var6.printStackTrace(); - } - finally - { - /* - if (var1 != null) - { - var1.disconnect(); - }*/ - loader.disconnect(); - } - } -} diff --git a/1.7.10-mcp908/src/minecraft/customskinloader/ModelManager.java b/1.7.10-mcp908/src/minecraft/customskinloader/ModelManager.java new file mode 100644 index 0000000..ce17051 --- /dev/null +++ b/1.7.10-mcp908/src/minecraft/customskinloader/ModelManager.java @@ -0,0 +1,65 @@ +package customskinloader; + +import java.util.ArrayList; +import java.util.HashMap; + +import com.google.common.collect.Maps; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; + +/** + * Model Manager for 1.7.10 and lower. + * A manager to check if model is available. + * It is the only class in package 'customskinloader' which has differences in different Minecraft version. + * @since 13.1 + */ +public class ModelManager { + private static ArrayList models=null; + + /** + * Check if model is available. + * @param model - default/slim + * @since 13.1 + */ + public static boolean checkModel(String model){ + if(models==null) + refreshModels(); + return models.contains(model); + } + + /** + * Parse hashMapProfile to UserProfile + * @param profile - hashMapProfile (HashMap) + * @return profile - UserProfile instance + * @since 13.1 + */ + public static UserProfile toUserProfile(HashMap profile){ + UserProfile userProfile=new UserProfile(); + MinecraftProfileTexture skin=(MinecraftProfileTexture)profile.get(Type.SKIN); + userProfile.skinUrl= skin==null?null:skin.getUrl();//Avoid NullPointerException + userProfile.model="default"; + MinecraftProfileTexture cape=(MinecraftProfileTexture)profile.get(Type.CAPE); + userProfile.capeUrl= cape==null?null:cape.getUrl(); + return userProfile; + } + + /** + * Parse UserProfile to hashMapProfile + * @param profile - UserProfile instance + * @return profile - hashMapProfile (HashMap) + * @since 13.1 + */ + public static HashMap fromUserProfile(UserProfile profile){ + HashMap hashMap=Maps.newHashMap(); + if(profile.skinUrl!=null) + hashMap.put(Type.SKIN, new MinecraftProfileTexture(profile.skinUrl)); + if(profile.capeUrl!=null) + hashMap.put(Type.CAPE, new MinecraftProfileTexture(profile.capeUrl)); + return hashMap; + } + + private static void refreshModels(){ + models=new ArrayList(); + models.add("default"); + } +} diff --git a/1.7.10-mcp908/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.7.10-mcp908/src/minecraft/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 718940d..0000000 --- a/1.7.10-mcp908/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,359 +0,0 @@ -package idv.jlchntoz; - -import net.minecraft.client.Minecraft; - -import java.io.*; -import java.math.BigInteger; -import java.net.*; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 12th Revision 8th Subversion 2016.2.3 - * - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2016 - */ -public class CustomSkinLoader { - public final static String VERSION="12.8"; - - 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$"), - optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); - - public final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"), - CACHE_DIR=new File(DATA_DIR,"caches"), - LOG_FILE=new File(DATA_DIR,"CustomSkinLoader.log"), - SKIN_URL_FILE=new File(DATA_DIR,"skinurls.txt"), - CAPE_URL_FILE=new File(DATA_DIR,"capeurls.txt"); - public final static MainLogger logger = getLogger(LOG_FILE); - - public final static String[] DEFAULT_SKIN_URLS={ - "http://skins.minecraft.net/MinecraftSkins/*.png", - "http://minecrack.fr.nf/mc/skinsminecrackd/*.png", - "http://www.skinme.cc/MinecraftSkins/*.png"}; - public final static String[] DEFAULT_CAPE_URLS={ - "http://skins.minecraft.net/MinecraftCloaks/*.png", - "http://s.optifine.net/capes/*.png", - "http://minecrack.fr.nf/mc/cloaksminecrackd/*.png", - "http://www.skinme.cc/MinecraftCloaks/*.png"}; - - private static String[] cloakURLs = null, skinURLs = null; - private HttpURLConnection C = null; - - //Entrance - public InputStream getPlayerSkinStream(String path) { - if(!DATA_DIR.exists()) - DATA_DIR.mkdir(); - if(!CACHE_DIR.exists()) - CACHE_DIR.mkdir(); - logger.info("Get a request: "+path); - if(path.contains("NOCSL"))//Not to use CSL to load, prepared for json api - return getStream(path, false); - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//May be old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - }else{ - m = newResPattern.matcher(path); - if(m.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 - logger.info("Ignore Optifine Cape."); - return null;//Not Load This - } - } - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if (skinURLs == null || cloakURLs == null || skinURLs.length <= 0 - || cloakURLs.length <= 0) - refreshSkinURL(); // If the list is blank or null, try to load again. - InputStream S=null; - - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - S = getStream(loc, true); - - if (S == null){ - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") + " found in " + loc); - }else{ - logger.info("Succeessfully load " + (isCloak ? "cloak" : "skin") + " in " + loc); - return S; - } - } - - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - boolean success=false; - File cacheFile=new File(CACHE_DIR,MD5(URL)); - boolean alreadyCached=false; - if(cacheFile.exists()&&cacheFile.length()>1){ - alreadyCached=true; - logger.info("Cache File Found"); - } - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setReadTimeout(15000); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - logger.info("Response Code: "+C.getResponseCode()); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful to get skin. - if(alreadyCached && C.getLastModified()==cacheFile.lastModified()){ - logger.info("Not Modified!"); - return getStreamFromCache(cacheFile); - } - if(C.getContentLength()<=0){//Nothing to get - return null; - } - InputStream IS=new BufferedInputStream(C.getInputStream()); - if (!CheckPNG){ // If no need to check PNG header, just skip it. - success=true; - saveToCache(IS,cacheFile); - return IS; - } - //logger.info(C.getContentLength()+" "+IS.available()); - IS.mark(C.getContentLength()+10); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - success=true; - saveToCache(IS,cacheFile); - return IS; - } - } - } catch (Exception ex) { - success=false; - logger.log(Level.WARNING, ex.getMessage()); - if(alreadyCached) - return getStreamFromCache(cacheFile); - }finally{ - if(!success) - disconnect(); - } - return null; - } - private InputStream getStreamFromCache(File cacheFile) { - try{ - logger.info("Try load local cache in " + cacheFile.getAbsolutePath()); - InputStream in = new FileInputStream(cacheFile); - BufferedInputStream bis=new BufferedInputStream(in); - if(bis.available()<=0){ - logger.info("Cannot load local cache in " + cacheFile.getAbsolutePath()); - return null; - }else{ - logger.info("Successfully load cache in " + cacheFile.getAbsolutePath()); - return bis; - } - }catch(Exception e){ - logger.log(Level.WARNING, e.getMessage()); - return null; - } - } - private void saveToCache(InputStream is,File to){ - logger.info("Try save local cache to " + to.getAbsolutePath()); - FileOutputStream fs=null; - int times=0; - try{//Save to Local Skin File - if(to.exists()){ - to.delete(); - } - fs = new FileOutputStream(to); - int byteRead = 0; - byte[] buffer = new byte[1024]; - while (( byteRead = is.read(buffer)) != -1) { - times+=byteRead; - fs.write(buffer, 0, byteRead); - if(times>=C.getContentLength()){ - //logger.info(times+" "+C.getContentLength()); - break; - } - } - - if(to.length()>1){ - logger.info("Successfully save cache to " + to.getAbsolutePath()); - }else{ - to.delete(); - logger.info("Cannot save local cache to " + to.getAbsolutePath()); - } - }catch(Exception e){ - logger.warning(e.getMessage()); - }finally{ - try { - if(fs!=null) - fs.close(); - is.reset(); - logger.info("Cache size : "+is.available()); - } catch (IOException e) { - logger.warning(e.getMessage()); - } - if(to.exists()){ - to.setLastModified(C.getLastModified()); - } - } - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - if(!SKIN_URL_FILE.exists()){ - logger.log(Level.INFO, "SKIN config not found, create a new one."); - SKIN_URL_FILE.createNewFile(); - } - if(!CAPE_URL_FILE.exists()){ - logger.log(Level.INFO, "CAPE config not found, create a new one."); - CAPE_URL_FILE.createNewFile(); - } - skinURLs = readAllLines(SKIN_URL_FILE); - cloakURLs = readAllLines(CAPE_URL_FILE); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - if(skinURLs.length==0&&cloakURLs.length==0){ - logger.info("No skinURLs and cloak URLS found, try to init and use default settings."); - initSkinURL(); - refreshSkinURL(); - }else{ - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - } - private static void initSkinURL(){ - //TODO Init URL List - skinURLs=DEFAULT_SKIN_URLS; - writeToFile(new File(DATA_DIR,"skinurls.txt"),parseArrayToText(skinURLs)); - cloakURLs=DEFAULT_CAPE_URLS; - writeToFile(new File(DATA_DIR,"capeurls.txt"),parseArrayToText(cloakURLs)); - } - - private static String[] readAllLines(File F) { - try { - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i=LOWEST_DISPLAY_LEVEL) - System.out.println(msg); - try { - writer.write("["); - writer.write(DATE_FORMAT.format(new Date())); - writer.write(" "); - writer.write(Thread.currentThread().getName()); - writer.write(" "); - writer.write(level.getName()); - writer.write("] "); - writer.write(msg); - writer.write("\r\n"); - writer.flush(); - } catch (Exception e) { - e.printStackTrace(); - } - } - public void info(String msg){ - log(Level.INFO,msg); - } - public void warning(String msg){ - log(Level.WARNING,msg); - } - public void warning(Exception e){ - log(Level.WARNING,"Exception occurs while running: "+e.getMessage()); - StackTraceElement[] stes=e.getStackTrace(); - for(StackTraceElement ste : stes){ - log(Level.WARNING,ste.toString()); - } - log(Level.WARNING,""); - } -} diff --git a/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java b/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java index 3281243..fdf1117 100644 --- a/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java +++ b/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java @@ -20,25 +20,22 @@ public class ImageBufferDownload implements IImageBuffer } else { - this.imageWidth = p_78432_1_.getWidth();//Default: 64 - this.imageHeight = p_78432_1_.getHeight();//Default: 32 - BufferedImage var2 = new BufferedImage(this.imageWidth, this.imageWidth / 2, 2); + int radio=p_78432_1_.getWidth()/64; + this.imageWidth = 64*radio; + this.imageHeight = 32*radio; + BufferedImage var2 = new BufferedImage(this.imageWidth, this.imageHeight, 2); Graphics var3 = var2.getGraphics(); - if(imageWidth == imageHeight){ - var3.drawImage(p_78432_1_, 0, 0, this.imageWidth, this.imageWidth / 2, 0, 0, this.imageWidth, this.imageWidth / 2, (ImageObserver)null); - var3.drawImage(p_78432_1_, 0, this.imageWidth / 4, this.imageWidth, this.imageWidth / 2, 0, this.imageWidth / 2 , this.imageWidth, this.imageWidth / 4 * 3, (ImageObserver)null); - imageHeight/=2; + if(imageWidth == p_78432_1_.getHeight()){ + var3.drawImage(p_78432_1_, 0 *radio, 0 *radio, 64*radio, 32*radio, 0 *radio, 0 *radio, 64*radio, 32*radio, (ImageObserver)null); + var3.drawImage(p_78432_1_, 0 *radio, 16*radio, 64*radio, 32*radio, 0 *radio, 32*radio, 64*radio, 48*radio, (ImageObserver)null); }else{ var3.drawImage(p_78432_1_, 0, 0, (ImageObserver)null); } var3.dispose(); this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData(); - //this.setAreaOpaque(0, 0, 32, 16); - //this.setAreaTransparent(32, 0, 64, 32); - //this.setAreaOpaque(0, 16, 64, 32); - this.setAreaOpaque(0, 0, imageWidth / 2, imageHeight / 2); - this.setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight); - this.setAreaOpaque(0, imageHeight / 2, imageWidth, imageHeight); + this.setAreaOpaque(0, 0, 32*radio, 16*radio); + this.setAreaTransparent(32*radio, 0, 64*radio, 32*radio); + this.setAreaOpaque(0, 16*radio, 64*radio, 32*radio); return var2; } } diff --git a/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java b/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java deleted file mode 100644 index 475a41a..0000000 --- a/1.7.10-mcp908/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java +++ /dev/null @@ -1,158 +0,0 @@ -package net.minecraft.client.renderer; - -import idv.jlchntoz.CustomSkinLoader; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.SimpleTexture; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class ThreadDownloadImageData extends SimpleTexture -{ - private static final Logger logger = LogManager.getLogger(); - private static final AtomicInteger field_147643_d = new AtomicInteger(0); - private final File field_152434_e; - private final String imageUrl; - private final IImageBuffer imageBuffer; - private BufferedImage bufferedImage; - private Thread imageThread; - private boolean textureUploaded; - private static final String __OBFID = "CL_00001049"; - - //For Optifine - public Boolean imageFound = null; - public boolean pipeline = false; - - public ThreadDownloadImageData(File p_i1049_1_, String p_i1049_2_, ResourceLocation p_i1049_3_, IImageBuffer p_i1049_4_) - { - super(p_i1049_3_); - this.field_152434_e = p_i1049_1_; - this.imageUrl = p_i1049_2_; - this.imageBuffer = p_i1049_4_; - } - - private void func_147640_e() - { - if (!this.textureUploaded) - { - if (this.bufferedImage != null) - { - if (this.textureLocation != null) - { - this.func_147631_c(); - } - - TextureUtil.uploadTextureImage(super.getGlTextureId(), this.bufferedImage); - this.textureUploaded = true; - } - } - } - - public int getGlTextureId() - { - this.func_147640_e(); - return super.getGlTextureId(); - } - - public void func_147641_a(BufferedImage p_147641_1_) - { - this.bufferedImage = p_147641_1_; - - if (this.imageBuffer != null) - { - this.imageBuffer.func_152634_a(); - } - } - - public void loadTexture(IResourceManager p_110551_1_) throws IOException - { - if (this.bufferedImage == null && this.textureLocation != null) - { - super.loadTexture(p_110551_1_); - } - - if (this.imageThread == null) - { - if (this.field_152434_e != null && this.field_152434_e.isFile()) - { - logger.debug("Loading http texture from local cache ({})", new Object[] {this.field_152434_e}); - - try - { - this.bufferedImage = ImageIO.read(this.field_152434_e); - - if (this.imageBuffer != null) - { - this.func_147641_a(this.imageBuffer.parseUserSkin(this.bufferedImage)); - } - } - catch (IOException var3) - { - logger.error("Couldn\'t load skin " + this.field_152434_e, var3); - this.func_152433_a(); - } - } - else - { - this.func_152433_a(); - } - } - } - - protected void func_152433_a() - { - this.imageThread = new Thread("Texture Downloader #" + field_147643_d.incrementAndGet()) - { - private static final String __OBFID = "CL_00001050"; - public void run() - { - ThreadDownloadImageData.logger.debug("Downloading http texture from {} to {}", new Object[] {ThreadDownloadImageData.this.imageUrl, ThreadDownloadImageData.this.field_152434_e}); - - try - { - CustomSkinLoader loader=new CustomSkinLoader(); - InputStream var9=loader.getPlayerSkinStream(ThreadDownloadImageData.this.imageUrl); - - - BufferedImage var2; - /* - if (ThreadDownloadImageData.this.field_152434_e != null) - { - FileUtils.copyInputStreamToFile(var9, ThreadDownloadImageData.this.field_152434_e); - var2 = ImageIO.read(ThreadDownloadImageData.this.field_152434_e); - } - else - { - - }*/ - var2 = ImageIO.read(var9); - if (ThreadDownloadImageData.this.imageBuffer != null) - { - var2 = ThreadDownloadImageData.this.imageBuffer.parseUserSkin(var2); - } - - ThreadDownloadImageData.this.func_147641_a(var2); - loader.disconnect(); - } - catch (Exception var6) - { - ThreadDownloadImageData.logger.error("Couldn\'t download http texture", var6); - } - } - }; - this.imageThread.setDaemon(true); - this.imageThread.start(); - } -} diff --git a/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java index 54b8695..fcd4358 100644 --- a/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.7.10-mcp908/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -17,6 +17,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ImageBufferDownload; @@ -61,10 +62,8 @@ public class SkinManager public ResourceLocation func_152789_a(MinecraftProfileTexture p_152789_1_, final Type p_152789_2_, final SkinManager.SkinAvailableCallback p_152789_3_) { - - final ResourceLocation var4 = new ResourceLocation(p_152789_2_.name()+"/" + p_152789_1_.getHash()); - //ITextureObject var5 = this.field_152795_c.getTexture(var4); -/* + final ResourceLocation var4 = new ResourceLocation("skins/" + p_152789_1_.getHash()); + ITextureObject var5 = this.field_152795_c.getTexture(var4); if (var5 != null) { if (p_152789_3_ != null) @@ -73,7 +72,7 @@ public class SkinManager } } else - {*/ + { File var6 = new File(this.field_152796_d, p_152789_1_.getHash().substring(0, 2)); File var7 = new File(var6, p_152789_1_.getHash()); final ImageBufferDownload var8 = p_152789_2_ == Type.SKIN ? new ImageBufferDownload() : null; @@ -103,7 +102,8 @@ public class SkinManager } }); this.field_152795_c.loadTexture(var4, var9); -//} + } + return var4; } @@ -124,28 +124,22 @@ public class SkinManager { ; } - + + /* + * If keep this, code below will not be executed. + * p_152790_1_.getId() may be null, so NullPointerException may be thrown. + * Minecraft.getMinecraft().getSession().func_148256_e().getId() also may be null, which makes it meaningless. if (var1.isEmpty() && p_152790_1_.getId().equals(Minecraft.getMinecraft().getSession().func_148256_e().getId())) { + System.out.println("RUN3"); var1.putAll(SkinManager.this.field_152797_e.getTextures(SkinManager.this.field_152797_e.fillProfileProperties(p_152790_1_, false), false)); - } + }*/ //CustomSkinLoader Begin - HashMap var2 = Maps.newHashMap(); - if (var1.containsKey(Type.SKIN)){ - var2.put(Type.SKIN, new MinecraftProfileTexture(((MinecraftProfileTexture)var1.get(Type.SKIN)).getUrl()+"?Skin="+p_152790_1_.getName())); - }else{ - var2.put(Type.SKIN,new MinecraftProfileTexture( "http://skins.minecraft.net/MinecraftSkins/"+p_152790_1_.getName()+".png")); - } - if (var1.containsKey(Type.CAPE)){ - var2.put(Type.CAPE, new MinecraftProfileTexture(((MinecraftProfileTexture)var1.get(Type.CAPE)).getUrl()+"?Cloak="+p_152790_1_.getName())); - }else{ - var2.put(Type.CAPE,new MinecraftProfileTexture( "http://skins.minecraft.net/MinecraftCloaks/"+p_152790_1_.getName()+".png")); - } var1.clear(); - var1.putAll(var2); + var1.putAll(customskinloader.CustomSkinLoader.loadProfile(p_152790_1_.getName(), var1)); //CustomSkinLoader End - + Minecraft.getMinecraft().func_152344_a(new Runnable() { private static final String __OBFID = "CL_00001826"; diff --git a/1.7.2-mcp903/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.7.2-mcp903/src/minecraft/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index ad06026..0000000 --- a/1.7.2-mcp903/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,357 +0,0 @@ -package idv.jlchntoz; - -import net.minecraft.client.Minecraft; - -import java.io.*; -import java.math.BigInteger; -import java.net.*; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 12th Revision 9th Subversion 2016.2.10 - * - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2016 - */ -public class CustomSkinLoader { - public final static String VERSION="12.9"; - - 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$"), - optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); - - public final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"), - CACHE_DIR=new File(DATA_DIR,"caches"), - LOG_FILE=new File(DATA_DIR,"CustomSkinLoader.log"), - SKIN_URL_FILE=new File(DATA_DIR,"skinurls.txt"), - CAPE_URL_FILE=new File(DATA_DIR,"capeurls.txt"); - public final static MainLogger logger = getLogger(LOG_FILE); - - public final static String[] DEFAULT_SKIN_URLS={ - "http://skins.minecraft.net/MinecraftSkins/*.png", - "http://minecrack.fr.nf/mc/skinsminecrackd/*.png", - "http://www.skinme.cc/MinecraftSkins/*.png"}; - public final static String[] DEFAULT_CAPE_URLS={ - "http://skins.minecraft.net/MinecraftCloaks/*.png", - "http://s.optifine.net/capes/*.png", - "http://minecrack.fr.nf/mc/cloaksminecrackd/*.png", - "http://www.skinme.cc/MinecraftCloaks/*.png"}; - - private static String[] cloakURLs = null, skinURLs = null; - private HttpURLConnection C = null; - - //Entrance - public InputStream getPlayerSkinStream(String path) { - if(!DATA_DIR.exists()) - DATA_DIR.mkdir(); - if(!CACHE_DIR.exists()) - CACHE_DIR.mkdir(); - logger.info("Get a request: "+path); - if(path.contains("NOCSL"))//Not to use CSL to load, prepared for json api - return getStream(path, false); - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//May be old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - }else{ - m = newResPattern.matcher(path); - if(m.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 - logger.info("Ignore Optifine Cape."); - return null;//Not Load This - } - } - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if ((skinURLs == null|| skinURLs.length <= 0) && (cloakURLs == null || cloakURLs.length <= 0)) - refreshSkinURL(); // If the list is blank or null, try to load again. - InputStream S=null; - - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - S = getStream(loc, true); - - if (S == null){ - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") + " found in " + loc); - }else{ - logger.info("Succeessfully load " + (isCloak ? "cloak" : "skin") + " in " + loc); - return S; - } - } - - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - boolean success=false; - File cacheFile=new File(CACHE_DIR,MD5(URL)); - boolean alreadyCached=false; - if(cacheFile.exists()&&cacheFile.length()>1){ - alreadyCached=true; - logger.info("Cache File Found (LastModified: "+cacheFile.lastModified()+" , Size: "+cacheFile.length()+")"); - } - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setReadTimeout(15000); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - logger.info("Response Code: "+C.getResponseCode()); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful to get skin. - if(C.getContentLength()<=0){//Nothing got - logger.info("Nothing got."); - return null; - } - logger.info("Successfully Get Resource (LastModified: "+C.getLastModified()+" , ContentLength: "+C.getContentLength()+")"); - if(alreadyCached && C.getLastModified()==cacheFile.lastModified() && C.getContentLength()==cacheFile.length()){ - logger.info("Not Modified."); - return getStreamFromCache(cacheFile); - } - InputStream IS=new BufferedInputStream(C.getInputStream()); - if (!CheckPNG){ // If no need to check PNG header, just skip it. - success=true; - saveToCache(IS,cacheFile); - return IS; - } - //logger.info(C.getContentLength()+" "+IS.available()); - IS.mark(C.getContentLength()+10); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - success=true; - saveToCache(IS,cacheFile); - return IS; - } - } - } catch (Exception ex) { - success=false; - logger.log(Level.WARNING, ex.getMessage()); - if(alreadyCached) - return getStreamFromCache(cacheFile); - }finally{ - if(!success) - disconnect(); - } - return null; - } - private InputStream getStreamFromCache(File cacheFile) { - try{ - logger.info("Try load local cache in " + cacheFile.getAbsolutePath()); - InputStream in = new FileInputStream(cacheFile); - BufferedInputStream bis=new BufferedInputStream(in); - if(bis.available()<=0){ - logger.info("Cannot load local cache in " + cacheFile.getAbsolutePath()); - return null; - }else{ - logger.info("Successfully load cache in " + cacheFile.getAbsolutePath()); - return bis; - } - }catch(Exception e){ - logger.log(Level.WARNING, e.getMessage()); - return null; - } - } - private void saveToCache(InputStream is,File to){ - logger.info("Try save local cache to " + to.getAbsolutePath()); - FileOutputStream fs=null; - int times=0; - try{//Save to Local Skin File - if(to.exists()){ - to.delete(); - } - fs = new FileOutputStream(to); - int byteRead = 0; - byte[] buffer = new byte[1024]; - while (( byteRead = is.read(buffer)) != -1) { - times+=byteRead; - fs.write(buffer, 0, byteRead); - if(times>=C.getContentLength()){ - //logger.info(times+" "+C.getContentLength()); - break; - } - } - - if(to.length()>1){ - to.setLastModified(C.getLastModified()); - logger.info("Cache saved to " + to.getAbsolutePath()+" (LastModified: "+to.lastModified()+" , Size: "+to.length()+")"); - }else{ - to.delete(); - logger.info("Cannot save local cache to " + to.getAbsolutePath()); - } - }catch(Exception e){ - logger.warning(e.getMessage()); - }finally{ - try { - if(fs!=null) - fs.close(); - is.reset(); - } catch (IOException e) { - logger.warning(e.getMessage()); - } - } - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - if(!SKIN_URL_FILE.exists()){ - logger.log(Level.INFO, "SKIN config not found, create a new one."); - SKIN_URL_FILE.createNewFile(); - } - if(!CAPE_URL_FILE.exists()){ - logger.log(Level.INFO, "CAPE config not found, create a new one."); - CAPE_URL_FILE.createNewFile(); - } - skinURLs = readAllLines(SKIN_URL_FILE); - cloakURLs = readAllLines(CAPE_URL_FILE); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - if(skinURLs.length==0&&cloakURLs.length==0){ - logger.info("No skinURLs and cloak URLS found, try to init and use default settings."); - initSkinURL(); - refreshSkinURL(); - }else{ - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - } - private static void initSkinURL(){ - //Init URL List - skinURLs=DEFAULT_SKIN_URLS; - writeToFile(new File(DATA_DIR,"skinurls.txt"),parseArrayToText(skinURLs)); - cloakURLs=DEFAULT_CAPE_URLS; - writeToFile(new File(DATA_DIR,"capeurls.txt"),parseArrayToText(cloakURLs)); - } - - private static String[] readAllLines(File F) { - try { - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i> 24 & 255) < 128) - { - return true; - } - } - } - - return false; - } -} 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 deleted file mode 100644 index 950cf40..0000000 --- a/1.7.2-mcp903/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java +++ /dev/null @@ -1,110 +0,0 @@ -package net.minecraft.client.renderer; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.SimpleTexture; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import idv.jlchntoz.CustomSkinLoader; - -public class ThreadDownloadImageData extends SimpleTexture -{ - private static final Logger logger = LogManager.getLogger(); - private static final AtomicInteger field_147643_d = new AtomicInteger(0); - private final String imageUrl; - private final IImageBuffer imageBuffer; - private BufferedImage bufferedImage; - private Thread imageThread; - 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) - { - super(par2ResourceLocation); - this.imageUrl = par1Str; - this.imageBuffer = par3IImageBuffer; - } - - private void func_147640_e() - { - if (!this.textureUploaded) - { - if (this.bufferedImage != null) - { - if (this.textureLocation != null) - { - this.func_147631_c(); - } - - TextureUtil.uploadTextureImage(super.getGlTextureId(), this.bufferedImage); - this.textureUploaded = true; - } - } - } - - public int getGlTextureId() - { - this.func_147640_e(); - return super.getGlTextureId(); - } - - public void func_147641_a(BufferedImage p_147641_1_) - { - this.bufferedImage = p_147641_1_; - } - - public void loadTexture(IResourceManager par1ResourceManager) throws IOException - { - if (this.bufferedImage == null && this.textureLocation != null) - { - super.loadTexture(par1ResourceManager); - } - - if (this.imageThread == null) - { - this.imageThread = new Thread("Texture Downloader #" + field_147643_d.incrementAndGet()) - { - private static final String __OBFID = "CL_00001050"; - public void run() - { - try - { - BufferedImage var2 = ImageIO.read( - ThreadDownloadImageData.this.customSkinLoader.getPlayerSkinStream( - ThreadDownloadImageData.this.imageUrl)); - if (ThreadDownloadImageData.this.imageBuffer != null){ - var2 = ThreadDownloadImageData.this.imageBuffer.parseUserSkin(var2); - } - ThreadDownloadImageData.this.func_147641_a(var2); - customSkinLoader.disconnect(); - }catch (Exception var6){ - ThreadDownloadImageData.logger.error("Couldn\'t download http texture", var6); - return; - } - - } - }; - this.imageThread.setDaemon(true); - //this.imageThread.setName("Skin downloader: " + this.imageUrl); - this.imageThread.start(); - } - } - - public boolean isTextureUploaded() - { - this.func_147640_e(); - return this.textureUploaded; - } -} diff --git a/1.7.4/bpi.java b/1.7.4/bpi.java deleted file mode 100644 index e61052d..0000000 --- a/1.7.4/bpi.java +++ /dev/null @@ -1,382 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import org.lwjgl.opengl.GL11; - -public class bpi extends bpa -{ - - private static final brq a = new brq("textures/entity/steve.png"); - private bih f; - private bih g; - private bih h; - - public bpi() - { - super(new bih(0.0F), 0.5F); - f = (bih)i; - g = new bih(1.0F); - h = new bih(0.5F); - } - - protected int a(bma bma1, int i, float f1) - { - abu abu1 = bma1.bm.d(3 - i); - if (abu1 != null) - { - abs abs1 = abu1.b(); - if (abs1 instanceof zs) - { - zs zs1 = (zs)abs1; - a(bop.a(zs1, i)); - bih bih1 = i != 2 ? g : h; - bih1.c.j = i == 0; - bih1.d.j = i == 0; - bih1.e.j = i == 1 || i == 2; - bih1.f.j = i == 1; - bih1.g.j = i == 1; - bih1.h.j = i == 2 || i == 3; - bih1.i.j = i == 2 || i == 3; - a(((bim) (bih1))); - bih1.p = this.i.p; - bih1.q = this.i.q; - bih1.s = this.i.s; - if (zs1.m_() == zu.a) - { - int j = zs1.b(abu1); - float f2 = (float)(j >> 16 & 0xff) / 255F; - float f3 = (float)(j >> 8 & 0xff) / 255F; - float f4 = (float)(j & 0xff) / 255F; - GL11.glColor3f(f2, f3, f4); - return !abu1.y() ? 16 : 31; - } - GL11.glColor3f(1.0F, 1.0F, 1.0F); - return !abu1.y() ? 1 : 15; - } - } - return -1; - } - - protected void b(bma bma1, int i, float f1) - { - abu abu1 = bma1.bm.d(3 - i); - if (abu1 != null) - { - abs abs1 = abu1.b(); - if (abs1 instanceof zs) - { - a(bop.a((zs)abs1, i, "overlay")); - GL11.glColor3f(1.0F, 1.0F, 1.0F); - } - } - } - - public void a(bma bma1, double d, double d1, double d2, - float f1, float f2) - { - GL11.glColor3f(1.0F, 1.0F, 1.0F); - abu abu1 = bma1.bm.h(); - g.m = h.m = f.m = abu1 == null ? 0 : 1; - if (abu1 != null && bma1.bw() > 0) - { - acz acz1 = abu1.o(); - if (acz1 == acz.d) - g.m = h.m = f.m = 3; - else - if (acz1 == acz.e) - g.o = h.o = f.o = true; - } - g.n = h.n = f.n = bma1.am(); - double d3 = d1 - (double)bma1.L; - if (bma1.am() && !(bma1 instanceof bmd)) - d3 -= 0.125D; - super.a(bma1, d, d3, d2, f1, f2); - g.o = h.o = f.o = false; - g.n = h.n = f.n = false; - g.m = h.m = f.m = 0; - } - - protected brq a(bma bma1) - { - return bma1.t(); - } - - protected void a(bma bma1, float f1) - { - GL11.glColor3f(1.0F, 1.0F, 1.0F); - super.c(bma1, f1); - super.e(bma1, f1); - abu abu1 = bma1.bm.d(3); - if (abu1 != null) - { - GL11.glPushMatrix(); - f.c.c(0.0625F); - if (abu1.b() instanceof zy) - { - if (bmf.a(ahz.a(abu1.b()).b())) - { - float f2 = 0.625F; - GL11.glTranslatef(0.0F, -0.25F, 0.0F); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(f2, -f2, -f2); - } - b.f.a(bma1, abu1, 0); - } else - if (abu1.b() == abv.bL) - { - float f3 = 1.0625F; - GL11.glScalef(f3, -f3, -f3); - String s = ""; - if (abu1.p() && abu1.q().b("SkullOwner", 8)) - s = abu1.q().j("SkullOwner"); - bnl.b.a(-0.5F, 0.0F, -0.5F, 1, 180F, abu1.k(), s); - } - GL11.glPopMatrix(); - } - if (bma1.b_().equals("deadmau5") && bma1.r().a()) - { - a(bma1.t()); - for (int i = 0; i < 2; i++) - { - float f4 = (bma1.A + (bma1.y - bma1.A) * f1) - (bma1.aN + (bma1.aM - bma1.aN) * f1); - float f5 = bma1.B + (bma1.z - bma1.B) * f1; - GL11.glPushMatrix(); - GL11.glRotatef(f4, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(f5, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.375F * (float)(i * 2 - 1), 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.375F, 0.0F); - GL11.glRotatef(-f5, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(-f4, 0.0F, 1.0F, 0.0F); - float f6 = 1.333333F; - GL11.glScalef(f6, f6, f6); - f.b(0.0625F); - GL11.glPopMatrix(); - } - - } - boolean flag = bma1.s().a(); - if (flag && !bma1.ao() && !bma1.bS()) - { - a(bma1.u()); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.0F, 0.125F); - double d = (bma1.bu + (bma1.bx - bma1.bu) * (double)f1) - (bma1.p + (bma1.s - bma1.p) * (double)f1); - double d1 = (bma1.bv + (bma1.by - bma1.bv) * (double)f1) - (bma1.q + (bma1.t - bma1.q) * (double)f1); - double d2 = (bma1.bw + (bma1.bz - bma1.bw) * (double)f1) - (bma1.r + (bma1.u - bma1.r) * (double)f1); - float f16 = bma1.aN + (bma1.aM - bma1.aN) * f1; - double d3 = oy.a((f16 * 3.141593F) / 180F); - double d4 = -oy.b((f16 * 3.141593F) / 180F); - float f18 = (float)d1 * 10F; - if (f18 < -6F) - f18 = -6F; - if (f18 > 32F) - f18 = 32F; - float f19 = (float)(d * d3 + d2 * d4) * 100F; - float f20 = (float)(d * d4 - d2 * d3) * 100F; - if (f19 < 0.0F) - f19 = 0.0F; - float f21 = bma1.br + (bma1.bs - bma1.br) * f1; - f18 += oy.a((bma1.O + (bma1.P - bma1.O) * f1) * 6F) * 32F * f21; - if (bma1.am()) - f18 += 25F; - GL11.glRotatef(6F + f19 / 2.0F + f18, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(f20 / 2.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-f20 / 2.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - f.c(0.0625F); - GL11.glPopMatrix(); - } - abu abu2 = bma1.bm.h(); - if (abu2 != null) - { - GL11.glPushMatrix(); - f.f.c(0.0625F); - GL11.glTranslatef(-0.0625F, 0.4375F, 0.0625F); - if (bma1.bK != null) - abu2 = new abu(abv.y); - acz acz1 = null; - if (bma1.bw() > 0) - acz1 = abu2.o(); - if ((abu2.b() instanceof zy) && bmf.a(ahz.a(abu2.b()).b())) - { - float f7 = 0.5F; - GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); - f7 *= 0.75F; - GL11.glRotatef(20F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(-f7, -f7, f7); - } else - if (abu2.b() == abv.f) - { - float f8 = 0.625F; - GL11.glTranslatef(0.0F, 0.125F, 0.3125F); - GL11.glRotatef(-20F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(f8, -f8, f8); - GL11.glRotatef(-100F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); - } else - if (abu2.b().f()) - { - float f9 = 0.625F; - if (abu2.b().g()) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -0.125F, 0.0F); - } - if (bma1.bw() > 0 && acz1 == acz.d) - { - GL11.glTranslatef(0.05F, 0.0F, -0.1F); - GL11.glRotatef(-50F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-10F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(-60F, 0.0F, 0.0F, 1.0F); - } - GL11.glTranslatef(0.0F, 0.1875F, 0.0F); - GL11.glScalef(f9, -f9, f9); - GL11.glRotatef(-100F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); - } else - { - float f10 = 0.375F; - GL11.glTranslatef(0.25F, 0.1875F, -0.1875F); - GL11.glScalef(f10, f10, f10); - GL11.glRotatef(60F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-90F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(20F, 0.0F, 0.0F, 1.0F); - } - if (abu2.b().b()) - { - for (int j = 0; j <= 1; j++) - { - int l = abu2.b().a(abu2, j); - float f12 = (float)(l >> 16 & 0xff) / 255F; - float f14 = (float)(l >> 8 & 0xff) / 255F; - float f17 = (float)(l & 0xff) / 255F; - GL11.glColor4f(f12, f14, f17, 1.0F); - b.f.a(bma1, abu2, j); - } - - } else - { - int k = abu2.b().a(abu2, 0); - float f11 = (float)(k >> 16 & 0xff) / 255F; - float f13 = (float)(k >> 8 & 0xff) / 255F; - float f15 = (float)(k & 0xff) / 255F; - GL11.glColor4f(f11, f13, f15, 1.0F); - b.f.a(bma1, abu2, 0); - } - GL11.glPopMatrix(); - } - } - - protected void b(bma bma1, float f1) - { - float f2 = 0.9375F; - GL11.glScalef(f2, f2, f2); - } - - protected void a(bma bma1, double d, double d1, double d2, - String s, float f1, double d3) - { - if (d3 < 100D) - { - ayw ayw1 = bma1.bT(); - ayr ayr1 = ayw1.a(2); - if (ayr1 != null) - { - ayt ayt1 = ayw1.a(bma1.b_(), ayr1); - if (bma1.bl()) - a(((qr) (bma1)), (new StringBuilder()).append(ayt1.c()).append(" ").append(ayr1.d()).toString(), d, d1 - 1.5D, d2, 64); - else - a(((qr) (bma1)), (new StringBuilder()).append(ayt1.c()).append(" ").append(ayr1.d()).toString(), d, d1, d2, 64); - d1 += (float)c().a * 1.15F * f1; - } - } - super.a(bma1, d, d1, d2, s, f1, d3); - } - - public void a(xq xq) - { - float f1 = 1.0F; - GL11.glColor3f(f1, f1, f1); - f.p = 0.0F; - f.a(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, xq); - f.f.a(0.0625F); - } - - protected void a(bma bma1, double d, double d1, double d2) - { - if (bma1.Y() && bma1.bl()) - super.a(bma1, d + (double)bma1.bC, d1 + (double)bma1.cc, d2 + (double)bma1.bD); - else - super.a(bma1, d, d1, d2); - } - - protected void a(bma bma1, float f1, float f2, float f3) - { - if (bma1.Y() && bma1.bl()) - { - GL11.glRotatef(bma1.bJ(), 0.0F, 1.0F, 0.0F); - GL11.glRotatef(a(((rm) (bma1))), 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, 1.0F, 0.0F); - } else - { - super.a(bma1, f1, f2, f3); - } - } - - protected volatile void a(rm rm, double d, double d1, double d2, - String s, float f1, double d3) - { - a((bma)rm, d, d1, d2, s, f1, d3); - } - - protected void a(rm rm, float f1) - { - b((bma)rm, f1); - } - - protected void c(rm rm, int i, float f1) - { - b((bma)rm, i, f1); - } - - protected volatile int a(rm rm, int i, float f1) - { - return a((bma)rm, i, f1); - } - - protected void c(rm rm, float f1) - { - a((bma)rm, f1); - } - - protected volatile void a(rm rm, float f1, float f2, float f3) - { - a((bma)rm, f1, f2, f3); - } - - protected volatile void a(rm rm, double d, double d1, double d2) - { - a((bma)rm, d, d1, d2); - } - - public volatile void a(rm rm, double d, double d1, double d2, - float f1, float f2) - { - a((bma)rm, d, d1, d2, f1, f2); - } - - protected volatile brq a(qr qr) - { - return a((bma)qr); - } - - public volatile void a(qr qr, double d, double d1, double d2, - float f1, float f2) - { - a((bma)qr, d, d1, d2, f1, f2); - } - -} diff --git a/1.7.4/bqk.java b/1.7.4/bqk.java deleted file mode 100644 index 6518f3b..0000000 --- a/1.7.4/bqk.java +++ /dev/null @@ -1,80 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.util.concurrent.atomic.AtomicInteger; - -public class bqk extends bqn -{ - - private static final AtomicInteger d = new AtomicInteger(0); - private final String e; - private final bmq f; - private BufferedImage g; - private Thread h; - private boolean i; - - public bqk(String s, brq brq, bmq bmq) - { - super(brq); - e = s; - f = bmq; - } - - private void e() - { - if (i) - return; - if (g != null) - { - if (b != null) - c(); - brb.a(super.b(), g); - i = true; - } - } - - public int b() - { - e(); - return super.b(); - } - - public void a(BufferedImage bufferedimage) - { - g = bufferedimage; - } - - public void a(brr brr1) - { - if (g == null && b != null) - super.a(brr1); - if (h == null) - { - h = new bql(this, (new StringBuilder()).append("Texture Downloader #").append(d.incrementAndGet()).toString()); - h.setDaemon(true); - h.setName((new StringBuilder()).append("Skin downloader: ").append(e).toString()); - h.start(); - } - } - - public boolean a() - { - e(); - return i; - } - - static String a(bqk bqk1) - { - return bqk1.e; - } - - static bmq b(bqk bqk1) - { - return bqk1.f; - } - - -} diff --git a/1.7.4/bql.java b/1.7.4/bql.java deleted file mode 100644 index d4e17f2..0000000 --- a/1.7.4/bql.java +++ /dev/null @@ -1,41 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; - -import idv.jlchntoz.CustomSkinLoader; -class bql extends Thread -{ - - final bqk a; - - bql(bqk bqk1, String s) - { - a = bqk1; - } - - public void run() - { - CustomSkinLoader Loader = new CustomSkinLoader(); - - try - { - BufferedImage var2 = ImageIO.read(Loader.getPlayerSkinStream(bqk.a(a))); - - a.a(var2); - } - catch (Exception var6) - { - return; - } - - - - - } -} diff --git a/1.7.4/build.bat b/1.7.4/build.bat deleted file mode 100644 index 0d0dbcc..0000000 --- a/1.7.4/build.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -title CustomSkinLoader 1.7.4 Builder -echo Please Build with Minecraft 1.7.4 classes -echo Building CustomSkinLoader.java[Main] -cd idv/jlchntoz -javac CustomSkinLoader.java -cd ../.. -echo Building bmv.java[For HD Skin] -javac bmv.java -echo Building bqk.java[DownloadImage] -javac bqk.java -echo Building bql.java[ThreadDownloadImage] -javac bql.java -pause \ No newline at end of file diff --git a/1.7.4/idv/jlchntoz/CustomSkinLoader.java b/1.7.4/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 7eec93c..0000000 --- a/1.7.4/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,189 +0,0 @@ -package idv.jlchntoz; - -import java.io.*; -import java.net.*; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 10th Revision 1st Subversion 2014.4.20 - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014 - */ -public class CustomSkinLoader { - 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 newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); - - private final static Logger logger = Logger - .getLogger(CustomSkinLoader.class.getName()); - - private static String[] cloakURLs = null, skinURLs = null; - - private HttpURLConnection C = null; - - public InputStream getPlayerSkinStream(String path) { - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//If is old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if (skinURLs == null || cloakURLs == null || skinURLs.length <= 0 - || cloakURLs.length <= 0) - refreshSkinURL(); // If the list is blank or null, try to load - // again. - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - InputStream S = getStream(loc, true); - if (S == null) - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") - + " found in " + loc); - else - return S; - } - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful (?) to get skin. - BufferedInputStream IS = new BufferedInputStream( - C.getInputStream()); - if (!CheckPNG) // If no need to check PNG header, just skip it. - return IS; - IS.mark(0); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' - && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - return IS; - } - } - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - disconnect(); - } - return null; - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - File mcdir = new File(""); - skinURLs = readAllLines(mcdir, "skinurls.txt"); - cloakURLs = readAllLines(mcdir, "capeurls.txt"); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - - private static String[] readAllLines(File mcdir, String path) { - try { - File F = new File(mcdir, path); - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (!F.exists()) { - logger.log(Level.INFO, "Config file not found, create new one."); - de(mcdir); - return new String[0]; - } else if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i> 24 & 0xff) < 128) - flag = true; - } - - } - - if (!flag) - { - for (int j = 32; j < 64; j++) - { - for (int l = 0; l < 16; l++) - { - int j1 = a[j + l * 64]; - boolean flag1; - if ((j1 >> 24 & 0xff) < 128) - flag1 = true; - } - - } - - } - return bufferedimage1; - } - - private void a(int i, int j, int k, int l) - { - if (c(i, j, k, l)) - return; - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * w23] &= 0xffffff; - - } - - } - - private void b(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * w23] |= 0xff000000; - - } - - } - - private boolean c(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - { - int k1 = a[i1 + j1 * w23]; - if ((k1 >> 24 & 0xff) < 128) - return true; - } - - } - - return false; - } -} diff --git a/1.7.5/bqq.java b/1.7.5/bqq.java deleted file mode 100644 index a1864ed..0000000 --- a/1.7.5/bqq.java +++ /dev/null @@ -1,82 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.util.concurrent.atomic.AtomicInteger; - - -public class bqq extends bqt -{ - - private static final AtomicInteger d = new AtomicInteger(0); - private final String e; - private final bmw f; - private BufferedImage g; - private Thread h; - private boolean i; - - public bqq(String s, brw brw, bmw bmw) - { - super(brw); - e = s; - f = bmw; - } - - private void e() - { - if (i) - return; - if (g != null) - { - if (b != null) - c(); - brh.a(super.b(), g); - i = true; - } - } - - public int b() - { - e(); - return super.b(); - } - - public void a(BufferedImage bufferedimage) - { - g = bufferedimage; - } - - public void a(brx brx1) - { - if (g == null && b != null) - super.a(brx1); - if (h == null) - { - h = new bqr(this, (new StringBuilder()).append("Texture Downloader #").append(d.incrementAndGet()).toString()); - h.setDaemon(true); - h.setName((new StringBuilder()).append("Skin downloader: ").append(e).toString()); - h.start(); - } - } - - public boolean a() - { - e(); - return i; - } - - public static String a(bqq bqq1) - { - return bqq1.e; - } - - static bmw b(bqq bqq1) - { - return bqq1.f; - } - - - -} diff --git a/1.7.5/bqr.java b/1.7.5/bqr.java deleted file mode 100644 index 26931e2..0000000 --- a/1.7.5/bqr.java +++ /dev/null @@ -1,37 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; - -import idv.jlchntoz.CustomSkinLoader; -class bqr extends Thread -{ - - final bqq a; - - bqr(bqq bqq1, String s) - { - a = bqq1; - } - - public void run() - { - CustomSkinLoader Loader = new CustomSkinLoader(); - - try - { - BufferedImage var2 = ImageIO.read(Loader.getPlayerSkinStream(bqq.a(a))); - - a.a(var2); - } - catch (Exception var6) - { - return; - } - } -} diff --git a/1.7.5/build.bat b/1.7.5/build.bat deleted file mode 100644 index 64f7a69..0000000 --- a/1.7.5/build.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -title CustomSkinLoader 1.7.5 Builder -echo Please Build with Minecraft 1.7.5 classes -echo Building CustomSkinLoader.java[Main] -cd idv/jlchntoz -javac CustomSkinLoader.java -cd ../.. -echo Building bnb.java[For HD Skin] -javac bnb.java -echo Building bqq.java[DownloadImage] -javac bqq.java -echo Building bqr.java[ThreadDownloadImage] -javac bqr.java -pause \ No newline at end of file diff --git a/1.7.5/idv/jlchntoz/CustomSkinLoader.java b/1.7.5/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 7eec93c..0000000 --- a/1.7.5/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,189 +0,0 @@ -package idv.jlchntoz; - -import java.io.*; -import java.net.*; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 10th Revision 1st Subversion 2014.4.20 - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014 - */ -public class CustomSkinLoader { - 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 newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); - - private final static Logger logger = Logger - .getLogger(CustomSkinLoader.class.getName()); - - private static String[] cloakURLs = null, skinURLs = null; - - private HttpURLConnection C = null; - - public InputStream getPlayerSkinStream(String path) { - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//If is old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if (skinURLs == null || cloakURLs == null || skinURLs.length <= 0 - || cloakURLs.length <= 0) - refreshSkinURL(); // If the list is blank or null, try to load - // again. - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - InputStream S = getStream(loc, true); - if (S == null) - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") - + " found in " + loc); - else - return S; - } - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful (?) to get skin. - BufferedInputStream IS = new BufferedInputStream( - C.getInputStream()); - if (!CheckPNG) // If no need to check PNG header, just skip it. - return IS; - IS.mark(0); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' - && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - return IS; - } - } - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - disconnect(); - } - return null; - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - File mcdir = new File(""); - skinURLs = readAllLines(mcdir, "skinurls.txt"); - cloakURLs = readAllLines(mcdir, "capeurls.txt"); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - - private static String[] readAllLines(File mcdir, String path) { - try { - File F = new File(mcdir, path); - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (!F.exists()) { - logger.log(Level.INFO, "Config file not found, create new one."); - de(mcdir); - return new String[0]; - } else if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i> 24 & 0xff) < 128) - flag = true; - } - - } - - if (!flag) - { - for (int j = 32; j < 64; j++) - { - for (int l = 0; l < 16; l++) - { - int j1 = a[j + l * 64]; - boolean flag1; - if ((j1 >> 24 & 0xff) < 128) - flag1 = true; - } - - } - - } - return bufferedimage1; - } - - public void a() - { - } - - private void a(int i, int j, int k, int l) - { - if (c(i, j, k, l)) - return; - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * w23] &= 0xffffff; - - } - - } - - private void b(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * w23] |= 0xff000000; - - } - - } - - private boolean c(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - { - int k1 = a[i1 + j1 * w23]; - if ((k1 >> 24 & 0xff) < 128) - return true; - } - - } - - return false; - } -} diff --git a/1.7.6/bsb.java b/1.7.6/bsb.java deleted file mode 100644 index 0d996a9..0000000 --- a/1.7.6/bsb.java +++ /dev/null @@ -1,105 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; - - -public class bsb extends bse -{ - - private static final AtomicInteger d = new AtomicInteger(0); - private final File e; - private final String f; - private final boh g; - private BufferedImage h; - private Thread i; - private boolean j; - - public bsb(File file, String s, bth bth, boh boh1) - { - super(bth); - e = file; - f = s; - g = boh1; - } - - private void f() - { - if (j) - return; - if (h != null) - { - if (b != null) - c(); - bss.a(super.b(), h); - j = true; - } - } - - public int b() - { - f(); - return super.b(); - } - - public void a(BufferedImage bufferedimage) - { - h = bufferedimage; - if (g != null) - g.a(); - } - - public void a(bti bti1) - { - if (h == null && b != null) - super.a(bti1); - if (i == null) - if (e != null && e.isFile()) - { - try - { - h = ImageIO.read(e); - if (g != null) - a(g.a(h)); - } - catch (IOException ioexception) - { - a(); - } - } else - { - a(); - } - } - - protected void a() - { - i = new bsc(this, (new StringBuilder()).append("Texture Downloader #").append(d.incrementAndGet()).toString()); - i.setDaemon(true); - i.start(); - } - - static String a(bsb bsb1) - { - return bsb1.f; - } - - static File b(bsb bsb1) - { - return bsb1.e; - } - - - - static boh c(bsb bsb1) - { - return bsb1.g; - } - -} diff --git a/1.7.6/bsc.java b/1.7.6/bsc.java deleted file mode 100644 index a97fc14..0000000 --- a/1.7.6/bsc.java +++ /dev/null @@ -1,37 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; - -import idv.jlchntoz.CustomSkinLoader; -class bsc extends Thread -{ - - final bsb a; - - bsc(bsb bsb1, String s) - { - a = bsb1; - } - - public void run() - { - CustomSkinLoader Loader = new CustomSkinLoader(); - - try - { - BufferedImage var2 = ImageIO.read(Loader.getPlayerSkinStream(bsb.a(a))); - - a.a(var2); - } - catch (Exception var6) - { - return; - } - } -} diff --git a/1.7.6/build.bat b/1.7.6/build.bat deleted file mode 100644 index e468854..0000000 --- a/1.7.6/build.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -title CustomSkinLoader 1.7.6 Builder -echo Please Build with Minecraft 1.7.6 classes -echo Building CustomSkinLoader.java[Main] -cd idv/jlchntoz -javac CustomSkinLoader.java -cd ../.. -echo Building bom.java[For HD Skin] -javac bom.java -echo Building bsb.java[DownloadImage] -javac bsb.java -echo Building bsc.java[ThreadDownloadImage] -javac bsc.java -pause \ No newline at end of file diff --git a/1.7.6/idv/jlchntoz/CustomSkinLoader.java b/1.7.6/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 7eec93c..0000000 --- a/1.7.6/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,189 +0,0 @@ -package idv.jlchntoz; - -import java.io.*; -import java.net.*; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 10th Revision 1st Subversion 2014.4.20 - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014 - */ -public class CustomSkinLoader { - 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 newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); - - private final static Logger logger = Logger - .getLogger(CustomSkinLoader.class.getName()); - - private static String[] cloakURLs = null, skinURLs = null; - - private HttpURLConnection C = null; - - public InputStream getPlayerSkinStream(String path) { - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//If is old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if (skinURLs == null || cloakURLs == null || skinURLs.length <= 0 - || cloakURLs.length <= 0) - refreshSkinURL(); // If the list is blank or null, try to load - // again. - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - InputStream S = getStream(loc, true); - if (S == null) - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") - + " found in " + loc); - else - return S; - } - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful (?) to get skin. - BufferedInputStream IS = new BufferedInputStream( - C.getInputStream()); - if (!CheckPNG) // If no need to check PNG header, just skip it. - return IS; - IS.mark(0); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' - && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - return IS; - } - } - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - disconnect(); - } - return null; - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - File mcdir = new File(""); - skinURLs = readAllLines(mcdir, "skinurls.txt"); - cloakURLs = readAllLines(mcdir, "capeurls.txt"); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - - private static String[] readAllLines(File mcdir, String path) { - try { - File F = new File(mcdir, path); - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (!F.exists()) { - logger.log(Level.INFO, "Config file not found, create new one."); - de(mcdir); - return new String[0]; - } else if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i> 24 & 0xff) < 128) - flag = true; - } - - } - - if (!flag) - { - for (int j = 32; j < 64; j++) - { - for (int l = 0; l < 16; l++) - { - int j1 = a[j + l * 64]; - boolean flag1; - if ((j1 >> 24 & 0xff) < 128) - flag1 = true; - } - - } - - } - return bufferedimage1; - } - - public void a() - { - } - - private void a(int i, int j, int k, int l) - { - if (c(i, j, k, l)) - return; - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * w23] &= 0xffffff; - - } - - } - - private void b(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * w23] |= 0xff000000; - - } - - } - - private boolean c(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - { - int k1 = a[i1 + j1 * w23]; - if ((k1 >> 24 & 0xff) < 128) - return true; - } - - } - - return false; - } -} diff --git a/1.7.7/bsb.java b/1.7.7/bsb.java deleted file mode 100644 index 0d996a9..0000000 --- a/1.7.7/bsb.java +++ /dev/null @@ -1,105 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; - - -public class bsb extends bse -{ - - private static final AtomicInteger d = new AtomicInteger(0); - private final File e; - private final String f; - private final boh g; - private BufferedImage h; - private Thread i; - private boolean j; - - public bsb(File file, String s, bth bth, boh boh1) - { - super(bth); - e = file; - f = s; - g = boh1; - } - - private void f() - { - if (j) - return; - if (h != null) - { - if (b != null) - c(); - bss.a(super.b(), h); - j = true; - } - } - - public int b() - { - f(); - return super.b(); - } - - public void a(BufferedImage bufferedimage) - { - h = bufferedimage; - if (g != null) - g.a(); - } - - public void a(bti bti1) - { - if (h == null && b != null) - super.a(bti1); - if (i == null) - if (e != null && e.isFile()) - { - try - { - h = ImageIO.read(e); - if (g != null) - a(g.a(h)); - } - catch (IOException ioexception) - { - a(); - } - } else - { - a(); - } - } - - protected void a() - { - i = new bsc(this, (new StringBuilder()).append("Texture Downloader #").append(d.incrementAndGet()).toString()); - i.setDaemon(true); - i.start(); - } - - static String a(bsb bsb1) - { - return bsb1.f; - } - - static File b(bsb bsb1) - { - return bsb1.e; - } - - - - static boh c(bsb bsb1) - { - return bsb1.g; - } - -} diff --git a/1.7.7/bsc.java b/1.7.7/bsc.java deleted file mode 100644 index a97fc14..0000000 --- a/1.7.7/bsc.java +++ /dev/null @@ -1,37 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; - -import idv.jlchntoz.CustomSkinLoader; -class bsc extends Thread -{ - - final bsb a; - - bsc(bsb bsb1, String s) - { - a = bsb1; - } - - public void run() - { - CustomSkinLoader Loader = new CustomSkinLoader(); - - try - { - BufferedImage var2 = ImageIO.read(Loader.getPlayerSkinStream(bsb.a(a))); - - a.a(var2); - } - catch (Exception var6) - { - return; - } - } -} diff --git a/1.7.7/build.bat b/1.7.7/build.bat deleted file mode 100644 index 13dc2f5..0000000 --- a/1.7.7/build.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -title CustomSkinLoader 1.7.7 Builder -echo Please Build with Minecraft 1.7.7 classes -echo Building CustomSkinLoader.java[Main] -cd idv/jlchntoz -javac CustomSkinLoader.java -cd ../.. -echo Building bom.java[For HD Skin] -javac bom.java -echo Building bsb.java[DownloadImage] -javac bsb.java -echo Building bsc.java[ThreadDownloadImage] -javac bsc.java -pause \ No newline at end of file diff --git a/1.7.7/idv/jlchntoz/CustomSkinLoader.java b/1.7.7/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 7eec93c..0000000 --- a/1.7.7/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,189 +0,0 @@ -package idv.jlchntoz; - -import java.io.*; -import java.net.*; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 10th Revision 1st Subversion 2014.4.20 - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014 - */ -public class CustomSkinLoader { - 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 newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); - - private final static Logger logger = Logger - .getLogger(CustomSkinLoader.class.getName()); - - private static String[] cloakURLs = null, skinURLs = null; - - private HttpURLConnection C = null; - - public InputStream getPlayerSkinStream(String path) { - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//If is old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if (skinURLs == null || cloakURLs == null || skinURLs.length <= 0 - || cloakURLs.length <= 0) - refreshSkinURL(); // If the list is blank or null, try to load - // again. - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - InputStream S = getStream(loc, true); - if (S == null) - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") - + " found in " + loc); - else - return S; - } - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful (?) to get skin. - BufferedInputStream IS = new BufferedInputStream( - C.getInputStream()); - if (!CheckPNG) // If no need to check PNG header, just skip it. - return IS; - IS.mark(0); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' - && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - return IS; - } - } - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - disconnect(); - } - return null; - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - File mcdir = new File(""); - skinURLs = readAllLines(mcdir, "skinurls.txt"); - cloakURLs = readAllLines(mcdir, "capeurls.txt"); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - - private static String[] readAllLines(File mcdir, String path) { - try { - File F = new File(mcdir, path); - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (!F.exists()) { - logger.log(Level.INFO, "Config file not found, create new one."); - de(mcdir); - return new String[0]; - } else if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i> 24 & 0xff) < 128) - flag = true; - } - - } - - if (!flag) - { - for (int j = 32; j < 64; j++) - { - for (int l = 0; l < 16; l++) - { - int j1 = a[j + l * 64]; - boolean flag1; - if ((j1 >> 24 & 0xff) < 128) - flag1 = true; - } - - } - - } - return bufferedimage1; - } - - public void a() - { - } - - private void a(int i, int j, int k, int l) - { - if (c(i, j, k, l)) - return; - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * b] &= 0xffffff; - - } - - } - - private void b(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * b] |= 0xff000000; - - } - - } - - private boolean c(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - { - int k1 = a[i1 + j1 * b]; - if ((k1 >> 24 & 0xff) < 128) - return true; - } - - } - - return false; - } -} diff --git a/1.7.8/bsd.java b/1.7.8/bsd.java deleted file mode 100644 index 9246c93..0000000 --- a/1.7.8/bsd.java +++ /dev/null @@ -1,106 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; - -public class bsd extends bsg -{ - - - private static final AtomicInteger d = new AtomicInteger(0); - private final File e; - private final String f; - private final boj g; - private BufferedImage h; - private Thread i; - private boolean j; - - public bsd(File file, String s, btj btj, boj boj1) - { - super(btj); - e = file; - f = s; - g = boj1; - } - - private void f() - { - if (j) - return; - if (h != null) - { - if (b != null) - c(); - bsu.a(super.b(), h); - j = true; - } - } - - public int b() - { - f(); - return super.b(); - } - - public void a(BufferedImage bufferedimage) - { - h = bufferedimage; - if (g != null) - g.a(); - } - - public void a(btk btk1) - { - if (h == null && b != null) - super.a(btk1); - if (i == null) - if (e != null && e.isFile()) - { - - try - { - h = ImageIO.read(e); - if (g != null) - a(g.a(h)); - } - catch (IOException ioexception) - { - - a(); - } - } else - { - a(); - } - } - - protected void a() - { - i = new bse(this, (new StringBuilder()).append("Texture Downloader #").append(d.incrementAndGet()).toString()); - i.setDaemon(true); - i.start(); - } - - static String a(bsd bsd1) - { - return bsd1.f; - } - - static File b(bsd bsd1) - { - return bsd1.e; - } - - - static boj c(bsd bsd1) - { - return bsd1.g; - } - -} diff --git a/1.7.8/bse.java b/1.7.8/bse.java deleted file mode 100644 index 7c42a78..0000000 --- a/1.7.8/bse.java +++ /dev/null @@ -1,38 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; - -import idv.jlchntoz.CustomSkinLoader; - -class bse extends Thread -{ - - final bsd a; - - bse(bsd bsd1, String s) - { - a = bsd1; - } - - public void run() - { - CustomSkinLoader Loader = new CustomSkinLoader(); - - try - { - BufferedImage var2 = ImageIO.read(Loader.getPlayerSkinStream(bsd.a(a))); - - a.a(var2); - } - catch (Exception var6) - { - return; - } - } -} diff --git a/1.7.8/build.bat b/1.7.8/build.bat deleted file mode 100644 index 6a9367a..0000000 --- a/1.7.8/build.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -title CustomSkinLoader 1.7.8 Builder -echo Please Build with Minecraft 1.7.8 classes -echo Building CustomSkinLoader.java[Main] -cd idv/jlchntoz -javac CustomSkinLoader.java -cd ../.. -echo Building boo.java[For HD Skin] -javac boo.java -echo Building bsd.java[DownloadImage] -javac bsd.java -echo Building bse.java[ThreadDownloadImage] -javac bse.java -pause \ No newline at end of file diff --git a/1.7.8/idv/jlchntoz/CustomSkinLoader.java b/1.7.8/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 7eec93c..0000000 --- a/1.7.8/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,189 +0,0 @@ -package idv.jlchntoz; - -import java.io.*; -import java.net.*; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 10th Revision 1st Subversion 2014.4.20 - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014 - */ -public class CustomSkinLoader { - 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 newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); - - private final static Logger logger = Logger - .getLogger(CustomSkinLoader.class.getName()); - - private static String[] cloakURLs = null, skinURLs = null; - - private HttpURLConnection C = null; - - public InputStream getPlayerSkinStream(String path) { - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//If is old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if (skinURLs == null || cloakURLs == null || skinURLs.length <= 0 - || cloakURLs.length <= 0) - refreshSkinURL(); // If the list is blank or null, try to load - // again. - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - InputStream S = getStream(loc, true); - if (S == null) - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") - + " found in " + loc); - else - return S; - } - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful (?) to get skin. - BufferedInputStream IS = new BufferedInputStream( - C.getInputStream()); - if (!CheckPNG) // If no need to check PNG header, just skip it. - return IS; - IS.mark(0); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' - && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - return IS; - } - } - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - disconnect(); - } - return null; - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - File mcdir = new File(""); - skinURLs = readAllLines(mcdir, "skinurls.txt"); - cloakURLs = readAllLines(mcdir, "capeurls.txt"); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - - private static String[] readAllLines(File mcdir, String path) { - try { - File F = new File(mcdir, path); - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (!F.exists()) { - logger.log(Level.INFO, "Config file not found, create new one."); - de(mcdir); - return new String[0]; - } else if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i> 24 & 0xff) < 128) - flag = true; - } - - } - - if (!flag) - { - for (int j = 32; j < 64; j++) - { - for (int l = 0; l < 16; l++) - { - int j1 = a[j + l * 64]; - boolean flag1; - if ((j1 >> 24 & 0xff) < 128) - flag1 = true; - } - - } - - } - return bufferedimage1; - } - - public void a() - { - } - - private void a(int i, int j, int k, int l) - { - if (c(i, j, k, l)) - return; - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * b] &= 0xffffff; - - } - - } - - private void b(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - a[i1 + j1 * b] |= 0xff000000; - - } - - } - - private boolean c(int i, int j, int k, int l) - { - for (int i1 = i; i1 < k; i1++) - { - for (int j1 = j; j1 < l; j1++) - { - int k1 = a[i1 + j1 * b]; - if ((k1 >> 24 & 0xff) < 128) - return true; - } - - } - - return false; - } -} diff --git a/1.7.9/bsd.java b/1.7.9/bsd.java deleted file mode 100644 index 9246c93..0000000 --- a/1.7.9/bsd.java +++ /dev/null @@ -1,106 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; - -public class bsd extends bsg -{ - - - private static final AtomicInteger d = new AtomicInteger(0); - private final File e; - private final String f; - private final boj g; - private BufferedImage h; - private Thread i; - private boolean j; - - public bsd(File file, String s, btj btj, boj boj1) - { - super(btj); - e = file; - f = s; - g = boj1; - } - - private void f() - { - if (j) - return; - if (h != null) - { - if (b != null) - c(); - bsu.a(super.b(), h); - j = true; - } - } - - public int b() - { - f(); - return super.b(); - } - - public void a(BufferedImage bufferedimage) - { - h = bufferedimage; - if (g != null) - g.a(); - } - - public void a(btk btk1) - { - if (h == null && b != null) - super.a(btk1); - if (i == null) - if (e != null && e.isFile()) - { - - try - { - h = ImageIO.read(e); - if (g != null) - a(g.a(h)); - } - catch (IOException ioexception) - { - - a(); - } - } else - { - a(); - } - } - - protected void a() - { - i = new bse(this, (new StringBuilder()).append("Texture Downloader #").append(d.incrementAndGet()).toString()); - i.setDaemon(true); - i.start(); - } - - static String a(bsd bsd1) - { - return bsd1.f; - } - - static File b(bsd bsd1) - { - return bsd1.e; - } - - - static boj c(bsd bsd1) - { - return bsd1.g; - } - -} diff --git a/1.7.9/bse.java b/1.7.9/bse.java deleted file mode 100644 index 7c42a78..0000000 --- a/1.7.9/bse.java +++ /dev/null @@ -1,38 +0,0 @@ -// Decompiled by Jad v1.5.8e2. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://kpdus.tripod.com/jad.html -// Decompiler options: packimports(3) fieldsfirst ansi space -// Source File Name: SourceFile - -import java.awt.image.BufferedImage; -import java.net.HttpURLConnection; -import java.net.URL; -import javax.imageio.ImageIO; - -import idv.jlchntoz.CustomSkinLoader; - -class bse extends Thread -{ - - final bsd a; - - bse(bsd bsd1, String s) - { - a = bsd1; - } - - public void run() - { - CustomSkinLoader Loader = new CustomSkinLoader(); - - try - { - BufferedImage var2 = ImageIO.read(Loader.getPlayerSkinStream(bsd.a(a))); - - a.a(var2); - } - catch (Exception var6) - { - return; - } - } -} diff --git a/1.7.9/build.bat b/1.7.9/build.bat deleted file mode 100644 index a725808..0000000 --- a/1.7.9/build.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -title CustomSkinLoader 1.7.9 Builder -echo Please Build with Minecraft 1.7.9 classes -echo Building CustomSkinLoader.java[Main] -cd idv/jlchntoz -javac CustomSkinLoader.java -cd ../.. -echo Building boo.java[For HD Skin] -javac boo.java -echo Building bsd.java[DownloadImage] -javac bsd.java -echo Building bse.java[ThreadDownloadImage] -javac bse.java -pause \ No newline at end of file diff --git a/1.7.9/idv/jlchntoz/CustomSkinLoader.java b/1.7.9/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index 7eec93c..0000000 --- a/1.7.9/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,189 +0,0 @@ -package idv.jlchntoz; - -import java.io.*; -import java.net.*; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 10th Revision 1st Subversion 2014.4.20 - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014 - */ -public class CustomSkinLoader { - 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 newURLPattern = Pattern.compile("^http://skins.minecraft.net/Minecraft(Skin|Cloak)s/(.*?).png$"), - oldURLPattern = Pattern.compile("^http://s3.amazonaws.com/Minecraft(Skin|Cloak)s/(.*?).png$"); - - private final static Logger logger = Logger - .getLogger(CustomSkinLoader.class.getName()); - - private static String[] cloakURLs = null, skinURLs = null; - - private HttpURLConnection C = null; - - public InputStream getPlayerSkinStream(String path) { - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//If is old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if (skinURLs == null || cloakURLs == null || skinURLs.length <= 0 - || cloakURLs.length <= 0) - refreshSkinURL(); // If the list is blank or null, try to load - // again. - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - InputStream S = getStream(loc, true); - if (S == null) - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") - + " found in " + loc); - else - return S; - } - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful (?) to get skin. - BufferedInputStream IS = new BufferedInputStream( - C.getInputStream()); - if (!CheckPNG) // If no need to check PNG header, just skip it. - return IS; - IS.mark(0); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' - && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - return IS; - } - } - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - disconnect(); - } - return null; - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - File mcdir = new File(""); - skinURLs = readAllLines(mcdir, "skinurls.txt"); - cloakURLs = readAllLines(mcdir, "capeurls.txt"); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - - private static String[] readAllLines(File mcdir, String path) { - try { - File F = new File(mcdir, path); - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (!F.exists()) { - logger.log(Level.INFO, "Config file not found, create new one."); - de(mcdir); - return new String[0]; - } else if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i1){ - alreadyCached=true; - logger.info("Cache File Found (LastModified: "+cacheFile.lastModified()+" , Size: "+cacheFile.length()+")"); - } - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setReadTimeout(15000); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - logger.info("Response Code: "+C.getResponseCode()); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful to get skin. - if(C.getContentLength()<=0){//Nothing got - logger.info("Nothing got."); - return null; - } - logger.info("Successfully Get Resource (LastModified: "+C.getLastModified()+" , ContentLength: "+C.getContentLength()+")"); - if(alreadyCached && C.getLastModified()==cacheFile.lastModified() && C.getContentLength()==cacheFile.length()){ - logger.info("Not Modified."); - return getStreamFromCache(cacheFile); - } - InputStream IS=new BufferedInputStream(C.getInputStream()); - if (!CheckPNG){ // If no need to check PNG header, just skip it. - success=true; - saveToCache(IS,cacheFile); - return IS; - } - //logger.info(C.getContentLength()+" "+IS.available()); - IS.mark(C.getContentLength()+10); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - success=true; - saveToCache(IS,cacheFile); - return IS; - } - } - } catch (Exception ex) { - success=false; - logger.log(Level.WARNING, ex.getMessage()); - if(alreadyCached) - return getStreamFromCache(cacheFile); - }finally{ - if(!success) - disconnect(); - } - return null; - } - private InputStream getStreamFromCache(File cacheFile) { - try{ - logger.info("Try load local cache in " + cacheFile.getAbsolutePath()); - InputStream in = new FileInputStream(cacheFile); - BufferedInputStream bis=new BufferedInputStream(in); - if(bis.available()<=0){ - logger.info("Cannot load local cache in " + cacheFile.getAbsolutePath()); - return null; - }else{ - logger.info("Successfully load cache in " + cacheFile.getAbsolutePath()); - return bis; - } - }catch(Exception e){ - logger.log(Level.WARNING, e.getMessage()); - return null; - } - } - private void saveToCache(InputStream is,File to){ - logger.info("Try save local cache to " + to.getAbsolutePath()); - FileOutputStream fs=null; - int times=0; - try{//Save to Local Skin File - if(to.exists()){ - to.delete(); - } - fs = new FileOutputStream(to); - int byteRead = 0; - byte[] buffer = new byte[1024]; - while (( byteRead = is.read(buffer)) != -1) { - times+=byteRead; - fs.write(buffer, 0, byteRead); - if(times>=C.getContentLength()){ - //logger.info(times+" "+C.getContentLength()); - break; - } - } - - if(to.length()>1){ - to.setLastModified(C.getLastModified()); - logger.info("Cache saved to " + to.getAbsolutePath()+" (LastModified: "+to.lastModified()+" , Size: "+to.length()+")"); - }else{ - to.delete(); - logger.info("Cannot save local cache to " + to.getAbsolutePath()); - } - }catch(Exception e){ - logger.warning(e.getMessage()); - }finally{ - try { - if(fs!=null) - fs.close(); - is.reset(); - } catch (IOException e) { - logger.warning(e.getMessage()); - } - } - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - if(!SKIN_URL_FILE.exists()){ - logger.log(Level.INFO, "SKIN config not found, create a new one."); - SKIN_URL_FILE.createNewFile(); - } - if(!CAPE_URL_FILE.exists()){ - logger.log(Level.INFO, "CAPE config not found, create a new one."); - CAPE_URL_FILE.createNewFile(); - } - skinURLs = readAllLines(SKIN_URL_FILE); - cloakURLs = readAllLines(CAPE_URL_FILE); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - if(skinURLs.length==0&&cloakURLs.length==0){ - logger.info("No skinURLs and cloak URLS found, try to init and use default settings."); - initSkinURL(); - refreshSkinURL(); - }else{ - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - } - private static void initSkinURL(){ - //Init URL List - skinURLs=DEFAULT_SKIN_URLS; - writeToFile(new File(DATA_DIR,"skinurls.txt"),parseArrayToText(skinURLs)); - cloakURLs=DEFAULT_CAPE_URLS; - writeToFile(new File(DATA_DIR,"capeurls.txt"),parseArrayToText(cloakURLs)); - } - - private static String[] readAllLines(File F) { - try { - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i=LOWEST_DISPLAY_LEVEL) - System.out.println(msg); - try { - writer.write("["); - writer.write(DATE_FORMAT.format(new Date())); - writer.write(" "); - writer.write(Thread.currentThread().getName()); - writer.write(" "); - writer.write(level.getName()); - writer.write("] "); - writer.write(msg); - writer.write("\r\n"); - writer.flush(); - } catch (Exception e) { - e.printStackTrace(); - } - } - public void info(String msg){ - log(Level.INFO,msg); - } - public void warning(String msg){ - log(Level.WARNING,msg); - } - public void warning(Exception e){ - log(Level.WARNING,"Exception occurs while running: "+e.getMessage()); - StackTraceElement[] stes=e.getStackTrace(); - for(StackTraceElement ste : stes){ - log(Level.WARNING,ste.toString()); - } - log(Level.WARNING,""); - } -} diff --git a/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java b/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java deleted file mode 100644 index 05bf060..0000000 --- a/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java +++ /dev/null @@ -1,116 +0,0 @@ -package net.minecraft.client.renderer; - -import java.awt.Graphics; -import java.awt.image.BufferedImage; -import java.awt.image.DataBufferInt; -import java.awt.image.ImageObserver; - -public class ImageBufferDownload implements IImageBuffer -{ - private int[] imageData; - private int imageWidth; - private int imageHeight; - private static final String __OBFID = "CL_00000956"; - - public BufferedImage parseUserSkin(BufferedImage p_78432_1_) - { - if (p_78432_1_ == null) - { - return null; - } - else - { - int ratio=p_78432_1_.getWidth()/64; - this.imageWidth = 64 * ratio; - this.imageHeight = 64 * ratio; - BufferedImage var2 = new BufferedImage(this.imageWidth, this.imageHeight, 2); - Graphics var3 = var2.getGraphics(); - var3.drawImage(p_78432_1_, 0, 0, (ImageObserver)null); - - if (p_78432_1_.getHeight() == 32 * ratio) - { - var3.drawImage(var2, 24 * ratio, 48 * ratio, 20 * ratio, 52 * ratio, 4 * ratio, 16 * ratio, 8 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 28 * ratio, 48 * ratio, 24 * ratio, 52 * ratio, 8 * ratio, 16 * ratio, 12 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 20 * ratio, 52 * ratio, 16 * ratio, 64 * ratio, 8 * ratio, 20 * ratio, 12 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 24 * ratio, 52 * ratio, 20 * ratio, 64 * ratio, 4 * ratio, 20 * ratio, 8 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 28 * ratio, 52 * ratio, 24 * ratio, 64 * ratio, 0 * ratio, 20 * ratio, 4 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 32 * ratio, 52 * ratio, 28 * ratio, 64 * ratio, 12 * ratio, 20 * ratio, 16 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 40 * ratio, 48 * ratio, 36 * ratio, 52 * ratio, 44 * ratio, 16 * ratio, 48 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 44 * ratio, 48 * ratio, 40 * ratio, 52 * ratio, 48 * ratio, 16 * ratio, 52 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 36 * ratio, 52 * ratio, 32 * ratio, 64 * ratio, 48 * ratio, 20 * ratio, 52 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 40 * ratio, 52 * ratio, 36 * ratio, 64 * ratio, 44 * ratio, 20 * ratio, 48 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 44 * ratio, 52 * ratio, 40 * ratio, 64 * ratio, 40 * ratio, 20 * ratio, 44 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 48 * ratio, 52 * ratio, 44 * ratio, 64 * ratio, 52 * ratio, 20 * ratio, 56 * ratio, 32 * ratio, (ImageObserver)null); - } - - var3.dispose(); - this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData(); - this.setAreaOpaque(0, 0, 32 * ratio, 16 * ratio); - this.setAreaTransparent(32 * ratio, 0, 64 * ratio, 32 * ratio); - this.setAreaOpaque(0, 16 * ratio, 64 * ratio, 32 * ratio); - this.setAreaTransparent(0, 32 * ratio, 16 * ratio, 48 * ratio); - this.setAreaTransparent(16 * ratio, 32 * ratio, 40 * ratio, 48 * ratio); - this.setAreaTransparent(40 * ratio, 32 * ratio, 56 * ratio, 48 * ratio); - this.setAreaTransparent(0, 48 * ratio, 16 * ratio, 64 * ratio); - this.setAreaOpaque(16 * ratio, 48 * ratio, 48 * ratio, 64 * ratio); - this.setAreaTransparent(48 * ratio, 48 * ratio, 64 * ratio, 64 * ratio); - return var2; - } - } - - public void func_152634_a() {} - - /** - * Makes the given area of the image transparent if it was previously completely opaque (used to remove the outer - * layer of a skin around the head if it was saved all opaque; this would be redundant so it's assumed that the skin - * maker is just using an image editor without an alpha channel) - */ - private void setAreaTransparent(int p_78434_1_, int p_78434_2_, int p_78434_3_, int p_78434_4_) - { - if (!this.hasTransparency(p_78434_1_, p_78434_2_, p_78434_3_, p_78434_4_)) - { - for (int var5 = p_78434_1_; var5 < p_78434_3_; ++var5) - { - for (int var6 = p_78434_2_; var6 < p_78434_4_; ++var6) - { - this.imageData[var5 + var6 * this.imageWidth] &= 16777215; - } - } - } - } - - /** - * Makes the given area of the image opaque - */ - private void setAreaOpaque(int p_78433_1_, int p_78433_2_, int p_78433_3_, int p_78433_4_) - { - for (int var5 = p_78433_1_; var5 < p_78433_3_; ++var5) - { - for (int var6 = p_78433_2_; var6 < p_78433_4_; ++var6) - { - this.imageData[var5 + var6 * this.imageWidth] |= -16777216; - } - } - } - - /** - * Returns true if the given area of the image contains transparent pixels - */ - private boolean hasTransparency(int p_78435_1_, int p_78435_2_, int p_78435_3_, int p_78435_4_) - { - for (int var5 = p_78435_1_; var5 < p_78435_3_; ++var5) - { - for (int var6 = p_78435_2_; var6 < p_78435_4_; ++var6) - { - int var7 = this.imageData[var5 + var6 * this.imageWidth]; - - if ((var7 >> 24 & 255) < 128) - { - return true; - } - } - } - - return false; - } -} 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 deleted file mode 100644 index 888bf79..0000000 --- a/1.8-mcp910/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java +++ /dev/null @@ -1,177 +0,0 @@ -package net.minecraft.client.renderer; - -import idv.jlchntoz.CustomSkinLoader; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.InputStream; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.SimpleTexture; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class ThreadDownloadImageData extends SimpleTexture -{ - private static final Logger logger = LogManager.getLogger(); - private static final AtomicInteger threadDownloadCounter = new AtomicInteger(0); - private final File field_152434_e; - private final String imageUrl; - private final IImageBuffer imageBuffer; - private BufferedImage bufferedImage; - private Thread imageThread; - private boolean textureUploaded; - private static final String __OBFID = "CL_00001049"; - - //For Optifine - public Boolean imageFound = null; - public boolean pipeline = false; - - public ThreadDownloadImageData(File p_i1049_1_, String p_i1049_2_, ResourceLocation p_i1049_3_, IImageBuffer p_i1049_4_) - { - super(p_i1049_3_); - this.field_152434_e = p_i1049_1_; - this.imageUrl = p_i1049_2_; - this.imageBuffer = p_i1049_4_; - } - - private void checkTextureUploaded() - { - if (!this.textureUploaded) - { - if (this.bufferedImage != null) - { - if (this.textureLocation != null) - { - this.deleteGlTexture(); - } - - TextureUtil.uploadTextureImage(super.getGlTextureId(), this.bufferedImage); - this.textureUploaded = true; - } - } - } - - public int getGlTextureId() - { - this.checkTextureUploaded(); - return super.getGlTextureId(); - } - - public void setBufferedImage(BufferedImage p_147641_1_) - { - this.bufferedImage = p_147641_1_; - - if (this.imageBuffer != null) - { - this.imageBuffer.func_152634_a(); - } - } - - public void loadTexture(IResourceManager p_110551_1_) throws IOException - { - if (this.bufferedImage == null && this.textureLocation != null) - { - super.loadTexture(p_110551_1_); - } - - if (this.imageThread == null) - { - if (this.field_152434_e != null && this.field_152434_e.isFile()) - { - logger.debug("Loading http texture from local cache ({})", new Object[] {this.field_152434_e}); - - try - { - this.bufferedImage = ImageIO.read(this.field_152434_e); - - if (this.imageBuffer != null) - { - this.setBufferedImage(this.imageBuffer.parseUserSkin(this.bufferedImage)); - } - } - catch (IOException var3) - { - logger.error("Couldn\'t load skin " + this.field_152434_e, var3); - this.func_152433_a(); - } - } - else - { - this.func_152433_a(); - } - } - } - - protected void func_152433_a() - { - this.imageThread = new Thread("Texture Downloader #" + threadDownloadCounter.incrementAndGet()) - { - private static final String __OBFID = "CL_00001050"; - public void run() - { - CustomSkinLoader loader=new CustomSkinLoader(); - //HttpURLConnection var1 = null; - ThreadDownloadImageData.logger.info("Downloading http texture from {} to {}", new Object[] {ThreadDownloadImageData.this.imageUrl, ThreadDownloadImageData.this.field_152434_e}); - - try - { - /* - var1 = (HttpURLConnection)(new URL(ThreadDownloadImageData.this.imageUrl)).openConnection(Minecraft.getMinecraft().getProxy()); - var1.setDoInput(true); - var1.setDoOutput(false); - var1.connect(); - - if (var1.getResponseCode() / 100 == 2) - {*/ - BufferedImage var2; -/* - if (ThreadDownloadImageData.this.field_152434_e != null) - { - FileUtils.copyInputStreamToFile(var1.getInputStream(), ThreadDownloadImageData.this.field_152434_e); - var2 = ImageIO.read(ThreadDownloadImageData.this.field_152434_e); - } - else - { - var2 = TextureUtil.func_177053_a(var1.getInputStream()); - } -*/ - InputStream var9=loader.getPlayerSkinStream(ThreadDownloadImageData.this.imageUrl); - var2 = TextureUtil.func_177053_a(var9); - if (ThreadDownloadImageData.this.imageBuffer != null) - { - var2 = ThreadDownloadImageData.this.imageBuffer.parseUserSkin(var2); - } - - ThreadDownloadImageData.this.setBufferedImage(var2); - return; - //} - } - catch (Exception var6) - { - ThreadDownloadImageData.logger.error("Couldn\'t download http texture", var6); - return; - } - finally - { - /* - if (var1 != null) - { - var1.disconnect(); - }*/ - loader.disconnect(); - } - } - }; - this.imageThread.setDaemon(true); - this.imageThread.start(); - } -} diff --git a/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java deleted file mode 100644 index 1eb59e7..0000000 --- a/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ /dev/null @@ -1,192 +0,0 @@ -package net.minecraft.client.resources; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.Maps; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.InsecureTextureException; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftSessionService; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IImageBuffer; -import net.minecraft.client.renderer.ImageBufferDownload; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.util.ResourceLocation; - -public class SkinManager -{ - private static final ExecutorService THREAD_POOL = new ThreadPoolExecutor(0, 2, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue()); - private final TextureManager textureManager; - private final File skinCacheDir; - private final MinecraftSessionService sessionService; - private final LoadingCache skinCacheLoader; - private static final String __OBFID = "CL_00001830"; - - public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) - { - this.textureManager = textureManagerInstance; - this.skinCacheDir = skinCacheDirectory; - this.sessionService = sessionService; - this.skinCacheLoader = CacheBuilder.newBuilder().expireAfterAccess(15L, TimeUnit.SECONDS).build(new CacheLoader() - { - private static final String __OBFID = "CL_00001829"; - public Map func_152786_a(GameProfile p_152786_1_) - { - return Minecraft.getMinecraft().getSessionService().getTextures(p_152786_1_, false); - } - public Object load(Object p_load_1_) - { - return this.func_152786_a((GameProfile)p_load_1_); - } - }); - } - - /** - * Used in the Skull renderer to fetch a skin. May download the skin if it's not in the cache - */ - public ResourceLocation loadSkin(MinecraftProfileTexture p_152792_1_, Type p_152792_2_) - { - return this.loadSkin(p_152792_1_, p_152792_2_, (SkinManager.SkinAvailableCallback)null); - } - - /** - * May download the skin if its not in the cache, can be passed a SkinManager#SkinAvailableCallback for handling - */ - public ResourceLocation loadSkin(final MinecraftProfileTexture p_152789_1_, final Type p_152789_2_, final SkinManager.SkinAvailableCallback p_152789_3_) - { - //final ResourceLocation var4 = new ResourceLocation("skins/" + p_152789_1_.getHash()); - final ResourceLocation var4 = new ResourceLocation(p_152789_2_.name() + "/" + p_152789_1_.getHash()); - //ITextureObject var5 = this.textureManager.getTexture(var4); -/* - if (var5 != null) - { - if (p_152789_3_ != null) - { - p_152789_3_.func_180521_a(p_152789_2_, var4, p_152789_1_); - } - } - else - {*/ - File var6 = new File(this.skinCacheDir, p_152789_1_.getHash().substring(0, 2)); - File var7 = new File(var6, p_152789_1_.getHash()); - final ImageBufferDownload var8 = p_152789_2_ == Type.SKIN ? new ImageBufferDownload() : null; - ThreadDownloadImageData var9 = new ThreadDownloadImageData(var7, p_152789_1_.getUrl(), DefaultPlayerSkin.func_177335_a(), new IImageBuffer() - { - private static final String __OBFID = "CL_00001828"; - public BufferedImage parseUserSkin(BufferedImage p_78432_1_) - { - if (var8 != null) - { - p_78432_1_ = var8.parseUserSkin(p_78432_1_); - } - - return p_78432_1_; - } - public void func_152634_a() - { - if (var8 != null) - { - var8.func_152634_a(); - } - - if (p_152789_3_ != null) - { - p_152789_3_.func_180521_a(p_152789_2_, var4, p_152789_1_); - } - } - }); - this.textureManager.loadTexture(var4, var9); - //} - - return var4; - } - - public void func_152790_a(final GameProfile p_152790_1_, final SkinManager.SkinAvailableCallback p_152790_2_, final boolean p_152790_3_) - { - THREAD_POOL.submit(new Runnable() - { - private static final String __OBFID = "CL_00001827"; - public void run() - { - final HashMap var1 = Maps.newHashMap(); - - try - { - var1.putAll(SkinManager.this.sessionService.getTextures(p_152790_1_, p_152790_3_)); - } - catch (InsecureTextureException var3) - { - ; - } - - if (var1.isEmpty() && p_152790_1_.getId().equals(Minecraft.getMinecraft().getSession().getProfile().getId())) - { - var1.putAll(SkinManager.this.sessionService.getTextures(SkinManager.this.sessionService.fillProfileProperties(p_152790_1_, false), false)); - } - //CustomSkinLoader Begin - HashMap var2 = Maps.newHashMap(); - if (var1.containsKey(Type.SKIN)){ - MinecraftProfileTexture var3=((MinecraftProfileTexture)var1.get(Type.SKIN)); - String var4=var3.getMetadata("model"); - HashMap var5 = null; - if(var4!=null){ - var5 = Maps.newHashMap(); - var5.put("model", var4); - } - var2.put(Type.SKIN, new MinecraftProfileTexture(var3.getUrl()+"?Skin="+p_152790_1_.getName(),var5)); - }else{ - HashMap var5 = Maps.newHashMap(); - //var5.put("model", "slim"); - var2.put(Type.SKIN,new MinecraftProfileTexture( "http://skins.minecraft.net/MinecraftSkins/"+p_152790_1_.getName()+".png",var5)); - } - if (var1.containsKey(Type.CAPE)){ - var2.put(Type.CAPE, new MinecraftProfileTexture(((MinecraftProfileTexture)var1.get(Type.CAPE)).getUrl()+"?Cloak="+p_152790_1_.getName(),null)); - }else{ - var2.put(Type.CAPE,new MinecraftProfileTexture( "http://skins.minecraft.net/MinecraftCloaks/"+p_152790_1_.getName()+".png",null)); - } - var1.clear(); - var1.putAll(var2); - //CustomSkinLoader End - - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - private static final String __OBFID = "CL_00001826"; - public void run() - { - if (var1.containsKey(Type.SKIN)) - { - SkinManager.this.loadSkin((MinecraftProfileTexture)var1.get(Type.SKIN), Type.SKIN, p_152790_2_); - } - - if (var1.containsKey(Type.CAPE)) - { - SkinManager.this.loadSkin((MinecraftProfileTexture)var1.get(Type.CAPE), Type.CAPE, p_152790_2_); - } - } - }); - } - }); - } - - public Map loadSkinFromCache(GameProfile p_152788_1_) - { - return (Map)this.skinCacheLoader.getUnchecked(p_152788_1_); - } - - public interface SkinAvailableCallback - { - void func_180521_a(Type p_180521_1_, ResourceLocation p_180521_2_, MinecraftProfileTexture p_180521_3_); - } -} diff --git a/1.8.8-mcp918/src/minecraft/idv/jlchntoz/CustomSkinLoader.java b/1.8.8-mcp918/src/minecraft/idv/jlchntoz/CustomSkinLoader.java deleted file mode 100644 index ad06026..0000000 --- a/1.8.8-mcp918/src/minecraft/idv/jlchntoz/CustomSkinLoader.java +++ /dev/null @@ -1,357 +0,0 @@ -package idv.jlchntoz; - -import net.minecraft.client.Minecraft; - -import java.io.*; -import java.math.BigInteger; -import java.net.*; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.logging.*; -import java.util.regex.*; - -/** - * Custom skin loader mod for Minecraft. - * - * @version 12th Revision 9th Subversion 2016.2.10 - * - * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2016 - */ -public class CustomSkinLoader { - public final static String VERSION="12.9"; - - 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$"), - optifineCapeURLPattern = Pattern.compile("^http://s.optifine.net/capes/(.*?).png$"); - - public final static File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"), - CACHE_DIR=new File(DATA_DIR,"caches"), - LOG_FILE=new File(DATA_DIR,"CustomSkinLoader.log"), - SKIN_URL_FILE=new File(DATA_DIR,"skinurls.txt"), - CAPE_URL_FILE=new File(DATA_DIR,"capeurls.txt"); - public final static MainLogger logger = getLogger(LOG_FILE); - - public final static String[] DEFAULT_SKIN_URLS={ - "http://skins.minecraft.net/MinecraftSkins/*.png", - "http://minecrack.fr.nf/mc/skinsminecrackd/*.png", - "http://www.skinme.cc/MinecraftSkins/*.png"}; - public final static String[] DEFAULT_CAPE_URLS={ - "http://skins.minecraft.net/MinecraftCloaks/*.png", - "http://s.optifine.net/capes/*.png", - "http://minecrack.fr.nf/mc/cloaksminecrackd/*.png", - "http://www.skinme.cc/MinecraftCloaks/*.png"}; - - private static String[] cloakURLs = null, skinURLs = null; - private HttpURLConnection C = null; - - //Entrance - public InputStream getPlayerSkinStream(String path) { - if(!DATA_DIR.exists()) - DATA_DIR.mkdir(); - if(!CACHE_DIR.exists()) - CACHE_DIR.mkdir(); - logger.info("Get a request: "+path); - if(path.contains("NOCSL"))//Not to use CSL to load, prepared for json api - return getStream(path, false); - Matcher m = newURLPattern.matcher(path); - if (!m.matches())//Is not new url - { - m = oldURLPattern.matcher(path);//May be old url - } - if (m.matches()) { - if (m.group(1).contains("Skin")) // Skin - return getPlayerSkinStream(false, m.group(2)); - else if (m.group(1).contains("Cloak")) // Cloak - return getPlayerSkinStream(true, m.group(2)); - }else{ - m = newResPattern.matcher(path); - if(m.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 - logger.info("Ignore Optifine Cape."); - return null;//Not Load This - } - } - } - return getStream(path, false); // Neither skin nor cloak... - } - - public InputStream getPlayerSkinStream(Boolean isCloak, String playerName) { - if ((skinURLs == null|| skinURLs.length <= 0) && (cloakURLs == null || cloakURLs.length <= 0)) - refreshSkinURL(); // If the list is blank or null, try to load again. - InputStream S=null; - - for (String l : isCloak ? cloakURLs : skinURLs) { - if(l==null||l.equalsIgnoreCase("")) - continue; - String loc = str_replace("*", playerName, l); - logger.log(Level.INFO, "Try to load " + (isCloak ? "cloak" : "skin") + " in " + loc); - S = getStream(loc, true); - - if (S == null){ - logger.log(Level.INFO, "No " + (isCloak ? "cloak" : "skin") + " found in " + loc); - }else{ - logger.info("Succeessfully load " + (isCloak ? "cloak" : "skin") + " in " + loc); - return S; - } - } - - logger.log(Level.INFO, "Try to load skin in default URL instead."); - return getStream(str_replace("*", playerName, isCloak ? DefaultCloakURL : DefaultSkinURL), true); - } - - private InputStream getStream(String URL, Boolean CheckPNG) { - boolean success=false; - File cacheFile=new File(CACHE_DIR,MD5(URL)); - boolean alreadyCached=false; - if(cacheFile.exists()&&cacheFile.length()>1){ - alreadyCached=true; - logger.info("Cache File Found (LastModified: "+cacheFile.lastModified()+" , Size: "+cacheFile.length()+")"); - } - try { - URL U = new URL(URL); - C = (HttpURLConnection) U.openConnection(); - C.setReadTimeout(15000); - C.setDoInput(true); - C.setDoOutput(false); - C.connect(); - logger.info("Response Code: "+C.getResponseCode()); - int respcode = C.getResponseCode() / 100; - if (respcode != 4 && respcode != 5) { // Successful to get skin. - if(C.getContentLength()<=0){//Nothing got - logger.info("Nothing got."); - return null; - } - logger.info("Successfully Get Resource (LastModified: "+C.getLastModified()+" , ContentLength: "+C.getContentLength()+")"); - if(alreadyCached && C.getLastModified()==cacheFile.lastModified() && C.getContentLength()==cacheFile.length()){ - logger.info("Not Modified."); - return getStreamFromCache(cacheFile); - } - InputStream IS=new BufferedInputStream(C.getInputStream()); - if (!CheckPNG){ // If no need to check PNG header, just skip it. - success=true; - saveToCache(IS,cacheFile); - return IS; - } - //logger.info(C.getContentLength()+" "+IS.available()); - IS.mark(C.getContentLength()+10); - byte[] ib = new byte[4]; - IS.read(ib); - if (ib[1] == (byte) 'P' && ib[2] == (byte) 'N' && ib[3] == (byte) 'G') { // Check PNG Header if needed - IS.reset(); - success=true; - saveToCache(IS,cacheFile); - return IS; - } - } - } catch (Exception ex) { - success=false; - logger.log(Level.WARNING, ex.getMessage()); - if(alreadyCached) - return getStreamFromCache(cacheFile); - }finally{ - if(!success) - disconnect(); - } - return null; - } - private InputStream getStreamFromCache(File cacheFile) { - try{ - logger.info("Try load local cache in " + cacheFile.getAbsolutePath()); - InputStream in = new FileInputStream(cacheFile); - BufferedInputStream bis=new BufferedInputStream(in); - if(bis.available()<=0){ - logger.info("Cannot load local cache in " + cacheFile.getAbsolutePath()); - return null; - }else{ - logger.info("Successfully load cache in " + cacheFile.getAbsolutePath()); - return bis; - } - }catch(Exception e){ - logger.log(Level.WARNING, e.getMessage()); - return null; - } - } - private void saveToCache(InputStream is,File to){ - logger.info("Try save local cache to " + to.getAbsolutePath()); - FileOutputStream fs=null; - int times=0; - try{//Save to Local Skin File - if(to.exists()){ - to.delete(); - } - fs = new FileOutputStream(to); - int byteRead = 0; - byte[] buffer = new byte[1024]; - while (( byteRead = is.read(buffer)) != -1) { - times+=byteRead; - fs.write(buffer, 0, byteRead); - if(times>=C.getContentLength()){ - //logger.info(times+" "+C.getContentLength()); - break; - } - } - - if(to.length()>1){ - to.setLastModified(C.getLastModified()); - logger.info("Cache saved to " + to.getAbsolutePath()+" (LastModified: "+to.lastModified()+" , Size: "+to.length()+")"); - }else{ - to.delete(); - logger.info("Cannot save local cache to " + to.getAbsolutePath()); - } - }catch(Exception e){ - logger.warning(e.getMessage()); - }finally{ - try { - if(fs!=null) - fs.close(); - is.reset(); - } catch (IOException e) { - logger.warning(e.getMessage()); - } - } - } - - public void disconnect() { - if (C != null) - C.disconnect(); - } - - private static void refreshSkinURL() { - try { - if(!SKIN_URL_FILE.exists()){ - logger.log(Level.INFO, "SKIN config not found, create a new one."); - SKIN_URL_FILE.createNewFile(); - } - if(!CAPE_URL_FILE.exists()){ - logger.log(Level.INFO, "CAPE config not found, create a new one."); - CAPE_URL_FILE.createNewFile(); - } - skinURLs = readAllLines(SKIN_URL_FILE); - cloakURLs = readAllLines(CAPE_URL_FILE); - } catch (Exception ex) { - logger.log(Level.WARNING, ex.getMessage()); - } finally { - if(skinURLs.length==0&&cloakURLs.length==0){ - logger.info("No skinURLs and cloak URLS found, try to init and use default settings."); - initSkinURL(); - refreshSkinURL(); - }else{ - logger.log(Level.INFO, "Skin URLs Refreshed. Skin count = " - + skinURLs.length + ", Cloak count = " + cloakURLs.length); - } - } - } - private static void initSkinURL(){ - //Init URL List - skinURLs=DEFAULT_SKIN_URLS; - writeToFile(new File(DATA_DIR,"skinurls.txt"),parseArrayToText(skinURLs)); - cloakURLs=DEFAULT_CAPE_URLS; - writeToFile(new File(DATA_DIR,"capeurls.txt"),parseArrayToText(cloakURLs)); - } - - private static String[] readAllLines(File F) { - try { - logger.log(Level.INFO, "Config file: " + F.getAbsolutePath()); - if (F.length() <= 0) { - logger.log(Level.INFO, "Config file is blank, skipped."); - return new String[0]; - } else { - byte[] b = new byte[(int) F.length()]; - BufferedInputStream S = new BufferedInputStream( - new FileInputStream(F)); - S.read(b); - S.close(); - logger.log(Level.INFO, "Config file loaded."); - String[] re= str_replace("\r", "\n", - str_replace("\r\n", "\n", new String(b))).split("\n"); - for(int i=0;i=LOWEST_DISPLAY_LEVEL) - System.out.println(msg); - try { - writer.write("["); - writer.write(DATE_FORMAT.format(new Date())); - writer.write(" "); - writer.write(Thread.currentThread().getName()); - writer.write(" "); - writer.write(level.getName()); - writer.write("] "); - writer.write(msg); - writer.write("\r\n"); - writer.flush(); - } catch (Exception e) { - e.printStackTrace(); - } - } - public void info(String msg){ - log(Level.INFO,msg); - } - public void warning(String msg){ - log(Level.WARNING,msg); - } - public void warning(Exception e){ - log(Level.WARNING,"Exception occurs while running: "+e.getMessage()); - StackTraceElement[] stes=e.getStackTrace(); - for(StackTraceElement ste : stes){ - log(Level.WARNING,ste.toString()); - } - log(Level.WARNING,""); - } -} diff --git a/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java b/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java deleted file mode 100644 index ad997aa..0000000 --- a/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ImageBufferDownload.java +++ /dev/null @@ -1,117 +0,0 @@ -package net.minecraft.client.renderer; - -import java.awt.Graphics; -import java.awt.image.BufferedImage; -import java.awt.image.DataBufferInt; -import java.awt.image.ImageObserver; - -public class ImageBufferDownload implements IImageBuffer -{ - private int[] imageData; - private int imageWidth; - private int imageHeight; - - public BufferedImage parseUserSkin(BufferedImage image) - { - if (image == null) - { - return null; - } - else - { - int ratio=image.getWidth()/64; - this.imageWidth = 64 * ratio; - this.imageHeight = 64 * ratio; - BufferedImage var2 = new BufferedImage(this.imageWidth, this.imageHeight, 2); - Graphics var3 = var2.getGraphics(); - var3.drawImage(image, 0, 0, (ImageObserver)null); - - if (image.getHeight() == 32 * ratio) - { - var3.drawImage(var2, 24 * ratio, 48 * ratio, 20 * ratio, 52 * ratio, 4 * ratio, 16 * ratio, 8 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 28 * ratio, 48 * ratio, 24 * ratio, 52 * ratio, 8 * ratio, 16 * ratio, 12 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 20 * ratio, 52 * ratio, 16 * ratio, 64 * ratio, 8 * ratio, 20 * ratio, 12 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 24 * ratio, 52 * ratio, 20 * ratio, 64 * ratio, 4 * ratio, 20 * ratio, 8 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 28 * ratio, 52 * ratio, 24 * ratio, 64 * ratio, 0 * ratio, 20 * ratio, 4 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 32 * ratio, 52 * ratio, 28 * ratio, 64 * ratio, 12 * ratio, 20 * ratio, 16 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 40 * ratio, 48 * ratio, 36 * ratio, 52 * ratio, 44 * ratio, 16 * ratio, 48 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 44 * ratio, 48 * ratio, 40 * ratio, 52 * ratio, 48 * ratio, 16 * ratio, 52 * ratio, 20 * ratio, (ImageObserver)null); - var3.drawImage(var2, 36 * ratio, 52 * ratio, 32 * ratio, 64 * ratio, 48 * ratio, 20 * ratio, 52 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 40 * ratio, 52 * ratio, 36 * ratio, 64 * ratio, 44 * ratio, 20 * ratio, 48 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 44 * ratio, 52 * ratio, 40 * ratio, 64 * ratio, 40 * ratio, 20 * ratio, 44 * ratio, 32 * ratio, (ImageObserver)null); - var3.drawImage(var2, 48 * ratio, 52 * ratio, 44 * ratio, 64 * ratio, 52 * ratio, 20 * ratio, 56 * ratio, 32 * ratio, (ImageObserver)null); - } - - var3.dispose(); - this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData(); - this.setAreaOpaque(0, 0, 32 * ratio, 16 * ratio); - this.setAreaTransparent(32 * ratio, 0, 64 * ratio, 32 * ratio); - this.setAreaOpaque(0, 16 * ratio, 64 * ratio, 32 * ratio); - this.setAreaTransparent(0, 32 * ratio, 16 * ratio, 48 * ratio); - this.setAreaTransparent(16 * ratio, 32 * ratio, 40 * ratio, 48 * ratio); - this.setAreaTransparent(40 * ratio, 32 * ratio, 56 * ratio, 48 * ratio); - this.setAreaTransparent(0, 48 * ratio, 16 * ratio, 64 * ratio); - this.setAreaOpaque(16 * ratio, 48 * ratio, 48 * ratio, 64 * ratio); - this.setAreaTransparent(48 * ratio, 48 * ratio, 64 * ratio, 64 * ratio); - return var2; - } - } - - public void skinAvailable() - { - } - - /** - * Makes the given area of the image transparent if it was previously completely opaque (used to remove the outer - * layer of a skin around the head if it was saved all opaque; this would be redundant so it's assumed that the skin - * maker is just using an image editor without an alpha channel) - */ - private void setAreaTransparent(int p_78434_1_, int p_78434_2_, int p_78434_3_, int p_78434_4_) - { - if (!this.hasTransparency(p_78434_1_, p_78434_2_, p_78434_3_, p_78434_4_)) - { - for (int i = p_78434_1_; i < p_78434_3_; ++i) - { - for (int j = p_78434_2_; j < p_78434_4_; ++j) - { - this.imageData[i + j * this.imageWidth] &= 16777215; - } - } - } - } - - /** - * Makes the given area of the image opaque - */ - private void setAreaOpaque(int p_78433_1_, int p_78433_2_, int p_78433_3_, int p_78433_4_) - { - for (int i = p_78433_1_; i < p_78433_3_; ++i) - { - for (int j = p_78433_2_; j < p_78433_4_; ++j) - { - this.imageData[i + j * this.imageWidth] |= -16777216; - } - } - } - - /** - * Returns true if the given area of the image contains transparent pixels - */ - private boolean hasTransparency(int p_78435_1_, int p_78435_2_, int p_78435_3_, int p_78435_4_) - { - for (int i = p_78435_1_; i < p_78435_3_; ++i) - { - for (int j = p_78435_2_; j < p_78435_4_; ++j) - { - int k = this.imageData[i + j * this.imageWidth]; - - if ((k >> 24 & 255) < 128) - { - return true; - } - } - } - - return false; - } -} diff --git a/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java b/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java deleted file mode 100644 index 3304749..0000000 --- a/1.8.8-mcp918/src/minecraft/net/minecraft/client/renderer/ThreadDownloadImageData.java +++ /dev/null @@ -1,148 +0,0 @@ -package net.minecraft.client.renderer; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.concurrent.atomic.AtomicInteger; -import javax.imageio.ImageIO; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.SimpleTexture; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import idv.jlchntoz.CustomSkinLoader; - -public class ThreadDownloadImageData extends SimpleTexture -{ - private static final Logger logger = LogManager.getLogger(); - private static final AtomicInteger threadDownloadCounter = new AtomicInteger(0); - private final File cacheFile; - private final String imageUrl; - private final IImageBuffer imageBuffer; - private BufferedImage bufferedImage; - private Thread imageThread; - private boolean textureUploaded; - - //For Optifine - public Boolean imageFound = null; - public boolean pipeline = false; - - public ThreadDownloadImageData(File cacheFileIn, String imageUrlIn, ResourceLocation textureResourceLocation, IImageBuffer imageBufferIn) - { - super(textureResourceLocation); - this.cacheFile = cacheFileIn; - this.imageUrl = imageUrlIn; - this.imageBuffer = imageBufferIn; - } - - private void checkTextureUploaded() - { - if (!this.textureUploaded) - { - if (this.bufferedImage != null) - { - if (this.textureLocation != null) - { - this.deleteGlTexture(); - } - - TextureUtil.uploadTextureImage(super.getGlTextureId(), this.bufferedImage); - this.textureUploaded = true; - } - } - } - - public int getGlTextureId() - { - this.checkTextureUploaded(); - return super.getGlTextureId(); - } - - public void setBufferedImage(BufferedImage bufferedImageIn) - { - this.bufferedImage = bufferedImageIn; - - if (this.imageBuffer != null) - { - this.imageBuffer.skinAvailable(); - } - } - - public void loadTexture(IResourceManager resourceManager) throws IOException - { - if (this.bufferedImage == null && this.textureLocation != null) - { - super.loadTexture(resourceManager); - } - - if (this.imageThread == null) - { - if (this.cacheFile != null && this.cacheFile.isFile()) - { - logger.info("Loading http texture from local cache ({})", new Object[] {this.cacheFile}); - - try - { - this.bufferedImage = ImageIO.read(this.cacheFile); - - if (this.imageBuffer != null) - { - this.setBufferedImage(this.imageBuffer.parseUserSkin(this.bufferedImage)); - } - } - catch (IOException ioexception) - { - logger.error((String)("Couldn\'t load skin " + this.cacheFile), (Throwable)ioexception); - this.loadTextureFromServer(); - } - } - else - { - this.loadTextureFromServer(); - } - } - } - - protected void loadTextureFromServer() - { - this.imageThread = new Thread("Texture Downloader #" + threadDownloadCounter.incrementAndGet()) - { - public void run() - { - CustomSkinLoader loader=new CustomSkinLoader(); - ThreadDownloadImageData.logger.info("Downloading http texture from {} to {}", new Object[] {ThreadDownloadImageData.this.imageUrl, ThreadDownloadImageData.this.cacheFile}); - - try - { - BufferedImage bufferedimage; - bufferedimage = TextureUtil.readBufferedImage(loader.getPlayerSkinStream(ThreadDownloadImageData.this.imageUrl)); - - if (ThreadDownloadImageData.this.imageBuffer != null) - { - bufferedimage = ThreadDownloadImageData.this.imageBuffer.parseUserSkin(bufferedimage); - } - - ThreadDownloadImageData.this.setBufferedImage(bufferedimage); - return; - } - catch (Exception exception) - { - ThreadDownloadImageData.logger.error((String)"Couldn\'t download http texture", (Throwable)exception); - return; - } - finally - { - loader.disconnect(); - } - } - }; - this.imageThread.setDaemon(true); - this.imageThread.start(); - } -} diff --git a/1.8.8-mcp918/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.8.8-mcp918/src/minecraft/net/minecraft/client/resources/SkinManager.java deleted file mode 100644 index dc7f1e7..0000000 --- a/1.8.8-mcp918/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ /dev/null @@ -1,184 +0,0 @@ -package net.minecraft.client.resources; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.Maps; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.InsecureTextureException; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftSessionService; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IImageBuffer; -import net.minecraft.client.renderer.ImageBufferDownload; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.util.ResourceLocation; - -public class SkinManager -{ - private static final ExecutorService THREAD_POOL = new ThreadPoolExecutor(0, 2, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue()); - private final TextureManager textureManager; - private final File skinCacheDir; - private final MinecraftSessionService sessionService; - private final LoadingCache> skinCacheLoader; - - public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) - { - this.textureManager = textureManagerInstance; - this.skinCacheDir = skinCacheDirectory; - this.sessionService = sessionService; - this.skinCacheLoader = CacheBuilder.newBuilder().expireAfterAccess(15L, TimeUnit.SECONDS).>build(new CacheLoader>() - { - public Map load(GameProfile p_load_1_) throws Exception - { - return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); - } - }); - } - - /** - * Used in the Skull renderer to fetch a skin. May download the skin if it's not in the cache - */ - public ResourceLocation loadSkin(MinecraftProfileTexture profileTexture, Type p_152792_2_) - { - return this.loadSkin(profileTexture, p_152792_2_, (SkinManager.SkinAvailableCallback)null); - } - - /** - * May download the skin if its not in the cache, can be passed a SkinManager#SkinAvailableCallback for handling - */ - public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type p_152789_2_, final SkinManager.SkinAvailableCallback skinAvailableCallback) - { - final ResourceLocation resourcelocation = new ResourceLocation(p_152789_2_.name() + "/" + profileTexture.getHash()); - /*Remove cache - ITextureObject itextureobject = this.textureManager.getTexture(resourcelocation); - - if (itextureobject != null) - { - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(p_152789_2_, resourcelocation, profileTexture); - } - } - else - {*/ - File file1 = new File(this.skinCacheDir, profileTexture.getHash().length() > 2 ? profileTexture.getHash().substring(0, 2) : "xx"); - File file2 = new File(file1, profileTexture.getHash()); - final IImageBuffer iimagebuffer = p_152789_2_ == Type.SKIN ? new ImageBufferDownload() : null; - ThreadDownloadImageData threaddownloadimagedata = new ThreadDownloadImageData(file2, profileTexture.getUrl(), DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer() - { - public BufferedImage parseUserSkin(BufferedImage image) - { - if (iimagebuffer != null) - { - image = iimagebuffer.parseUserSkin(image); - } - - return image; - } - public void skinAvailable() - { - if (iimagebuffer != null) - { - iimagebuffer.skinAvailable(); - } - - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(p_152789_2_, resourcelocation, profileTexture); - } - } - }); - this.textureManager.loadTexture(resourcelocation, threaddownloadimagedata); - //} - - return resourcelocation; - } - - public void loadProfileTextures(final GameProfile profile, final SkinManager.SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) - { - THREAD_POOL.submit(new Runnable() - { - public void run() - { - final Map map = Maps.newHashMap(); - - try - { - map.putAll(SkinManager.this.sessionService.getTextures(profile, requireSecure)); - } - catch (InsecureTextureException var3) - { - ; - } - - if (map.isEmpty() && profile.getId().equals(Minecraft.getMinecraft().getSession().getProfile().getId())) - { - profile.getProperties().clear(); - profile.getProperties().putAll(Minecraft.getMinecraft().func_181037_M()); - map.putAll(SkinManager.this.sessionService.getTextures(profile, false)); - } - //CustomSkinLoader Begin - Map var2 = Maps.newHashMap(); - if (map.containsKey(Type.SKIN)){ - MinecraftProfileTexture var3=((MinecraftProfileTexture)map.get(Type.SKIN)); - String var4=var3.getMetadata("model"); - Map var5 = null; - if(var4!=null){ - var5 = Maps.newHashMap(); - var5.put("model", var4); - } - var2.put(Type.SKIN, new MinecraftProfileTexture(var3.getUrl()+"?Skin="+profile.getName(),var5)); - }else{ - Map var5 = Maps.newHashMap(); - //var5.put("model", "slim"); - var2.put(Type.SKIN,new MinecraftProfileTexture( "http://skins.minecraft.net/MinecraftSkins/"+profile.getName()+".png",var5)); - } - if (map.containsKey(Type.CAPE)){ - var2.put(Type.CAPE, new MinecraftProfileTexture(((MinecraftProfileTexture)map.get(Type.CAPE)).getUrl()+"?Cloak="+profile.getName(),null)); - }else{ - var2.put(Type.CAPE,new MinecraftProfileTexture( "http://skins.minecraft.net/MinecraftCloaks/"+profile.getName()+".png",null)); - } - map.clear(); - map.putAll(var2); - //CustomSkinLoader End - - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - public void run() - { - if (map.containsKey(Type.SKIN)) - { - SkinManager.this.loadSkin((MinecraftProfileTexture)map.get(Type.SKIN), Type.SKIN, skinAvailableCallback); - } - - if (map.containsKey(Type.CAPE)) - { - SkinManager.this.loadSkin((MinecraftProfileTexture)map.get(Type.CAPE), Type.CAPE, skinAvailableCallback); - } - } - }); - } - }); - } - - public Map loadSkinFromCache(GameProfile profile) - { - return (Map)this.skinCacheLoader.getUnchecked(profile); - } - - public interface SkinAvailableCallback - { - void skinAvailable(Type p_180521_1_, ResourceLocation location, MinecraftProfileTexture profileTexture); - } -} diff --git a/Common Tweaker/META-INF/MANIFEST.MF b/Common Tweaker/META-INF/MANIFEST.MF deleted file mode 100644 index 8fc74de..0000000 --- a/Common Tweaker/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -TweakClass: idv.jlchntoz.tweaker.ForgeTweaker -TweakOrder: -10 diff --git a/Common/META-INF/MANIFEST.MF b/Common/META-INF/MANIFEST.MF new file mode 100644 index 0000000..9d45ea8 --- /dev/null +++ b/Common/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +TweakClass: customskinloader.tweaker.ForgeTweaker +TweakOrder: -10 diff --git a/Common/customskinloader/CustomSkinLoader.java b/Common/customskinloader/CustomSkinLoader.java new file mode 100644 index 0000000..e66173e --- /dev/null +++ b/Common/customskinloader/CustomSkinLoader.java @@ -0,0 +1,130 @@ +package customskinloader; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.HashMap; + +import org.apache.commons.io.IOUtils; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import customskinloader.config.Config; +import customskinloader.config.SkinSiteProfile; +import customskinloader.loader.CustomSkinAPILoader; +import customskinloader.loader.IProfileLoader; +import customskinloader.loader.LegacyLoader; +import customskinloader.loader.MojangAPILoader; +import customskinloader.loader.UniSkinAPILoader; +import net.minecraft.client.Minecraft; + +/** + * Custom skin loader mod for Minecraft. + * @author (C) Jeremy Lam [JLChnToZ] 2013 & Alexander Xia [xfl03] 2014-2016 + * @version 13.1 + */ +public class CustomSkinLoader { + public static final String CustomSkinLoader_VERSION="13.1"; + public static final File DATA_DIR=new File(Minecraft.getMinecraft().mcDataDir,"CustomSkinLoader"), + LOG_FILE=new File(DATA_DIR,"CustomSkinLoader.log"), + CONFIG_FILE=new File(DATA_DIR,"CustomSkinLoader.json"); + public static final SkinSiteProfile[] DEFAULT_LOAD_LIST={ + new SkinSiteProfile("Mojang","MojangAPI"), + new SkinSiteProfile("BlessingSkin","CustomSkinAPI","https://skin.prinzeugen.net/csl/"), + //Minecrack could not load skin correctly + //new SkinSiteProfile("Minecrack","Legacy","http://minecrack.fr.nf/mc/skinsminecrackd/{USERNAME}.png","http://minecrack.fr.nf/mc/cloaksminecrackd/{USERNAME}.png"), + new SkinSiteProfile("SkinMe","UniSkinAPI","http://www.skinme.cc/uniskin/")}; + public static final HashMap LOADERS=initLoaders(); + + public static final Logger logger=initLogger(); + public static final Config config=loadConfig0(); + + public static HashMap loadProfile(String username,HashMap defaultProfile){ + for(int i=0;i initLoaders() { + HashMap loaders=new HashMap(); + loaders.put("mojangapi", new MojangAPILoader()); + loaders.put("customskinapi", new CustomSkinAPILoader()); + loaders.put("legacy", new LegacyLoader()); + loaders.put("uniskinapi", new UniSkinAPILoader()); + return loaders; + } + + private static Config loadConfig0() { + Config config=loadConfig(); + logger.info("Enable: "+config.enable); + logger.info("LoadList: "+(config.loadlist==null?0:config.loadlist.length)); + return config; + } + + private static Config loadConfig() { + logger.info("Config File: "+CONFIG_FILE.getAbsolutePath()); + if(!CONFIG_FILE.exists()){ + logger.info("Config file not found, use default instead."); + return initConfig(); + } + try { + logger.info("Try to load config."); + String json=IOUtils.toString(new FileInputStream(CONFIG_FILE)); + Config config=new Gson().fromJson(json, Config.class); + logger.info("Successfully load config."); + return config; + }catch (Exception e) { + logger.info("Failed to load config, use default instead.("+e.getMessage()+")"); + return initConfig(); + } + } + + private static Config initConfig() { + Config config=new Config(DEFAULT_LOAD_LIST); + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + String json=gson.toJson(config); + if(CONFIG_FILE.exists()) + CONFIG_FILE.delete(); + try { + CONFIG_FILE.createNewFile(); + IOUtils.write(json, new FileOutputStream(CONFIG_FILE)); + logger.info("Successfully create config."); + } catch (Exception e) { + logger.info("Failed to create config.("+e.getMessage()+")"); + } + return config; + } +} diff --git a/1.7.2-mcp903/src/minecraft/idv/jlchntoz/MainLogger.java b/Common/customskinloader/Logger.java similarity index 91% rename from 1.7.2-mcp903/src/minecraft/idv/jlchntoz/MainLogger.java rename to Common/customskinloader/Logger.java index dcc8fff..065d860 100644 --- a/1.7.2-mcp903/src/minecraft/idv/jlchntoz/MainLogger.java +++ b/Common/customskinloader/Logger.java @@ -1,4 +1,4 @@ -package idv.jlchntoz; +package customskinloader; import java.io.BufferedWriter; import java.io.File; @@ -8,11 +8,11 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.logging.Level; -public class MainLogger { +public class Logger { private static final int LOWEST_DISPLAY_LEVEL=Level.INFO.intValue(); SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private BufferedWriter writer; - public MainLogger(File logFile){ + public Logger(File logFile){ try { if(!logFile.getParentFile().exists()){ logFile.getParentFile().mkdirs(); @@ -61,7 +61,7 @@ public class MainLogger { log(Level.WARNING,msg); } public void warning(Exception e){ - log(Level.WARNING,"Exception occurs while running: "+e.getMessage()); + log(Level.WARNING,"Exception: "+e.getMessage()); StackTraceElement[] stes=e.getStackTrace(); for(StackTraceElement ste : stes){ log(Level.WARNING,ste.toString()); diff --git a/Common/customskinloader/UserProfile.java b/Common/customskinloader/UserProfile.java new file mode 100644 index 0000000..a041803 --- /dev/null +++ b/Common/customskinloader/UserProfile.java @@ -0,0 +1,43 @@ +package customskinloader; + +/**The instance to storage user's profile in memory temporarily. + * In this manner, it could be easier to pass profile in program. + * @since 13.1 + */ +public class UserProfile { + + /** + * Direct url for skin. + * @since 13.1 + */ + public String skinUrl=null; + + /** + * Model for skin. + * default/slim + * @since 13.1 + */ + public String model=null; + + /** + * Direct url for cape. + * @since 13.1 + */ + public String capeUrl=null; + + /** + * Get parsed String to output the instance. + */ + @Override + public String toString(){ + return "(SkinUrl: "+skinUrl+" , Model: "+model+" , CapeUrl: "+capeUrl+")"; + } + + /** + * Check if the instance is empty. + * @return status (true - empty) + */ + public boolean isEmpty(){ + return skinUrl==null && model==null && capeUrl==null; + } +} diff --git a/Common/customskinloader/config/Config.java b/Common/customskinloader/config/Config.java new file mode 100644 index 0000000..75ca099 --- /dev/null +++ b/Common/customskinloader/config/Config.java @@ -0,0 +1,11 @@ +package customskinloader.config; + +public class Config { + public boolean enable; + public SkinSiteProfile[] loadlist; + + public Config(SkinSiteProfile[] loadlist){ + this.enable=true; + this.loadlist=loadlist; + } +} diff --git a/Common/customskinloader/config/SkinSiteProfile.java b/Common/customskinloader/config/SkinSiteProfile.java new file mode 100644 index 0000000..beb6a24 --- /dev/null +++ b/Common/customskinloader/config/SkinSiteProfile.java @@ -0,0 +1,27 @@ +package customskinloader.config; + +public class SkinSiteProfile { + public String name; + public String type; + public String root; + public String skin; + public String cape; + + public SkinSiteProfile(String name,String type){ + this.name=name; + this.type=type; + } + + public SkinSiteProfile(String name,String type,String root){ + this.name=name; + this.type=type; + this.root=root; + } + + public SkinSiteProfile(String name,String type,String skin,String cape){ + this.name=name; + this.type=type; + this.skin=skin; + this.cape=cape; + } +} diff --git a/Common/customskinloader/loader/CustomSkinAPILoader.java b/Common/customskinloader/loader/CustomSkinAPILoader.java new file mode 100644 index 0000000..cb68c6f --- /dev/null +++ b/Common/customskinloader/loader/CustomSkinAPILoader.java @@ -0,0 +1,62 @@ +package customskinloader.loader; + +import java.util.HashMap; +import java.util.Set; + +import com.google.gson.Gson; + +import customskinloader.CustomSkinLoader; +import customskinloader.ModelManager; +import customskinloader.UserProfile; +import customskinloader.config.SkinSiteProfile; +import customskinloader.utils.HttpUtil; + +public class CustomSkinAPILoader implements IProfileLoader { + public static final String TEXTURES="textures/"; + @Override + public UserProfile loadProfile(SkinSiteProfile ssp, String username) throws Exception { + if(ssp.root==null||ssp.root.equals("")){ + CustomSkinLoader.logger.info("Root not denined."); + return null; + } + String json=HttpUtil.readHttp(ssp.root+username+".json"); + if(json==null||json.equals("")){ + CustomSkinLoader.logger.info("Profile not found."); + return null; + } + CustomSkinAPI profile=new Gson().fromJson(json, CustomSkinAPI.class); + UserProfile p=new UserProfile(); + if(profile.skins!=null && !profile.skins.isEmpty()){ + Set keys=profile.skins.keySet(); + for(String s:keys){ + if(ModelManager.checkModel(s)){ + p.skinUrl=ssp.root+TEXTURES+profile.skins.get(s); + p.model=s; + break; + } + } + if(p.skinUrl==null){ + p.skinUrl=ssp.root+TEXTURES+profile.skins.get(keys.toArray()[0]); + p.model="default"; + } + }else if(profile.skin!=null && !profile.skin.equals("")){ + p.skinUrl=ssp.root+TEXTURES+profile.skin; + } + if(profile.cape!=null && !profile.cape.equals("")){ + p.capeUrl=ssp.root+TEXTURES+profile.cape; + } + if(p.isEmpty()){ + CustomSkinLoader.logger.info("Both skin and cape not found."); + return null; + }else{ + return p; + } + } + + private class CustomSkinAPI{ + public String username; + public HashMap skins; + public String skin; + public String cape; + } +} diff --git a/Common/customskinloader/loader/IProfileLoader.java b/Common/customskinloader/loader/IProfileLoader.java new file mode 100644 index 0000000..52d7f6f --- /dev/null +++ b/Common/customskinloader/loader/IProfileLoader.java @@ -0,0 +1,8 @@ +package customskinloader.loader; + +import customskinloader.UserProfile; +import customskinloader.config.SkinSiteProfile; + +public interface IProfileLoader { + public UserProfile loadProfile(SkinSiteProfile ssp,String username) throws Exception; +} diff --git a/Common/customskinloader/loader/LegacyLoader.java b/Common/customskinloader/loader/LegacyLoader.java new file mode 100644 index 0000000..463f80a --- /dev/null +++ b/Common/customskinloader/loader/LegacyLoader.java @@ -0,0 +1,34 @@ +package customskinloader.loader; + +import customskinloader.CustomSkinLoader; +import customskinloader.UserProfile; +import customskinloader.config.SkinSiteProfile; +import customskinloader.utils.HttpUtil; + +public class LegacyLoader implements IProfileLoader { + public static final String USERNAME_REGEX="\\{USERNAME\\}"; + @Override + public UserProfile loadProfile(SkinSiteProfile ssp, String username) throws Exception { + UserProfile profile=new UserProfile(); + if(ssp.skin!=null && !ssp.skin.equals("")){ + String skin=HttpUtil.getRealUrl(ssp.skin.replaceAll(USERNAME_REGEX, username)); + if(skin!=null&&!skin.equals("")){ + profile.skinUrl=skin; + profile.model="default"; + } + } + if(ssp.cape!=null && !ssp.cape.equals("")){ + String cape=HttpUtil.getRealUrl(ssp.cape.replaceAll(USERNAME_REGEX, username)); + if(cape!=null&&!cape.equals("")){ + profile.capeUrl=cape; + } + } + if(profile.isEmpty()){ + CustomSkinLoader.logger.info("Both skin and cape not found."); + return null; + }else{ + return profile; + } + } + +} diff --git a/Common/customskinloader/loader/MojangAPILoader.java b/Common/customskinloader/loader/MojangAPILoader.java new file mode 100644 index 0000000..b8e8e09 --- /dev/null +++ b/Common/customskinloader/loader/MojangAPILoader.java @@ -0,0 +1,78 @@ +package customskinloader.loader; + +import java.util.HashMap; +import java.util.Set; + +import org.apache.commons.codec.binary.Base64; + +import com.google.gson.Gson; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; +import com.mojang.authlib.properties.Property; + +import customskinloader.CustomSkinLoader; +import customskinloader.ModelManager; +import customskinloader.UserProfile; +import customskinloader.config.SkinSiteProfile; +import customskinloader.utils.HttpUtil; + +public class MojangAPILoader implements IProfileLoader { + + @Override + public UserProfile loadProfile(SkinSiteProfile ssp, String username) throws Exception { + //Get UUID Begin (http://wiki.vg/Mojang_API#Username_-.3E_UUID_at_time) + String json0=HttpUtil.readHttp("https://api.mojang.com/users/profiles/minecraft/"+username); + if(json0==null||json0.equals("")){ + CustomSkinLoader.logger.info("Profile not found.("+username+"'s UUID not found.)"); + return null; + } + Gson gson=new Gson(); + UUIDProfile uuidProfile=gson.fromJson(json0, UUIDProfile.class); + if(uuidProfile.id==null||uuidProfile.id.equals("")){ + CustomSkinLoader.logger.info("Profile not found.("+username+"'s UUID is empty.)"); + return null; + } + //Get UUID End + //Get Profile Begin (http://wiki.vg/Mojang_API#UUID_-.3E_Profile_.2B_Skin.2FCape) + String json1=HttpUtil.readHttp("https://sessionserver.mojang.com/session/minecraft/profile/"+uuidProfile.id); + if(json1==null||json1.equals("")){ + CustomSkinLoader.logger.info("Profile not found.("+username+"'s Profile is empty.)"); + return null; + } + UserProfile0 profile= gson.fromJson(json1, UserProfile0.class); + //Get Profile End + //Get Texture Begin + Property p=profile.properties.length>=1?profile.properties[0]:null; + if(p==null){ + CustomSkinLoader.logger.info("Profile not found.("+username+"'s Profile doesn't have property for texture.)"); + return null; + } + String texture=p.getValue(); + if(texture==null||texture.equals("")){ + CustomSkinLoader.logger.info("Profile not found.("+username+"'s texture not found.)"); + return null; + } + String json2=new String(Base64.decodeBase64(texture)); + UserTexture texture1=gson.fromJson(json2, UserTexture.class); + if(texture1.textures==null||texture1.textures.isEmpty()){ + CustomSkinLoader.logger.info("Profile not found.("+username+" doesn't have skin/cape.)"); + return null; + } + //Get Texture End + return ModelManager.toUserProfile(texture1.textures); + } + + private class UUIDProfile{ + public String id; + public String name; + } + + private class UserProfile0{ + public String id; + public String name; + public Property[] properties; + } + private class UserTexture{ + public HashMap textures; + } +} diff --git a/Common/customskinloader/loader/UniSkinAPILoader.java b/Common/customskinloader/loader/UniSkinAPILoader.java new file mode 100644 index 0000000..2877904 --- /dev/null +++ b/Common/customskinloader/loader/UniSkinAPILoader.java @@ -0,0 +1,69 @@ +package customskinloader.loader; + +import java.util.List; +import java.util.Map; + +import com.google.gson.Gson; + +import customskinloader.CustomSkinLoader; +import customskinloader.ModelManager; +import customskinloader.UserProfile; +import customskinloader.config.SkinSiteProfile; +import customskinloader.utils.HttpUtil; + +public class UniSkinAPILoader implements IProfileLoader { + public static final String TEXTURES="textures/"; + @Override + public UserProfile loadProfile(SkinSiteProfile ssp, String username) throws Exception { + if(ssp.root==null||ssp.root.equals("")){ + CustomSkinLoader.logger.info("Root not denined."); + return null; + } + String json=HttpUtil.readHttp(ssp.root+username+".json"); + if(json==null||json.equals("")){ + CustomSkinLoader.logger.info("Profile not found."); + return null; + } + UniSkinAPI profile=new Gson().fromJson(json, UniSkinAPI.class); + UserProfile p=new UserProfile(); + if(profile.skins!=null && !profile.skins.isEmpty()){ + if(profile.model_preference!=null && !profile.model_preference.isEmpty()){ + for(String s:profile.model_preference){ + if(ModelManager.checkModel(s)){ + p.skinUrl=ssp.root+TEXTURES+profile.skins.get(s); + p.model=s; + break; + } + } + } + if(p.skinUrl==null){ + String s=profile.skins.get("default"); + if(s!=null){ + p.skinUrl=ssp.root+TEXTURES+s; + p.model="default"; + } + } + } + if(profile.cape!=null && !profile.cape.equals("")){ + p.capeUrl=ssp.root+TEXTURES+profile.cape; + } + if(p.isEmpty()){ + CustomSkinLoader.logger.info("Both skin and cape not found."); + return null; + }else{ + return p; + } + } + /** + * Json profile for UniSkinAPI + * Source Code: https://github.com/RecursiveG/UniSkinMod/blob/master/src/main/java/org/devinprogress/uniskinmod/UniSkinApiProfile.java#L18-L22 + * @author RecursiveG + */ + private class UniSkinAPI{ + public String player_name; + public long last_update; + public List model_preference; + public Map skins; + public String cape; + } +} diff --git a/Common Tweaker/idv/jlchntoz/tweaker/ClassTransformer.java b/Common/customskinloader/tweaker/ClassTransformer.java similarity index 93% rename from Common Tweaker/idv/jlchntoz/tweaker/ClassTransformer.java rename to Common/customskinloader/tweaker/ClassTransformer.java index 14ac8cd..b5fffa4 100644 --- a/Common Tweaker/idv/jlchntoz/tweaker/ClassTransformer.java +++ b/Common/customskinloader/tweaker/ClassTransformer.java @@ -1,6 +1,4 @@ -package idv.jlchntoz.tweaker; - -import idv.jlchntoz.CustomSkinLoader; +package customskinloader.tweaker; import java.io.*; import java.net.*; @@ -42,7 +40,7 @@ public class ClassTransformer implements IClassTransformer { URI uri = url.toURI(); File file = new File(uri); zipFile0 = new ZipFile(file); - if (zipFile0.getEntry("idv/jlchntoz/tweaker/ClassTransformer.class") != null){ + if (zipFile0.getEntry("customskinloader/tweaker/ClassTransformer.class") != null){ ForgeTweaker.logger.info("JAR Found!"); return zipFile0; } diff --git a/Common Tweaker/idv/jlchntoz/tweaker/ForgeTweaker.java b/Common/customskinloader/tweaker/ForgeTweaker.java similarity index 87% rename from Common Tweaker/idv/jlchntoz/tweaker/ForgeTweaker.java rename to Common/customskinloader/tweaker/ForgeTweaker.java index c093e19..c40e905 100644 --- a/Common Tweaker/idv/jlchntoz/tweaker/ForgeTweaker.java +++ b/Common/customskinloader/tweaker/ForgeTweaker.java @@ -1,6 +1,6 @@ -package idv.jlchntoz.tweaker; +package customskinloader.tweaker; -import idv.jlchntoz.MainLogger; +import customskinloader.Logger; import java.io.File; import java.util.List; @@ -23,7 +23,7 @@ public class ForgeTweaker implements ITweaker { public void injectIntoClassLoader(LaunchClassLoader classLoader) { logger.info("ForgeTweaker: injectIntoClassLoader"); - classLoader.registerTransformer("idv.jlchntoz.tweaker.ClassTransformer"); + classLoader.registerTransformer("customskinloader.tweaker.ClassTransformer"); logger.info("ClassTransformer Registered"); } diff --git a/Common Tweaker/idv/jlchntoz/tweaker/Tweaker.java b/Common/customskinloader/tweaker/Tweaker.java similarity index 95% rename from Common Tweaker/idv/jlchntoz/tweaker/Tweaker.java rename to Common/customskinloader/tweaker/Tweaker.java index a66a780..38c54ad 100644 --- a/Common Tweaker/idv/jlchntoz/tweaker/Tweaker.java +++ b/Common/customskinloader/tweaker/Tweaker.java @@ -1,6 +1,6 @@ -package idv.jlchntoz.tweaker; +package customskinloader.tweaker; -import idv.jlchntoz.MainLogger; +import customskinloader.Logger; import java.io.File; import java.util.ArrayList; diff --git a/Common/customskinloader/utils/HttpUtil.java b/Common/customskinloader/utils/HttpUtil.java new file mode 100644 index 0000000..8f80072 --- /dev/null +++ b/Common/customskinloader/utils/HttpUtil.java @@ -0,0 +1,71 @@ +package customskinloader.utils; + +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; + +import org.apache.commons.io.Charsets; +import org.apache.commons.io.IOUtils; + +import customskinloader.CustomSkinLoader; + +public class HttpUtil { + /** + * Read all text from http. + */ + public static String readHttp(String url){ + try { + CustomSkinLoader.logger.info("Try to read '"+url+"'"); + HttpURLConnection c=createConnection(url); + int res = c.getResponseCode()/100; + if (res==4||res==5||c.getResponseCode()==HttpURLConnection.HTTP_NO_CONTENT) { + CustomSkinLoader.logger.info("Failed to read (Response Code: "+c.getResponseCode()+")"); + return null; + } + CustomSkinLoader.logger.info("Successfully read (Response Code: "+c.getResponseCode()+" , Content Length: "+c.getContentLength()+")"); + InputStream is = c.getInputStream(); + return IOUtils.toString(is, Charsets.UTF_8); + } catch (Exception e) { + CustomSkinLoader.logger.info("Failed to read (Exception: "+e.getMessage()+")"); + return null; + } + } + + /** + * Get url after redirect. + * Using this method, can also check if it is exist. + * @param url - before redirect + * @return url - after redirect (null for not exist) + */ + public static String getRealUrl(String url){ + try { + CustomSkinLoader.logger.info("Try to get real url of '"+url+"'."); + HttpURLConnection c=createConnection(url); + int res = c.getResponseCode()/100; + if (res==4||res==5) { + CustomSkinLoader.logger.info("Failed to get real url (Response Code: "+c.getResponseCode()+")"); + return null; + } + CustomSkinLoader.logger.info("Successfully get real url (" + + "Response Code: "+c.getResponseCode()+" , " + + "Content Length: "+c.getContentLength()+" , " + + "Real URL: "+c.getURL().toString()+")"); + return c.getURL().toString(); + } catch (Exception e) { + CustomSkinLoader.logger.info("Failed to get real url (Exception: "+e.getMessage()+")"); + return null; + } + } + + private static HttpURLConnection createConnection(String url) throws MalformedURLException, IOException{ + HttpURLConnection c = (HttpURLConnection) (new URL(url)).openConnection(); + c.setReadTimeout(1000 * 10); + c.setConnectTimeout(1000 * 10); + c.setUseCaches(false); + c.setInstanceFollowRedirects(true); + c.connect(); + return c; + } +} diff --git a/README.md b/README.md index 1173d8c..60e1ebd 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,29 @@ -MCCustomSkinLoader -================== -版权所有(C) 2013-2016 JLChnToZ xfl03 - - 这一程序是自由软件,你可以遵照自由软件基金会出版的GNU通用公共许可证条款来修改和重新发布这一程序。或者用许可证的第三版,或者(根据你的选择)用任何更新的版本。 - - 发布这一程序的目的是希望它有用,但没有任何担保。甚至没有适合特定目的的隐含的担保。更详细的情况请参阅GNU通用公共许可证。 - - +#CustomSkinLoader +##What's this? +Custom Skin Loader mod for Minecraft. +You can use it to load any skin from any website. +##Feature +###Plenty of Skin Load API Support and Customizable Skin Load List +Skin Load API Supported: +- [Mojang API](http://wiki.vg/Mojang_API) +- [CustomSkinAPI](https://github.com/xfl03/CustomSkinLoaderAPI/tree/master/CustomSkinAPI) +- [UniSkinAPI](https://github.com/RecursiveG/UniSkinServer/tree/master/doc) +- Legacy +You can use this feature to customize your skin load list so as to load from any website you want. +If you are the owner of skin website, you can use CustomSkinLoader to load skin from your website if one of the api has been actualized. +###HD skins support +Even though there is no Optifine, CustomSkinLoader has fix this problem. +You can easily to get a better view in skin. +##Default Load List +- [Mojang](http://www.minecraft.net/) (Mojang API) +- [Blessing Skin](https://skin.prinzeugen.net/) (CustomSkinAPI) +- SkinMe (UniSkinAPI) +If you want to apply to add other skin website to default list, please go to [issue](https://github.com/JLChnToZ/MCCustomSkinLoader/issues). +##Copyright Copyright(C) 2013-2016 JLChnToZ xfl03 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - GPLv3: http://www.gnu.org/licenses/gpl.html