From 3f40c250d36a51e11f6a307610129f2a90555098 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 26 Aug 2026 09:32:08 -0400 Subject: [PATCH] Switched to .hjson for texture packer config --- core/assets-raw/sprites/font/pack.hjson | 7 +++++++ core/assets-raw/sprites/font/pack.json | 8 -------- core/assets-raw/sprites/pack.hjson | 8 ++++++++ core/assets-raw/sprites/pack.json | 10 ---------- gradle.properties | 2 +- 5 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 core/assets-raw/sprites/font/pack.hjson delete mode 100644 core/assets-raw/sprites/font/pack.json create mode 100644 core/assets-raw/sprites/pack.hjson delete mode 100644 core/assets-raw/sprites/pack.json diff --git a/core/assets-raw/sprites/font/pack.hjson b/core/assets-raw/sprites/font/pack.hjson new file mode 100644 index 0000000000..5b984e4785 --- /dev/null +++ b/core/assets-raw/sprites/font/pack.hjson @@ -0,0 +1,7 @@ +maxWidth: 2 +maxHeight: 2 +minWidth: 2 +minHeight: 2 +paddingX: 0 +paddingY: 0 + diff --git a/core/assets-raw/sprites/font/pack.json b/core/assets-raw/sprites/font/pack.json deleted file mode 100644 index 97ede99a18..0000000000 --- a/core/assets-raw/sprites/font/pack.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - maxWidth: 2, - maxHeight: 2, - minWidth: 2, - minHeight: 2, - paddingX: 0, - paddingY: 0 -} diff --git a/core/assets-raw/sprites/pack.hjson b/core/assets-raw/sprites/pack.hjson new file mode 100644 index 0000000000..486c014f19 --- /dev/null +++ b/core/assets-raw/sprites/pack.hjson @@ -0,0 +1,8 @@ +duplicatePadding: true +combineSubdirectories: true +flattenPaths: true +maxWidth: 4096 +maxHeight: 4096 +fast: true +stripWhitespaceCenter: true +ignoredWhitespaceStrings: ["effects/", "environment/"] \ No newline at end of file diff --git a/core/assets-raw/sprites/pack.json b/core/assets-raw/sprites/pack.json deleted file mode 100644 index 9c2b7e51a7..0000000000 --- a/core/assets-raw/sprites/pack.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - duplicatePadding: true, - combineSubdirectories: true, - flattenPaths: true, - maxWidth: 4096, - maxHeight: 4096, - fast: true, - stripWhitespaceCenter: true, - ignoredWhitespaceStrings: ["effects/", "environment/"] -} diff --git a/gradle.properties b/gradle.properties index 2621bb2854..63c259d376 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=66e543ff96 +archash=a20d6b823e