From 6fa88188e993f608c585d53bae7276a141c2aef9 Mon Sep 17 00:00:00 2001 From: Adrian Bergqvist Date: Sun, 5 Jun 2022 18:08:00 +0200 Subject: [PATCH] Memory optimizations. --- build.gradle | 2 +- .../org/adde0109/ambassador/forge/HandshakeDataTransmitter.java | 2 ++ .../forge/mixin/status/StatusResponseSerializationMixin.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 087fc78..58009ff 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'net.minecraftforge.gradle' // MixinGradle: apply plugin: 'org.spongepowered.mixin' -version = '1.16.5-1.0.0.0' +version = '1.16.5-0.1.0' group = 'org.adde0109.ambassador' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'ambassador-forge' diff --git a/src/main/java/org/adde0109/ambassador/forge/HandshakeDataTransmitter.java b/src/main/java/org/adde0109/ambassador/forge/HandshakeDataTransmitter.java index d4b96be..74f49fc 100644 --- a/src/main/java/org/adde0109/ambassador/forge/HandshakeDataTransmitter.java +++ b/src/main/java/org/adde0109/ambassador/forge/HandshakeDataTransmitter.java @@ -33,6 +33,7 @@ public HandshakeDataTransmitter() { public static class handshakeData { public String packetSplitters; public List parts; + public int totalLength; public handshakeData() { packetSplitters = ""; parts = new ArrayList<>(); @@ -88,6 +89,7 @@ private void buildData() { //Place everything into an array //Splice into parts to fit a statusResponse + totalLength = buffer.readableBytes(); while (buffer.readableBytes() > 0) { byte[] data = new byte[Math.min(buffer.readableBytes(), MAX_DATA_LENGTH)]; buffer.readBytes(data); diff --git a/src/main/java/org/adde0109/ambassador/forge/mixin/status/StatusResponseSerializationMixin.java b/src/main/java/org/adde0109/ambassador/forge/mixin/status/StatusResponseSerializationMixin.java index c8fc58c..3733176 100644 --- a/src/main/java/org/adde0109/ambassador/forge/mixin/status/StatusResponseSerializationMixin.java +++ b/src/main/java/org/adde0109/ambassador/forge/mixin/status/StatusResponseSerializationMixin.java @@ -24,7 +24,7 @@ private void lastSerialization(CallbackInfoReturnable cir) { HandshakeDataTransmitter.handshakeData data = HandshakeDataTransmitter.storedHandshakeData; jsonObject.add("modinfo", HandshakeDataTransmitter.serializeJson(new String(data.parts.get(HandshakeDataTransmitter.partNrToSend-1), StandardCharsets.ISO_8859_1), - String.valueOf(HandshakeDataTransmitter.partNrToSend) + "-" + String.valueOf(data.parts.size())+ data.packetSplitters)); + String.valueOf(HandshakeDataTransmitter.partNrToSend) + "-" + String.valueOf(data.parts.size()) + "-" + String.valueOf(data.totalLength) + data.packetSplitters)); HandshakeDataTransmitter.partNrToSend = (HandshakeDataTransmitter.partNrToSend >= data.parts.size()) ? 1 : HandshakeDataTransmitter.partNrToSend + 1;