feat: add Findable Blocks (Presents) assets #4
bot
smell-of-curry
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "feature/findable-blocks"
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?
Summary
Companion RES PR for BEH findable-blocks / presents.
Branch eature/findable-blocks existed on Forgejo after the GitHub->Forgejo move, but no open PR. Rebased onto current main and reopened here.
Assets
Test plan
bb9ae3ef6abcc0cb327ebcc0cb327e61a1d097ad61a1d097adbca8b16a92Resource-pack review of head
bca8b16a9230. Live human PR (smell-of-curry); Ghost beh#487 is ignored on the beh side. mergeable=true.Present geo, 16 color textures,
block.png, andterrain_texture.jsonkeys (findable_block,findable_blocks_present_*) line up. Form/actionbar keys are present in all 7 locales.Blockers:
texts/en_US.lang(and the other locales, same +60/−1) ends with a bareError: %sline aftermessage.rewards.grantError=.... That is not akey=valueentry — it will be ignored or poison lang parse. Fold it into the grantError value (...discord.\nError: %s) or give it a real key.tile.pokeb:present.name/tile.pokeb:findable_block.name(or item names). Inventory/hotbar will show the raw identifier. Add tile names if these blocks are player-visible.Nit:
blocks.jsonhas nopokeb:present/ findable sound entry. Existing custom blocks in this pack are sound-only there; textures can come from BEHmaterial_instances. Add a sound row if you want footsteps to match.@ -11658,2 +11715,4 @@phud.playerPing.label=Current Ping:message.rewards.grantError=§cFailed to give reward %s, please report this in the discord.Error: %sOrphan lang line — no
key=. Either append tomessage.rewards.grantErroras a second line or introducemessage.rewards.grantError.detail=Error: %s. As written this is invalid.lang.@ -487,1 +487,4 @@"textures": "textures/blocks/berries/wiki/stage_5"},"findable_block": {"textures": "textures/blocks/findable_blocks/block"Atlas keys match the 16 PNGs +
textures/blocks/findable_blocks/block. Good. Still missing the clienttile.pokeb:*display names in lang, and there is noblocks.jsonsound entry for the present/findable identifiers.Re-review of head
c997d59f84cc(sync after "Fix Lang File, and Update Block Sounds Json"). Prior REQUEST_CHANGES onbca8b16a9230is stale. mergeable=false — rebase onto currentmainbefore merge; not approving conflicted heads.Fixed since last review
texts/en_US.lang: bareError: %sfolded intomessage.rewards.grantError=...\nError: %s.tile.pokeb:findable_block.nameadded in en_US.blocks.json:pokeb:findable_blocksound row added.Still blocking
Error: %sremains aftermessage.rewards.grantErrorin the other 6 locales (cs_CZ,de_DE,es_ES,pt_BR,ru_RU,zh_CN). Same poison as before — fold into the grantError value like en_US, or give it a real key. Do not leave a non-key=valueline.tile.pokeb:findable_block.nameis en_US-only. Mirror it in all 7 locales.tile.pokeb:present.name(test plan placespokeb:present). Inventory/hotbar will show the raw id if that block is player-visible. Add it in all 7 locales (and ablocks.jsonsound row forpokeb:presentif it is a distinct block id).Assets otherwise line up: present geo
geometry.findable_block_present, 16 present textures +block.png,terrain_texture.jsonkeys (findable_block,findable_blocks_present_*), form/actionbar findable keys present in all 7 locales.CI not verified green on this head — do not treat as merge-ready until checks pass post-rebase.
@ -11658,2 +11715,4 @@phud.playerPing.label=Aktuální ping:message.rewards.grantError=§cFailed to give reward %s, please report this in the discord.Error: %sStill a bare
Error: %s(notkey=value). Same in de_DE / es_ES / pt_BR / ru_RU / zh_CN. Fold intomessage.rewards.grantErrorlike en_US (...discord.\nError: %s) or give it a real key.@ -38,2 +38,4 @@item.pokeb:box_of_chocolate=Box Of Chocolate## Findable Blockstile.pokeb:findable_block.name=Findable Blocktile.pokeb:findable_block.nameis good here — mirror it in the other 6 locales. Still missingtile.pokeb:present.nameifpokeb:presentis the placeable id (see test plan).c997d59f8441132feb10Re-review of head
41132feb1084(sync after rebase onto currentmain). Prior REQUEST_CHANGES onc997d59f84cc/bca8b16a9230are stale. mergeable=true now — conflict hold lifted.Fixed since last review
main(36203026d0d3).Still blocking (unchanged vs
c997d59f84ccreview)Error: %sremains aftermessage.rewards.grantErrorin the other 6 locales (cs_CZ,de_DE,es_ES,pt_BR,ru_RU,zh_CN). Fold into the grantError value likeen_US(...discord.\nError: %s), or give it a real key. Do not leave a non-key=valueline.tile.pokeb:findable_block.nameis stillen_US-only. Mirror it in all 7 locales.tile.pokeb:present.name(test plan placespokeb:present). Inventory/hotbar will show the raw id if that block is player-visible. Add it in all 7 locales (and ablocks.jsonsound row forpokeb:presentif it is a distinct block id).Assets otherwise still line up: present geo
geometry.findable_block_present, 16 present textures +block.png,terrain_texture.jsonkeys (findable_block,findable_blocks_present_*), form/actionbar findable keys in all 7 locales,pokeb:findable_blocksound row present.Not merge-ready until the lang blockers land (and CI is green on this head).
@ -429,6 +429,9 @@"pokeb:yago_berry_plant": {"sound": "grass"},"pokeb:findable_block": {pokeb:findable_blocksound row is good. Ifpokeb:presentis a distinct block id (test plan), add a matching sound row here too.pokeb:presentis not a valid blockAck — thanks @nathan. Dropping the pokeb:present sound-row ask.
Also dropping tile.pokeb:present.name from the lang blockers for the same reason.
Still open on this head (
41132feb):@ -11659,2 +11715,4 @@phud.playerPing.label=Aktuální ping:message.rewards.grantError=§cFailed to give reward %s, please report this in the discord.Error: %sStill a bare
Error: %sline (notkey=value). Same poison inde_DE/es_ES/pt_BR/ru_RU/zh_CN. Fold intomessage.rewards.grantErrorlikeen_US(...discord.\nError: %s), or give it a real key.@ -38,2 +38,4 @@item.pokeb:box_of_chocolate=Box Of Chocolate## Findable Blockstile.pokeb:findable_block.name=Findable Blocktile.pokeb:findable_block.nameis still en_US-only — mirror in the other 6 locales. Also still missingtile.pokeb:present.namein all 7 locales (test plan placespokeb:present; inventory will show the raw id otherwise).Update on this thread: dropping the tile.pokeb:present.name ask — @nathan confirmed pokeb:present is not a valid block.
Still need: mirror tile.pokeb:findable_block.name into the other 6 locales (this key stays).
Re-review of head
2d873888406eef("Add findable block locale strings"). Prior REQUEST_CHANGES#2847 on41132febis stale. mergeable=true.Fixed since last review
Error: %sfolded intomessage.rewards.grantErrorin all 7 locales (not justen_US).tile.pokeb:findable_block.namenow present in all 7 locales.Still blocking
tile.pokeb:present.namein any locale. Test plan placespokeb:present— inventory/hotbar will show the raw id if that block is player-visible. Add it in all 7 locales.blocks.jsonstill has onlypokeb:findable_block(soundstone). Add apokeb:presentsound row if it is a distinct block id.Nit (non-blocking): the 6 non-
en_USlocales use the EnglishFindable Block/ grantError strings — fine for key presence; translate later if you care.Assets otherwise still line up. Not merge-ready until the present tile name (and sound row if distinct) land.
@ -429,6 +429,9 @@"pokeb:yago_berry_plant": {"sound": "grass"},"pokeb:findable_block": {pokeb:findable_blocksound row is here; still nopokeb:present. If present is a distinct block id (test plan), add a matching sound entry.pokeb:presentdoesnt exist@ -38,2 +38,4 @@item.pokeb:box_of_chocolate=Box Of Chocolate## Findable Blockstile.pokeb:findable_block.name=Findable BlockStill missing
tile.pokeb:present.namenext to this. Test plan placespokeb:present— add the tile name in all 7 locales or inventory/hotbar shows the raw id.pokeb:presentdoesnt exist