Backport: enchantment-numbers-fix — @Overwrite to @Redirect, guard RomanNumeralUtil (26.1.2) - #89
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>
…rect; guard RomanNumeralUtil 4.3 - ENFEnchantmentMixin used @overwrite on Enchantment.getFullname: a verbatim copy of vanilla with one line changed (the level suffix). @overwrite is maximally incompatible - any other mod touching getFullname clashes. Replace it with a @reDIrect on the single internal Component.translatable(String) call, substituting a literal Roman-numeral component. Vanilla keeps ownership of the description copy, the curse/gray styling, and the `level != 1 || maxLevel != 1` guard that decides whether a suffix is appended at all, so this now composes with other enchantment-tooltip mods. Six imports become unused and are dropped. 4.5 - RomanNumeralUtil.toRoman falls back to the Arabic value outside 1..3999. Classic numerals do not represent 0 or negatives, which other mods' /enchant commands can produce, and for n < 1 map.floorKey(n) returns null - which the old code unboxed straight to int, throwing NPE. Verified on 26.1.2 rather than assumed, since a mixin that fails to apply is not a compile error: - javap on the 26.1.2 jar: getFullname contains exactly one Component.translatable(String) invocation (offset 95, immediately before the append that adds the suffix), so the @reDIrect needs no `ordinal`. - A temporary GameTest run - removed again before this commit - printed getFullname(sharpness, 3) = 'Sharpness III' (not '3'), proving the redirect both resolves and fires, and toRoman(-5|0|4000) = '-5'|'0'|'4000'. Gate: :enchantment-numbers-fix:{common,fabric,neoforge}:build green. Wave 2 of docs/backport-26.1.2; see enchantment-numbers-fix.md. Backport of 0b7f650 + 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 |
This was referenced Jul 26, 2026
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/enchantment-numbers-fix.md.ENFEnchantmentMixinused@OverwriteonEnchantment.getFullname: a verbatim copy of vanilla with one line changed.@Overwriteis maximally incompatible — any other mod touchinggetFullnameclashes. Now a@Redirecton the single internalComponent.translatable(String)call. Vanilla keeps ownership of the description copy, the curse/gray styling, and thelevel != 1 || maxLevel != 1guard, so this composes with other enchantment-tooltip mods.RomanNumeralUtil.toRomanfalls back to the Arabic value outside 1..3999. Classic numerals don't represent 0 or negatives — which other mods'/enchantcommands can produce — and forn < 1map.floorKey(n)returnsnull, which the old code unboxed straight toint, throwing NPE.Verified at runtime, not just compiled
A mixin that fails to apply is not a compile error, so:
javap -con the 26.1.2 jar:getFullnamecontains exactly oneComponent.translatable(String)invocation (offset 95, immediately before the append that adds the suffix) — so the@Redirectneeds noordinal.getFullname(sharpness, 3) = 'Sharpness III'(not'3'), proving the redirect both resolves and fires, andtoRoman(-5|0|4000)='-5'|'0'|'4000'.Both loaders build.
Note the deliberate contrast with banner-tweaks (#90), which keeps its
@Overwritefor the same review item: there the changed behaviour is distributed through the method, here it's a single call.🤖 Generated with Claude Code