diff --git a/changelog.md b/changelog.md index ccc47ca8..063e6ad5 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1,2 @@ -- Fix chest tag \ No newline at end of file +- Fixed 1.21.1 crash when placing blocks with containers +- Fixed desk displaying the wrong tooltip (#112) \ No newline at end of file diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/BenchBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/BenchBlock.java index c191d420..e8b2c33f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/BenchBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/BenchBlock.java @@ -85,7 +85,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.CUSHION); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.CUSHION); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ChairBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ChairBlock.java index 7af23801..6e4b4add 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ChairBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ChairBlock.java @@ -117,8 +117,8 @@ public BlockState getStateForPlacement(BlockPlaceContext ctx) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.CUSHION); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.CUSHION); } @Override diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CouchBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CouchBlock.java index ae79d1a5..8a0b7b0e 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CouchBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CouchBlock.java @@ -85,7 +85,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.CUSHION); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.CUSHION); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CounterBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CounterBlock.java index a5f8a076..088cc57f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CounterBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CounterBlock.java @@ -106,7 +106,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.COUNTER, ConstantComponents.HAMMER_USE_LOOK); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.COUNTER, ConstantComponents.HAMMER_USE_LOOK); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CupboardBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CupboardBlock.java index 8191ede1..3ae89cb2 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CupboardBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CupboardBlock.java @@ -83,8 +83,8 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.HAMMER_USE_LOOK); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.HAMMER_USE_LOOK); } @Override diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CushionBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CushionBlock.java index bef630d8..a26222ea 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CushionBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/CushionBlock.java @@ -48,7 +48,7 @@ public AABB getSeatSize(BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.PLACE_ON_FURNITURE); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.PLACE_ON_FURNITURE); } } \ No newline at end of file diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DeskBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DeskBlock.java index 45993816..c0df799e 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DeskBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DeskBlock.java @@ -46,7 +46,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.HAMMER); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.SHEET); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DrawerBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DrawerBlock.java index 5e172c83..eca96548 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DrawerBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/DrawerBlock.java @@ -97,8 +97,8 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.HAMMER_USE_LOOK); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.HAMMER_USE_LOOK); } @Override diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/FancyBedBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/FancyBedBlock.java index 62dad26a..eb9fc2de 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/FancyBedBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/FancyBedBlock.java @@ -155,7 +155,7 @@ public static DirectionalBlockProperty getShape(Block block, Direction direction } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.BED_PILLOW, ConstantComponents.BED_SHEET); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.BED_PILLOW, ConstantComponents.BED_SHEET); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/NightstandBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/NightstandBlock.java index a85c6e5b..12652d27 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/NightstandBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/NightstandBlock.java @@ -46,7 +46,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.SHEET); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.SHEET); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ShelfBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ShelfBlock.java index 0a71e647..ca49516f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ShelfBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/ShelfBlock.java @@ -97,8 +97,8 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.HAMMER_USE_LOOK); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.HAMMER_USE_LOOK); } @Override diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/SideTableBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/SideTableBlock.java index 6eadad84..19e4e1f4 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/SideTableBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/SideTableBlock.java @@ -46,7 +46,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.SHEET); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.SHEET); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/TableBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/TableBlock.java index b68b7370..c98ab947 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/TableBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/TableBlock.java @@ -154,8 +154,8 @@ public TableProperty getShape(BlockGetter level, BlockPos pos) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.SHEET); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.SHEET); } static { diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/crockery/CrockeryComboBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/crockery/CrockeryComboBlock.java index 35f5c488..245c8f63 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/crockery/CrockeryComboBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/crockery/CrockeryComboBlock.java @@ -67,8 +67,8 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.CROCKERY_COMBO); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.CROCKERY_COMBO); } @Override diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/CornerTrimBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/CornerTrimBlock.java index e66e4971..0052456f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/CornerTrimBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/CornerTrimBlock.java @@ -166,8 +166,8 @@ public VoxelShape getShape(BlockState state, @NotNull BlockGetter level, @NotNul } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.HAMMER_USE_SHAPE); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.HAMMER_USE_SHAPE); } static { diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/PillarTrimBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/PillarTrimBlock.java index c2cdccaa..e2bd1440 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/PillarTrimBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/blocks/trims/PillarTrimBlock.java @@ -164,8 +164,8 @@ public BlockState getStateForPlacement(BlockPlaceContext ctx) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tootipComponents, TooltipFlag tooltipFlag) { - TooltipUtils.addDescriptionComponent(tootipComponents, ConstantComponents.HAMMER_USE_SHAPE, ConstantComponents.HAMMER_USE_LOOK_SHIFT); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipUtils.addDescriptionComponent(tooltipComponents, ConstantComponents.HAMMER_USE_SHAPE, ConstantComponents.HAMMER_USE_LOOK_SHIFT); } @Override diff --git a/gradle.properties b/gradle.properties index 3be070c5..3f1715be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,12 +2,12 @@ org.gradle.jvmargs=-Xmx2G enabledPlatforms=fabric,neoforge -version=4.0.1 +version=4.0.2 group=earth.terrarium.handcrafted minecraftVersion=1.21.1 parchmentVersion=2024.07.28 -modMenuVersion=11.0.0-beta.2 +modMenuVersion=11.0.1 -resourcefulLibVersion=3.0.0 +resourcefulLibVersion=3.0.9