From a49fea706d6ee39afa8341c6bed255c64e03d097 Mon Sep 17 00:00:00 2001 From: Alexander Xia Date: Sun, 13 Aug 2017 20:48:18 +0800 Subject: [PATCH] Support 1.12.1 --- 1.11.2-mcp937/build.properties | 4 +- {1.12-test => 1.12-mcp940}/build.properties | 4 +- .../client/resources/SkinManager.java | 1 - 1.12.1-test/build.properties | 6 ++ .../client/resources/SkinManager.java | 91 +++++++++++++++++++ .../customskinloader/CustomSkinLoader.java | 6 +- README.md | 4 +- settings.gradle | 3 +- 8 files changed, 109 insertions(+), 10 deletions(-) rename {1.12-test => 1.12-mcp940}/build.properties (63%) rename {1.12-test => 1.12-mcp940}/src/minecraft/net/minecraft/client/resources/SkinManager.java (99%) create mode 100644 1.12.1-test/build.properties create mode 100644 1.12.1-test/src/minecraft/net/minecraft/client/resources/SkinManager.java diff --git a/1.11.2-mcp937/build.properties b/1.11.2-mcp937/build.properties index 9ff34b4..d8de2c6 100644 --- a/1.11.2-mcp937/build.properties +++ b/1.11.2-mcp937/build.properties @@ -2,5 +2,5 @@ minecraft_version=1.11.2 minecraft_full_versions=1.11.1,1.11.2 #forge gradle needs forge version forge_mc_version=1.11.2 -forge_version=13.20.0.2228 -mappings_version=snapshot_20170106 \ No newline at end of file +forge_version=13.20.1.2386 +mappings_version=stable_32 \ No newline at end of file diff --git a/1.12-test/build.properties b/1.12-mcp940/build.properties similarity index 63% rename from 1.12-test/build.properties rename to 1.12-mcp940/build.properties index 761741d..a2aa268 100644 --- a/1.12-test/build.properties +++ b/1.12-mcp940/build.properties @@ -2,5 +2,5 @@ minecraft_version=1.12 minecraft_full_versions=1.12 #forge gradle needs forge version forge_mc_version=1.12 -forge_version=14.21.0.2321 -mappings_version=snapshot_20170106 \ No newline at end of file +forge_version=14.21.1.2387 +mappings_version=snapshot_20170813 \ No newline at end of file diff --git a/1.12-test/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.12-mcp940/src/minecraft/net/minecraft/client/resources/SkinManager.java similarity index 99% rename from 1.12-test/src/minecraft/net/minecraft/client/resources/SkinManager.java rename to 1.12-mcp940/src/minecraft/net/minecraft/client/resources/SkinManager.java index 3b06cf1..e60b05f 100644 --- a/1.12-test/src/minecraft/net/minecraft/client/resources/SkinManager.java +++ b/1.12-mcp940/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; -//From 1.11.2-mcp937 public class SkinManager { private static final ExecutorService THREAD_POOL = new ThreadPoolExecutor(0, 2, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue()); diff --git a/1.12.1-test/build.properties b/1.12.1-test/build.properties new file mode 100644 index 0000000..f45e609 --- /dev/null +++ b/1.12.1-test/build.properties @@ -0,0 +1,6 @@ +minecraft_version=1.12.1 +minecraft_full_versions=1.12.1 +#forge gradle needs forge version +forge_mc_version=1.12.1 +forge_version=14.22.0.2452 +mappings_version=snapshot_20170813 \ No newline at end of file diff --git a/1.12.1-test/src/minecraft/net/minecraft/client/resources/SkinManager.java b/1.12.1-test/src/minecraft/net/minecraft/client/resources/SkinManager.java new file mode 100644 index 0000000..35e2015 --- /dev/null +++ b/1.12.1-test/src/minecraft/net/minecraft/client/resources/SkinManager.java @@ -0,0 +1,91 @@ +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 javax.annotation.Nullable; +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; + +//From 1.12-mcp940 +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 customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager + + 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 + { + try + { + return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); + } + catch (Throwable var3) + { + return Maps.newHashMap(); + } + } + }); + this.fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); + } + + /** + * 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 textureType) + { + return this.loadSkin(profileTexture, textureType, (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 textureType, @Nullable final SkinManager.SkinAvailableCallback skinAvailableCallback) + { + return this.fakeManager.loadSkin(profileTexture, textureType, skinAvailableCallback); + } + + public void loadProfileTextures(final GameProfile profile, final SkinManager.SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) + { + this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); + } + + public Map loadSkinFromCache(GameProfile profile) + { + return this.fakeManager.loadSkinFromCache(profile); + } + + public interface SkinAvailableCallback + { + void skinAvailable(Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture); + } +} diff --git a/Common/source/customskinloader/CustomSkinLoader.java b/Common/source/customskinloader/CustomSkinLoader.java index 8ed229e..d7e1f31 100644 --- a/Common/source/customskinloader/CustomSkinLoader.java +++ b/Common/source/customskinloader/CustomSkinLoader.java @@ -33,8 +33,10 @@ public class CustomSkinLoader { CONFIG_FILE=new File(DATA_DIR,"CustomSkinLoader.json"); public static final SkinSiteProfile[] DEFAULT_LOAD_LIST={ SkinSiteProfile.createMojangAPI("Mojang"), - SkinSiteProfile.createCustomSkinAPI("BlessingSkin","http://123.57.132.134/"), - SkinSiteProfile.createCustomSkinAPI("OneSkin","http://fleey.cn/skin/skin_user/skin_json.php/"), + SkinSiteProfile.createCustomSkinAPI("LittleSkin","https://mcskin.littleservice.cn/"), + SkinSiteProfile.createCustomSkinAPI("BlessingSkin","http://skin.prinzeugen.net/"), + //OneSkin has been removed temporarily + //SkinSiteProfile.createCustomSkinAPI("OneSkin","http://fleey.cn/skin/skin_user/skin_json.php/"), //Minecrack could not load skin correctly //SkinSiteProfile.creatLegacy("Minecrack","http://minecrack.fr.nf/mc/skinsminecrackd/{USERNAME}.png","http://minecrack.fr.nf/mc/cloaksminecrackd/{USERNAME}.png",null), SkinSiteProfile.createUniSkinAPI("SkinMe","http://www.skinme.cc/uniskin/"), diff --git a/README.md b/README.md index 402cfd2..9e5cc2d 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,8 @@ The problem of rendering incorrect texture has been fixed. ## Default Load List - [Mojang](http://www.minecraft.net/) (Mojang API) -- [Blessing Skin](http://123.57.132.134/) (CustomSkinAPI) -- [OneSkin](http://fleey.cn/skin/) (CustomSkinAPI) +- [Little Skin](https://mcskin.littleservice.cn/) (CustomSkinAPI) +- [Blessing Skin](http://skin.prinzeugen.net/) (CustomSkinAPI) - SkinMe (UniSkinAPI) - LocalSkin (Legacy) If you want to apply to add other skin server to default list, please go to [issue](https://github.com/JLChnToZ/MCCustomSkinLoader/issues). diff --git a/settings.gradle b/settings.gradle index 4ca6e3a..fc69807 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,8 @@ include "1.9-mcp924" include "1.9.4-mcp928" include "1.10-mcp931" include "1.11.2-mcp937" -include "1.12-test" +include "1.12-mcp940" +include "1.12.1-test" //Universial Forge Version for [1.8,) include "Forge" \ No newline at end of file