Skip to content

Minecraft: Java Edition 26.3 rewritten from scratch in Rust, checked against vanilla with 281 differential harnesses. Get it with the Horizon launcher.

Merge main into #6334

Ludovic Marie2d5237b3be7c
diff --cc crates/horizon-client/src/game/item_draw.rs
index 09554d3e2,89059759d..8476e7e4b
--- a/crates/horizon-client/src/game/item_draw.rs
+++ b/crates/horizon-client/src/game/item_draw.rs
@@@ -293,39 -292,21 +293,44 @@@ impl Game<'_>
display: DisplayContext,
owner: Option<&OwnerState>,
seed: i32,
+ ) -> ItemRenderState {
+ self.resolve_item_in_hand(stack, display, owner, seed, CitHand::Main)
+ }
+ /// [`Self::resolve_item`] of a stack held in `hand`, which OptiFine CIT rules can test
+ /// (GUI items count as the main hand).
+ pub(super) fn resolve_item_in_hand(
+ &self,
+ stack: &ItemStack,
+ display: DisplayContext,
+ owner: Option<&OwnerState>,
+ seed: i32,
+ hand: CitHand,
) -> ItemRenderState {
let level = self.item_level();
- let mut state = self.pack.item_renderer.resolve(
+ let renderer = &self.pack.item_renderer;
+ let rule = renderer.cit.as_ref().and_then(|cit| {
+ let item_max = self
+ .res
+ .items()
+ .get(&stack.item)
+ .map_or(0, |i| i.max_damage);
+ let max_damage = item_render::cit::stack_max_damage(stack, item_max);
+ cit.rules.select(CitKind::Item, stack, hand, max_damage)
+ });
- renderer.resolve_with_rule(
++ let mut state = renderer.resolve_with_rule(
&item_render::stack_view(stack),
display,
owner,
Some(&level),
seed,
&self.item_env(),
+ rule,
- )
+ );
+ state.hdr_tier = self.luminance().hdr_tier(&stack.item);
+ if state.hdr_tier > 0 && self.renderer.as_ref().is_some_and(|r| r.hdr_on()) {
+ state.hdr_light = self.luminance().of(&stack.item);
+ }
+ state
}
/// `GuiGraphics.renderItem(player, level, stack, x, y, 0)`.
pub(super) fn draw_item_model(&self, batch: &mut HudBatch, stack: &ItemStack, x: f32, y: f32) {
diff --cc crates/horizon-client/src/item_render.rs
index c1ae6e014,6dc06a146..6f0513cca
--- a/crates/horizon-client/src/item_render.rs
+++ b/crates/horizon-client/src/item_render.rs
@@@ -557,10 -575,14 +579,14 @@@ impl ItemRenderer
.map(|(item, components)| Ok((item, serde_json::from_value(components)?)))
.collect::<serde_json::Result<_>>()?;
let models = ItemModels {
- definitions: load_definitions(root),
+ definitions: if drawn {
+ load_definitions(root)
+ } else {
+ BTreeMap::new()
+ },
prototypes,
};
- let library = library?;
+ let (library, cit) = cit::load(root, library?);
let permutations = PalettedPermutations::from_atlas(
&fs::read_to_string(root.join("assets/minecraft/atlases/items.json"))
.unwrap_or_default(),