reformat

Suiranoil · Suiranoil · commit 6ef3a6848ced · 2026-03-17T23:06:05.000+03:00
diff --git a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java
@@ -35,13 +35,11 @@ public static void onPlayerJoin(ServerPlayer player) {
     public static void handleSkinRefresh(
             MinecraftServer server, ServerPlayer player, SkinShuffleSkinRefreshPayload payload) {
         var property = payload.textureProperty();
-        
-        if (!property.getName().equals(PlayerUtils.TEXTURES_KEY))
-            return;
-        
-        if (!property.hasSignature())
-            return;
-        
+
+        if (!property.getName().equals(PlayerUtils.TEXTURES_KEY)) return;
+
+        if (!property.hasSignature()) return;
+
         server.execute(() -> {
             SkinService.applySkin(
                     server,
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
@@ -4,14 +4,13 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 
-public record SkinShuffleSkinRefreshV1Payload(
-        Property textureProperty) implements SkinShuffleSkinRefreshPayload {
-    
+public record SkinShuffleSkinRefreshV1Payload(Property textureProperty) implements SkinShuffleSkinRefreshPayload {
+
     public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("refresh");
 
     public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV1Payload value) {
         var textureProperty = value.textureProperty();
-        
+
         buf.writeUtf(textureProperty.getName());
         buf.writeUtf(textureProperty.getValue());
         buf.writeNullable(textureProperty.getSignature(), FriendlyByteBuf::writeUtf);
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
@@ -4,9 +4,8 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 
-public record SkinShuffleSkinRefreshV2Payload(
-        Property textureProperty) implements SkinShuffleSkinRefreshPayload {
-    
+public record SkinShuffleSkinRefreshV2Payload(Property textureProperty) implements SkinShuffleSkinRefreshPayload {
+
     public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("skin_refresh");
 
     public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV2Payload value) {
@@ -17,7 +16,7 @@ public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV2Payload v
         buf.writeUtf(textureProperty.getValue());
         if (textureProperty.hasSignature()) {
             assert textureProperty.getSignature() != null;
-            
+
             buf.writeUtf(textureProperty.getSignature());
         }
     }
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
@@ -42,7 +42,7 @@ private void removeAll(CallbackInfo ci) {
     @Inject(method = "placeNewPlayer", at = @At("HEAD"))
     private void placeNewPlayer(Connection connection, ServerPlayer player, CallbackInfo ci) {
         var delay = SkinRestorer.getConfig().join().applyDelay();
-        
+
         if (delay <= 0) {
             skinrestorer$tryApplySkin(server, player);
         } else {
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
@@ -21,26 +21,26 @@
 
 @Mixin(ServerLoginPacketListenerImpl.class)
 public abstract class ServerLoginPacketListenerImplMixin {
-    
-    @Shadow @Nullable
+
+    @Shadow
+    @Nullable
     private GameProfile gameProfile;
-    
+
     @Shadow
     protected abstract GameProfile createFakeProfile(GameProfile original);
-    
+
     @Unique
     private CompletableFuture<Void> skinrestorer$pendingSkin;
-    
+
     @Inject(method = "handleAcceptedLogin", at = @At(value = "HEAD"), cancellable = true)
     public void waitForSkin(CallbackInfo ci) {
         if (skinrestorer$pendingSkin == null) {
             skinrestorer$pendingSkin = CompletableFuture.supplyAsync(() -> {
                 var profile = gameProfile;
                 assert profile != null;
-                
-                if (!profile.isComplete())
-                    profile = createFakeProfile(profile);
-                
+
+                if (!profile.isComplete()) profile = createFakeProfile(profile);
+
                 var originalSkin = PlayerUtils.getPlayerSkin(profile);
 
                 if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
diff --git a/common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java b/common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java
@@ -21,36 +21,35 @@ public abstract class SkullBlockEntityMixin {
 
     @Shadow
     private static GameProfileCache profileCache;
-    
-    @Inject(method = "updateGameprofile", at = @At("HEAD"),
-            cancellable = true)
-    private static void fetchProfileByName(GameProfile profile, Consumer<GameProfile> profileConsumer, CallbackInfo ci) {
-        if (profileCache == null)
-            return;
-        
-        if (profile == null || profile.isComplete() || profile.getName() == null)
-            return;
-        
+
+    @Inject(method = "updateGameprofile", at = @At("HEAD"), cancellable = true)
+    private static void fetchProfileByName(
+            GameProfile profile, Consumer<GameProfile> profileConsumer, CallbackInfo ci) {
+        if (profileCache == null) return;
+
+        if (profile == null || profile.isComplete() || profile.getName() == null) return;
+
         var profileOpt = Optional.<GameProfile>empty();
-        var gameProfileInfo = ((GameProfileCacheAccessor) profileCache).getProfilesByName().get(profile.getName().toLowerCase(Locale.ROOT));
-        
-        if (gameProfileInfo != null)
-            profileOpt = Optional.of(gameProfileInfo.getProfile());
-        
+        var gameProfileInfo = ((GameProfileCacheAccessor) profileCache)
+                .getProfilesByName()
+                .get(profile.getName().toLowerCase(Locale.ROOT));
+
+        if (gameProfileInfo != null) profileOpt = Optional.of(gameProfileInfo.getProfile());
+
         skinrestorer$replaceSkin(profileOpt, profileConsumer, ci);
     }
 
     @Unique
-    private static void skinrestorer$replaceSkin(Optional<GameProfile> profileOpt, Consumer<GameProfile> profileConsumer, CallbackInfo ci) {
-        if (profileOpt.isEmpty())
-            return;
-        
+    private static void skinrestorer$replaceSkin(
+            Optional<GameProfile> profileOpt, Consumer<GameProfile> profileConsumer, CallbackInfo ci) {
+        if (profileOpt.isEmpty()) return;
+
         var profile = PlayerUtils.cloneGameProfile(profileOpt.get());
 
         if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
             var skin = SkinRestorer.getSkinStorage().getSkin(profile.getId(), false);
             PlayerUtils.applyRestoredSkin(profile, skin.value());
-            
+
             profileConsumer.accept(profile);
             ci.cancel();
         }
diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinResigner.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinResigner.java
@@ -36,18 +36,14 @@ public Optional<Property> extractSkin(GameProfile profile) throws Exception {
         if (this.useProviderSignature) return Optional.ofNullable(PlayerUtils.getPlayerSkin(profile));
 
         var skin = PlayerUtils.getPlayerSkin(profile);
-        if (skin == null)
-            return Optional.empty();
-        
-        if (PlayerUtils.getSkinUrl(skin) == null)
-            return Optional.empty();
-        
+        if (skin == null) return Optional.empty();
+
+        if (PlayerUtils.getSkinUrl(skin) == null) return Optional.empty();
+
         var propertyHash = skin.getValue().hashCode();
-        var cached = this.signatureCache != null
-                ? this.signatureCache.getIfPresent(propertyHash) : null;
-        if (cached != null)
-            return Optional.of(cached);
-        
+        var cached = this.signatureCache != null ? this.signatureCache.getIfPresent(propertyHash) : null;
+        if (cached != null) return Optional.of(cached);
+
         var signed = this.skinSigner.signSkin(skin);
         signed.ifPresent(property -> {
             if (this.signatureCache != null) this.signatureCache.put(propertyHash, property);
diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/base/YggdrasilSkinProvider.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/base/YggdrasilSkinProvider.java
@@ -27,17 +27,15 @@ protected GameProfile fetchProfileWithProperties(UUID uuid) throws IOException {
         var request = HttpRequest.newBuilder()
                 .uri(this.baseSessionServerUrl()
                         .resolve("/session/minecraft/profile/")
-                        .resolve(uuid.toString() + "?unsigned=false")
-                )
+                        .resolve(uuid.toString() + "?unsigned=false"))
                 .GET()
                 .build();
 
         var response = WebUtils.executeRequest(request);
         WebUtils.throwOnClientErrors(response);
-        
-        if (response.statusCode() != 200)
-            throw new IllegalArgumentException("no profile with uuid " + uuid);
-        
+
+        if (response.statusCode() != 200) throw new IllegalArgumentException("no profile with uuid " + uuid);
+
         return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
     }
 
diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/builtin/ElyBySkinProvider.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/builtin/ElyBySkinProvider.java
@@ -61,10 +61,9 @@ private static GameProfile getElyByProfile(String username) throws IOException {
 
         var response = WebUtils.executeRequest(request);
         WebUtils.throwOnClientErrors(response);
-        
-        if (response.statusCode() != 200)
-            throw new IllegalArgumentException("no profile with name " + username);
-        
+
+        if (response.statusCode() != 200) throw new IllegalArgumentException("no profile with name " + username);
+
         return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
     }
 }
diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/builtin/MojangSkinProvider.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/builtin/MojangSkinProvider.java
@@ -26,8 +26,9 @@ public final class MojangSkinProvider extends YggdrasilSkinProvider {
 
     static {
         try {
-            ENVIRONMENT = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
-            
+            ENVIRONMENT =
+                    EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
+
             SERVICES_SERVER_URI = new URI(ENVIRONMENT.getServicesHost());
             SESSION_SERVER_URI = new URI(ENVIRONMENT.getSessionHost());
         } catch (URISyntaxException e) {
@@ -36,16 +37,18 @@ public final class MojangSkinProvider extends YggdrasilSkinProvider {
     }
 
     public MojangSkinProvider() {
-        this.profileCache = new GameProfileCache((names, agent, callback) -> {
-            for (var name : names) {
-                try {
-                    var profile = MojangSkinProvider.this.getProfile(name);
-                    callback.onProfileLookupSucceeded(profile);
-                } catch (IOException e) {
-                    throw new TransparentException(e);
-                }
-            }
-        }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());
+        this.profileCache = new GameProfileCache(
+                (names, agent, callback) -> {
+                    for (var name : names) {
+                        try {
+                            var profile = MojangSkinProvider.this.getProfile(name);
+                            callback.onProfileLookupSucceeded(profile);
+                        } catch (IOException e) {
+                            throw new TransparentException(e);
+                        }
+                    }
+                },
+                SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());
     }
 
     @Override
diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/custom/CustomAuthlibInjectorSkinProvider.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/custom/CustomAuthlibInjectorSkinProvider.java
@@ -122,17 +122,15 @@ protected GameProfile fetchProfileWithProperties(UUID uuid) throws IOException {
         var request = HttpRequest.newBuilder()
                 .uri(this.resolvedApiRoot
                         .resolve("sessionserver/session/minecraft/profile/")
-                        .resolve(uuid.toString() + "?unsigned=false")
-                )
+                        .resolve(uuid.toString() + "?unsigned=false"))
                 .GET()
                 .build();
 
         var response = WebUtils.executeRequest(request);
         WebUtils.throwOnClientErrors(response);
-        
-        if (response.statusCode() != 200)
-            throw new IllegalArgumentException("no profile with uuid " + uuid);
-        
+
+        if (response.statusCode() != 200) throw new IllegalArgumentException("no profile with uuid " + uuid);
+
         return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
     }
 
diff --git a/common/src/main/java/net/lionarius/skinrestorer/util/JsonUtils.java b/common/src/main/java/net/lionarius/skinrestorer/util/JsonUtils.java
@@ -64,10 +64,11 @@ public static void moveProperty(JsonObject from, JsonObject to, String fromKey,
 
     public static JsonObject skinPropertyToJson(Property property) {
         try {
-            JsonObject json = GSON.fromJson(new String(Base64.getDecoder().decode(property.getValue()), StandardCharsets.UTF_8), JsonObject.class);
-            if (json != null)
-                json.remove("timestamp");
-            
+            JsonObject json = GSON.fromJson(
+                    new String(Base64.getDecoder().decode(property.getValue()), StandardCharsets.UTF_8),
+                    JsonObject.class);
+            if (json != null) json.remove("timestamp");
+
             return json;
         } catch (Exception e) {
             SkinRestorer.LOGGER.error("Could not parse skin property", e);
diff --git a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java
@@ -67,20 +67,17 @@ public static void refreshPlayer(ServerPlayer player) {
         }
 
         if (!player.isDeadOrDying()) {
-            player.connection.send(
-                    new ClientboundRespawnPacket(
-                            player.level().dimensionTypeId(),
-                            player.level().dimension(),
-                            BiomeManager.obfuscateSeed(player.serverLevel().getSeed()),
-                            player.gameMode.getGameModeForPlayer(),
-                            player.gameMode.getPreviousGameModeForPlayer(),
-                            player.level().isDebug(),
-                            player.serverLevel().isFlat(),
-                            (byte) 3,
-                            player.getLastDeathLocation(),
-                            player.getPortalCooldown()
-                    )
-            );
+            player.connection.send(new ClientboundRespawnPacket(
+                    player.level().dimensionTypeId(),
+                    player.level().dimension(),
+                    BiomeManager.obfuscateSeed(player.serverLevel().getSeed()),
+                    player.gameMode.getGameModeForPlayer(),
+                    player.gameMode.getPreviousGameModeForPlayer(),
+                    player.level().isDebug(),
+                    player.serverLevel().isFlat(),
+                    (byte) 3,
+                    player.getLastDeathLocation(),
+                    player.getPortalCooldown()));
             player.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
             player.connection.send(new ClientboundSetEntityMotionPacket(player));
             var vehicle = player.getVehicle();
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

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,9 @@ private static GameProfile getElyByProfile(String username) throws IOException {`
`61`	`61`
`62`	`62`	`var response = WebUtils.executeRequest(request);`
`63`	`63`	`WebUtils.throwOnClientErrors(response);`
`64`		`-`
`65`		`- if (response.statusCode() != 200)`
`66`		`- throw new IllegalArgumentException("no profile with name " + username);`
`67`		`-`
	`64`	`+`
	`65`	`+ if (response.statusCode() != 200) throw new IllegalArgumentException("no profile with name " + username);`
	`66`	`+`
`68`	`67`	`return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));`
`69`	`68`	`}`
`70`	`69`	`}`