Puqns67/SkinTypeFix
Puqns67/SkinTypeFix
1
0
Fork 0
Code Issues Pull Requests Projects Activity

fix: crash when joining world

Browse Source 
Upstream renamed the method "com.mojang.blaze3d.platform.NativeImage$getPixelRGBA" to "getPixelABGR" and made it private.

So add the AccessTransformer to make it public and follow upstream rename.

Also reformatted json files.
This commit is contained in:
Puqns67 2024-10-27 18:53:12 +08:00
parent 9dd8b8c0eb
commit fd6ee4f9ec
Signed by: Puqns67
GPG Key ID: 9669DF042554F536
6 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -39,6 +39,10 @@ java {
targetCompatibility = JavaVersion.valueOf("VERSION_${javaVersion}")
}
loom {
accessWidenerPath = file("src/main/resources/${modId}.accesswidener")
}
modrinth {
token = System.getenv("MODRINTH_TOKEN") ?: properties["modrinth_token"]?.toString()
projectId = modId

5
src/main/java/icu/puqns67/skintypefix/util/Utils.java
View File

@ -28,9 +28,8 @@ public class Utils {
var timesForSlim = new HashMap<Integer, Integer>();
PlayerSkin.Model result = null;
// The result of NativeImage.getPixelRGBA() is ARGB, not RGBA, like 0xAARRGGBB
PLAYER_SKIN_DIFF_SLIM_TO_WILD.forEach(p -> timesForDiff.merge(image.getPixelRGBA(p.x(), p.y()), 1, Integer::sum));
PLAYER_SKIN_SLIM.forEach(p -> timesForSlim.merge(image.getPixelRGBA(p.x(), p.y()), 1, Integer::sum));
PLAYER_SKIN_DIFF_SLIM_TO_WILD.forEach(p -> timesForDiff.merge(image.getPixelABGR(p.x(), p.y()), 1, Integer::sum));
PLAYER_SKIN_SLIM.forEach(p -> timesForSlim.merge(image.getPixelABGR(p.x(), p.y()), 1, Integer::sum));
var blackTimesForDiff = timesForDiff.getOrDefault(0xff000000, 0);
var blackTimesForSlim = timesForSlim.getOrDefault(0xff000000, 0);

6
src/main/resources/assets/skintypefix/lang/en_us.json
View File

@ -1,5 +1,5 @@
{
"modmenu.nameTranslation.skintypefix": "Skin type fix",
"modmenu.summaryTranslation.skintypefix": "Fix wrong skin type for some players.",
"modmenu.descriptionTranslation.skintypefix": "Fix an issue where the skin type of some players did not match the skin type of the actual skin file."
"modmenu.nameTranslation.skintypefix": "Skin type fix",
"modmenu.summaryTranslation.skintypefix": "Fix wrong skin type for some players.",
"modmenu.descriptionTranslation.skintypefix": "Fix an issue where the skin type of some players did not match the skin type of the actual skin file."
}

6
src/main/resources/assets/skintypefix/lang/zh_cn.json
View File

@ -1,5 +1,5 @@
{
"modmenu.nameTranslation.skintypefix": "皮肤类型修复",
"modmenu.summaryTranslation.skintypefix": "为部分玩家修复错误的皮肤类型。",
"modmenu.descriptionTranslation.skintypefix": "修复部分玩家的皮肤类型与实际皮肤文件的实际皮肤类型不匹配的问题。"
"modmenu.nameTranslation.skintypefix": "皮肤类型修复",
"modmenu.summaryTranslation.skintypefix": "为部分玩家修复错误的皮肤类型。",
"modmenu.descriptionTranslation.skintypefix": "修复部分玩家的皮肤类型与实际皮肤文件的实际皮肤类型不匹配的问题。"
}

69
src/main/resources/fabric.mod.json
View File

@ -1,36 +1,37 @@
{
"schemaVersion": 1,
"id": "${mod_id}",
"name": "${mod_name}",
"version": "${mod_version}",
"description": "${mod_description}",
"authors": [
"Puqns67"
],
"contact": {
"homepage": "https://modrinth.com/project/skintypefix",
"sources": "https://github.com/Puqns67/SkinTypeFix"
},
"license": "${mod_license}",
"icon": "assets/skintypefix/icon.png",
"environment": "client",
"entrypoints": {
"client": [
"icu.puqns67.skintypefix.SkinTypeFix"
]
},
"mixins": [
{
"config": "skintypefix.mixins.json",
"environment": "client"
}
],
"depends": {
"java": ">=${java_version}",
"minecraft": "~${minecraft_version}",
"fabricloader": ">=${fabric_version}"
},
"suggests": {
"another-mod": "*"
}
"schemaVersion": 1,
"id": "${mod_id}",
"name": "${mod_name}",
"version": "${mod_version}",
"description": "${mod_description}",
"authors": [
"Puqns67"
],
"contact": {
"homepage": "https://modrinth.com/project/skintypefix",
"sources": "https://github.com/Puqns67/SkinTypeFix"
},
"license": "${mod_license}",
"icon": "assets/skintypefix/icon.png",
"environment": "client",
"entrypoints": {
"client": [
"icu.puqns67.skintypefix.SkinTypeFix"
]
},
"accessWidener": "${mod_id}.accesswidener",
"mixins": [
{
"config": "skintypefix.mixins.json",
"environment": "client"
}
],
"depends": {
"java": ">=${java_version}",
"minecraft": "~${minecraft_version}",
"fabricloader": ">=${fabric_version}"
},
"suggests": {
"another-mod": "*"
}
}

2
src/main/resources/skintypefix.accesswidener Normal file
View File

@ -0,0 +1,2 @@
accessWidener v2 named
accessible method com/mojang/blaze3d/platform/NativeImage getPixelABGR (II)I