diff --git a/Common/source/customskinloader/Logger.java b/Common/source/customskinloader/Logger.java index 2b499b5..ea32d42 100644 --- a/Common/source/customskinloader/Logger.java +++ b/Common/source/customskinloader/Logger.java @@ -4,6 +4,8 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.Date; @@ -97,10 +99,8 @@ public class Logger { warning(String.format(format, objs)); } public void warning(Throwable e){ - log(Level.WARNING,"Exception: "+e.toString()); - StackTraceElement[] stes=e.getStackTrace(); - for(StackTraceElement ste : stes){ - log(Level.WARNING,ste.toString()); - } + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw)); + log(Level.WARNING,"Exception: "+sw.toString()); } } diff --git a/Common/source/customskinloader/fake/FakeSkinManager.java b/Common/source/customskinloader/fake/FakeSkinManager.java index 5a12829..4560e5c 100644 --- a/Common/source/customskinloader/fake/FakeSkinManager.java +++ b/Common/source/customskinloader/fake/FakeSkinManager.java @@ -63,22 +63,24 @@ public class FakeSkinManager { } public void loadProfileTextures(final GameProfile profile, final SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) { - THREAD_POOL.execute(new Runnable() { - public void run() { - final Map map = Maps.newHashMap(); - map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile)); + THREAD_POOL.execute(() -> { + final Map map = Maps.newHashMap(); + map.putAll(CustomSkinLoader.loadProfile(profile)); - for (MinecraftProfileTexture.Type type : MinecraftProfileTexture.Type.values()) { - MinecraftProfileTexture profileTexture = map.get(type); - if (profileTexture != null) { - HttpTextureInfo info = HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); - FakeThreadDownloadImageData.downloadTexture(info.cacheFile, info.url); + for (MinecraftProfileTexture.Type type : MinecraftProfileTexture.Type.values()) { + MinecraftProfileTexture profileTexture = map.get(type); + if (profileTexture != null) { + HttpTextureInfo info = HttpTextureUtil.toHttpTextureInfo(profileTexture.getUrl()); + FakeThreadDownloadImageData.downloadTexture(info.cacheFile, info.url); - ((IFakeMinecraft) Minecraft.getMinecraft()).execute(() -> { - CustomSkinLoader.logger.debug("Loading type:" + type); - FakeSkinManager.this.loadSkin(profileTexture, info, type, skinAvailableCallback); - }); - } + ((IFakeMinecraft) Minecraft.getMinecraft()).execute(() -> { + CustomSkinLoader.logger.debug("Loading type: " + type); + try { + this.loadSkin(profileTexture, info, type, skinAvailableCallback); + } catch (Throwable t) { + CustomSkinLoader.logger.warning(t); + } + }); } } }); diff --git a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java index 9aa16b5..6ffc5f2 100644 --- a/Forge/source/customskinloader/forge/loader/LaunchWrapper.java +++ b/Forge/source/customskinloader/forge/loader/LaunchWrapper.java @@ -57,7 +57,7 @@ public class LaunchWrapper implements IClassTransformer { } //Parse Class Node to bytes - ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); cn.accept(cw); return cw.toByteArray(); }