Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix translate fallbacks for 1.19.4 #857

Merged
merged 6 commits into from
Apr 10, 2023

Conversation

misode
Copy link
Member

@misode misode commented Mar 13, 2023

The first commit was automated through regexes:

For *.mcfunction:
"translate":\s*"%1\$s%3427655\$s",\s*"with":\s*\["([^"]+)",\{"translate":\s*"([a-z0-9_.]+)"\}\] -> "translate":"$2","fallback":"$1"

"translate":"%1\$s%3427655\$s","with":\["([^"]+)",\{"translate":"([a-z0-9_.]+)","with":\[\{"translate":"([a-z0-9_.]+)"\}\]\}\] -> "translate":"$2","fallback":"$1","with":[{"translate":"$3"}]

For *.json:
"translate": "%1\$s%3427655\$s",\n(\s+)"with": \[\n\s+"([^"]+)",\n\s+\{\n\s+"translate": "([a-z0-9_.]+)"\n\s+\}\n\s+\] -> "translate": "$3",\n$1"fallback": "$2"

"translate": "%1\$s%3427655\$s",\n(\s+)"with": \[\n\s+"([^"]+)",\n\s+\{"translate": "([a-z0-9_.]+)"\}\n\s+\] -> "translate": "$3",\n$1"fallback": "$2"

Following commits will be manual, but currently ignoring:
gm4_guidebook,guidebook,gm4_combat_expanded,machine,gm4_auto_crafting,lib_machines

@SpecialBuilder32 SpecialBuilder32 added the fix This fixes something that was wrong label Mar 26, 2023
@SpecialBuilder32
Copy link
Member

I believe that we should also check the contents of structure files for any translation data hidden within (I know orbis pirates have a custom hat) that will have been missed by this textfile regex

@Bloo-dev
Copy link
Member

Bloo-dev commented Apr 2, 2023

I know orbis pirates have a custom hat
This is no longer the case, I have moved the custom hat to a loot table.

However, that check is probably still a good idea.

@misode misode marked this pull request as ready for review April 5, 2023 21:30
@misode misode linked an issue Apr 6, 2023 that may be closed by this pull request
@misode misode changed the base branch from master to 1.19.4-update April 10, 2023 20:11
@misode
Copy link
Member Author

misode commented Apr 10, 2023

Merging with the 1.19.4 dev branch

@misode misode merged commit 9646644 into Gamemode4Dev:1.19.4-update Apr 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix This fixes something that was wrong
Projects
None yet
Development

Successfully merging this pull request may close these issues.

In-Game Text Appears Broken
3 participants