Skip to content

Commit ac97d87

Browse files
committed
Account for liquid blocks in the member tooltip
1 parent 0252246 commit ac97d87

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/client/java/aztech/modern_industrialization/items/client/ClientStructureMemberBlockTooltip.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import net.minecraft.world.item.ItemStack;
5151
import net.minecraft.world.item.Items;
5252
import net.minecraft.world.level.block.Block;
53+
import net.minecraft.world.level.block.LiquidBlock;
5354
import net.minecraft.world.level.block.state.BlockState;
5455
import org.jetbrains.annotations.Nullable;
5556
import org.joml.Matrix4f;
@@ -87,7 +88,17 @@ public ClientStructureMemberBlockTooltip(StructureMultiblockMemberBlockItem.Tool
8788
if (data.members() != null) {
8889
for (StructureMemberTest member : data.members()) {
8990
if (member instanceof StateStructureMemberTest stateTest) {
90-
members.add(new IconsLine.StackEntry(stateTest.blockState().getBlock().asItem().getDefaultInstance()));
91+
Block block = stateTest.blockState().getBlock();
92+
ItemStack stack;
93+
if (block instanceof LiquidBlock liquidBlock) {
94+
stack = liquidBlock.fluid.getBucket().getDefaultInstance();
95+
} else {
96+
stack = block.asItem().getDefaultInstance();
97+
if (stack.isEmpty()) {
98+
stack = Items.BUCKET.getDefaultInstance();
99+
}
100+
}
101+
members.add(new IconsLine.StackEntry(stack));
91102
} else if (member instanceof TagStructureMemberTest tagTest) {
92103
members.add(new IconsLine.TagEntry(tagTest.blockTag()));
93104
}

0 commit comments

Comments
 (0)