From ff1c8cddb51217283cc02dff3c455eec20f7b233 Mon Sep 17 00:00:00 2001 From: William Date: Mon, 11 Jul 2022 12:48:41 +0100 Subject: [PATCH] Cleanup user logic --- .../net/william278/husksync/player/User.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/net/william278/husksync/player/User.java b/common/src/main/java/net/william278/husksync/player/User.java index 77e287cf..501056b7 100644 --- a/common/src/main/java/net/william278/husksync/player/User.java +++ b/common/src/main/java/net/william278/husksync/player/User.java @@ -1,28 +1,34 @@ package net.william278.husksync.player; -import com.google.gson.annotations.SerializedName; import org.jetbrains.annotations.NotNull; import java.util.UUID; +/** + * Represents a user who has their data synchronised by HuskSync + */ public class User { - @SerializedName("username") - public String username; - - @SerializedName("uuid") + /** + * The user's unique account ID + */ public UUID uuid; + /** + * The user's username + */ + public String username; + public User(@NotNull UUID uuid, @NotNull String username) { this.username = username; this.uuid = uuid; } @Override - public boolean equals(Object obj) { - if (obj instanceof User other) { + public boolean equals(Object object) { + if (object instanceof User other) { return this.uuid.equals(other.uuid); } - return super.equals(obj); + return super.equals(object); } }