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

backport to 1.20.3

This commit is contained in:
2024-09-24 08:12:20 +03:00
parent 8a9802f763
commit 3203435453
2 changed files with 4 additions and 12 deletions

View File

@@ -9,11 +9,7 @@ import com.mojang.authlib.properties.Property;
import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.skin.SkinVariant;
import net.lionarius.skinrestorer.util.JsonUtils;
import net.lionarius.skinrestorer.util.PlayerUtils;
import net.lionarius.skinrestorer.util.Result;
import net.lionarius.skinrestorer.util.WebUtils;
import net.minecraft.util.StringUtil;
import net.lionarius.skinrestorer.util.*;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
@@ -67,7 +63,7 @@ public final class ElyBySkinProvider implements SkinProvider {
@Override
public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
try {
if (!StringUtil.isValidPlayerName(username))
if (!StringUtils.isValidPlayerName(username))
throw new IllegalArgumentException("invalid username");
var usernameLowerCase = username.toLowerCase(Locale.ROOT);

View File

@@ -10,12 +10,8 @@ import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
import com.mojang.util.UndashedUuid;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.skin.SkinVariant;
import net.lionarius.skinrestorer.util.JsonUtils;
import net.lionarius.skinrestorer.util.PlayerUtils;
import net.lionarius.skinrestorer.util.Result;
import net.lionarius.skinrestorer.util.WebUtils;
import net.lionarius.skinrestorer.util.*;
import net.minecraft.server.players.GameProfileCache;
import net.minecraft.util.StringUtil;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
@@ -91,7 +87,7 @@ public final class MojangSkinProvider implements SkinProvider {
@Override
public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
try {
if (!StringUtil.isValidPlayerName(username))
if (!StringUtils.isValidPlayerName(username))
throw new IllegalArgumentException("invalid username");
var cachedProfile = MojangSkinProvider.PROFILE_CACHE.get(username);