Implement QOL Features #24
No reviewers
Labels
No labels
No milestone
No project
No assignees
3 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
pokebedrock/pokebedrock-res!24
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "feature/qol-updates"
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?
Lang for pokebedrock/pokebedrock-beh#780
events.claimManager.error.tooSmallis updated in place (%1side,%2area,§ckept). The duplicate at the top of each file is gone.models.battleUtils.error.ballMissedandmodels.player.bag.error.missed.Non-English files use the English fallback for the changed strings.
Review at
9e04867f(res companion to behfeature/qol-updates).Blocker:
events.claimManager.error.tooSmallis now defined twice in every lang file. The new line 3 was added, but the original key further down (around L4095 in en_US/de_DE/es_ES) was never removed or edited. That leaves the file ambiguous, and the old stale "Greater Than or Equal to 10" line comes later, so in practice players will likely keep seeing the old message instead of the new%1x%1text. Edit the existing key in place in itsevents.claimManagersection and drop the line 3 copies.Also: the non-English copies just repeat the old "≥ 10" wording, which is wrong now that the beh side enforces a 3x3 minimum and passes
with: [size, area]. They need the%1/%2placeholders too (an English fallback is fine until translators catch up).The skipAnimation keys look right: placeholder counts match beh
langKeys.ts(title 1, body 2, buttons 0), and%1style matches the newer keys. They're English in all 6 non-en files, which is fine as a fallback, just flagging it for translation follow-up.Nit: PR body is empty. Please link the companion beh branch/PR so the two get merged together.
@ -1,5 +1,6 @@pack.name=§lPokeBedrock v3.1.0 RESpack.description=§aEin High-Level-Pokémon-Addon von Smell of curry erstellt für Minecraft Bedrockevents.claimManager.error.tooSmall=§cUngültige Auswahl, Claimgröße muss größer oder gleich 10 sein!Same duplicate-key problem here and in cs_CZ, es_ES, pt_BR, ru_RU and zh_CN: line 3 just copies the existing (~L4095) value word for word. It also keeps the stale "≥ 10" wording, which no longer matches the beh rule (3x3 minimum, with
%1= side length and%2= total area passed in). Fix the existing key in place in each locale with the%1/%2placeholders (English fallback is OK), and delete these line 3 copies.@ -1,5 +1,6 @@pack.name=§lPokeBedrock v3.1.0 RESpack.description=§aA High Level Pokemon Addon Created by Smell of curry for Minecraft Bedrockevents.claimManager.error.tooSmall=Claims must be at least %1x%1 blocks (%2 blocks total).Duplicate key.
events.claimManager.error.tooSmallalready exists in theevents.claimManagerblock (~L4095) with the old "≥ 10" text, and that later line is the one most likely to win. Update that line in place instead of adding a second definition here. Keep the§cprefix too, since every siblingevents.claimManager.error.*string is red and this one dropped it:events.claimManager.error.tooSmall=§cClaims must be at least %1x%1 blocks (%2 blocks total).9e04867fb6ae97fee9e7Re-review at
ae97fee9.Both blockers from my last review are fixed.
events.claimManager.error.tooSmallis now edited in place in itsevents.claimManagerblock in all 7 locales, so there's no duplicate key, it keeps the§cprefix, and it uses%1/%2, which matches beh #780 (langKeyscount 2,with: [size, area]).Checked against beh #780 at fe5e60c1:
skipAnimationtitle/body/buttons placeholder counts match (1/2/0/0).events.onInteract.slider.giveRareCandy(0 args) matches theaddSlidercall.models.battleUtils.error.ballMissedandmodels.player.bag.error.missedmatches beh removing both keys and their call sites.Non-blocking:
tooSmall, the skipAnimation keys andgiveRareCandyare English in cs_CZ/de_DE/es_ES/pt_BR/ru_RU/zh_CN. That's fine as a fallback, but they need a translation pass later.CI (build-and-test, model-preview) was still pending when I reviewed, so this approval covers the lang content only. Merge once CI is green and it's paired with beh #780.
@ -11919,3 +11922,4 @@ commands.spawnrate.success=Spawn rate settings updated.phud.playerPing.label=Current Ping:message.rewards.grantError=§cFailed to give reward %s, please report this in the discord.\nError: %sNit: this adds an extra trailing blank line at EOF. The same happens in all 7 locale files, so please drop it in each one.
Re-review at
ae97fee9(fixes from9e04867fREQUEST_CHANGES).Prior blockers are cleared:
events.claimManager.error.tooSmallis edited in place in the claimManager section (no duplicate), keeps§c, and uses%1/%2to match beht(..., MIN_CLAIM_SIZE, MIN_CLAIM_BLOCK_AREA)/ langKeys arity 2. Skip-animation keys still match PokemonEntity (title1,body2, buttons 0). Rare-candy slider key matcheson_interact/ langKeys arity 0. Unused ball-miss keys are gone. PR body now links beh #780.English fallbacks in the non-en locales for the changed strings are fine until translators catch up. Merge with beh #780.
Addressed on
ae97fee9e. This Forgejo build returns 405 for review-comment replies and resolve, so the answers are here.events.claimManager.error.tooSmallline is updated in place and keeps the§cprefix:Claims must be at least %1x%1 blocks (%2 blocks total).%1and%2still substitute.Also added
events.onInteract.slider.giveRareCandyand removedmodels.battleUtils.error.ballMissedandmodels.player.bag.error.missed. Companion: pokebedrock/pokebedrock-beh#780