Revamp Party GUI Form To Use New DDUI CustomForm's #7
bot
smell-of-curry
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "feature/ddui-testing"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Resource-pack review of head
487555b5df1e(companion to beh#716). mergeable=false vs current main — rebase before merge. No prior reviews.This PR is lang only (7 locale files). There is no party UI JSON / DDUI screen in res — title oversells "Revamp Party GUI Form". That is fine if the form lives in beh#716; just do not expect a UI review here.
Needs work, not a hard asset break:
forms.party.label.*keys are English in every locale (cs/de/es/pt/ru/zh).models.battleUtils.move.{currentPP,maxPP,accuracy}added (also English-only), anddatabase.pokemon.summary.separatorshortened in en_US only. Split those out.forms.party.label.confirmMoveChangehas- >(spaces around the arrow).Party button/title rewords (
Return Pokemon,§e%1'stitles, dropped leading\n\non useCount) look intentional for the DDUI layout.@ -10661,6 +10664,18 @@ forms.party.title.editSkin=Upravit skin %1forms.party.title.move=Útok: %1forms.party.title.pokemon=Pokémon: %1forms.party.title.summary=Souhrn: %1forms.party.label.editMoves=Click on the move icon to edit the move in that slot.These new party labels (and the battleUtils PP/accuracy keys) are pasted in English. Same on de/es/pt/ru/zh. Either translate or keep the keys en_US-only until localization is ready — do not ship English UI copy as Czech.
@ -10664,0 +10667,4 @@forms.party.label.editMoves=Click on the move icon to edit the move in that slot.forms.party.label.moveSlot=§lSlot %1: §r%2forms.party.label.moveDescription=§lDescription:\n§r%sforms.party.label.confirmMoveChange=§lConfirm Change: %1\n§r%2 - > %3%2 - > %3reads like a typo. Use→or->without the extra spaces so the confirm line does not look broken in the form.Request changes. The localized companion is not merge-ready: the new party/battle labels remain English across non-en_US locales, confirmMoveChange contains the malformed "- >" separator, and the PR conflicts with current main. Please translate or keep non-English keys out until localized, fix the separator, remove unrelated churn, rebase, and rerun CI. Existing inline comments identify the affected lines.
487555b5df2afc862e0628910d0e3ee0eb6b154ce0eb6b154c6ac88eb9d7Re-review of head
a6ca7815after main merge (prior bot reviews on487555b5are stale). Companion to beh#716. mergeable=true vs main5a2ff211— conflict cleared. Still lang-only (7 locale files); no party UI JSON/DDUI screen in res.Still blocking (same class as before):
forms.party.label.*/ category strings are English in every non-en_US locale (cs/de/es/pt/ru/zh).forms.party.label.confirmMoveChangestill has malformed- >(spaces around the arrow) in all locales.models.battleUtils.move.{currentPP,maxPP,accuracy}(also English-only outside en_US),common.default=Defaultuntranslated, anddatabase.pokemon.summary.separatorshortened in en_US only. Split those out or localize them with the party keys.Progress / nits:
common.errornow takes%s(watch callers that expected the bareErrorstring).pt_BRcatchFaileddouble-E typo fix is fine to keep.runickname errors got real Russian — keep that pattern for the new labels.Translate (or omit non-en keys until localized), fix the arrow, drop/split unrelated keys, then this can clear. Not merge-ready until those land + CI green.
@ -4444,7 +4444,10 @@ models.battle.log.entry=§c[BITVA]: §r%smodels.battle.log.request=§a[ŽÁDOST O BITVU]: §r%smodels.battleUtils.error.ballMissed=Míč chyběl!models.battleUtils.error.catchFailed=§cChyba při chytání Pokémona: %smodels.battleUtils.move.currentPP=Current PP: %sBattle-utils PP/accuracy keys are English here and in the other non-en files — out of scope for a Party GUI lang PR, and untranslated. Split to a separate change or localize with the party strings.
@ -10815,6 +10821,22 @@ forms.party.title.editSkin=Upravit skin %1forms.party.title.move=Útok: %1forms.party.title.pokemon=Pokémon: %1forms.party.title.summary=Souhrn: %1forms.party.label.editMoves=Click on the move icon to edit the move in that slot.English left in cs_CZ (and the same block is English in de/es/pt/ru/zh). Translate these
forms.party.label.*/ category keys, or keep them out of non-en locales until a localization pass.@ -10818,0 +10824,4 @@forms.party.label.editMoves=Click on the move icon to edit the move in that slot.forms.party.label.moveSlot=§lSlot %1: §r%2forms.party.label.moveDescription=§lDescription:\n§r%sforms.party.label.confirmMoveChange=§lConfirm Change: %1\n§r%2 - > %3Malformed separator:
- >should be something like→or->without the spaces around the hyphen. This string is copied into every locale as-is.Request changes on head
a6ca7815(main merged in; mergeable=true). Companion to beh#716. Still lang-only — no party UI JSON in res.Prior REQUEST_CHANGES on
487555b5is not addressed:forms.party.label.*/ category keys remain English in every non-en_US locale.forms.party.label.confirmMoveChangestill has the malformed- >separator (all locales).models.battleUtils.move.{currentPP,maxPP,accuracy}English-only across locales,common.default=DefaultEnglish-only,database.pokemon.summary.separatorshortened in en_US only.Translate or keep non-English keys out until localized, fix the separator, split unrelated churn, then re-request review. Nickname §cError: stripping and intentional DDUI title rewords look fine.
@ -4444,7 +4444,10 @@ models.battle.log.entry=§c[BITVA]: §r%smodels.battle.log.request=§a[ŽÁDOST O BITVU]: §r%smodels.battleUtils.error.ballMissed=Míč chyběl!models.battleUtils.error.catchFailed=§cChyba při chytání Pokémona: %smodels.battleUtils.move.currentPP=Current PP: %sUnrelated to Party DDUI and English-only here. Split
models.battleUtils.move.{currentPP,maxPP,accuracy}(and the similarcommon.default) out of this PR.@ -10815,6 +10821,22 @@ forms.party.title.editSkin=Upravit skin %1forms.party.title.move=Útok: %1forms.party.title.pokemon=Pokémon: %1forms.party.title.summary=Souhrn: %1forms.party.label.editMoves=Click on the move icon to edit the move in that slot.Still English in cs_CZ (and the other non-en_US files). Same for the rest of the new
forms.party.label.*/forms.party.category.*block below — translate or omit until localized.@ -10818,0 +10824,4 @@forms.party.label.editMoves=Click on the move icon to edit the move in that slot.forms.party.label.moveSlot=§lSlot %1: §r%2forms.party.label.moveDescription=§lDescription:\n§r%sforms.party.label.confirmMoveChange=§lConfirm Change: %1\n§r%2 - > %3Malformed separator:
- >should be→or->(no spaces around a broken split). Same string is copied into every locale.Re-review of head
a73bbaff(prior tipa6ca7815+ CI workflow retarget). Companion to beh#716. mergeable=true vs maind9b4c7e6(merge_base5a2ff211). Still primarily lang (+ one workflow file); no party UI JSON/DDUI screen in res.Tip commit:
Point model preview at the Forgejo copy of the action.—model-preview.ymlnowuses: https://git.pokebedrock.com/pokebedrock/mc-model-preview@b10a8ffc…instead ofsmell-of-curry/mc-model-preview@latest. Sound Forgejo pin; does not clear lang blockers.Prior REQUEST_CHANGES (#2938/#2936) still stand — unchanged lang content:
forms.party.label.*/forms.party.category.*strings remain English in every non-en_US locale (cs/de/es/pt/ru/zh).forms.party.label.confirmMoveChangestill has malformed- >(spaces around the arrow) in all locales including en_US.models.battleUtils.move.{currentPP,maxPP,accuracy}English-only outside en_US,common.default=DefaultEnglish-only,database.pokemon.summary.separatorshortened in en_US only.Translate (or omit non-en keys until localized), fix the arrow, split unrelated keys, then re-request. Nickname §cError: stripping and intentional DDUI title rewords still look fine. Not merge-ready until those land + CI green.
Do not merge res alone (beh companion).
@ -4445,2 +4445,4 @@models.battleUtils.error.ballMissed=Ball wurde verfehlt!models.battleUtils.error.catchFailed=§cFehler beim Fangen von Pokémon: %smodels.battleUtils.move.currentPP=Current PP: %smodels.battleUtils.move.maxPP=Max PP: %sStill blocking / out of scope:
models.battleUtils.move.{currentPP,maxPP,accuracy}added as English-only here (same in other non-en locales), pluscommon.default=DefaultEnglish-only later in this file. Split unrelated battle/common keys out of this party-DDUI lang PR, or localize them with the party keys.@ -10816,2 +10822,4 @@forms.party.title.pokemon=Pokémon: %1forms.party.title.summary=Zusammenfassung: %1forms.party.label.editMoves=Click on the move icon to edit the move in that slot.forms.party.label.moveSlot=§lSlot %1: §r%2Still blocking (same class as #2938): new
forms.party.label.*/forms.party.category.*block is English in de_DE (and the same English blob in cs/es/pt/ru/zh). Translate these, or keep the keys out of non-en_US until localized.@ -10817,1 +10823,4 @@forms.party.title.summary=Summary: %1forms.party.label.editMoves=Click on the move icon to edit the move in that slot.forms.party.label.moveSlot=§lSlot %1: §r%2forms.party.label.moveDescription=§lDescription:\n§r%sStill blocking:
forms.party.label.confirmMoveChangehas malformed- >(spaces around the arrow). Use->or a clear separator (e.g.→/→text) consistently across all locales — this string is copied English-only into cs/de/es/pt/ru/zh as well.Re-review of head
a73bbaff(prior REQUEST_CHANGES#2936/#2938 ona6ca7815are stale vs this tip). Companion to beh#716. tip maind9b4c7e6= PR base; mergeable=true. CI statuses pending on this SHA (build-and-test + model-preview waiting).Still lang-only for the Party/DDUI work — 7 locale files (+ workflow pin of
mc-model-previewto Forgejo). No party UI JSON/DDUI screen in res. Do not merge res alone; gameplay depends on beh#716.Prior blockers still open (unchanged in this tip — only delta vs
a6ca7815is model-preview.yml):forms.party.label.*/ category strings remain English in every non-en_US locale (cs/de/es/pt/ru/zh).forms.party.label.confirmMoveChangestill has malformed- >(spaces around the arrow) in all locales — use->or a real localized separator.models.battleUtils.move.{currentPP,maxPP,accuracy}English-only outside en_US;common.default=Defaultuntranslated in non-en;database.pokemon.summary.separatorshortened in en_US only. Split those out or localize with the party keys.Translate (or omit non-en keys until localized), fix the arrow, drop/split unrelated keys. Nickname §cError: strip + DDUI title rewords still look intentional. Not merge-ready.
Still English in cs (same for de/es/pt/ru/zh). Translate these
forms.party.label.*/ category keys or keep them out of non-en locales until localized.Malformed separator
- >(spaces around arrow) — same string in every locale including en_US. Use->or a proper localized connector.Unrelated churn: separator shortened en_US-only. Split out of this Party DDUI lang PR unless intentional + mirrored.
Out-of-scope + English-only in non-en locales (
currentPP/maxPP/accuracy). Split or localize with the party keys.Follow-up on RC 2956/2965 (head
a73bbaffhasn't changed). This isn't a new review. The earlier findings still stand.New conflict: res main
b4a8343a(v3.1.1) now conflicts with this branch intexts/pt_BR.lang(L4547). It was mergeable when it was reviewed. The cause: #24 "Implement QOL Features" deletedmodels.battleUtils.error.ballMissedfrom every lang, and this branch fixes the§cEErrotypo on the adjacentcatchFailedline. Resolution: dropballMissed(BEH main no longer references it) and keep this branch's§cErro ao capturar Pokémon: %s. It's a one-line, mechanical fix. No other paths conflict.View command line instructions
Manual merge helper
Use this merge commit message when completing the merge manually.
Checkout
From your project repository, check out a new branch and test the changes.Merge
Merge the changes and update on Forgejo.Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.