fix: equality check with v6 authlib (#238)

toxicity188 · toxicity188 · commit 1ccb75b72c31 · 2025-12-30T23:19:17.000+09:00
diff --git a/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/Functions.kt b/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/Functions.kt
@@ -57,20 +57,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R
     }
 }
 
-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {
+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {
     val lock = Any()
     var h = hash()
     var value = function(h)
     return {
         val newH = hash()
-        when {
-            h === newH -> value
-            h == newH -> value
-            else -> synchronized(lock) {
-                h = newH
-                value = function(h)
-                value
-            }
+        if (equalityChecker(h, newH)) value else synchronized(lock) {
+            h = newH
+            value = function(h)
+            value
         }
     }
 }
diff --git a/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/NMSImpl.kt b/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/NMSImpl.kt
@@ -358,7 +358,11 @@ class NMSImpl : NMS {
         player as CraftPlayer
         return BasePlayerImpl(
             player,
-            dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),
+            dirtyChecked(
+                { getGameProfile(player.handle) },
+                { ModelGameProfile(it) },
+                { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}
+            ),
             dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })
         )
     }
diff --git a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/Functions.kt b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/Functions.kt
@@ -53,20 +53,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R
     }
 }
 
-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {
+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {
     val lock = Any()
     var h = hash()
     var value = function(h)
     return {
         val newH = hash()
-        when {
-            h === newH -> value
-            h == newH -> value
-            else -> synchronized(lock) {
-                h = newH
-                value = function(h)
-                value
-            }
+        if (equalityChecker(h, newH)) value else synchronized(lock) {
+            h = newH
+            value = function(h)
+            value
         }
     }
 }
diff --git a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/NMSImpl.kt b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/NMSImpl.kt
@@ -358,7 +358,11 @@ class NMSImpl : NMS {
         player as CraftPlayer
         return BasePlayerImpl(
             player,
-            dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),
+            dirtyChecked(
+                { getGameProfile(player.handle) },
+                { ModelGameProfile(it) },
+                { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}
+            ),
             dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })
         )
     }
diff --git a/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/Functions.kt b/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/Functions.kt
@@ -53,20 +53,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R
     }
 }
 
-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {
+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {
     val lock = Any()
     var h = hash()
     var value = function(h)
     return {
         val newH = hash()
-        when {
-            h === newH -> value
-            h == newH -> value
-            else -> synchronized(lock) {
-                h = newH
-                value = function(h)
-                value
-            }
+        if (equalityChecker(h, newH)) value else synchronized(lock) {
+            h = newH
+            value = function(h)
+            value
         }
     }
 }
diff --git a/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/NMSImpl.kt b/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/NMSImpl.kt
@@ -358,7 +358,11 @@ class NMSImpl : NMS {
         player as CraftPlayer
         return BasePlayerImpl(
             player,
-            dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),
+            dirtyChecked(
+                { getGameProfile(player.handle) },
+                { ModelGameProfile(it) },
+                { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}
+            ),
             dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })
         )
     }
diff --git a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/Functions.kt b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/Functions.kt
@@ -53,20 +53,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R
     }
 }
 
-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {
+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {
     val lock = Any()
     var h = hash()
     var value = function(h)
     return {
         val newH = hash()
-        when {
-            h === newH -> value
-            h == newH -> value
-            else -> synchronized(lock) {
-                h = newH
-                value = function(h)
-                value
-            }
+        if (equalityChecker(h, newH)) value else synchronized(lock) {
+            h = newH
+            value = function(h)
+            value
         }
     }
 }
diff --git a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/NMSImpl.kt b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/NMSImpl.kt
@@ -364,7 +364,11 @@ class NMSImpl : NMS {
         player as CraftPlayer
         return BasePlayerImpl(
             player,
-            dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),
+            dirtyChecked(
+                { getGameProfile(player.handle) },
+                { ModelGameProfile(it) },
+                { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}
+            ),
             dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })
         )
     }
diff --git a/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/nms/v1_21_R4/Functions.kt b/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/nms/v1_21_R4/Functions.kt
@@ -53,20 +53,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R
     }
 }
 
-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {
+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {
     val lock = Any()
     var h = hash()
     var value = function(h)
     return {
         val newH = hash()
-        when {
-            h === newH -> value
-            h == newH -> value
-            else -> synchronized(lock) {
-                h = newH
-                value = function(h)
-                value
-            }
+        if (equalityChecker(h, newH)) value else synchronized(lock) {
+            h = newH
+            value = function(h)
+            value
         }
     }
 }
diff --git a/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/nms/v1_21_R4/NMSImpl.kt b/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/nms/v1_21_R4/NMSImpl.kt
@@ -365,7 +365,11 @@ class NMSImpl : NMS {
         player as CraftPlayer
         return BasePlayerImpl(
             player,
-            dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),
+            dirtyChecked(
+                { getGameProfile(player.handle) },
+                { ModelGameProfile(it) },
+                { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}
+            ),
             dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })
         )
     }
