upstream #1

Closed
bridge wants to merge 65 commits from feat/upstream into 2.X
2 changed files with 6 additions and 0 deletions
Showing only changes of commit c0bcbcf7a3 - Show all commits
api/src/main/java/lol/pyr/znpcsplus/api/skin
plugin/src/main/java/lol/pyr/znpcsplus/skin

View file

@ -12,4 +12,5 @@ public interface SkinDescriptorFactory {
SkinDescriptor createStaticDescriptor(String texture, String signature);
SkinDescriptor createUrlDescriptor(String url, String variant);
SkinDescriptor createUrlDescriptor(URL url, String variant);
SkinDescriptor createFileDescriptor(String path);
}

View file

@ -52,4 +52,9 @@ public class SkinDescriptorFactoryImpl implements SkinDescriptorFactory {
public SkinDescriptor createUrlDescriptor(URL url, String variant) {
return PrefetchedDescriptor.fromUrl(skinCache, url, variant).join();
}
@Override
public SkinDescriptor createFileDescriptor(String path) {
return PrefetchedDescriptor.fromFile(skinCache, path).join();
}
}