diff --git a/src/generated/resources/data/minecraft/tags/items/lectern_books.json b/src/generated/resources/data/minecraft/tags/items/lectern_books.json new file mode 100644 index 0000000..932b7ca --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/lectern_books.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "tmechworks:book" + ] +} \ No newline at end of file diff --git a/src/main/java/slimeknights/tmechworks/common/items/MechworksBookItem.java b/src/main/java/slimeknights/tmechworks/common/items/MechworksBookItem.java index 6d1cf7c..0e6f10b 100644 --- a/src/main/java/slimeknights/tmechworks/common/items/MechworksBookItem.java +++ b/src/main/java/slimeknights/tmechworks/common/items/MechworksBookItem.java @@ -6,32 +6,36 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import slimeknights.mantle.client.book.BookLoader; -import slimeknights.mantle.client.book.data.BookData; -import slimeknights.mantle.client.book.repository.FileRepository; +import slimeknights.mantle.item.LecternBookItem; import slimeknights.tmechworks.client.ClientProxy; import slimeknights.tmechworks.common.MechworksContent; import javax.annotation.Nonnull; +import javax.annotation.ParametersAreNonnullByDefault; -public class MechworksBookItem extends MechworksItem { +public class MechworksBookItem extends LecternBookItem { public MechworksBookItem() { - super(new Item.Properties().maxStackSize(1)); + super(new Item.Properties().group(MechworksContent.tabMechworks).maxStackSize(1)); } - @Nonnull @Override - public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand handIn) { - ItemStack stack = playerIn.getHeldItem(handIn); + @Nonnull + @ParametersAreNonnullByDefault + public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) { + ItemStack stack = playerIn.getHeldItem(hand); if(worldIn.isRemote){ - ClientProxy.book.openGui(new TranslationTextComponent("item.tmechworks.book"), stack); + ClientProxy.book.openGui(hand, stack); } return new ActionResult<>(ActionResultType.SUCCESS, stack); } + + @Override + @ParametersAreNonnullByDefault + public void openLecternScreenClient(BlockPos pos, ItemStack stack) { + ClientProxy.book.openGui(pos, stack); + } } diff --git a/src/main/java/slimeknights/tmechworks/data/ItemTags.java b/src/main/java/slimeknights/tmechworks/data/ItemTags.java index ff152ed..ca10d4c 100644 --- a/src/main/java/slimeknights/tmechworks/data/ItemTags.java +++ b/src/main/java/slimeknights/tmechworks/data/ItemTags.java @@ -35,6 +35,8 @@ protected void registerTags() { addNugget(MechworksTags.Items.NUGGETS_ALUMINUM, MechworksContent.Items.aluminum_nugget.get()); addNugget(MechworksTags.Items.NUGGETS_COPPER, MechworksContent.Items.copper_nugget.get()); + + getOrCreateBuilder(net.minecraft.tags.ItemTags.LECTERN_BOOKS).add(MechworksContent.Items.book.get()); } private void addIngot(ITag.INamedTag tag, Item... item) {