diff --git a/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/nms/v1_21_R5/Functions.kt b/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/nms/v1_21_R5/Functions.kt
@@ -53,20 +53,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R
     }
 }
 
-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {
+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {
     val lock = Any()
     var h = hash()
     var value = function(h)
     return {
         val newH = hash()
-        when {
-            h === newH -> value
-            h == newH -> value
-            else -> synchronized(lock) {
-                h = newH
-                value = function(h)
-                value
-            }
+        if (equalityChecker(h, newH)) value else synchronized(lock) {
+            h = newH
+            value = function(h)
+            value
         }
     }
 }
diff --git a/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/nms/v1_21_R5/NMSImpl.kt b/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/nms/v1_21_R5/NMSImpl.kt
@@ -365,7 +365,11 @@ class NMSImpl : NMS {
         player as CraftPlayer
         return BasePlayerImpl(
             player,
-            dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),
+            dirtyChecked(
+                { getGameProfile(player.handle) },
+                { ModelGameProfile(it) },
+                { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}
+            ),
             dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -57,20 +57,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {`
	`60`	`+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {`
`61`	`61`	`val lock = Any()`
`62`	`62`	`var h = hash()`
`63`	`63`	`var value = function(h)`
`64`	`64`	`return {`
`65`	`65`	`val newH = hash()`
`66`		`- when {`
`67`		`- h === newH -> value`
`68`		`- h == newH -> value`
`69`		`- else -> synchronized(lock) {`
`70`		`- h = newH`
`71`		`- value = function(h)`
`72`		`- value`
`73`		`- }`
	`66`	`+ if (equalityChecker(h, newH)) value else synchronized(lock) {`
	`67`	`+ h = newH`
	`68`	`+ value = function(h)`
	`69`	`+ value`
`74`	`70`	`}`
`75`	`71`	`}`
`76`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,11 @@ class NMSImpl : NMS {`
`358`	`358`	`player as CraftPlayer`
`359`	`359`	`return BasePlayerImpl(`
`360`	`360`	`player,`
`361`		`- dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),`
	`361`	`+ dirtyChecked(`
	`362`	`+ { getGameProfile(player.handle) },`
	`363`	`+ { ModelGameProfile(it) },`
	`364`	`+ { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}`
	`365`	`+ ),`
`362`	`366`	`dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })`
`363`	`367`	`)`
`364`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,20 +53,16 @@ internal inline fun <reified T, reified R> createAdaptedFieldGetter(): (T) -> R`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`-internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T): () -> T {`
	`56`	`+internal fun <H, T> dirtyChecked(hash: () -> H, function: (H) -> T, equalityChecker: (H, H) -> Boolean = { a, b -> a == b }): () -> T {`
`57`	`57`	`val lock = Any()`
`58`	`58`	`var h = hash()`
`59`	`59`	`var value = function(h)`
`60`	`60`	`return {`
`61`	`61`	`val newH = hash()`
`62`		`- when {`
`63`		`- h === newH -> value`
`64`		`- h == newH -> value`
`65`		`- else -> synchronized(lock) {`
`66`		`- h = newH`
`67`		`- value = function(h)`
`68`		`- value`
`69`		`- }`
	`62`	`+ if (equalityChecker(h, newH)) value else synchronized(lock) {`
	`63`	`+ h = newH`
	`64`	`+ value = function(h)`
	`65`	`+ value`
`70`	`66`	`}`
`71`	`67`	`}`
`72`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,11 @@ class NMSImpl : NMS {`
`364`	`364`	`player as CraftPlayer`
`365`	`365`	`return BasePlayerImpl(`
`366`	`366`	`player,`
`367`		`- dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),`
	`367`	`+ dirtyChecked(`
	`368`	`+ { getGameProfile(player.handle) },`
	`369`	`+ { ModelGameProfile(it) },`
	`370`	`+ { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}`
	`371`	`+ ),`
`368`	`372`	`dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })`
`369`	`373`	`)`
`370`	`374`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,11 @@ class NMSImpl : NMS {`
`365`	`365`	`player as CraftPlayer`
`366`	`366`	`return BasePlayerImpl(`
`367`	`367`	`player,`
`368`		`- dirtyChecked({ getGameProfile(player.handle) }, { ModelGameProfile(it) }),`
	`368`	`+ dirtyChecked(`
	`369`	`+ { getGameProfile(player.handle) },`
	`370`	`+ { ModelGameProfile(it) },`
	`371`	`+ { a, b -> a == b && a.properties["texture"] === b.properties["texture"]}`
	`372`	`+ ),`
`369`	`373`	`dirtyChecked({ player.handle.toCustomisation() }, { PlayerSkinParts(it) })`
`370`	`374`	`)`
`371`	`375`	`}`