Fix: update Dummy Player data format used in Top Donors list

LoveTropics · Nov 14, 2024 · c543eae · c543eae
1 parent e1ccba2
commit c543eae
Showing 1 changed file with 25 additions and 6 deletions.
diff --git a/src/main/java/com/lovetropics/donations/top_donor/TopDonorManager.java b/src/main/java/com/lovetropics/donations/top_donor/TopDonorManager.java
@@ -3,25 +3,30 @@
 import com.lovetropics.donations.DonationConfigs;
 import com.lovetropics.donations.backend.ltts.DonationRequests;
 import com.lovetropics.donations.backend.ltts.json.TopDonor;
+import com.mojang.authlib.properties.PropertyMap;
 import com.mojang.logging.LogUtils;
+import com.mojang.serialization.JsonOps;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.item.component.ResolvableProfile;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.server.ServerLifecycleHooks;
 import org.slf4j.Logger;
 
 import javax.annotation.Nullable;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -61,30 +66,44 @@ private void applyTopDonors(List<TopDonor> topDonors) {
 
     private void applyToEntity(Entity entity, @Nullable String minecraftName, Component fallbackName, double total, boolean anonymous) {
         CompoundTag data = entity.saveWithoutId(new CompoundTag());
+        ResolvableProfile profile;
         if (anonymous) {
             // We look for the null UUID in the datapack
-            data.putUUID("ProfileID", Util.NIL_UUID);
+            profile = new ResolvableProfile(
+                    Optional.empty(),
+                    Optional.of(Util.NIL_UUID),
+                    new PropertyMap()
+            );
             data.putString("CustomName", Component.Serializer.toJson(fallbackName, entity.registryAccess()));
         } else if (minecraftName != null) {
         	data.remove("CustomName");
         	entity.setCustomName(null);
-        	data.putString("ProfileName", minecraftName);
+            profile = new ResolvableProfile(
+                    Optional.of(minecraftName),
+                    Optional.empty(),
+                    new PropertyMap()
+            );
         } else {
-        	data.putString("ProfileName", "");
+            profile = null;
         	data.putString("CustomName", Component.Serializer.toJson(fallbackName, entity.registryAccess()));
         }
+        if (profile != null) {
+            data.put("profile", ResolvableProfile.CODEC.encodeStart(NbtOps.INSTANCE, profile).getOrThrow());
+        } else {
+            data.remove("profile");
+        }
         Component suffix = Component.literal(" - ").withStyle(ChatFormatting.GRAY)
                 .append(Component.literal(String.format("$%.2f", total)).withStyle(ChatFormatting.GREEN));
-        data.putString("NameSuffix", Component.Serializer.toJson(suffix, entity.registryAccess()));
+        data.putString("name_suffix", Component.Serializer.toJson(suffix, entity.registryAccess()));
         data.putBoolean("CustomNameVisible", true);
         entity.load(data);
     }
 
     private void clearEntity(Entity entity) {
         CompoundTag data = entity.saveWithoutId(new CompoundTag());
         data.putString("CustomName", "{\"text\":\"A Future Donator\"}");
-        data.putString("ProfileName", "");
-        data.putString("NameSuffix", EMPTY_COMPONENT_STRING);
+        data.remove("profile");
+        data.putString("name_suffix", EMPTY_COMPONENT_STRING);
 
         entity.load(data);
     }