From 8365adb4cdbf872a3b7f56bea2010a58234e790b Mon Sep 17 00:00:00 2001
From: olebeck <31539311+olebeck@users.noreply.github.com>
Date: Thu, 23 Feb 2023 10:23:35 +0100
Subject: [PATCH] add deviceID to custom data

---
 subcommands/skins/skins.go | 52 ++++++++++++++++++--------------------
 utils/proxy.go             |  3 +++
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/subcommands/skins/skins.go b/subcommands/skins/skins.go
index ab09835..594172e 100644
--- a/subcommands/skins/skins.go
+++ b/subcommands/skins/skins.go
@@ -69,41 +69,39 @@ func (s *skinsSession) AddPlayerSkin(playerID uuid.UUID, playerName string, skin
 	}
 }
 
+func (s *skinsSession) AddSkin(playerName string, playerID uuid.UUID, playerSkin *protocol.Skin) {
+	if playerName == "" {
+		playerName = s.playerNames[playerID]
+		if playerName == "" {
+			playerName = playerID.String()
+		}
+	}
+	if !strings.HasPrefix(playerName, s.PlayerNameFilter) {
+		return
+	}
+	s.playerNames[playerID] = playerName
+
+	skin := Skin{playerSkin}
+	if s.OnlyIfHasGeometry && !skin.HaveGeometry() {
+		return
+	}
+	s.AddPlayerSkin(playerID, playerName, &skin)
+}
+
 func (s *skinsSession) ProcessPacket(pk packet.Packet) {
 	switch pk := pk.(type) {
 	case *packet.PlayerSkin:
-		playerName := s.playerNames[pk.UUID]
-		if playerName == "" {
-			playerName = pk.UUID.String()
-		}
-		if !strings.HasPrefix(playerName, s.PlayerNameFilter) {
-			return
-		}
-
-		skin := Skin{&pk.Skin}
-		if s.OnlyIfHasGeometry && !skin.HaveGeometry() {
-			return
-		}
-		s.AddPlayerSkin(pk.UUID, playerName, &skin)
+		s.AddSkin("", pk.UUID, &pk.Skin)
 	case *packet.PlayerList:
 		if pk.ActionType == 1 { // remove
 			return
 		}
 		for _, player := range pk.Entries {
-			playerName := utils.CleanupName(player.Username)
-			if playerName == "" {
-				playerName = player.UUID.String()
-			}
-			if !strings.HasPrefix(playerName, s.PlayerNameFilter) {
-				return
-			}
-			s.playerNames[player.UUID] = playerName
-
-			skin := Skin{&player.Skin}
-			if s.OnlyIfHasGeometry && !skin.HaveGeometry() {
-				return
-			}
-			s.AddPlayerSkin(player.UUID, playerName, &skin)
+			s.AddSkin(utils.CleanupName(player.Username), player.UUID, &player.Skin)
+		}
+	case *packet.AddPlayer:
+		if _, ok := s.playerNames[pk.UUID]; !ok {
+			s.playerNames[pk.UUID] = utils.CleanupName(pk.Username)
 		}
 	}
 }
diff --git a/utils/proxy.go b/utils/proxy.go
index 9a2b2bc..0bbf0a3 100644
--- a/utils/proxy.go
+++ b/utils/proxy.go
@@ -99,6 +99,7 @@ type CustomClientData struct {
 	// misc
 	IsEditorMode bool
 	LanguageCode string
+	DeviceID     string
 }
 
 func (p *ProxyContext) LoadCustomUserData(path string) error {
@@ -148,6 +149,8 @@ func (p *ProxyContext) LoadCustomUserData(path string) error {
 		p.CustomClientData.SkinGeometry = base64.RawStdEncoding.EncodeToString(data)
 	}
 
+	p.CustomClientData.DeviceID = customData.DeviceID
+
 	return nil
 }