diff --git a/src/main/java/ru/betterend/item/ItemDrink.java b/src/main/java/ru/betterend/item/ItemDrink.java index e113e0b5..21abce1a 100644 --- a/src/main/java/ru/betterend/item/ItemDrink.java +++ b/src/main/java/ru/betterend/item/ItemDrink.java @@ -1,16 +1,30 @@ package ru.betterend.item; -import net.minecraft.item.PotionItem; -import ru.betterend.patterns.Patterned; -import ru.betterend.patterns.Patterns; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsage; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.UseAction; +import net.minecraft.world.World; -public class ItemDrink extends PotionItem implements Patterned { +public class ItemDrink extends PatternedItem { public ItemDrink(Settings settings) { super(settings); } - + @Override - public String getModelPattern(String name) { - return Patterns.createJson(Patterns.ITEM_GENERATED, name); + public int getMaxUseTime(ItemStack stack) { + return 32; + } + + @Override + public UseAction getUseAction(ItemStack stack) { + return UseAction.DRINK; + } + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + return ItemUsage.consumeHeldItem(world, user, hand); } } diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 3a88770a..23c130b3 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -548,5 +548,6 @@ "block.betterend.jellyshroom_trapdoor": "Jellyshroom Trapdoor", "biome.betterend.eterial_grove": "Eterial Grove", - "block.betterend.umbrella_tree_sapling": "Umbrella Tree Sapling" + "block.betterend.umbrella_tree_sapling": "Umbrella Tree Sapling", + "item.betterend.umbrella_cluster_juice": "Umbrella Cluster Juice" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 75ee17aa..b45499a0 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -550,5 +550,6 @@ "block.betterend.jellyshroom_trapdoor": "Люк из желейного гриба", "biome.betterend.eterial_grove": "Эфирная роща", - "block.betterend.umbrella_tree_sapling": "Саженец зонтичного дерева" + "block.betterend.umbrella_tree_sapling": "Саженец зонтичного дерева", + "item.betterend.umbrella_cluster_juice": "Сок зонтичного кластера" } \ No newline at end of file