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

better exception logging

This commit is contained in:
2025-07-07 21:25:19 +03:00
parent 6ce3484824
commit a8cc81e570
4 changed files with 27 additions and 6 deletions

View File

@@ -1,10 +1,12 @@
package net.lionarius.skinrestorer; package net.lionarius.skinrestorer;
import com.google.common.base.Throwables;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.CommandDispatcher;
import net.lionarius.skinrestorer.command.SkinCommand; import net.lionarius.skinrestorer.command.SkinCommand;
import net.lionarius.skinrestorer.config.Config; import net.lionarius.skinrestorer.config.Config;
import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig; import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig;
import net.lionarius.skinrestorer.exception.TransparentException;
import net.lionarius.skinrestorer.platform.Services; import net.lionarius.skinrestorer.platform.Services;
import net.lionarius.skinrestorer.skin.SkinIO; import net.lionarius.skinrestorer.skin.SkinIO;
import net.lionarius.skinrestorer.skin.SkinStorage; import net.lionarius.skinrestorer.skin.SkinStorage;
@@ -147,7 +149,7 @@ public final class SkinRestorer {
var skinResult = result.get(); var skinResult = result.get();
if (skinResult.isError()) if (skinResult.isError())
return Result.<Collection<ServerPlayer>, String>error(skinResult.getErrorValue().getMessage()); throw new TransparentException(Throwables.getRootCause(skinResult.getErrorValue()));
var skinValue = SkinValue.fromProviderContextWithValue(context, skinResult.getSuccessValue().orElse(null)); var skinValue = SkinValue.fromProviderContextWithValue(context, skinResult.getSuccessValue().orElse(null));
@@ -156,7 +158,7 @@ public final class SkinRestorer {
return Result.<Collection<ServerPlayer>, String>success(acceptedPlayers); return Result.<Collection<ServerPlayer>, String>success(acceptedPlayers);
}, server) }, server)
.exceptionally(e -> { .exceptionally(e -> {
SkinRestorer.LOGGER.error(e.toString()); SkinRestorer.LOGGER.error("Failed to set skin '{}:{}'", context.name(), context.argument(), e);
return Result.error(e.getMessage()); return Result.error(e.getMessage());
}); });
} }

View File

@@ -0,0 +1,19 @@
package net.lionarius.skinrestorer.exception;
import org.jetbrains.annotations.NotNull;
public class TransparentException extends RuntimeException {
public TransparentException(@NotNull Throwable cause) {
super(cause);
}
@Override
public String getMessage() {
return this.getCause().getMessage();
}
@Override
public String toString() {
return this.getLocalizedMessage();
}
}

View File

@@ -82,7 +82,7 @@ public abstract class ServerLoginPacketListenerImplMixin {
var value = SkinValue.fromProviderContextWithValue(context, result.getSuccessValue().orElse(null)); var value = SkinValue.fromProviderContextWithValue(context, result.getSuccessValue().orElse(null));
SkinRestorer.getSkinStorage().setSkin(profile.getId(), value); SkinRestorer.getSkinStorage().setSkin(profile.getId(), value);
} else { } else {
SkinRestorer.LOGGER.warn("Failed to fetch skin: {}", result.getErrorValue().getMessage()); SkinRestorer.LOGGER.warn("Failed to fetch skin '{}:{}'", context.name(), context.argument(), result.getErrorValue());
} }
} }
} }

View File

@@ -10,6 +10,7 @@ import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse; import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
import com.mojang.util.UndashedUuid; import com.mojang.util.UndashedUuid;
import net.lionarius.skinrestorer.SkinRestorer; import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.exception.TransparentException;
import net.lionarius.skinrestorer.skin.SkinVariant; import net.lionarius.skinrestorer.skin.SkinVariant;
import net.lionarius.skinrestorer.util.JsonUtils; import net.lionarius.skinrestorer.util.JsonUtils;
import net.lionarius.skinrestorer.util.PlayerUtils; import net.lionarius.skinrestorer.util.PlayerUtils;
@@ -58,7 +59,7 @@ public final class MojangSkinProvider implements SkinProvider {
var profile = MojangSkinProvider.getProfile(name); var profile = MojangSkinProvider.getProfile(name);
callback.onProfileLookupSucceeded(profile); callback.onProfileLookupSucceeded(profile);
} catch (IOException e) { } catch (IOException e) {
callback.onProfileLookupFailed(name, e); throw new TransparentException(e);
} }
} }
} }
@@ -69,8 +70,7 @@ public final class MojangSkinProvider implements SkinProvider {
var profile = MojangSkinProvider.getProfile(name); var profile = MojangSkinProvider.getProfile(name);
return Optional.of(profile); return Optional.of(profile);
} catch (IOException e) { } catch (IOException e) {
SkinRestorer.LOGGER.error("Failed to find profile by name", e); throw new TransparentException(e);
throw new RuntimeException(e);
} }
} }
}, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile()); }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());