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

move areSkinPropertiesEquals to PlayerUtils

Browse Source
This commit is contained in:
Lionarius
2024-06-28 08:20:55 +03:00
parent 7b6937bf8e
commit dbb7c19f10
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,11 @@
package net.lionarius.skinrestorer;
import com.google.gson.JsonObject;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import it.unimi.dsi.fastutil.Pair;
import net.lionarius.skinrestorer.skin.SkinIO;
import net.lionarius.skinrestorer.skin.SkinResult;
import net.lionarius.skinrestorer.skin.SkinStorage;
import net.lionarius.skinrestorer.util.JsonUtils;
import net.lionarius.skinrestorer.util.PlayerUtils;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
@@ -22,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
public class SkinRestorer {
public final class SkinRestorer {
public static final String MOD_ID = "skinrestorer";
public static final Logger LOGGER = LoggerFactory.getLogger("SkinRestorer");
@@ -68,7 +66,7 @@ public class SkinRestorer {
for (GameProfile profile : acceptedProfiles) {
ServerPlayerEntity player = server.getPlayerManager().getPlayer(profile.getId());
if (player == null || areSkinPropertiesEquals(skin, PlayerUtils.getPlayerSkin(player)))
if (player == null || PlayerUtils.areSkinPropertiesEquals(skin, PlayerUtils.getPlayerSkin(player)))
continue;
PlayerUtils.applyRestoredSkin(player, skin);
@@ -83,23 +81,4 @@ public class SkinRestorer {
return Pair.of(Collections.emptySet(), Collections.emptySet());
});
}
private static boolean areSkinPropertiesEquals(Property x, Property y) {
if (x == y)
return true;
if (x == null || y == null)
return false;
if (x.equals(y))
return true;
JsonObject xJson = JsonUtils.skinPropertyToJson(x);
JsonObject yJson = JsonUtils.skinPropertyToJson(y);
if (xJson == null || yJson == null)
return false;
return xJson.equals(yJson);
}
}

21
common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java
View File

@@ -1,5 +1,6 @@
package net.lionarius.skinrestorer.util;
import com.google.gson.JsonObject;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import net.minecraft.network.packet.s2c.play.*;
@@ -62,4 +63,24 @@ public class PlayerUtils {
if (skin != null)
profile.getProperties().put(TEXTURES_KEY, skin);
}
public static boolean areSkinPropertiesEquals(Property x, Property y) {
if (x == y)
return true;
if (x == null || y == null)
return false;
if (x.equals(y))
return true;
JsonObject xJson = JsonUtils.skinPropertyToJson(x);
JsonObject yJson = JsonUtils.skinPropertyToJson(y);
if (xJson == null || yJson == null)
return false;
return xJson.equals(yJson);
}
}