Skip to content

Commit 5bab060

Browse files
committed
remove unused UUID field
1 parent 63c2d36 commit 5bab060

3 files changed

Lines changed: 4 additions & 16 deletions

File tree

src/main/java/de/srendi/advancedperipherals/common/network/toclient/RenderableObjectBulkSyncPacket.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,15 @@
1515
import org.apache.logging.log4j.Level;
1616

1717
import java.util.Collection;
18-
import java.util.UUID;
1918

2019
public class RenderableObjectBulkSyncPacket implements IAPPacket {
2120

2221
public static final Type<RenderableObjectBulkSyncPacket> TYPE = new Type<>(AdvancedPeripherals.getRL("renderable_object_bulk_sync"));
2322

24-
private final UUID player;
2523
private final int count;
2624
private final RegistryFriendlyByteBuf data;
2725

28-
public RenderableObjectBulkSyncPacket(UUID player, Collection<OverlayObject> objects) {
29-
this.player = player;
26+
public RenderableObjectBulkSyncPacket(Collection<OverlayObject> objects) {
3027
this.count = objects.size();
3128
RegistryFriendlyByteBuf buf = new RegistryFriendlyByteBuf(Unpooled.buffer(), ServerLifecycleHooks.getCurrentServer().registryAccess());
3229
for (OverlayObject object : objects) {
@@ -38,7 +35,6 @@ public RenderableObjectBulkSyncPacket(UUID player, Collection<OverlayObject> obj
3835

3936
public RenderableObjectBulkSyncPacket(RegistryFriendlyByteBuf buffer) {
4037
Registry<OverlayObjectType<?>> registry = buffer.registryAccess().registryOrThrow(APRegistries.OVERLAY_OBJECTS);
41-
this.player = buffer.readUUID();
4238
this.count = buffer.readVarInt();
4339
int size = buffer.readVarInt();
4440
this.data = new RegistryFriendlyByteBuf(Unpooled.buffer(size, size), buffer.registryAccess());
@@ -64,7 +60,6 @@ public void handle(IPayloadContext context) {
6460
@Override
6561
public void write(RegistryFriendlyByteBuf buffer) {
6662
Registry<OverlayObjectType<?>> registry = buffer.registryAccess().registryOrThrow(APRegistries.OVERLAY_OBJECTS);
67-
buffer.writeUUID(this.player);
6863
buffer.writeVarInt(this.count);
6964
this.data.readerIndex(0);
7065
buffer.writeVarInt(this.data.readableBytes());

src/main/java/de/srendi/advancedperipherals/common/network/toclient/RenderableObjectSyncPacket.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,21 @@
1111
import net.neoforged.neoforge.server.ServerLifecycleHooks;
1212
import org.apache.logging.log4j.Level;
1313

14-
import java.util.UUID;
15-
1614
public class RenderableObjectSyncPacket implements IAPPacket {
1715

1816
public static final CustomPacketPayload.Type<RenderableObjectSyncPacket> TYPE = new Type<>(AdvancedPeripherals.getRL("renderable_object_sync"));
1917

20-
private final UUID player;
2118
private final int id;
2219
private final RegistryFriendlyByteBuf data;
2320

24-
public RenderableObjectSyncPacket(UUID player, OverlayObject object) {
25-
this.player = player;
21+
public RenderableObjectSyncPacket(OverlayObject object) {
2622
this.id = object.getId();
2723
RegistryFriendlyByteBuf buf = new RegistryFriendlyByteBuf(Unpooled.buffer(), ServerLifecycleHooks.getCurrentServer().registryAccess());
2824
object.encodeUpdated(buf);
2925
this.data = buf;
3026
}
3127

3228
public RenderableObjectSyncPacket(RegistryFriendlyByteBuf buffer) {
33-
this.player = buffer.readUUID();
3429
this.id = buffer.readVarInt();
3530
int size = buffer.readVarInt();
3631
this.data = new RegistryFriendlyByteBuf(Unpooled.buffer(size, size), buffer.registryAccess());
@@ -52,7 +47,6 @@ public void handle(IPayloadContext context) {
5247

5348
@Override
5449
public void write(RegistryFriendlyByteBuf buffer) {
55-
buffer.writeUUID(this.player);
5650
buffer.writeVarInt(this.id);
5751
this.data.readerIndex(0);
5852
buffer.writeVarInt(this.data.readableBytes());

src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayModule.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ public int clear() {
169169
*/
170170
public void update(OverlayObject object) {
171171
if (this.autoUpdate) {
172-
ServerPlayer owner = this.getOwner();
173-
PacketDistributor.sendToPlayer(owner, new RenderableObjectSyncPacket(owner.getUUID(), object));
172+
PacketDistributor.sendToPlayer(this.getOwner(), new RenderableObjectSyncPacket(object));
174173
return;
175174
}
176175
if (!this.objectsToAdd.containsKey(object.getId())) {
@@ -215,7 +214,7 @@ public int bulkUpdate() {
215214
break;
216215
}
217216
}
218-
PacketDistributor.sendToPlayer(owner, new RenderableObjectBulkSyncPacket(owner.getUUID(), List.copyOf(packedObjects)));
217+
PacketDistributor.sendToPlayer(owner, new RenderableObjectBulkSyncPacket(List.copyOf(packedObjects)));
219218
}
220219
}
221220

0 commit comments

Comments
 (0)