PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-12-01 16:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into hdskins_rewrites

Browse source
This commit is contained in:
Sollace 2018-08-08 08:24:23 +02:00
commit 44ffb2362f
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
View file

@ -34,6 +34,9 @@ import net.minecraft.client.resources.IResourceManagerReloadListener;
import net.minecraft.client.resources.SkinManager.SkinAvailableCallback; import net.minecraft.client.resources.SkinManager.SkinAvailableCallback;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.logging.log4j.LogManager;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -48,6 +51,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

1
src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
View file

@ -20,7 +20,6 @@ import net.minecraft.util.ResourceLocation;
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;
@SuppressWarnings("EntityConstructor") @SuppressWarnings("EntityConstructor")
public class EntityPlayerModel extends EntityLivingBase implements IBlankSkinSupplier { public class EntityPlayerModel extends EntityLivingBase implements IBlankSkinSupplier {

6
src/hdskins/java/com/voxelmodpack/hdskins/skins/MoreHttpResponses.java
View file

@ -10,7 +10,7 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -52,13 +52,13 @@ public interface MoreHttpResponses extends AutoCloseable {
} }
default <T> T json(Class<T> type) throws IOException { default <T> T json(Class<T> type) throws IOException {
try (Reader reader = new InputStreamReader(getResponse().getEntity().getContent())) { try (BufferedReader reader = getReader()) {
return SkinServer.gson.fromJson(reader, type); return SkinServer.gson.fromJson(reader, type);
} }
} }
default <T> T json(Type type) throws IOException { default <T> T json(Type type) throws IOException {
try (Reader reader = new InputStreamReader(getResponse().getEntity().getContent())) { try (BufferedReader reader = getReader()) {
return SkinServer.gson.fromJson(reader, type); return SkinServer.gson.fromJson(reader, type);
} }
} }

2
src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
View file

@ -37,12 +37,10 @@ public class ValhallaSkinServer extends AbstractSkinServer {
super(address); super(address);
} }
@Override @Override
public MinecraftTexturesPayload getProfileData(GameProfile profile) throws IOException { public MinecraftTexturesPayload getProfileData(GameProfile profile) throws IOException {
try (MoreHttpResponses response = MoreHttpResponses.execute(NetClient.nativeClient(), new HttpGet(getTexturesURI(profile)))) { try (MoreHttpResponses response = MoreHttpResponses.execute(NetClient.nativeClient(), new HttpGet(getTexturesURI(profile)))) {
if (response.ok()) { if (response.ok()) {
return readJson(response, MinecraftTexturesPayload.class); return readJson(response, MinecraftTexturesPayload.class);
} }