Backport: houdini-block — client ghost items and the double drop (26.1.2) - #87
Merged
Merged
Conversation
Wave 1 of docs/backport-26.1.2. Everything Wave 2's mods compile against.
Bug fixes:
- ImplementedInventory.isMatchingPartialStack compared with ItemStack.matches,
which also compares counts, so two otherwise-identical partial stacks only
merged when their counts happened to be equal. Every tryInsert consumer
(minekea shelves/armoires/glass jars, the block painter, the hopper filter)
silently failed to merge partials. Use isSameItemSameComponents. (1.6)
- clearContent now preserves the fixed slot count of a NonNullList.withSize. (4.7)
- BlockConfig.getTexture() used Map.getOrDefault, whose default argument is
evaluated unconditionally, so a config with an explicit texture but no
ingredient threw "No default ingredient set" from a fallback it never needed.
Look the texture up first. (2.4)
New shared API (the Wave 2 dependency surface):
- screen/InventoryScreenHandler - base for fixed-grid container menus (layout,
quickMoveStack, removed()/stopOpen()). Simple/DoubleWide collapse to thin
subclasses that only pin the column count. (3.2, 2.6)
- inventories/ContainerOpenersCounters - factory replacing three hand-rolled
anonymous counters. Takes the menu class as a required parameter and confirms
ownership against the block entity, which is what makes shulker-stuff's 2.5
unrepeatable. (3.5)
- item/AbstractWrenchItem - the wrench logic duplicated byte-for-byte between
minekea and hopper-xtreme. (3.4)
- blocks/BlockUtils - moved here from sponj. (3.9)
- neoforge/loot/LootModifierHelper.createRegister(modId). (3.6)
ColorHelpers: palette arrays are private and handed out only as defensive
copies via a new getTints(String); getTint gains a lower bound. The 26.1.2 flat
Blocks/Items constants are kept - main's ColorCollection accessors
(Blocks.WOOL.red()) do not exist here. (4.7)
Test harness: common/testFixtures publishes BootstrapMinecraft plus
GameTestContainers/Entities/Menus; 9 JUnit classes (43 tests) and 5 fabric
GameTest classes (11 tests) in the never-shipped gametest source set.
Two adaptations the plan did not predict, both now recorded in it:
1. Data components ARE lazily bound on 26.1.2. The plan said the
"Components not bound yet" bake was 26.2-only and should be deleted; that was
inferred from `git grep DATA_COMPONENT_INITIALIZERS 26.1.2` returning nothing,
which only proves the repo never used it. Without the bake, 8 of 43 tests fail;
javap on the 26.1.2 jar shows BuiltInRegistries.DATA_COMPONENT_INITIALIZERS and
DataComponentInitializers.build(Provider) -> List<PendingComponents> with
apply(), identically shaped to 26.2. BootstrapMinecraft keeps main's bake.
This also means minekea must KEEP its datagen component bind - minekea.md,
README.md, docs/TESTING.md and CLAUDE.md are all corrected here.
2. new BlockEntityType<>(factory, blocks) is private on 26.1.2 (public on 26.2).
Mods that call it directly each widen it in their own access widener;
chimeric-lib has none enabled. Rather than add a shipping access widener to
serve a test fixture, the gametest builds the type with fabric-api's public
FabricBlockEntityTypeBuilder - that source set is fabric-only and never ships.
Gate: :chimeric-lib:{common,fabric,neoforge}:build green;
:chimeric-lib:fabric:test 43/43; :chimeric-lib:fabric:runGameTest 11/11.
Backport of e5233d8, e69d6e8, 60a8169, 3aaa3bb, 5315faa, 8d7fa89,
875eaa2, 5f70e69, d0ed03c, 8acc6af, e8aaffb, c392de4.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
…t table
2.8 - replaceWithBlockInHand and playerWillDestroy both called
world.addFreshEntity and setBlockAndUpdate with no isClientSide guard, so a
client running those paths spawned its own copy of the dropped Houdini Block
(which popped the moment the server synced) and swapped the block locally
before the server said so. Guards go on the item spawn and the block swap;
particles stay unguarded because they are a level event vanilla fires on both
sides. spawnHoudiniBlockItem also bails early on the client even though both
callers already guard - deliberate belt-and-braces, commented as such.
Double drop (found while testing 2.8) - the block hands itself back manually in
both paths AND carried a loot table: Properties.ofFullCopy(Blocks.STONE)
inherits stone's derived-name drops, resolving to
blocks/houdini_block.json. A player breaking it with the right tool therefore
got the loot-table drop on top of the manual spawn - two blocks for one. Add
.noLootTable() and delete the loot-table JSON.
Verified BlockBehaviour.Properties.noLootTable() exists on 26.1.2 via javap
rather than assuming (no file on this branch used it).
Adaptation: the gametest's mock-player helper used
GameTestHelper.makeMockServerPlayer(GameType), which 26.1.2 does not have. Here
makeMockPlayer(GameType) honours the game mode but returns a plain Player (no
gameMode field to drive destroyBlock), and makeMockServerPlayerInLevel()
returns a ServerPlayer whose gameMode() is hardcoded to CREATIVE. Neither
yields a survival ServerPlayer, so the helper now constructs one directly and
overrides gameMode() - ServerPlayerGameMode reads the mode back through that
accessor.
Gate: :houdini-block:{common,fabric,neoforge}:build green;
:houdini-block:fabric:runGameTest 5/5. Falsified the survival-break test
(asserting 2 drops instead of 1) to confirm the replacement mock player
really drives the drop path rather than passing vacuously - it failed with
"Expected 2 ... found 1".
Wave 2 of docs/backport-26.1.2; see houdini-block.md.
Backport of 1beaea9 + d23ae3c + 9006fdd + 41ab0ad + 2b53182.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
chimericdream
force-pushed
the
backport/26.1.2/chimeric-lib
branch
from
July 27, 2026 00:43
7c945fb to
c213381
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Wave 2, stacked on #82. Plan:
docs/backport-26.1.2/houdini-block.md.replaceWithBlockInHandandplayerWillDestroyboth calledworld.addFreshEntityandsetBlockAndUpdatewith noisClientSideguard, so a client running those paths spawned its own copy of the dropped block (which popped the moment the server synced) and swapped the block locally before the server said so. Guards go on the item spawn and the block swap; particles stay unguarded because they're a level event vanilla fires on both sides.spawnHoudiniBlockItemalso bails early on the client even though both callers guard — deliberate belt-and-braces, commented as such.Properties.ofFullCopy(Blocks.STONE)inherits stone's derived-name drops. A player breaking it with the right tool got the loot-table drop on top of the manual spawn — two blocks for one. Adds.noLootTable()and deletes the loot-table JSON.Adaptations
BlockBehaviour.Properties.noLootTable()exists on 26.1.2 viajavaprather than assuming — no file on this branch used it.GameTestHelper.makeMockServerPlayer(GameType), which 26.1.2 doesn't have. HeremakeMockPlayer(GameType)honours the mode but returns a plainPlayer(nogameModefield to drivedestroyBlock), andmakeMockServerPlayerInLevel()returns aServerPlayerwhosegameMode()is hardcoded to CREATIVE. Neither yields a survivalServerPlayer, so the helper builds one directly and overrides the accessor.Verification
:houdini-block:fabric:runGameTest5/5.Because I replaced the mock player, I falsified the survival-break test (asserting 2 drops instead of 1) to confirm it really drives the drop path rather than passing vacuously — it failed with "Expected 2 … found 1".
🤖 Generated with Claude Code