diff --git a/1.10-mcp931/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.10-mcp931/src/minecraft/net/minecraft/client/resources/SkinManager.java index e079120..28a2ab1 100644 --- a/1.10-mcp931/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.10-mcp931/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -32,6 +32,8 @@ public class SkinManager private final File skinCacheDir; private final MinecraftSessionService sessionService; private final LoadingCache> skinCacheLoader; + + private customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { @@ -45,10 +47,7 @@ public class SkinManager return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); } }); - //CustomSkinLoader Begin (Init) - customskinloader.loader.MojangAPILoader.defaultSessionService=sessionService; - customskinloader.utils.HttpTextureUtil.defaultCacheDir=skinCacheDirectory; - //CustomSkinLoader End + this.fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); } /** @@ -64,94 +63,17 @@ public class SkinManager */ public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type textureType, @Nullable final SkinManager.SkinAvailableCallback skinAvailableCallback) { - //CustomSkinLoader Begin (Parse HttpTextureInfo) - customskinloader.utils.HttpTextureUtil.HttpTextureInfo info=customskinloader.utils.HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); - //CustomSkinLoader End - final ResourceLocation resourcelocation = new ResourceLocation("skins/" + info.hash);//Modified - ITextureObject itextureobject = this.textureManager.getTexture(resourcelocation); - - if (itextureobject != null) - { - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(textureType, resourcelocation, profileTexture); - } - } - else - { - final IImageBuffer iimagebuffer = textureType == Type.SKIN ? new customskinloader.renderer.SkinBuffer() : null;//Modified - ThreadDownloadImageData threaddownloadimagedata = new ThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer()//Modified - { - 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(textureType, resourcelocation, profileTexture); - } - } - }); - this.textureManager.loadTexture(resourcelocation, threaddownloadimagedata); - } - - return resourcelocation; + return this.fakeManager.loadSkin(profileTexture, textureType, skinAvailableCallback); } 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(); - - //CustomSkinLoader Begin (User Profile Part) - if(customskinloader.CustomSkinLoader.config.enable){ - map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); - }else{ - try{ - map.putAll(SkinManager.this.sessionService.getTextures(profile, requireSecure)); - }catch (InsecureTextureException var3){} - } - //CustomSkinLoader End - - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - public void run() - { - //CustomSkinLoader Begin (Loading Task) - for(Type type:Type.values()){ - if(map.containsKey(type)) - SkinManager.this.loadSkin((MinecraftProfileTexture)map.get(type), type, skinAvailableCallback); - } - //CustomSkinLoader End - } - }); - } - }); + this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); } public Map loadSkinFromCache(GameProfile profile) { - //CustomSkinLoader Begin (Skull Part) - //return (Map)this.skinCacheLoader.getUnchecked(profile); - return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? - customskinloader.CustomSkinLoader.loadProfileFromCache(profile): - this.skinCacheLoader.getUnchecked(profile); - //CustomSkinLoader End + return this.fakeManager.loadSkinFromCache(profile); } public interface SkinAvailableCallback diff --git a/1.11-test/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.11-test/src/minecraft/net/minecraft/client/resources/SkinManager.java index af38d4e..accf2f3 100644 --- a/1.11-test/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.11-test/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -25,7 +25,7 @@ import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; -//This code is from 1.10-mcp931 +//From 1.10-mcp931 public class SkinManager { private static final ExecutorService THREAD_POOL = new ThreadPoolExecutor(0, 2, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue()); @@ -33,6 +33,8 @@ public class SkinManager private final File skinCacheDir; private final MinecraftSessionService sessionService; private final LoadingCache> skinCacheLoader; + + private customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { @@ -46,10 +48,7 @@ public class SkinManager return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); } }); - //CustomSkinLoader Begin (Init) - customskinloader.loader.MojangAPILoader.defaultSessionService=sessionService; - customskinloader.utils.HttpTextureUtil.defaultCacheDir=skinCacheDirectory; - //CustomSkinLoader End + this.fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); } /** @@ -65,94 +64,17 @@ public class SkinManager */ public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type textureType, @Nullable final SkinManager.SkinAvailableCallback skinAvailableCallback) { - //CustomSkinLoader Begin (Parse HttpTextureInfo) - customskinloader.utils.HttpTextureUtil.HttpTextureInfo info=customskinloader.utils.HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); - //CustomSkinLoader End - final ResourceLocation resourcelocation = new ResourceLocation("skins/" + info.hash);//Modified - ITextureObject itextureobject = this.textureManager.getTexture(resourcelocation); - - if (itextureobject != null) - { - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(textureType, resourcelocation, profileTexture); - } - } - else - { - final IImageBuffer iimagebuffer = textureType == Type.SKIN ? new customskinloader.renderer.SkinBuffer() : null;//Modified - ThreadDownloadImageData threaddownloadimagedata = new ThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer()//Modified - { - 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(textureType, resourcelocation, profileTexture); - } - } - }); - this.textureManager.loadTexture(resourcelocation, threaddownloadimagedata); - } - - return resourcelocation; + return this.fakeManager.loadSkin(profileTexture, textureType, skinAvailableCallback); } 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(); - - //CustomSkinLoader Begin (User Profile Part) - if(customskinloader.CustomSkinLoader.config.enable){ - map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); - }else{ - try{ - map.putAll(SkinManager.this.sessionService.getTextures(profile, requireSecure)); - }catch (InsecureTextureException var3){} - } - //CustomSkinLoader End - - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - public void run() - { - //CustomSkinLoader Begin (Loading Task) - for(Type type:Type.values()){ - if(map.containsKey(type)) - SkinManager.this.loadSkin((MinecraftProfileTexture)map.get(type), type, skinAvailableCallback); - } - //CustomSkinLoader End - } - }); - } - }); + this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); } public Map loadSkinFromCache(GameProfile profile) { - //CustomSkinLoader Begin (Skull Part) - //return (Map)this.skinCacheLoader.getUnchecked(profile); - return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? - customskinloader.CustomSkinLoader.loadProfileFromCache(profile): - this.skinCacheLoader.getUnchecked(profile); - //CustomSkinLoader End + return this.fakeManager.loadSkinFromCache(profile); } public interface SkinAvailableCallback 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 index a9357fd..4a1face 100644 --- a/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.8-mcp910/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -33,6 +33,8 @@ public class SkinManager private final MinecraftSessionService sessionService; private final LoadingCache skinCacheLoader; private static final String __OBFID = "CL_00001830"; + + private customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { @@ -51,10 +53,7 @@ public class SkinManager return this.func_152786_a((GameProfile)p_load_1_); } }); - //CustomSkinLoader Begin (Init) - customskinloader.loader.MojangAPILoader.defaultSessionService=sessionService; - customskinloader.utils.HttpTextureUtil.defaultCacheDir=skinCacheDirectory; - //CustomSkinLoader End + fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); } /** @@ -70,100 +69,17 @@ public class SkinManager */ public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type p_152789_2_, final SkinManager.SkinAvailableCallback skinAvailableCallback) { - //CustomSkinLoader Begin (Parse HttpTextureInfo) - customskinloader.utils.HttpTextureUtil.HttpTextureInfo info=customskinloader.utils.HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); - //CustomSkinLoader End - final ResourceLocation var4 = new ResourceLocation("skins/" + info.hash);//Modified - ITextureObject var5 = this.textureManager.getTexture(var4); - - if (var5 != null) - { - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(p_152789_2_, var4, profileTexture); - } - } - else - { - final IImageBuffer var8 = p_152789_2_ == Type.SKIN ? new customskinloader.renderer.SkinBuffer() : null;//Modified - ThreadDownloadImageData var9 = new ThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer()//Modified - { - private static final String __OBFID = "CL_00001828"; - public BufferedImage parseUserSkin(BufferedImage image) - { - if (var8 != null) - { - image = var8.parseUserSkin(image); - } - - return image; - } - public void skinAvailable() - { - if (var8 != null) - { - var8.skinAvailable(); - } - - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(p_152789_2_, var4, profileTexture); - } - } - }); - this.textureManager.loadTexture(var4, var9); - } - - return var4; + return this.fakeManager.loadSkin(profileTexture, p_152789_2_, skinAvailableCallback); } public void loadProfileTextures(final GameProfile profile, final SkinManager.SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) { - THREAD_POOL.submit(new Runnable() - { - private static final String __OBFID = "CL_00001827"; - public void run() - { - final HashMap var1 = Maps.newHashMap(); - - //CustomSkinLoader Begin (User Skin/Cape Part) - if(customskinloader.CustomSkinLoader.config.enable){ - var1.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); - }else{ - try{ - var1.putAll(SkinManager.this.sessionService.getTextures(profile, requireSecure)); - }catch(InsecureTextureException var3){} - } - //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, skinAvailableCallback); - } - - if (var1.containsKey(Type.CAPE)) - { - SkinManager.this.loadSkin((MinecraftProfileTexture)var1.get(Type.CAPE), Type.CAPE, skinAvailableCallback); - } - } - }); - } - }); + this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); } public Map loadSkinFromCache(GameProfile profile) { - //CustomSkinLoader Begin (Skull Part) - //return (Map)this.skinCacheLoader.getUnchecked(profile); - return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? - customskinloader.CustomSkinLoader.loadProfileFromCache(profile): - (Map)this.skinCacheLoader.getUnchecked(profile); - //CustomSkinLoader End + return this.fakeManager.loadSkinFromCache(profile); } public interface SkinAvailableCallback 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 index 0cec7b1..616c877 100644 --- 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 @@ -31,6 +31,8 @@ public class SkinManager private final File skinCacheDir; private final MinecraftSessionService sessionService; private final LoadingCache> skinCacheLoader; + + private customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { @@ -44,10 +46,7 @@ public class SkinManager return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); } }); - //CustomSkinLoader Begin (Init) - customskinloader.loader.MojangAPILoader.defaultSessionService=sessionService; - customskinloader.utils.HttpTextureUtil.defaultCacheDir=skinCacheDirectory; - //CustomSkinLoader End + fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); } /** @@ -63,97 +62,17 @@ public class SkinManager */ public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type p_152789_2_, final SkinManager.SkinAvailableCallback skinAvailableCallback) { - //CustomSkinLoader Begin (Parse HttpTextureInfo) - customskinloader.utils.HttpTextureUtil.HttpTextureInfo info=customskinloader.utils.HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); - //CustomSkinLoader End - final ResourceLocation resourcelocation = new ResourceLocation("skins/" + info.hash);//Modified - ITextureObject itextureobject = this.textureManager.getTexture(resourcelocation); - - if (itextureobject != null) - { - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(p_152789_2_, resourcelocation, profileTexture); - } - } - else - { - final IImageBuffer iimagebuffer = p_152789_2_ == Type.SKIN ? new customskinloader.renderer.SkinBuffer() : null;//Modified - ThreadDownloadImageData threaddownloadimagedata = new ThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer()//Modified - { - 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; + return this.fakeManager.loadSkin(profileTexture, p_152789_2_, skinAvailableCallback); } 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(); - - //CustomSkinLoader Begin (User Skin/Cape Part) - if(customskinloader.CustomSkinLoader.config.enable){ - map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); - }else{ - try{ - map.putAll(SkinManager.this.sessionService.getTextures(profile, requireSecure)); - }catch(InsecureTextureException var3){} - } - //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); - } - } - }); - } - }); + this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); } public Map loadSkinFromCache(GameProfile profile) { - //CustomSkinLoader Begin (Skull Part) - //return (Map)this.skinCacheLoader.getUnchecked(profile); - return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? - customskinloader.CustomSkinLoader.loadProfileFromCache(profile): - this.skinCacheLoader.getUnchecked(profile); - //CustomSkinLoader End + return this.fakeManager.loadSkinFromCache(profile); } public interface SkinAvailableCallback diff --git a/1.9-mcp924/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.9-mcp924/src/minecraft/net/minecraft/client/resources/SkinManager.java index 45e66c4..9e25b8a 100644 --- a/1.9-mcp924/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.9-mcp924/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -32,6 +32,8 @@ public class SkinManager private final File skinCacheDir; private final MinecraftSessionService sessionService; private final LoadingCache> skinCacheLoader; + + private customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { @@ -45,10 +47,7 @@ public class SkinManager return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); } }); - //CustomSkinLoader Begin (Init) - customskinloader.loader.MojangAPILoader.defaultSessionService=sessionService; - customskinloader.utils.HttpTextureUtil.defaultCacheDir=skinCacheDirectory; - //CustomSkinLoader End + this.fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); } /** @@ -64,94 +63,17 @@ public class SkinManager */ public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type textureType, final SkinManager.SkinAvailableCallback skinAvailableCallback) { - //CustomSkinLoader Begin (Parse HttpTextureInfo) - customskinloader.utils.HttpTextureUtil.HttpTextureInfo info=customskinloader.utils.HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); - //CustomSkinLoader End - final ResourceLocation resourcelocation = new ResourceLocation("skins/" + info.hash);//Modified - ITextureObject itextureobject = this.textureManager.getTexture(resourcelocation); - - if (itextureobject != null) - { - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(textureType, resourcelocation, profileTexture); - } - } - else - { - final IImageBuffer iimagebuffer = textureType == Type.SKIN ? new customskinloader.renderer.SkinBuffer() : null;//Modified - ThreadDownloadImageData threaddownloadimagedata = new ThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer()//Modified - { - 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(textureType, resourcelocation, profileTexture); - } - } - }); - this.textureManager.loadTexture(resourcelocation, threaddownloadimagedata); - } - - return resourcelocation; + return this.fakeManager.loadSkin(profileTexture, textureType, skinAvailableCallback); } 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(); - - //CustomSkinLoader Begin (User Profile Part) - if(customskinloader.CustomSkinLoader.config.enable){ - map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); - }else{ - try{ - map.putAll(SkinManager.this.sessionService.getTextures(profile, requireSecure)); - }catch(InsecureTextureException var3){} - } - //CustomSkinLoader End - - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - public void run() - { - //CustomSkinLoader Begin (Loading Task) - for(Type type:Type.values()){ - if(map.containsKey(type)) - SkinManager.this.loadSkin((MinecraftProfileTexture)map.get(type), type, skinAvailableCallback); - } - //CustomSkinLoader End - } - }); - } - }); + this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); } public Map loadSkinFromCache(GameProfile profile) { - //CustomSkinLoader Begin (Skull Part) - //return (Map)this.skinCacheLoader.getUnchecked(profile); - return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? - customskinloader.CustomSkinLoader.loadProfileFromCache(profile): - this.skinCacheLoader.getUnchecked(profile); - //CustomSkinLoader End + return this.fakeManager.loadSkinFromCache(profile); } public interface SkinAvailableCallback diff --git a/1.9.4-mcp928/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.9.4-mcp928/src/minecraft/net/minecraft/client/resources/SkinManager.java index 953a20e..aea184e 100644 --- a/1.9.4-mcp928/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.9.4-mcp928/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -32,6 +32,8 @@ public class SkinManager private final File skinCacheDir; private final MinecraftSessionService sessionService; private final LoadingCache> skinCacheLoader; + + private customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) { @@ -45,10 +47,7 @@ public class SkinManager return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); } }); - //CustomSkinLoader Begin (Init) - customskinloader.loader.MojangAPILoader.defaultSessionService=sessionService; - customskinloader.utils.HttpTextureUtil.defaultCacheDir=skinCacheDirectory; - //CustomSkinLoader End + this.fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); } /** @@ -64,94 +63,17 @@ public class SkinManager */ public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type textureType, @Nullable final SkinManager.SkinAvailableCallback skinAvailableCallback) { - //CustomSkinLoader Begin (Parse HttpTextureInfo) - customskinloader.utils.HttpTextureUtil.HttpTextureInfo info=customskinloader.utils.HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); - //CustomSkinLoader End - final ResourceLocation resourcelocation = new ResourceLocation("skins/" + info.hash);//Modified - ITextureObject itextureobject = this.textureManager.getTexture(resourcelocation); - - if (itextureobject != null) - { - if (skinAvailableCallback != null) - { - skinAvailableCallback.skinAvailable(textureType, resourcelocation, profileTexture); - } - } - else - { - final IImageBuffer iimagebuffer = textureType == Type.SKIN ? new customskinloader.renderer.SkinBuffer() : null;//Modified - ThreadDownloadImageData threaddownloadimagedata = new ThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new IImageBuffer()//Modified - { - 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(textureType, resourcelocation, profileTexture); - } - } - }); - this.textureManager.loadTexture(resourcelocation, threaddownloadimagedata); - } - - return resourcelocation; + return this.fakeManager.loadSkin(profileTexture, textureType, skinAvailableCallback); } 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(); - - //CustomSkinLoader Begin (User Profile Part) - if(customskinloader.CustomSkinLoader.config.enable){ - map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); - }else{ - try{ - map.putAll(SkinManager.this.sessionService.getTextures(profile, requireSecure)); - }catch(InsecureTextureException var3){} - } - //CustomSkinLoader End - - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - public void run() - { - //CustomSkinLoader Begin (Loading Task) - for(Type type:Type.values()){ - if(map.containsKey(type)) - SkinManager.this.loadSkin((MinecraftProfileTexture)map.get(type), type, skinAvailableCallback); - } - //CustomSkinLoader End - } - }); - } - }); + this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); } public Map loadSkinFromCache(GameProfile profile) { - //CustomSkinLoader Begin (Skull Part) - //return (Map)this.skinCacheLoader.getUnchecked(profile); - return (customskinloader.CustomSkinLoader.config.enable && customskinloader.CustomSkinLoader.config.enableSkull)? - customskinloader.CustomSkinLoader.loadProfileFromCache(profile): - this.skinCacheLoader.getUnchecked(profile); - //CustomSkinLoader End + return this.fakeManager.loadSkinFromCache(profile); } public interface SkinAvailableCallback diff --git a/Common/source/customskinloader/config/Config.java b/Common/source/customskinloader/config/Config.java index cdeee6b..baff11f 100644 --- a/Common/source/customskinloader/config/Config.java +++ b/Common/source/customskinloader/config/Config.java @@ -20,7 +20,6 @@ public class Config { public List loadlist; //Function - public boolean enableSkull=true; public boolean enableDynamicSkull=true; public boolean enableTransparentSkin=true; public boolean ignoreHttpsCertificate=false; @@ -62,8 +61,7 @@ public class Config { } //Output config - CustomSkinLoader.logger.info("EnableSkull:"+config.enableSkull+ - ", EnableDynamicSkull:"+config.enableDynamicSkull+ + CustomSkinLoader.logger.info("EnableDynamicSkull:"+config.enableDynamicSkull+ ", EnableTranSkin:"+config.enableTransparentSkin+ ", IgnoreHttpsCertificate:"+config.ignoreHttpsCertificate+ ", CacheExpiry:"+config.cacheExpiry+ diff --git a/Common/source/customskinloader/fake/FakeSkinManager.java b/Common/source/customskinloader/fake/FakeSkinManager.java index 3a7cdb8..3574b91 100644 --- a/Common/source/customskinloader/fake/FakeSkinManager.java +++ b/Common/source/customskinloader/fake/FakeSkinManager.java @@ -76,9 +76,7 @@ public class FakeSkinManager extends SkinManager { } @Override public Map loadSkinFromCache(GameProfile profile){ - return CustomSkinLoader.config.enableSkull? - CustomSkinLoader.loadProfileFromCache(profile): - super.loadSkinFromCache(profile); + return CustomSkinLoader.loadProfileFromCache(profile); } private static void makeCallback(SkinAvailableCallback callback,Type type, ResourceLocation location, MinecraftProfileTexture texture){ diff --git a/Forge/build.gradle b/Forge/build.gradle index 376bdf8..3e10c38 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -30,7 +30,7 @@ compileJava { } jar { manifest { - attributes 'FMLCorePlugin': 'customskinloader.forge.FMLPlugin' + attributes 'FMLCorePlugin': 'customskinloader.forge.ForgePlugin' attributes 'FMLCorePluginContainsFMLMod': true } } diff --git a/Forge/source/customskinloader/forge/FMLMod.java b/Forge/source/customskinloader/forge/ForgeMod.java similarity index 89% rename from Forge/source/customskinloader/forge/FMLMod.java rename to Forge/source/customskinloader/forge/ForgeMod.java index 4008408..aacc52f 100644 --- a/Forge/source/customskinloader/forge/FMLMod.java +++ b/Forge/source/customskinloader/forge/ForgeMod.java @@ -3,6 +3,6 @@ package customskinloader.forge; import net.minecraftforge.fml.common.Mod; @Mod(modid = "customskinloader", name = "CustomSkinLoader", version = "@MOD_FULL_VERSION@", clientSideOnly=true) -public class FMLMod{ +public class ForgeMod{ } \ No newline at end of file diff --git a/Forge/source/customskinloader/forge/FMLPlugin.java b/Forge/source/customskinloader/forge/ForgePlugin.java similarity index 91% rename from Forge/source/customskinloader/forge/FMLPlugin.java rename to Forge/source/customskinloader/forge/ForgePlugin.java index a02c744..f0eb671 100644 --- a/Forge/source/customskinloader/forge/FMLPlugin.java +++ b/Forge/source/customskinloader/forge/ForgePlugin.java @@ -4,7 +4,7 @@ import java.util.Map; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; -public class FMLPlugin implements IFMLLoadingPlugin { +public class ForgePlugin implements IFMLLoadingPlugin { @Override public String[] getASMTransformerClass() { diff --git a/Forge/source/customskinloader/forge/TransformerManager.java b/Forge/source/customskinloader/forge/TransformerManager.java index 613f924..082d985 100644 --- a/Forge/source/customskinloader/forge/TransformerManager.java +++ b/Forge/source/customskinloader/forge/TransformerManager.java @@ -1,5 +1,7 @@ package customskinloader.forge; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -15,67 +17,63 @@ import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRema import net.minecraftforge.fml.relauncher.FMLRelaunchLog; public class TransformerManager implements IClassTransformer { - public static class TransformTarget{ - public String className; - public String srgName; - public String mcpName; - public String desc; - public TransformTarget(String className,String srgName,String mcpName,String desc){ - this.className=className; - this.srgName=srgName; - this.mcpName=mcpName; - this.desc=desc; - } + @Target(ElementType.TYPE) + public @interface TransformTarget{ + public String className(); + public String[] methodNames(); + public String desc(); } public interface IMethodTransformer{ - public TransformTarget getTarget(); public void transform(MethodNode mn); } private static final IMethodTransformer[] TRANFORMERS={new Transformers.SkinManagerTransformer()}; private Map> map; public TransformerManager(){ map = new HashMap>(); - for(IMethodTransformer t:TRANFORMERS) - addMethodTransformer(t.getTarget(),t); + for(IMethodTransformer t:TRANFORMERS){ + if(!t.getClass().isAnnotationPresent(TransformTarget.class)) + continue; + addMethodTransformer(t.getClass().getAnnotation(TransformTarget.class),t); + } } private void addMethodTransformer(TransformTarget target, IMethodTransformer transformer) { - if (!map.containsKey(target.className)) - map.put(target.className, new HashMap()); - map.get(target.className).put(target.srgName + target.desc, transformer); - map.get(target.className).put(target.mcpName + target.desc, transformer); - } + if (!map.containsKey(target.className())) + map.put(target.className(), new HashMap()); + for(String methodName:target.methodNames()) + map.get(target.className()).put(methodName + target.desc(), transformer); + } //From: https://github.com/RecursiveG/UniSkinMod/blob/1.9.4/src/main/java/org/devinprogress/uniskinmod/coremod/BaseAsmTransformer.java @Override public byte[] transform(String obfClassName, String className, byte[] bytes) { if (!map.containsKey(className)) return bytes; - Map transMap = map.get(className); - - ClassReader cr = new ClassReader(bytes); - ClassNode cn = new ClassNode(); - cr.accept(cn, 0); + Map transMap = map.get(className); + + ClassReader cr = new ClassReader(bytes); + ClassNode cn = new ClassNode(); + cr.accept(cn, 0); - // NOTE: `map` = convert obfuscated name to srgName; - List ml = new ArrayList(); - ml.addAll(cn.methods); - for (MethodNode mn : ml) { - String methodName = FMLDeobfuscatingRemapper.INSTANCE.mapMethodName(obfClassName, mn.name, mn.desc); - String methodDesc = FMLDeobfuscatingRemapper.INSTANCE.mapMethodDesc(mn.desc); - if (transMap.containsKey(methodName + methodDesc)) { - try { - FMLRelaunchLog.info("Transforming method %s in class %s(%s)", methodName + methodDesc, obfClassName, className); - transMap.get(methodName + methodDesc).transform(mn); - FMLRelaunchLog.info("Successfully transformed method %s in class %s(%s)", methodName + methodDesc, obfClassName, className); - } catch (Exception e) { - FMLRelaunchLog.warning("An error happened when transforming method %s in class %s(%s). The whole class was not modified.", methodName + methodDesc, obfClassName, className); - e.printStackTrace(); - return bytes; - } - } - } + // NOTE: `map` = convert obfuscated name to srgName; + List ml = new ArrayList(); + ml.addAll(cn.methods); + for (MethodNode mn : ml) { + String methodName = FMLDeobfuscatingRemapper.INSTANCE.mapMethodName(obfClassName, mn.name, mn.desc); + String methodDesc = FMLDeobfuscatingRemapper.INSTANCE.mapMethodDesc(mn.desc); + if (transMap.containsKey(methodName + methodDesc)) { + try { + FMLRelaunchLog.info("Transforming method %s in class %s(%s)", methodName + methodDesc, obfClassName, className); + transMap.get(methodName + methodDesc).transform(mn); + FMLRelaunchLog.info("Successfully transformed method %s in class %s(%s)", methodName + methodDesc, obfClassName, className); + } catch (Exception e) { + FMLRelaunchLog.warning("An error happened when transforming method %s in class %s(%s). The whole class was not modified.", methodName + methodDesc, obfClassName, className); + e.printStackTrace(); + return bytes; + } + } + } - ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); - cn.accept(cw); - return cw.toByteArray(); + ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + cn.accept(cw); + return cw.toByteArray(); } } diff --git a/Forge/source/customskinloader/forge/Transformers.java b/Forge/source/customskinloader/forge/Transformers.java index 4a76d21..ded3705 100644 --- a/Forge/source/customskinloader/forge/Transformers.java +++ b/Forge/source/customskinloader/forge/Transformers.java @@ -1,21 +1,38 @@ package customskinloader.forge; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TypeInsnNode; import customskinloader.forge.TransformerManager.IMethodTransformer; import customskinloader.forge.TransformerManager.TransformTarget; public class Transformers { + @TransformTarget(className="net.minecraft.client.Minecraft", + methodNames={"func_71384_a","init","startGame"}, + desc="()V") public static class SkinManagerTransformer implements IMethodTransformer{ - TransformTarget target=new TransformTarget("net.minecraft.client.Minecraft","init","func_71384_a","()V"); - @Override - public TransformTarget getTarget() { - return target; - } - @Override public void transform(MethodNode mn) { - //TODO + //TODO transform here + AbstractInsnNode node=mn.instructions.getFirst(); + while(node!=null){ + if(node.getOpcode()==Opcodes.NEW){ + TypeInsnNode typeNode=(TypeInsnNode) node; + if(typeNode.desc.equalsIgnoreCase("net/minecraft/client/resources/SkinManager")){ + typeNode.desc="customskinloader/fake/FakeSkinManager"; + } + } + if(node.getOpcode()==Opcodes.INVOKESPECIAL){ + MethodInsnNode min=(MethodInsnNode) node; + if(min.owner.equalsIgnoreCase("net/minecraft/client/resources/SkinManager")){ + min.owner="customskinloader/fake/FakeSkinManager"; + } + } + node=node.getNext(); + } } }