merge to CraftedCore 5.3

Author: ToCraft

CHANGELOG.md

@@ -1,9 +1,10 @@
-SkinShifter 1..1
+SkinShifter 1.1
 ================
 
 - run different tasks asynchronous to fix stuck when running commands with bad internet connection
 - change player chat name
 - performance improvements
+- merge caching to CraftedCore
 
 SkinShifter 1.0
 ================

common/src/main/java/dev/tocraft/skinshifter/SkinShifter.java

@@ -2,12 +2,10 @@
 
 import dev.tocraft.skinshifter.data.SkinPlayerData;
 import net.minecraft.nbt.Tag;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import tocraft.craftedcore.config.ConfigLoader;
 import tocraft.craftedcore.event.common.CommandEvents;
-import tocraft.craftedcore.patched.Identifier;
 import tocraft.craftedcore.patched.TComponent;
 import tocraft.craftedcore.platform.VersionChecker;
 import tocraft.craftedcore.registration.PlayerDataRegistry;
@@ -30,6 +28,10 @@ public void initialize() {
         CommandEvents.REGISTRATION.register(new SkinShifterCommand());
     }
 
+    /**
+     * @param player the player the skin should be set of
+     * @param skinPlayer the uuid of the owner of the new skin
+     */
     public static void setSkin(ServerPlayer player, UUID skinPlayer) {
         if (Objects.equals(player.getUUID(), skinPlayer)) {
             SkinPlayerData.setSkin(player, null);
@@ -38,6 +40,10 @@ public static void setSkin(ServerPlayer player, UUID skinPlayer) {
         }
     }
 
+    /**
+     * @param player the player that is being tested
+     * @return the uuid of the owner of the current skin the player wears
+     */
     public static UUID getCurrentSkin(Player player) {
         Tag currentSkinTag = PlayerDataRegistry.readTag(player, TAG_NAME);
         if (currentSkinTag != null) {
@@ -50,8 +56,4 @@ public static UUID getCurrentSkin(Player player) {
         // fallback
         return player.getUUID();
     }
-
-    public static ResourceLocation id(String name) {
-        return Identifier.parse(MODID, name);
-    }
 }

common/src/main/java/dev/tocraft/skinshifter/SkinShifterCommand.java

@@ -75,7 +75,7 @@ private void onRegister(CommandDispatcher<CommandSourceStack> dispatcher) {
         LiteralCommandNode<CommandSourceStack> changeChatName = Commands.literal("changeChatName")
                 .executes(context -> {
                     boolean bool = SkinShifter.CONFIG.changeChatName;
-                    CCommandSourceStack.sendSuccess(context.getSource(), TComponent.translatable("skinshifter.config.get", "changeChatName", String.valueOf(bool)), true);
+                    CCommandSourceStack.sendSuccess(context.getSource(), TComponent.translatable("craftedcore.config.get", "changeChatName", String.valueOf(bool)), true);
                     return 1;
                 })
                 .then(Commands.argument("value", BoolArgumentType.bool())
@@ -84,7 +84,7 @@ private void onRegister(CommandDispatcher<CommandSourceStack> dispatcher) {
                             SkinShifter.CONFIG.changeChatName = bool;
                             SkinShifter.CONFIG.save();
                             SkinShifter.CONFIG.sendToAllPlayers(context.getSource().getLevel());
-                            CCommandSourceStack.sendSuccess(context.getSource(), TComponent.translatable("skinshifter.config.set", "changeChatName", String.valueOf(bool)), true);
+                            CCommandSourceStack.sendSuccess(context.getSource(), TComponent.translatable("craftedcore.config.set", "changeChatName", String.valueOf(bool)), true);
                             return 1;
                 })).build();
 

common/src/main/java/dev/tocraft/skinshifter/data/SkinCache.java

@@ -9,15 +9,12 @@
 import tocraft.craftedcore.platform.PlayerProfile;
 import tocraft.craftedcore.registration.PlayerDataRegistry;
 
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
 
 @ApiStatus.Internal
 public class SkinPlayerData {
     public static final String TAG_NAME = "CurrentSkin";
-    private static final Map<UUID, PlayerProfile> CACHED_SKINS = new ConcurrentHashMap<>();
 
     public static void initialize() {
         PlayerDataRegistry.registerKey(TAG_NAME, true, true);
@@ -27,17 +24,13 @@ public static void initialize() {
     public static PlayerProfile getSkin(Player player) {
         UUID uuid = SkinShifter.getCurrentSkin(player);
         if (uuid != player.getUUID()) {
-            // TODO: Replace with CraftedCore's Caching methods to save RAM
-                if (!CACHED_SKINS.containsKey(uuid)) {
-                    // do this in an external thread so the game isn't stuck with bad internet connection (might take some time for skin to load, though)
-                    CompletableFuture.runAsync(() -> {
-                        PlayerProfile skin = PlayerProfile.ofId(uuid);
-                        CACHED_SKINS.put(uuid, skin);
-                    });
-                }
-
-                return CACHED_SKINS.get(uuid);
+            PlayerProfile playerProfile = PlayerProfile.getCachedProfile(uuid);
+            if (playerProfile == null) {
+                // cache profile asynchronous
+                CompletableFuture.runAsync(() -> PlayerProfile.ofId(uuid));
             }
+            return playerProfile;
+        }
 
         return null;
     }

common/src/main/java/dev/tocraft/skinshifter/data/SkinPlayerData.java

@@ -1,7 +1,6 @@
 package dev.tocraft.skinshifter.mixin.client;
 
 import dev.tocraft.skinshifter.SkinShifter;
-import dev.tocraft.skinshifter.data.SkinCache;
 import dev.tocraft.skinshifter.data.SkinPlayerData;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -25,8 +24,8 @@ public class AbstractClientPlayerMixin {
     public void setToNewSkin(CallbackInfoReturnable<PlayerSkin> cir) {
         PlayerProfile skin = SkinPlayerData.getSkin((Player) (Object) this);
         if (skin != null && skin.skin() != null) {
-            ResourceLocation skinId = SkinCache.getCustomSkinId(skin.skin());
-            ResourceLocation capeId = SkinShifter.CONFIG.changeCape ? SkinCache.getCustomCapeId(skin.cape()) : null;
+            ResourceLocation skinId = skin.getSkinId();
+            ResourceLocation capeId = SkinShifter.CONFIG.changeCape ? skin.getCapeId() : null;
             PlayerSkin.Model model = skin.isSlim() ? PlayerSkin.Model.SLIM : PlayerSkin.Model.WIDE;
             PlayerSkin playerSkin = new PlayerSkin(skinId, skin.skin().toString(), capeId, null, model, true);
             cir.setReturnValue(playerSkin);
@@ -37,7 +36,7 @@ public void setToNewSkin(CallbackInfoReturnable<PlayerSkin> cir) {
     //$$ public void setToNewSkin(CallbackInfoReturnable<ResourceLocation> cir) {
     //$$     PlayerProfile skin = SkinPlayerData.getSkin((Player) (Object) this);
     //$$     if (skin != null && skin.skin() != null) {
-    //$$         cir.setReturnValue(SkinCache.getCustomSkinId(skin.skin()));
+    //$$         cir.setReturnValue(skin.getSkinId());
     //$$     }
     //$$ }
     //$$ @Inject(method = "getModelName", at = @At("RETURN"), cancellable = true)
@@ -52,7 +51,7 @@ public void setToNewSkin(CallbackInfoReturnable<PlayerSkin> cir) {
     //$$     if (SkinShifter.CONFIG.changeCape) {
     //$$         PlayerProfile skin = SkinPlayerData.getSkin((Player) (Object) this);
     //$$         if (skin != null && skin.cape() != null) {
-    //$$             cir.setReturnValue(SkinCache.getCustomCapeId(skin.cape()));
+    //$$             cir.setReturnValue(skin.getCapeId());
     //$$         }
     //$$     }
     //$$ }

common/src/main/java/dev/tocraft/skinshifter/mixin/client/AbstractClientPlayerMixin.java

@@ -1,7 +1,5 @@
 {
   "skinshifter.command.set": "Setzte den Skin von %s auf den von %s.",
   "skinshifter.command.reset": "Setzte den Skin von %s zurück.",
-  "skinshifter.invalid_player": "Ungültiger Spieler-Name: %s",
-  "skinshifter.config.set": "Config entry %s is now %s",
-  "skinshifter.config.get": "Config entry %s is set to %s"
+  "skinshifter.invalid_player": "Ungültiger Spieler-Name: %s"
 }

common/src/main/resources/assets/skinshifter/lang/de_de.json

@@ -1,7 +1,5 @@
 {
   "skinshifter.command.set": "Set the skin of %s to %s.",
   "skinshifter.command.reset": "Reset the skin of %s.",
-  "skinshifter.invalid_player": "Invalid Player Name: %s",
-  "skinshifter.config.set": "Config entry %s is now %s",
-  "skinshifter.config.get": "Config entry %s is set to %s"
+  "skinshifter.invalid_player": "Invalid Player Name: %s"
 }

common/src/main/resources/assets/skinshifter/lang/en_us.json

@@ -7,7 +7,7 @@ maven_group=dev.tocraft
 # Loader Versions
 fabric_loader=0.15.11
 # Dependency Versions
-craftedcore_version=5.2
+craftedcore_version=5.3
 # Upload data
 curseforge_id=1076301
 modrinth_id=dSkZ41Y3