From bb9a8c05127ada0b36eb1206944b27e43874f6eb Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 5 Nov 2016 13:41:49 +0100 Subject: [PATCH] Made the AIOT able to make both farmland and paths Closes #323 --- .../ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java | 7 ++++++- .../resources/assets/actuallyadditions/lang/en_US.lang | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 2f8b8d57b..35dc47155 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -65,7 +65,12 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ - return Items.IRON_HOE.onItemUse(stack, playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); + if(!playerIn.isSneaking()){ + return Items.IRON_HOE.onItemUse(stack, playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); + } + else{ + return Items.IRON_SHOVEL.onItemUse(stack, playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); + } } @Override diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index e78f9534b..ec1f93edf 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -864,7 +864,7 @@ booklet.actuallyadditions.chapter.leafBlower.name=Leaf Blowers booklet.actuallyadditions.chapter.leafBlower.text.1=The Leaf Blower can blow away tall grass, flowers and other stuff around you when you hold right-click. There is an Advanced Leaf Blower, which works like the basic one, except that it operates much faster and also breaks Leaves. booklet.actuallyadditions.chapter.aiots.name=All-In-One-Tools (AIOTs) -booklet.actuallyadditions.chapter.aiots.text.1=An All-In-One-Tool is a tool that is Pickaxe, Axe, Shovel, Sword and Hoe in one. They are available in every common material. +booklet.actuallyadditions.chapter.aiots.text.1=An All-In-One-Tool is a tool that is Pickaxe, Axe, Shovel, Sword and Hoe in one. They are available in every common material. Additionally to being able to mine stone, wood and softer materials, when not sneaking, they create Farmland on right-click, whereas when sneaking, they create Paths. booklet.actuallyadditions.chapter.jams.name=Jams booklet.actuallyadditions.chapter.jams.text.1=Once, there was a Kitty who really wanted some Jam. So I made some Jam. Seriously, this is Jam. You can find it in Village Houses or buy it from the Jam Villager. Every Jam gives you two different potion effects!