This commit is contained in:
LZX committed 2026-07-27 01:41:36 +08:00
1 parent 20f662075a
commit e5c7f2b69c
6 files changed
+74 -47

No files matched your search

@@ -0,0 +1,70 @@
package com.lzxnone.terraria.client;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import com.mojang.authlib.yggdrasil.ProfileResult;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.PlayerInfo;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.resources.PlayerSkin;
import net.minecraft.world.entity.Entity;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
public class ClientSkinUtil {
private static final Map<UUID, GameProfile> PROFILE_CACHE = new ConcurrentHashMap<>();
private static final Set<UUID> PENDING_PROFILES = ConcurrentHashMap.newKeySet();
public static PlayerSkin getPlayerSkin(UUID uuid, Entity entity) {
if(entity instanceof AbstractClientPlayer clientPlayer && clientPlayer.getUUID().equals(uuid)) {
return clientPlayer.getSkin();
}
Minecraft minecraft = Minecraft.getInstance();
if(minecraft.level != null) {
for(AbstractClientPlayer player : minecraft.level.players()) {
if(player.getUUID().equals(uuid)) {
return player.getSkin();
}
}
}
if(minecraft.getConnection() != null) {
PlayerInfo playerInfo = minecraft.getConnection().getPlayerInfo(uuid);
if(playerInfo != null) {
return playerInfo.getSkin();
}
}
GameProfile cachedProfile = PROFILE_CACHE.get(uuid);
if(cachedProfile != null) {
return minecraft.getSkinManager().getInsecureSkin(cachedProfile);
}
fetchProfile(uuid);
return minecraft.getSkinManager().getInsecureSkin(new GameProfile(uuid, ""));
}
private static void fetchProfile(UUID uuid) {
if(!PENDING_PROFILES.add(uuid)) return;
CompletableFuture.supplyAsync(() -> {
try {
MinecraftSessionService sessionService = Minecraft.getInstance().getMinecraftSessionService();
ProfileResult result = sessionService.fetchProfile(uuid, true);
return result == null ? null : result.profile();
}catch (Exception ignored) {
return null;
}
}).thenAccept(profile -> {
if(profile != null) {
PROFILE_CACHE.put(uuid, profile);
}
PENDING_PROFILES.remove(uuid);
});
}
}
@@ -1,11 +1,10 @@
package com.lzxnone.terraria.client.item.melee;
import com.lzxnone.terraria.client.ClientSkinUtil;
import com.lzxnone.terraria.entity.ModRenderTypes;
import com.lzxnone.terraria.entity.TintedVertexConsumer;
import com.lzxnone.terraria.entity.summon.*;
import com.lzxnone.terraria.network.SkinFetch;
import com.lzxnone.terraria.utils.*;
import com.mojang.authlib.GameProfile;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Axis;
@@ -40,8 +39,7 @@ public class ClientFirstFractal {
ItemStack item = summon.getEntityData().get(StaticSummon.ITEM);
if(item == ItemStack.EMPTY) return;
GameProfile profile = SkinFetch.getCachedProfile(uuid);
PlayerSkin playerSkin = Minecraft.getInstance().getSkinManager().getInsecureSkin(profile);
PlayerSkin playerSkin = ClientSkinUtil.getPlayerSkin(uuid, summon.getOwner());
boolean isSlim = playerSkin.model() == PlayerSkin.Model.SLIM;
PlayerModel<LivingEntity> activeModel = isSlim ? StaticSummonRenderer.getSlimModel() : StaticSummonRenderer.getWideModel();
@@ -7,9 +7,7 @@ import com.lzxnone.terraria.entity.ModEntities;
import com.lzxnone.terraria.entity.summon.*;
import com.lzxnone.terraria.item.ModItems;
import com.lzxnone.terraria.particle.ZenithTrailParticleOptions;
import com.lzxnone.terraria.network.SkinFetch;
import com.lzxnone.terraria.utils.*;
import com.mojang.authlib.GameProfile;
import com.mojang.math.Axis;
import net.minecraft.core.component.DataComponents;
import net.minecraft.resources.ResourceLocation;
@@ -1,39 +0,0 @@
package com.lzxnone.terraria.network;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import com.mojang.authlib.yggdrasil.ProfileResult;
import net.minecraft.client.Minecraft;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
public class SkinFetch {
private static final Map<UUID, GameProfile> PROFILE_CACHE = new ConcurrentHashMap<>();
public static void fetchProfile(UUID uuid) {
CompletableFuture.supplyAsync(() -> {
try {
MinecraftSessionService sessionService = Minecraft.getInstance().getMinecraftSessionService();
ProfileResult result = sessionService.fetchProfile(uuid, true);
if(result != null) {
GameProfile filled = result.profile();
PROFILE_CACHE.put(uuid, filled);
return filled;
}
}catch (Exception ignored) {}
GameProfile fallback = new GameProfile(uuid, "");
PROFILE_CACHE.put(uuid, fallback);
return fallback;
});
}
public static GameProfile getCachedProfile(UUID uuid) {
GameProfile cached = PROFILE_CACHE.get(uuid);
if(cached != null) return cached;
fetchProfile(uuid);
return new GameProfile(uuid, "");
}
}