lionarius/SkinRestorer
1
0
Fork 0
mirror of https://github.com/Suiranoil/SkinRestorer.git synced 2026-01-16 04:42:12 +00:00
Code Wiki Activity

add collection provider

Browse Source
This commit is contained in:
Lionarius
2026-01-13 02:04:21 +03:00
parent ffd2a0dba7
commit e832e02fd4
14 changed files with 317 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
View File

@@ -88,6 +88,7 @@ public final class SkinRestorer {
SkinRestorer.registerDefaultSkinProvider(MojangSkinProvider.PROVIDER_NAME, SkinProvider.MOJANG, SkinRestorer.getConfig().providersConfig().mojang());
SkinRestorer.registerDefaultSkinProvider(ElyBySkinProvider.PROVIDER_NAME, SkinProvider.ELY_BY, SkinRestorer.getConfig().providersConfig().ely_by());
SkinRestorer.registerDefaultSkinProvider(MineskinSkinProvider.PROVIDER_NAME, SkinProvider.MINESKIN, SkinRestorer.getConfig().providersConfig().mineskin());
SkinRestorer.registerDefaultSkinProvider(CollectionSkinProvider.PROVIDER_NAME, SkinProvider.COLLECTION, SkinRestorer.getConfig().providersConfig().collection());
}
private static void registerDefaultSkinProvider(String defaultName, SkinProvider provider, BuiltInProviderConfig config) {
@@ -106,6 +107,7 @@ public final class SkinRestorer {
MojangSkinProvider.reload();
ElyBySkinProvider.reload();
MineskinSkinProvider.reload();
CollectionSkinProvider.reload();
}
public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<ServerPlayer> targets, SkinValue value, boolean save) {

5
common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java
View File

@@ -1,6 +1,7 @@
package net.lionarius.skinrestorer.config;
import com.google.gson.annotations.SerializedName;
import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
import net.lionarius.skinrestorer.skin.provider.ElyBySkinProvider;
import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
@@ -8,7 +9,9 @@ public enum FirstJoinSkinProvider {
@SerializedName(value = "MOJANG", alternate = {"mojang"})
MOJANG(MojangSkinProvider.PROVIDER_NAME),
@SerializedName(value = "ELY.BY", alternate = {"ely.by", "ELY_BY", "ely_by"})
ELY_BY(ElyBySkinProvider.PROVIDER_NAME);
ELY_BY(ElyBySkinProvider.PROVIDER_NAME),
@SerializedName(value = "COLLECTION", alternate = {"collection"})
COLLECTION(CollectionSkinProvider.PROVIDER_NAME);
private final String name;

7
common/src/main/java/net/lionarius/skinrestorer/config/provider/BuiltInProviderConfig.java
View File

@@ -8,8 +8,13 @@ public abstract class BuiltInProviderConfig implements GsonPostProcessable {
protected String name;
protected CacheConfig cache;
public BuiltInProviderConfig(String name, CacheConfig cache) {
this.enabled = true;
this(name, cache, true);
}
public BuiltInProviderConfig(String name, CacheConfig cache, boolean enabled) {
this.enabled = enabled;
this.name = name;
this.cache = cache;
}

17
common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java
View File

@@ -1,23 +1,27 @@
package net.lionarius.skinrestorer.config.provider;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.config.provider.collection.CollectionProviderConfig;
import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
public final class ProvidersConfig implements GsonPostProcessable {
public static final ProvidersConfig DEFAULT = new ProvidersConfig(
new MojangProviderConfig(),
new ElyByProviderConfig(),
new MineskinProviderConfig()
new MineskinProviderConfig(),
new CollectionProviderConfig()
);
private MojangProviderConfig mojang;
private ElyByProviderConfig ely_by;
private MineskinProviderConfig mineskin;
private CollectionProviderConfig collection;
public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin) {
public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin, CollectionProviderConfig collection) {
this.mojang = mojang;
this.ely_by = ely_by;
this.mineskin = mineskin;
this.collection = collection;
}
public MojangProviderConfig mojang() {
@@ -32,6 +36,10 @@ public final class ProvidersConfig implements GsonPostProcessable {
return this.mineskin;
}
public CollectionProviderConfig collection() {
return this.collection;
}
@Override
public void gsonPostProcess() {
if (this.mojang == null) {
@@ -48,5 +56,10 @@ public final class ProvidersConfig implements GsonPostProcessable {
SkinRestorer.LOGGER.warn("Mineskin provider config is null, using default");
this.mineskin = ProvidersConfig.DEFAULT.mineskin();
}
if (this.collection == null) {
SkinRestorer.LOGGER.warn("Collection provider config is null, using default");
this.collection = ProvidersConfig.DEFAULT.collection();
}
}
}

32
common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionProviderConfig.java Normal file
View File

@@ -0,0 +1,32 @@
package net.lionarius.skinrestorer.config.provider.collection;
import com.google.gson.annotations.JsonAdapter;
import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig;
import net.lionarius.skinrestorer.config.provider.CacheConfig;
import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
import java.util.ArrayList;
import java.util.List;
public final class CollectionProviderConfig extends BuiltInProviderConfig implements GsonPostProcessable {
private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 604800);
@JsonAdapter(CollectionSkinSourceListDeserializer.class)
private List<CollectionSkinSource> sources = new ArrayList<>();
public CollectionProviderConfig() {
super(CollectionSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE, false);
}
public List<CollectionSkinSource> sources() {
return this.sources;
}
@Override
public void gsonPostProcess() {
if (this.sources == null) {
this.sources = new ArrayList<>();
}
}
}

60
common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinFile.java Normal file
View File

@@ -0,0 +1,60 @@
package net.lionarius.skinrestorer.config.provider.collection;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.skin.SkinVariant;
import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
import org.jetbrains.annotations.Nullable;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
public final class CollectionSkinFile implements CollectionSkinSource, GsonPostProcessable {
private String path = "";
private SkinVariant variant = SkinVariant.CLASSIC;
@Override
public @Nullable URI uri() {
if (this.path.isEmpty())
return null;
try {
var filePath = SkinRestorer.getConfigDir().resolve(this.path);
if (!Files.exists(filePath)) {
SkinRestorer.LOGGER.warn("Skin file does not exist: {}", this.path);
return null;
}
if (!Files.isRegularFile(filePath)) {
SkinRestorer.LOGGER.warn("Skin path is not a file: {}", this.path);
return null;
}
if (!this.path.toLowerCase().endsWith(".png")) {
SkinRestorer.LOGGER.warn("Skin file is not a PNG file: {}", this.path);
return null;
}
return filePath.toUri();
} catch (Exception e) {
SkinRestorer.LOGGER.warn("Invalid file path: {}", this.path, e);
return null;
}
}
@Override
public SkinVariant variant() {
return this.variant;
}
@Override
public void gsonPostProcess() {
if (this.path == null) {
this.path = "";
}
if (this.variant == null) {
this.variant = SkinVariant.CLASSIC;
}
}
}

12
common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSource.java Normal file
View File

@@ -0,0 +1,12 @@
package net.lionarius.skinrestorer.config.provider.collection;
import net.lionarius.skinrestorer.skin.SkinVariant;
import org.jetbrains.annotations.Nullable;
import java.net.URI;
public interface CollectionSkinSource {
@Nullable URI uri();
SkinVariant variant();
}

30
common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSourceListDeserializer.java Normal file
View File

@@ -0,0 +1,30 @@
package net.lionarius.skinrestorer.config.provider.collection;
import com.google.gson.*;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
public class CollectionSkinSourceListDeserializer implements JsonDeserializer<List<CollectionSkinSource>> {
@Override
public List<CollectionSkinSource> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
throws JsonParseException {
List<CollectionSkinSource> sources = new ArrayList<>();
if (json.isJsonArray()) {
for (JsonElement element : json.getAsJsonArray()) {
if (element.isJsonObject()) {
JsonObject obj = element.getAsJsonObject();
if (obj.has("url")) {
sources.add(context.deserialize(obj, CollectionSkinUrl.class));
} else if (obj.has("path")) {
sources.add(context.deserialize(obj, CollectionSkinFile.class));
}
}
}
}
return sources;
}
}

41
common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinUrl.java Normal file
View File

@@ -0,0 +1,41 @@
package net.lionarius.skinrestorer.config.provider.collection;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.skin.SkinVariant;
import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
import org.jetbrains.annotations.Nullable;
import java.net.URI;
public final class CollectionSkinUrl implements CollectionSkinSource, GsonPostProcessable {
private String url = "";
private SkinVariant variant = SkinVariant.CLASSIC;
@Override
public @Nullable URI uri() {
try {
if (this.url.isEmpty())
return null;
return new URI(this.url);
} catch (Exception e) {
SkinRestorer.LOGGER.warn("Invalid URI: {}", this.url, e);
return null;
}
}
@Override
public SkinVariant variant() {
return this.variant;
}
@Override
public void gsonPostProcess() {
if (this.url == null) {
this.url = "";
}
if (this.variant == null) {
this.variant = SkinVariant.CLASSIC;
}
}
}

11
common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
View File

@@ -2,6 +2,7 @@ package net.lionarius.skinrestorer.mixin;
import com.mojang.authlib.GameProfile;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.config.FirstJoinSkinProvider;
import net.lionarius.skinrestorer.skin.SkinValue;
import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
import net.lionarius.skinrestorer.util.PlayerUtils;
@@ -53,9 +54,15 @@ public abstract class ServerLoginPacketListenerImplMixin {
return null;
}
if (originalSkin == null && SkinRestorer.getConfig().fetchSkinOnFirstJoin()) {
var config = SkinRestorer.getConfig();
var provider = config.firstJoinSkinProvider();
var shouldFetch = (originalSkin == null && config.fetchSkinOnFirstJoin()) ||
(originalSkin != null && config.forceFirstJoinSkinFetch() && provider != FirstJoinSkinProvider.MOJANG);
if (shouldFetch) {
var context = new SkinProviderContext(
SkinRestorer.getConfig().firstJoinSkinProvider().getName(),
provider.getName(),
profile.name(),
null
);

5
common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java
View File

@@ -1,8 +1,11 @@
package net.lionarius.skinrestorer.skin;
public enum SkinVariant {
import com.google.gson.annotations.SerializedName;
public enum SkinVariant {
@SerializedName(value = "classic", alternate = {"CLASSIC"})
CLASSIC("classic"),
@SerializedName(value = "slim", alternate = {"SLIM"})
SLIM("slim");
private final String name;

91
common/src/main/java/net/lionarius/skinrestorer/skin/provider/CollectionSkinProvider.java Normal file
View File

@@ -0,0 +1,91 @@
package net.lionarius.skinrestorer.skin.provider;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.util.concurrent.UncheckedExecutionException;
import com.mojang.authlib.properties.Property;
import it.unimi.dsi.fastutil.Pair;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.config.provider.collection.CollectionSkinSource;
import net.lionarius.skinrestorer.skin.SkinVariant;
import net.lionarius.skinrestorer.util.Result;
import org.jetbrains.annotations.NotNull;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
public final class CollectionSkinProvider implements SkinProvider {
public static final String PROVIDER_NAME = "collection";
private static LoadingCache<Integer, Optional<Property>> SKIN_CACHE;
private static List<Pair<URI, SkinVariant>> COLLECTION_SKINS;
public static void reload() {
COLLECTION_SKINS = loadCollectionSkins();
createCache();
}
private static List<Pair<URI, SkinVariant>> loadCollectionSkins() {
List<Pair<URI, SkinVariant>> skins = new ArrayList<>();
var config = SkinRestorer.getConfig().providersConfig().collection();
for (CollectionSkinSource source : config.sources()) {
var uri = source.uri();
if (uri != null) {
skins.add(Pair.of(uri, source.variant()));
}
}
return skins;
}
private static void createCache() {
var config = SkinRestorer.getConfig().providersConfig().collection();
var time = config.cache().enabled() ? config.cache().duration() : 0;
SKIN_CACHE = CacheBuilder.newBuilder()
.expireAfterWrite(time, TimeUnit.SECONDS)
.build(new CacheLoader<>() {
@Override
public @NotNull Optional<Property> load(@NotNull Integer key) throws Exception {
var skinEntry = COLLECTION_SKINS.get(key);
return MineskinSkinProvider.loadSkin(skinEntry.first(), skinEntry.second());
}
});
}
@Override
public String getArgumentName() {
return "seed";
}
@Override
public boolean hasVariantSupport() {
return false;
}
@Override
public Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant) {
if (COLLECTION_SKINS.isEmpty()) {
return Result.error(new IllegalStateException("No collection skins configured"));
}
var skinIndex = Math.abs(argument.hashCode()) % COLLECTION_SKINS.size();
try {
return Result.success(SKIN_CACHE.get(skinIndex));
} catch (UncheckedExecutionException e) {
return Result.error((Exception) e.getCause());
} catch (Exception e) {
return Result.error(e);
}
}
}

11
common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java
View File

@@ -22,6 +22,8 @@ import org.mineskin.response.QueueResponse;
import java.net.InetSocketAddress;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
@@ -94,13 +96,18 @@ public final class MineskinSkinProvider implements SkinProvider {
}
}
private static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
var mineskinVariant = switch (variant) {
case CLASSIC -> Variant.CLASSIC;
case SLIM -> Variant.SLIM;
};
var request = GenerateRequest.url(uri)
var request = "file".equals(uri.getScheme())
? GenerateRequest.upload(Files.newInputStream(Path.of(uri)))
.variant(mineskinVariant)
.name("skinrestorer-skin")
.visibility(Visibility.UNLISTED)
: GenerateRequest.url(uri)
.variant(mineskinVariant)
.name("skinrestorer-skin")
.visibility(Visibility.UNLISTED);

2
common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProvider.java
View File

@@ -13,6 +13,7 @@ public interface SkinProvider {
MojangSkinProvider MOJANG = new MojangSkinProvider();
ElyBySkinProvider ELY_BY = new ElyBySkinProvider();
MineskinSkinProvider MINESKIN = new MineskinSkinProvider();
CollectionSkinProvider COLLECTION = new CollectionSkinProvider();
SkinShuffleSkinProvider SKIN_SHUFFLE = new SkinShuffleSkinProvider();
Set<String> BUILTIN_PROVIDER_NAMES = ImmutableSet.of(
@@ -20,6 +21,7 @@ public interface SkinProvider {
MojangSkinProvider.PROVIDER_NAME,
ElyBySkinProvider.PROVIDER_NAME,
MineskinSkinProvider.PROVIDER_NAME,
CollectionSkinProvider.PROVIDER_NAME,
SkinShuffleSkinProvider.PROVIDER_NAME
);