From e5a31ae49edd55a3b67ceb281aa958e1b735da86 Mon Sep 17 00:00:00 2001 From: Alexander Xia Date: Wed, 18 Sep 2019 22:50:04 +0800 Subject: [PATCH] Add custom Yggdrasil api & sessionserver root --- .../customskinloader/config/SkinSiteProfile.java | 4 ++-- .../customskinloader/loader/MojangAPILoader.java | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Common/source/customskinloader/config/SkinSiteProfile.java b/Common/source/customskinloader/config/SkinSiteProfile.java index a717def..5e7fd8a 100644 --- a/Common/source/customskinloader/config/SkinSiteProfile.java +++ b/Common/source/customskinloader/config/SkinSiteProfile.java @@ -6,11 +6,11 @@ public class SkinSiteProfile { public String type; public String userAgent; - //Mojang API - invisible in config + //Mojang API public String apiRoot; public String seesionRoot; - //Json API & Mojang API + //Json API public String root; //Legacy diff --git a/Common/source/customskinloader/loader/MojangAPILoader.java b/Common/source/customskinloader/loader/MojangAPILoader.java index 1a52b1f..e0b8357 100644 --- a/Common/source/customskinloader/loader/MojangAPILoader.java +++ b/Common/source/customskinloader/loader/MojangAPILoader.java @@ -1,6 +1,5 @@ package customskinloader.loader; -import java.util.Arrays; import java.util.Collections; import java.util.Map; import java.util.UUID; @@ -15,7 +14,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.PropertyMap; import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse; @@ -29,7 +27,6 @@ import customskinloader.profile.UserProfile; import customskinloader.utils.HttpRequestUtil; import customskinloader.utils.HttpRequestUtil.HttpRequest; import customskinloader.utils.HttpRequestUtil.HttpResponce; -import customskinloader.utils.MinecraftUtil; public class MojangAPILoader implements ProfileLoader.IProfileLoader { @@ -127,13 +124,11 @@ public class MojangAPILoader implements ProfileLoader.IProfileLoader { @Override public void init(SkinSiteProfile ssp) { - //Init api & session root for custom ygg root - if (ssp.root != null) { - ssp.apiRoot = ssp.root + "api/"; - ssp.seesionRoot = ssp.root + "sessionserver/"; - } else { + //Init default api & session root for Mojang + if (ssp.apiRoot == null) ssp.apiRoot = "https://api.mojang.com/"; + if (ssp.seesionRoot == null) ssp.seesionRoot = "https://sessionserver.mojang.com/"; - } + } }