saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

networking fix

Browse Source
This commit is contained in:
selimaj-dev
2025-04-13 13:30:45 +02:00
parent c6bdceffc3
commit 3c468536f4
3 changed files with 71 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/saturnclient/saturnclient/auth/Auth.java
+3 -1
View File
@@ -53,6 +53,8 @@ public class Auth {
players.put(uuid, new SaturnPlayer(cloak, hat));
Cloaks.loadCloak(uuid);
playerNames.put(client.getSession().getUsername(), uuid);
afterAuth();
@@ -90,7 +92,7 @@ public class Auth {
String cloak = parser.getString("cloak");
String hat = parser.getString("hat");
players.put(uuid, new SaturnPlayer(cloak, hat));
Cloaks.setCloakSilent(uuid, cloak);
Cloaks.loadCloak(uuid);
} else {
playerNames.entrySet().removeIf(entry -> entry.getValue().equals(uuid));
}
src/main/java/org/saturnclient/saturnclient/auth/Network.java
+7 -8
View File
@@ -11,7 +11,7 @@ import java.security.spec.X509EncodedKeySpec;
public class Network {
static Socket socket;
static DataOutputStream out;
static PrintWriter out;
static BufferedReader in;
static byte[] key = new byte[32];
@@ -37,8 +37,9 @@ public class Network {
// Generate AES key
new SecureRandom().nextBytes(key);
socket = new Socket("localhost", 8080);
out = new DataOutputStream(socket.getOutputStream());
socket = new Socket("77.247.92.168", 8080);
// out = new DataOutputStream(socket.getOutputStream());
out = new PrintWriter(socket.getOutputStream(), true);
in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
StringBuilder publicKeyBuilder = new StringBuilder();
@@ -62,16 +63,14 @@ public class Network {
rsaCipher.init(Cipher.ENCRYPT_MODE, publicKey);
byte[] encryptedKey = rsaCipher.doFinal(key);
out.write(Base64.getEncoder().encode(encryptedKey));
out.write('\n');
out.println(Base64.getEncoder().encodeToString(encryptedKey));
}
public static void write(String message) {
try {
out.write(Base64.getEncoder().encode(AES.encryptAES256(message, key)));
out.write('\n');
out.flush();
out.println(Base64.getEncoder().encodeToString(AES.encryptAES256(message, key)));
} catch (Exception e) {
throw new RuntimeException("Failed to write to server: " + e.getMessage());
}
}
src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
+61 -34
View File
@@ -71,6 +71,65 @@ public class Cloaks {
}
}
/**
* Handles loading and caching of a new cloak texture, without connecting to the
* server.
*
* @param cloakName Name of the cloak file to load
*/
public static void loadCloak(String uuid) {
SaturnPlayer player = Auth.players.get(uuid);
if (player != null && player.cloak != null) {
if (!player.cloak.isEmpty()) {
if (Arrays.asList(ANIMATED_CLOAKS).contains(player.cloak)) {
// Load animated cloak data in background thread
new Thread(() -> {
try {
String fileName = player.cloak + ".gif";
String resourcePath = CLOAKS_RESOURCE_PATH + fileName;
InputStream inputStream = Cloaks.class.getClassLoader().getResourceAsStream(resourcePath);
if (inputStream != null) {
byte[] data = inputStream.readAllBytes();
GifDecoder.GifImage gif = GifDecoder.read(data);
List<BufferedImage> frames = new ArrayList<>();
List<Integer> delays = new ArrayList<>();
int frameCount = gif.getFrameCount();
for (int i = 0; i < frameCount; i++) {
frames.add(gif.getFrame(i));
delays.add(gif.getDelay(i) * 10);
}
// Register textures on main thread
net.minecraft.client.MinecraftClient.getInstance().execute(() -> {
try {
List<AnimatedCloakData> animatedFrames = new ArrayList<>();
for (int i = 0; i < frameCount; i++) {
String frameId = fileName.replace(".gif", "") + "_frame_" + i;
Identifier frameIdentifier = Identifier.of(SaturnClient.MOD_ID, "cloaks_" + frameId);
IdentifierUtils.registerBufferedImageTexture(frameIdentifier, frames.get(i));
animatedFrames.add(new AnimatedCloakData(frameIdentifier, delays.get(i)));
}
animatedCloaks.put(uuid, animatedFrames);
lastFrameTime.put(uuid, System.currentTimeMillis());
SaturnClient.LOGGER.info("Loaded " + frames.size() + " frames for animated cloak: " + fileName);
} catch (Exception e) {
SaturnClient.LOGGER.error("Failed to register animated cloak textures: " + fileName, e);
}
});
}
} catch (IOException e) {
SaturnClient.LOGGER.error("Failed to load animated cloak from resources: " + player.cloak + ".gif", e);
}
}).start();
} else {
net.minecraft.client.MinecraftClient.getInstance().execute(() -> loadStaticCloak(player.cloak + ".png"));
}
}
}
}
/**
* Loads and processes a static cloak from a PNG file in resources.
*
@@ -100,40 +159,8 @@ public class Cloaks {
}
private static void loadAnimatedCloak(String uuid, String fileName) {
try {
String resourcePath = CLOAKS_RESOURCE_PATH + fileName;
InputStream inputStream = Cloaks.class.getClassLoader().getResourceAsStream(resourcePath);
if (inputStream != null) {
// Read all bytes from input stream
byte[] data = inputStream.readAllBytes();
// Use our custom GifDecoder
GifDecoder.GifImage gif = GifDecoder.read(data);
List<AnimatedCloakData> frames = new ArrayList<>();
int frameCount = gif.getFrameCount();
for (int i = 0; i < frameCount; i++) {
BufferedImage frame = gif.getFrame(i);
// Convert from hundredths of a second to milliseconds (multiply by 10)
int delay = gif.getDelay(i) * 10;
String frameId = fileName.replace(".gif", "") + "_frame_" + i;
Identifier frameIdentifier = Identifier.of(SaturnClient.MOD_ID, "cloaks_" + frameId);
IdentifierUtils.registerBufferedImageTexture(frameIdentifier, frame);
frames.add(new AnimatedCloakData(frameIdentifier, delay));
}
animatedCloaks.put(uuid, frames);
lastFrameTime.put(uuid, System.currentTimeMillis());
SaturnClient.LOGGER.info("Loaded " + frames.size() + " frames for animated cloak: " + fileName);
}
} catch (IOException e) {
SaturnClient.LOGGER.error("Failed to load animated cloak from resources: " + fileName, e);
}
// This method is now handled directly in loadCloak
throw new UnsupportedOperationException("This method should not be called directly. Use loadCloak instead.");
}
public static Identifier getCurrentCloakTexture(String uuid) {