From dc54566cd44d988aed817fd3eedf69b7f8d3ba0b Mon Sep 17 00:00:00 2001 From: Pyogenics Date: Sat, 7 Mar 2026 16:08:44 +0000 Subject: [PATCH] Sort localisation strings alphabetically like 4j does --- Minecraft.Assets/meson.build | 8 ++++---- Minecraft.Client/Build/stdafx.h | 2 +- Minecraft.World/Build/stdafx.h | 2 +- scripts/pack_loc.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Minecraft.Assets/meson.build b/Minecraft.Assets/meson.build index 902d3535f..3264556c4 100644 --- a/Minecraft.Assets/meson.build +++ b/Minecraft.Assets/meson.build @@ -22,14 +22,13 @@ install_subdir(client_platform_path / 'DurangoMedia/DLC', install_dir : 'Windows # TODO: Need to make this take inputs localisation = custom_target('Minecraft.Assets_Localisation', - output : [ 'languages.loc', 'localisation_strings.h' ], + output : [ 'languages.loc', 'strings.h' ], command : [ 'python3', meson.project_source_root() / 'scripts/pack_loc.py', client_platform_path / 'Windows64Media/loc', '@OUTPUT0@', '@OUTPUT1@' - ], - build_always_stale : true + ] ) colour_table = custom_target('Minecraft.Assets_Colour_Table', @@ -427,7 +426,7 @@ assets_archive = custom_target('Minecraft.Assets_Archive', install : true, install_dir : 'Common/Media', build_subdir : 'Common/Media', - build_by_default : true, + build_by_default : true ) @@ -438,6 +437,7 @@ assets_archive = custom_target('Minecraft.Assets_Archive', assets_localisation_dep = declare_dependency( sources : localisation[1], + # sources : client_platform_path / 'Windows64Media/strings.h', include_directories : include_directories('.') ) diff --git a/Minecraft.Client/Build/stdafx.h b/Minecraft.Client/Build/stdafx.h index 70b19eb0a..125f6a34f 100644 --- a/Minecraft.Client/Build/stdafx.h +++ b/Minecraft.Client/Build/stdafx.h @@ -236,7 +236,7 @@ typedef XUID GameSessionUID; #include "Common/BuildVer.h" // This is generated at build time via scripts/pack_loc.py -#include "localisation_strings.h" +#include "strings.h" #ifdef _XBOX #include "../Platform/Xbox/Xbox_App.h" diff --git a/Minecraft.World/Build/stdafx.h b/Minecraft.World/Build/stdafx.h index 0a996f76a..ab23484f8 100644 --- a/Minecraft.World/Build/stdafx.h +++ b/Minecraft.World/Build/stdafx.h @@ -208,7 +208,7 @@ void MemSect(int sect); #include "../../Minecraft.Client/Build/Common/BuildVer.h" // This is generated at build time via scripts/pack_loc.py -#include "localisation_strings.h" +#include "strings.h" #ifdef _XBOX #include "../../Minecraft.Client/Platform/Xbox/Xbox_App.h" diff --git a/scripts/pack_loc.py b/scripts/pack_loc.py index 0e4a2e15d..42afaf3d9 100644 --- a/scripts/pack_loc.py +++ b/scripts/pack_loc.py @@ -71,7 +71,7 @@ for lang_file_path in lang_file_paths: strings[string_name] = string print(f"Processed {len(strings)} strings from {lang_file_path}") - langs[lang_name] = strings + langs[lang_name] = dict(sorted(strings.items())) print(f"Processed {len(langs)} languages") # Write loc file