PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

For god's sake space your code out. I can't stand these cramped conditions

Browse source
This commit is contained in:
Sollace 2018-09-04 22:49:40 +02:00
parent a308e0ce96
commit 2c4a03d74b
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,6 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
private List<ISkinParser> skinParsers = Lists.newArrayList();
private SkinResourceManager resources = new SkinResourceManager();
// private ExecutorService executor = Executors.newCachedThreadPool();
private Function<List<SkinServer>, GuiSkins> skinsGuiFunc = GuiSkins::new;
@ -189,6 +188,7 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
callback.skinAvailable(type, resource, texture);
}
} else {
// schedule texture loading on the main thread.
TextureLoader.loadTexture(resource, new ThreadDownloadImageData(
new File(LiteLoader.getAssetsDirectory(), "hd/" + skinDir + texture.getHash().substring(0, 2) + "/" + texture.getHash()),
@ -200,26 +200,30 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
}
})));
}
return resource;
}
public Map<Type, ResourceLocation> getTextures(GameProfile profile) {
Map<Type, ResourceLocation> map = new HashMap<>();
for (Map.Entry<Type, MinecraftProfileTexture> e : loadProfileTextures(profile).getNow(Collections.emptyMap()).entrySet()) {
map.put(e.getKey(), loadTexture(e.getKey(), e.getValue(), null));
}
return map;
return map;
}
private void addSkinServerType(Class<? extends SkinServer> type) {
Preconditions.checkArgument(!type.isInterface(), "type cannot be an interface");
Preconditions.checkArgument(!Modifier.isAbstract(type.getModifiers()), "type cannot be abstract");
ServerType st = type.getAnnotation(ServerType.class);
if (st == null) {
throw new IllegalArgumentException("class is not annotated with @ServerType");
}
this.skinServerTypes.put(st.value(), type);
}
@ -336,9 +340,11 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
private static <T> CompletableFuture<T> getUntilNonnull(Supplier<T> getter) {
return CompletableFuture.supplyAsync(() -> {
T res = null;
while (res == null) {
res = getter.get();
}
return res;
});
}

14
src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java
View file

@ -26,11 +26,17 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo {
private Map<Type, ResourceLocation> customTextures = new HashMap<>();
private Map<Type, MinecraftProfileTexture> customProfiles = new HashMap<>();
@Shadow @Final private GameProfile gameProfile;
@Shadow private boolean playerTexturesLoaded;
@Shadow private String skinType;
@Shadow @Final
private GameProfile gameProfile;
@Shadow private Map<Type, ResourceLocation> playerTextures;
@Shadow
private boolean playerTexturesLoaded;
@Shadow
private String skinType;
@Shadow
private Map<Type, ResourceLocation> playerTextures;
@SuppressWarnings("InvalidMemberReference") // mc-dev bug?
@Redirect(method = { "getLocationSkin", "getLocationCape", "getLocationElytra" },