From 2ea4d3f3e700f5580850db1cf43818b90f583cc9 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Sat, 5 Jul 2025 19:21:45 +0300 Subject: [PATCH] formatting --- .../SkinShuffleSkinRefreshV1Payload.java | 2 +- .../SkinShuffleSkinRefreshV2Payload.java | 4 ++-- .../config/provider/CacheConfig.java | 8 +++---- .../config/provider/ProvidersConfig.java | 16 ++++++------- .../skinrestorer/platform/Services.java | 4 ++-- .../lionarius/skinrestorer/util/Result.java | 24 +++++++++---------- .../lionarius/skinrestorer/util/WebUtils.java | 4 ++-- .../skinshuffle/SkinShufflePacketHandler.java | 8 +++---- .../SkinShuffleModEventHandler.java | 2 +- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java index 8892357..6ec72e4 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java +++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java @@ -22,7 +22,7 @@ public record SkinShuffleSkinRefreshV1Payload( buf.writeUtf(textureProperty.value()); buf.writeNullable(textureProperty.signature(), FriendlyByteBuf::writeUtf); } - + public static SkinShuffleSkinRefreshV1Payload decode(FriendlyByteBuf buf) { return new SkinShuffleSkinRefreshV1Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readNullable(FriendlyByteBuf::readUtf))); } diff --git a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java index 177fef9..49938be 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java +++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java @@ -14,7 +14,7 @@ public record SkinShuffleSkinRefreshV2Payload( SkinShuffleSkinRefreshV2Payload::encode, SkinShuffleSkinRefreshV2Payload::decode ); - + public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV2Payload value) { var textureProperty = value.textureProperty(); @@ -27,7 +27,7 @@ public record SkinShuffleSkinRefreshV2Payload( buf.writeUtf(textureProperty.signature()); } } - + public static SkinShuffleSkinRefreshV2Payload decode(FriendlyByteBuf buf) { if (buf.readBoolean()) { return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readUtf())); diff --git a/common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java b/common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java index 6daf190..84e0fff 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java +++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java @@ -5,20 +5,20 @@ import net.lionarius.skinrestorer.SkinRestorer; public final class CacheConfig { private boolean enabled; private long duration; - + public CacheConfig(boolean enabled, long duration) { this.enabled = enabled; this.duration = duration; } - + public boolean enabled() { return enabled; } - + public long duration() { return duration; } - + void validate(CacheConfig defaultValue) { if (this.duration <= 0) { SkinRestorer.LOGGER.warn("Cache duration is less than or equal to zero, defaulting to {}", defaultValue.duration()); diff --git a/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java b/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java index c8a793e..4e4f69b 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java +++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java @@ -9,41 +9,41 @@ public final class ProvidersConfig implements GsonPostProcessable { new ElyByProviderConfig(), new MineskinProviderConfig() ); - + private MojangProviderConfig mojang; private ElyByProviderConfig ely_by; private MineskinProviderConfig mineskin; - + public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin) { this.mojang = mojang; this.ely_by = ely_by; this.mineskin = mineskin; } - + public MojangProviderConfig mojang() { return this.mojang; } - + public ElyByProviderConfig ely_by() { return this.ely_by; } - + public MineskinProviderConfig mineskin() { return this.mineskin; } - + @Override public void gsonPostProcess() { if (this.mojang == null) { SkinRestorer.LOGGER.warn("Mojang provider config is null, using default"); this.mojang = ProvidersConfig.DEFAULT.mojang(); } - + if (this.ely_by == null) { SkinRestorer.LOGGER.warn("Ely.By provider config is null, using default"); this.ely_by = ProvidersConfig.DEFAULT.ely_by(); } - + if (this.mineskin == null) { SkinRestorer.LOGGER.warn("Mineskin provider config is null, using default"); this.mineskin = ProvidersConfig.DEFAULT.mineskin(); diff --git a/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java b/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java index 7b3c00f..eb59f92 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java +++ b/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java @@ -8,11 +8,11 @@ import java.util.ServiceLoader; public final class Services { - private Services() {} - public final static PlatformHelper PLATFORM = load(PlatformHelper.class); public final static CompatibilityHelper COMPATIBILITY = load(CompatibilityHelper.class); + private Services() {} + private static T load(Class clazz) { final T loadedService = ServiceLoader.load(clazz) .findFirst() diff --git a/common/src/main/java/net/lionarius/skinrestorer/util/Result.java b/common/src/main/java/net/lionarius/skinrestorer/util/Result.java index 1740a37..b452b06 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/util/Result.java +++ b/common/src/main/java/net/lionarius/skinrestorer/util/Result.java @@ -19,6 +19,18 @@ public class Result { this.errorValue = errorValue; } + public static Result success(@NotNull S successValue) { + return new Result<>(successValue, null); + } + + public static Result error(@NotNull E errorValue) { + return new Result<>(null, errorValue); + } + + public static Result, E> ofNullable(S successValue) { + return Result.success(Optional.ofNullable(successValue)); + } + public S getSuccessValue() { return successValue; } @@ -69,16 +81,4 @@ public class Result { public int hashCode() { return Objects.hash(successValue, errorValue); } - - public static Result success(@NotNull S successValue) { - return new Result<>(successValue, null); - } - - public static Result error(@NotNull E errorValue) { - return new Result<>(null, errorValue); - } - - public static Result, E> ofNullable(S successValue) { - return Result.success(Optional.ofNullable(successValue)); - } } diff --git a/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java b/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java index 1f6946a..28338d3 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java +++ b/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java @@ -13,8 +13,6 @@ import java.time.temporal.ChronoUnit; public final class WebUtils { - private WebUtils() {} - public static final String USER_AGENT; private static HttpClient HTTP_CLIENT = null; @@ -23,6 +21,8 @@ public final class WebUtils { USER_AGENT = String.format("SkinRestorer/%d", System.currentTimeMillis() % 65535); } + private WebUtils() {} + public static void recreateHttpClient() { HTTP_CLIENT = WebUtils.buildClient(); } diff --git a/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java b/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java index 16084a7..badc589 100644 --- a/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java +++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java @@ -1,8 +1,8 @@ package net.lionarius.skinrestorer.forge.compat.skinshuffle; import net.lionarius.skinrestorer.SkinRestorer; -import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility; import net.lionarius.skinrestorer.compat.skinshuffle.*; +import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility; import net.minecraft.network.Connection; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraftforge.event.network.CustomPayloadEvent; @@ -10,9 +10,6 @@ import net.minecraftforge.network.Channel; import net.minecraftforge.network.ChannelBuilder; public class SkinShufflePacketHandler { - private SkinShufflePacketHandler() { - } - private static final Channel INSTANCE = ChannelBuilder .named(SkinRestorer.resourceLocation("skin_shuffle_compat")) .optional() @@ -26,6 +23,9 @@ public class SkinShufflePacketHandler { .add(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleSkinRefreshV2Payload.PACKET_CODEC, SkinShufflePacketHandler::handleSkinRefreshPacket) .build(); + private SkinShufflePacketHandler() { + } + protected static void initialize() { // NO-OP } diff --git a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java index 6036393..fdd2fdc 100644 --- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java +++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java @@ -1,7 +1,7 @@ package net.lionarius.skinrestorer.neoforge.compat.skinshuffle; -import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility; import net.lionarius.skinrestorer.compat.skinshuffle.*; +import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility; import net.minecraft.server.level.ServerPlayer; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;