mirror of
https://github.com/MineLittlePony/MineLittlePony.git
synced 2024-12-02 00:37:59 +01:00
We really don't need any of this
This commit is contained in:
parent
43ae93c186
commit
fa44676aa7
7 changed files with 22 additions and 27 deletions
|
@ -204,10 +204,9 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
|
|||
private Map<Type, MinecraftProfileTexture> loadProfileData(GameProfile profile) {
|
||||
Map<Type, MinecraftProfileTexture> textures = Maps.newEnumMap(Type.class);
|
||||
|
||||
skinServers.forEach(server -> server
|
||||
.loadProfileData(profile)
|
||||
.map(MinecraftTexturesPayload::getTextures)
|
||||
.ifPresent(a -> a.forEach(textures::putIfAbsent)));
|
||||
for (SkinServer server : skinServers) {
|
||||
server.getProfileTextures(profile).forEach(textures::putIfAbsent);
|
||||
}
|
||||
|
||||
return textures;
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ public class PreviewTextureManager {
|
|||
@Nullable
|
||||
private PreviewTexture loadPreviewTexture(ResourceLocation location, Type type, ResourceLocation def, @Nullable SkinAvailableCallback callback) {
|
||||
if (textures == null) {
|
||||
textures = HDSkinManager.INSTANCE.getGatewayServer().getPreviewTextures(profile);
|
||||
textures = HDSkinManager.INSTANCE.getGatewayServer().getProfileTextures(profile);
|
||||
}
|
||||
|
||||
if (!textures.containsKey(type)) {
|
||||
|
|
|
@ -4,7 +4,6 @@ import java.io.IOException;
|
|||
import java.net.URI;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
@ -32,15 +31,14 @@ public abstract class AbstractSkinServer implements SkinServer {
|
|||
}
|
||||
|
||||
@Override
|
||||
public final Optional<MinecraftTexturesPayload> loadProfileData(GameProfile profile) {
|
||||
return Optional.ofNullable(getProfileData(profile));
|
||||
public Map<Type, MinecraftProfileTexture> getProfileTextures(GameProfile profile) {
|
||||
MinecraftTexturesPayload payload = getProfileData(profile);
|
||||
|
||||
if (payload != null && payload.getTextures() != null) {
|
||||
return payload.getTextures();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Type, MinecraftProfileTexture> getPreviewTextures(GameProfile profile) {
|
||||
return loadProfileData(profile)
|
||||
.map(MinecraftTexturesPayload::getTextures)
|
||||
.orElse(Collections.emptyMap());
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -57,8 +55,6 @@ public abstract class AbstractSkinServer implements SkinServer {
|
|||
}
|
||||
}
|
||||
|
||||
protected abstract MinecraftTexturesPayload getProfileData(GameProfile profile);
|
||||
|
||||
protected abstract SkinUploadResponse doUpload(Session session, URI image, Type type, Map<String, String> metadata) throws AuthenticationException, IOException;
|
||||
|
||||
@Override
|
||||
|
|
|
@ -26,7 +26,7 @@ public class BethlehemSkinServer extends AbstractSkinServer {
|
|||
}
|
||||
|
||||
@Override
|
||||
protected MinecraftTexturesPayload getProfileData(GameProfile profile) {
|
||||
public MinecraftTexturesPayload getProfileData(GameProfile profile) {
|
||||
try (NetClient client = new NetClient("GET", getPath(profile))) {
|
||||
if (client.getResponseCode() == HttpStatus.SC_OK) {
|
||||
return gson.fromJson(client.getResponseText(), MinecraftTexturesPayload.class);
|
||||
|
|
|
@ -39,7 +39,7 @@ public class LegacySkinServer extends AbstractSkinServer {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Map<Type, MinecraftProfileTexture> getPreviewTextures(GameProfile profile) {
|
||||
public Map<Type, MinecraftProfileTexture> getProfileTextures(GameProfile profile) {
|
||||
Map<Type, MinecraftProfileTexture> map = new EnumMap<>(Type.class);
|
||||
|
||||
for (Type type : Type.values()) {
|
||||
|
@ -51,7 +51,7 @@ public class LegacySkinServer extends AbstractSkinServer {
|
|||
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
protected MinecraftTexturesPayload getProfileData(GameProfile profile) {
|
||||
public MinecraftTexturesPayload getProfileData(GameProfile profile) {
|
||||
ImmutableMap.Builder<Type, MinecraftProfileTexture> builder = ImmutableMap.builder();
|
||||
|
||||
for (Type type : Type.values()) {
|
||||
|
|
|
@ -18,7 +18,6 @@ import net.minecraft.util.Session;
|
|||
import java.net.URI;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
|
@ -34,9 +33,9 @@ public interface SkinServer extends Exposable {
|
|||
"http://skins.voxelmodpack.com",
|
||||
"http://skinmanager.voxelmodpack.com"));
|
||||
|
||||
Optional<MinecraftTexturesPayload> loadProfileData(GameProfile profile);
|
||||
MinecraftTexturesPayload getProfileData(GameProfile profile);
|
||||
|
||||
Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getPreviewTextures(GameProfile profile);
|
||||
Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getProfileTextures(GameProfile profile);
|
||||
|
||||
CompletableFuture<SkinUploadResponse> uploadSkin(Session session, @Nullable URI image, MinecraftProfileTexture.Type type, Map<String, String> metadata);
|
||||
|
||||
|
|
|
@ -47,12 +47,13 @@ public class ValhallaSkinServer extends AbstractSkinServer {
|
|||
}
|
||||
|
||||
@Override
|
||||
protected MinecraftTexturesPayload getProfileData(GameProfile profile) {
|
||||
try (CloseableHttpClient client = HttpClients.createSystem();
|
||||
CloseableHttpResponse response = client.execute(new HttpGet(getTexturesURI(profile)))) {
|
||||
public MinecraftTexturesPayload getProfileData(GameProfile profile) {
|
||||
try (CloseableHttpClient client = HttpClients.createSystem()) {
|
||||
try (CloseableHttpResponse response = client.execute(new HttpGet(getTexturesURI(profile)))) {
|
||||
if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
|
||||
return readJson(response, MinecraftTexturesPayload.class);
|
||||
}
|
||||
}
|
||||
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
|
|
Loading…
Reference in a new issue