From 07d14d84504d50aefd5bf2f454204cd914835551 Mon Sep 17 00:00:00 2001 From: Srendi Date: Mon, 4 Nov 2024 11:14:35 +0100 Subject: [PATCH] Fixed overlay object sync packets --- .../modules/overlay/objects/two_dim/CircleObject.java | 2 ++ .../modules/overlay/objects/two_dim/ItemObject.java | 2 ++ .../overlay/objects/two_dim/RectangleObject.java | 10 ++++++---- .../modules/overlay/objects/two_dim/TextObject.java | 10 ++++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/CircleObject.java b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/CircleObject.java index f535bb1e8..99600bd0c 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/CircleObject.java +++ b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/CircleObject.java @@ -63,6 +63,7 @@ public static CircleObject decode(FriendlyByteBuf buffer) { int z = buffer.readInt(); int maxX = buffer.readInt(); int maxY = buffer.readInt(); + int maxZ = buffer.readInt(); int radius = buffer.readInt(); CircleObject clientObject = new CircleObject(player); @@ -74,6 +75,7 @@ public static CircleObject decode(FriendlyByteBuf buffer) { clientObject.z = z; clientObject.maxX = maxX; clientObject.maxY = maxY; + clientObject.maxZ = maxZ; clientObject.radius = radius; return clientObject; diff --git a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/ItemObject.java b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/ItemObject.java index 7a54bbc63..85a576e0b 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/ItemObject.java +++ b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/ItemObject.java @@ -59,6 +59,7 @@ public static ItemObject decode(FriendlyByteBuf buffer) { int z = buffer.readInt(); int maxX = buffer.readInt(); int maxY = buffer.readInt(); + int maxZ = buffer.readInt(); String item = buffer.readUtf(); ItemObject clientObject = new ItemObject(player); @@ -70,6 +71,7 @@ public static ItemObject decode(FriendlyByteBuf buffer) { clientObject.z = z; clientObject.maxX = maxX; clientObject.maxY = maxY; + clientObject.maxZ = maxZ; clientObject.item = item; return clientObject; diff --git a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/RectangleObject.java b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/RectangleObject.java index 6da199e43..6e13ae990 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/RectangleObject.java +++ b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/RectangleObject.java @@ -51,8 +51,9 @@ public static RectangleObject decode(FriendlyByteBuf buffer) { int x = buffer.readInt(); int y = buffer.readInt(); int z = buffer.readInt(); - int sizeX = buffer.readInt(); - int sizeY = buffer.readInt(); + int maxX = buffer.readInt(); + int maxY = buffer.readInt(); + int maxZ = buffer.readInt(); RectangleObject clientObject = new RectangleObject(player); clientObject.setId(objectId); @@ -61,8 +62,9 @@ public static RectangleObject decode(FriendlyByteBuf buffer) { clientObject.x = x; clientObject.y = y; clientObject.z = z; - clientObject.maxX = sizeX; - clientObject.maxY = sizeY; + clientObject.maxX = maxX; + clientObject.maxY = maxY; + clientObject.maxZ = maxZ; return clientObject; } diff --git a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/TextObject.java b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/TextObject.java index 6d21b175d..7e50e1735 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/TextObject.java +++ b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/TextObject.java @@ -98,8 +98,9 @@ public static TextObject decode(FriendlyByteBuf buffer) { int x = buffer.readInt(); int y = buffer.readInt(); int z = buffer.readInt(); - int sizeX = buffer.readInt(); - int sizeY = buffer.readInt(); + int maxX = buffer.readInt(); + int maxY = buffer.readInt(); + int maxZ = buffer.readInt(); String content = buffer.readUtf(); float fontSize = buffer.readFloat(); boolean shadow = buffer.readBoolean(); @@ -111,8 +112,9 @@ public static TextObject decode(FriendlyByteBuf buffer) { clientObject.x = x; clientObject.y = y; clientObject.z = z; - clientObject.maxX = sizeX; - clientObject.maxY = sizeY; + clientObject.maxX = maxX; + clientObject.maxY = maxY; + clientObject.maxZ = maxZ; clientObject.content = content; clientObject.fontSize = fontSize; clientObject.shadow = shadow;