From 892086d62d45e31fd5be9657c2a46aaa0384b8d2 Mon Sep 17 00:00:00 2001 From: pauljako Date: Mon, 13 Jan 2025 18:01:48 +0100 Subject: [PATCH] update --- Dockerfile | 15 +++++++++++++++ build.gradle | 2 +- .../pauljako/cosmeticserver/CosmeticSocket.java | 9 +++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4fd3b4b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM gradle:8.10.2-jdk21-alpine AS airserver-builder +RUN mkdir /src +COPY . /src +WORKDIR /src +RUN gradle build + +FROM eclipse-temurin:21 +RUN mkdir /data +WORKDIR /data +RUN curl -Lo craftsnet.jar https://github.com/CraftsBlock/CraftsNet/releases/download/v3.0.6/CraftsNet_3.0.6-SNAPSHOT.jar +RUN mkdir addons +COPY --from=airserver-builder /src/build/libs/AirServer*.jar addons/AirServer.jar +EXPOSE 5000 +EXPOSE 5001 +CMD [ "java", "-jar", "craftsnet.jar", "-debug" ] diff --git a/build.gradle b/build.gradle index 3564379..32c210b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ repositories { } dependencies { - implementation 'de.craftsblock:craftsnet:3.2.2-SNAPSHOT' + implementation 'de.craftsblock:craftsnet:3.0.6-SNAPSHOT' implementation 'de.craftsblock.craftscore:CraftsCore:3.7.53-SNAPSHOT' implementation 'com.squareup.okhttp3:okhttp:4.12.0' implementation 'com.google.code.gson:gson:2.10' diff --git a/src/main/java/de/pauljako/cosmeticserver/CosmeticSocket.java b/src/main/java/de/pauljako/cosmeticserver/CosmeticSocket.java index 3c76e7f..ef8427f 100644 --- a/src/main/java/de/pauljako/cosmeticserver/CosmeticSocket.java +++ b/src/main/java/de/pauljako/cosmeticserver/CosmeticSocket.java @@ -76,6 +76,8 @@ public class CosmeticSocket implements SocketHandler, ListenerAdapter { JsonArray array = new JsonArray(); if (data.contains("data")) { + // Does not work with Hypixel for some reason + /* for (UUID uuid : data.getStringList("data").stream().map(UUID::fromString).toList()) { if (cosmetics.containsKey(uuid)) { ClientMapping mapping = cosmetics.get(uuid); @@ -85,6 +87,13 @@ public class CosmeticSocket implements SocketHandler, ListenerAdapter { array.add(target.getObject()); } } + */ + cosmetics.forEach(((uuid, clientMapping) -> { + Json target = JsonParser.parse("{}"); + target.set("uuid", uuid.toString()); + target.set("cosmetics", bakeData(clientMapping.cosmetics())); + array.add(target.getObject()); + })); } client.sendMessage(JsonParser.parse("{}")