Skip to content

Backport Wave 1: chimeric-lib shared API, fixes and test harness (26.1.2) - #82

Merged
chimericdream merged 1 commit into
26.1.2from
backport/26.1.2/chimeric-lib
Jul 27, 2026
Merged

Backport Wave 1: chimeric-lib shared API, fixes and test harness (26.1.2)#82
chimericdream merged 1 commit into
26.1.2from
backport/26.1.2/chimeric-lib

Conversation

@chimericdream

Copy link
Copy Markdown
Owner

Wave 1 of the main26.1.2 backport. Plan: docs/backport-26.1.2/chimeric-lib.md.

Stacked on #81 — base is backport/26.1.2/shared-build, merge that first. This PR blocks all 14 per-mod PRs, which compile against the API added here.

Bug fixes

  • 1.6 ImplementedInventory.isMatchingPartialStack used 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.
  • 4.7 clearContent now preserves the fixed slot count of a NonNullList.withSize.
  • 2.4 BlockConfig.getTexture() used Map.getOrDefault, whose default argument is evaluated unconditionally — a config with an explicit texture but no ingredient threw IllegalStateException: No default ingredient set from a fallback it never needed.

New shared API (what Wave 2 depends on)

Class Item Replaces
screen/InventoryScreenHandler 3.2, 2.6 Simple/DoubleWide collapse to thin subclasses that only pin the column count
inventories/ContainerOpenersCounters 3.5 Three hand-rolled anonymous counters. Takes the menu class as a required parameter — which is what makes shulker-stuff's 2.5 unrepeatable
item/AbstractWrenchItem 3.4 Wrench logic duplicated byte-for-byte between minekea and hopper-xtreme
blocks/BlockUtils 3.9 Moved here from sponj
neoforge/loot/LootModifierHelper 3.6 DeferredRegister.create(NeoForgeRegistries...) boilerplate in two mods

ColorHelpers gains getTints() with a private, defensively-copied palette and a lower bound on getTint. The 26.1.2 flat constants are kept — main's Blocks.WOOL.red() accessors don't exist here.

Test harness

common/testFixtures publishes BootstrapMinecraft + 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

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. Wrong — that was inferred from git grep DATA_COMPONENT_INITIALIZERS 26.1.2 returning nothing, which only proves the repo never used it. Removing the bake failed 8 of 43 tests; 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.

This also means minekea must keep its datagen component bind. minekea.md, README.md, docs/TESTING.md and CLAUDE.md are all corrected in this PR.

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 uses fabric-api's public FabricBlockEntityTypeBuilder — that source set is fabric-only and never ships.

Verification

  • :chimeric-lib:{common,fabric,neoforge}:build green
  • :chimeric-lib:fabric:test43/43
  • :chimeric-lib:fabric:runGameTest11/11

🤖 Generated with Claude Code

@coderabbitai

coderabbitai Bot commented Jul 26, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 79f1b7d5-dc16-4945-a0d8-1351e7a3b6ec

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch backport/26.1.2/chimeric-lib

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

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>
@chimericdream
chimericdream force-pushed the backport/26.1.2/chimeric-lib branch from 7c945fb to c213381 Compare July 27, 2026 00:43
@chimericdream
chimericdream merged commit cbb5aad into 26.1.2 Jul 27, 2026
3 checks passed
@chimericdream
chimericdream deleted the backport/26.1.2/chimeric-lib branch July 27, 2026 00:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant