Allow block info hotkey to also work on units (#10894)

* Allow the block info key to also work on units

* Follow code formatting guidelines
This commit is contained in:
Iniquit 2025-06-13 18:06:14 -04:00 committed by GitHub
parent 19d3e20328
commit ef5fae289c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -251,12 +251,16 @@ public class PlacementFragment{
}
if(Core.input.keyTap(Binding.blockInfo)){
var build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
Block hovering = build == null ? null : build instanceof ConstructBuild c ? c.current : build.block;
Block displayBlock = menuHoverBlock != null ? menuHoverBlock : input.block != null ? input.block : hovering;
if(displayBlock != null && displayBlock.unlockedNow()){
ui.content.show(displayBlock);
Events.fire(new BlockInfoEvent());
if(hovered() instanceof Unit unit && unit.type.unlockedNow()){
ui.content.show(unit.type());
}else{
var build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
Block hovering = build == null ? null : build instanceof ConstructBuild c ? c.current : build.block;
Block displayBlock = menuHoverBlock != null ? menuHoverBlock : input.block != null ? input.block : hovering;
if(displayBlock != null && displayBlock.unlockedNow()){
ui.content.show(displayBlock);
Events.fire(new BlockInfoEvent());
}
}
}