From 1b1bddc17ff40224594f1810b776f9427991e048 Mon Sep 17 00:00:00 2001
From: olebeck <31539311+olebeck@users.noreply.github.com>
Date: Fri, 24 Mar 2023 23:29:53 +0100
Subject: [PATCH] ignore skin id changes without new data

---
 subcommands/skins/skin.go     | 9 ++-------
 subcommands/skins/skinpack.go | 3 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/subcommands/skins/skin.go b/subcommands/skins/skin.go
index 127726d..31688c4 100644
--- a/subcommands/skins/skin.go
+++ b/subcommands/skins/skin.go
@@ -1,7 +1,6 @@
 package skins
 
 import (
-	"crypto/sha256"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -28,12 +27,8 @@ type SkinGeometry struct {
 }
 
 func (skin *Skin) Hash() uuid.UUID {
-	h := sha256.New()
-	h.Write(skin.SkinData)
-	h.Write(skin.SkinGeometry)
-	h.Write(skin.CapeData)
-	h.Write([]byte(skin.SkinID))
-	return uuid.NewSHA1(uuid.NameSpaceURL, h.Sum(nil))
+	h := append(skin.CapeData, append(skin.SkinData, skin.SkinGeometry...)...)
+	return uuid.NewSHA1(uuid.NameSpaceURL, h)
 }
 
 func (skin *Skin) getGeometry() (*SkinGeometry, string, error) {
diff --git a/subcommands/skins/skinpack.go b/subcommands/skins/skinpack.go
index 7ff60c1..fb13cc2 100644
--- a/subcommands/skins/skinpack.go
+++ b/subcommands/skins/skinpack.go
@@ -18,6 +18,9 @@ type _skinWithIndex struct {
 }
 
 func (s _skinWithIndex) Name(name string) string {
+	if s.i == 1 {
+		return name
+	}
 	return fmt.Sprintf("%s-%d", name, s.i)
 }