tggamesyt/szar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

another cosmetics update

Browse Source
This commit is contained in:
TGdoesCode
2026-02-23 11:28:17 +01:00
parent 0f14f00bea
commit 8ff7e4e4ec
6 changed files with 136 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/client/java/dev/tggamesyt/szar/client/ClientCosmetics.java
View File

@@ -1,8 +1,12 @@
package dev.tggamesyt.szar.client;
import com.google.gson.*;
import com.mojang.authlib.GameProfile;
import dev.tggamesyt.szar.ServerCosmetics.NameType;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.texture.NativeImage;
import net.minecraft.client.texture.NativeImageBackedTexture;
import net.minecraft.network.PacketByteBuf;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.minecraft.text.MutableText;
@@ -17,12 +21,10 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.util.*;
import static dev.tggamesyt.szar.ServerCosmetics.MOJANG_CAPES_SYNC;
public class ClientCosmetics {
public enum NameType {
STATIC,
GRADIENT
}
public static class CosmeticProfile {
public NameType nameType;
@@ -34,9 +36,6 @@ public class ClientCosmetics {
private static final Map<UUID, CosmeticProfile> PROFILES = new HashMap<>();
// Player UUID -> Mojang cape list
public static final Map<UUID, List<MojangCape>> MOJANG_CAPES = new HashMap<>();
public static class MojangCape {
public String id;
public String name;
@@ -106,8 +105,8 @@ public class ClientCosmetics {
/* ---------------- FETCH MOJANG CAPES ---------------- */
public static void fetchMojangCapes(UUID uuid) {
try {
String accessToken = getAccessTokenFromLaunchArgs();
try {MinecraftClient client = MinecraftClient.getInstance();
String accessToken = client.getSession().getAccessToken();
if (accessToken == null) return;
URL url = new URL("https://api.minecraftservices.com/minecraft/profile");
@@ -119,8 +118,6 @@ public class ClientCosmetics {
String json = new String(in.readAllBytes());
in.close();
System.out.println("[ClientCosmetics] Mojang capes JSON: " + json);
JsonObject obj = JsonParser.parseString(json).getAsJsonObject();
JsonArray capes = obj.getAsJsonArray("capes");
if (capes == null) return;
@@ -135,7 +132,17 @@ public class ClientCosmetics {
list.add(cape);
}
MOJANG_CAPES.put(uuid, list);
PacketByteBuf buf = PacketByteBufs.create();
buf.writeUuid(uuid);
buf.writeInt(list.size());
for (MojangCape cape : list) {
buf.writeString(cape.id);
buf.writeString(cape.name);
buf.writeString(cape.url);
}
ClientPlayNetworking.send(MOJANG_CAPES_SYNC, buf);
} catch (Exception ex) {
ex.printStackTrace();
@@ -143,13 +150,20 @@ public class ClientCosmetics {
}
private static String getAccessTokenFromLaunchArgs() {
for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
if (arg.startsWith("--accessToken")) {
String[] split = arg.split("=", 2);
if (split.length == 2) return split[1];
else continue;
}
MinecraftClient client = MinecraftClient.getInstance();
return client.getSession().getAccessToken();
}
public static Identifier loadTextureFromURL(String url, String playerId) {
if (url == null || url.isEmpty() || playerId == null || playerId.isEmpty()) return null;
try (InputStream in = new URL(url).openStream()) {
NativeImage img = NativeImage.read(in);
NativeImageBackedTexture texture = new NativeImageBackedTexture(img);
Identifier id = new Identifier("szar", "cape_" + playerId);
MinecraftClient.getInstance().getTextureManager().registerTexture(id, texture);
return id;
} catch (Exception e) {
e.printStackTrace();
return null;
}
return null;
}
}

22
src/client/java/dev/tggamesyt/szar/client/SzarClient.java
View File

@@ -5,6 +5,7 @@ import dev.tggamesyt.szar.NyanEntity;
import dev.tggamesyt.szar.PlaneEntity;
import dev.tggamesyt.szar.Szar;
import dev.tggamesyt.szar.PlaneAnimation;
import dev.tggamesyt.szar.ServerCosmetics.NameType;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -43,7 +44,9 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.*;
import static dev.tggamesyt.szar.ServerCosmetics.SYNC_PACKET;
import static dev.tggamesyt.szar.Szar.*;
import static dev.tggamesyt.szar.client.ClientCosmetics.loadTextureFromURL;
import static dev.tggamesyt.szar.client.UraniumUtils.updateUranium;
public class SzarClient implements ClientModInitializer {
@@ -73,6 +76,25 @@ public class SzarClient implements ClientModInitializer {
int loopStart = startOffset + startLength;
@Override
public void onInitializeClient() {
ClientPlayNetworking.registerGlobalReceiver(SYNC_PACKET, (client, handler, buf, responseSender) -> {
// First read the player UUID
UUID playerUuid = buf.readUuid();
// Read cosmetic data
NameType nameType = buf.readEnumConstant(NameType.class);
Integer staticColor = buf.readBoolean() ? buf.readInt() : null;
Integer gradientStart = buf.readBoolean() ? buf.readInt() : null;
Integer gradientEnd = gradientStart != null ? buf.readInt() : null;
String textureUrl = buf.readString();
Identifier capeTexture = loadTextureFromURL(textureUrl, playerUuid.toString());
// Apply the cosmetic profile on the main thread
client.execute(() -> {
ClientCosmetics.fetchMojangCapes(playerUuid);
ClientCosmetics.apply(playerUuid, nameType, staticColor, gradientStart, gradientEnd, capeTexture);
});
});
ClientPlayNetworking.registerGlobalReceiver(Szar.OPEN_MERL_SCREEN,
(client, handler, buf, responseSender) -> {
int entityId = buf.readInt();