From 463331cbcf1a7043dacbd9b91c4c1053f161ec6f Mon Sep 17 00:00:00 2001 From: Hubry Date: Mon, 6 Jan 2020 16:19:48 +0100 Subject: [PATCH] Fire hoe events if shovel has no effect, look up results in their maps Fixes #3116 --- .../tool/manasteel/ItemManasteelShovel.java | 64 ++++++++++--------- .../botania/common/lib/LibObfuscation.java | 3 + 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 8ec45a97d..bbea5696a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -12,10 +12,10 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.HoeItem; import net.minecraft.item.IItemTier; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; @@ -28,16 +28,20 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.equipment.tool.ToolCommons; +import vazkii.botania.common.lib.LibObfuscation; import javax.annotation.Nonnull; +import java.util.Map; public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, ISortableTool { + private static final Map HOE_LOOKUP = ObfuscationReflectionHelper.getPrivateValue(HoeItem.class, null, LibObfuscation.HOE_LOOKUP); private static final int MANA_PER_DAMAGE = 60; public ItemManasteelShovel(Properties props) { @@ -70,46 +74,48 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I World world = ctx.getWorld(); BlockPos pos = ctx.getPos(); - if(player == null || !player.canPlayerEdit(pos, ctx.getFace(), stack)) + if (player == null || !player.canPlayerEdit(pos, ctx.getFace(), stack)) return ActionResultType.PASS; - else { + + Block block = world.getBlockState(pos).getBlock(); + BlockState converted = field_195955_e.get(block); + + if (converted == null) { UseHoeEvent event = new UseHoeEvent(ctx); - if(MinecraftForge.EVENT_BUS.post(event)) + + if (MinecraftForge.EVENT_BUS.post(event)) return ActionResultType.FAIL; - if(event.getResult() == Event.Result.ALLOW) { + if (event.getResult() == Event.Result.ALLOW) { ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); return ActionResultType.SUCCESS; } - - Block block = world.getBlockState(pos).getBlock(); - - if(ctx.getFace() != Direction.DOWN && world.getBlockState(pos.up()).getBlock().isAir(world.getBlockState(pos.up()), world, pos.up()) && (block == Blocks.GRASS_BLOCK || block == Blocks.DIRT || block == Blocks.GRASS_PATH)) { - Block block1 = Blocks.GRASS_PATH; - if(block == block1) - block1 = Blocks.FARMLAND; - - world.playSound(null, pos, block1.getDefaultState().getSoundType().getStepSound(), - SoundCategory.BLOCKS, - (block1.getDefaultState().getSoundType().getVolume() + 1.0F) / 2.0F, - block1.getDefaultState().getSoundType().getPitch() * 0.8F); - - if (world.isRemote) - return ActionResultType.SUCCESS; - else { - world.setBlockState(pos, block1.getDefaultState()); - ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); - return ActionResultType.SUCCESS; - } - } - - return ActionResultType.PASS; + converted = HOE_LOOKUP.get(block); } + if (converted == null) + return ActionResultType.PASS; + + if (ctx.getFace() != Direction.DOWN && world.getBlockState(pos.up()).getBlock().isAir(world.getBlockState(pos.up()), world, pos.up())) { + world.playSound(null, pos, converted.getSoundType().getStepSound(), + SoundCategory.BLOCKS, + (converted.getSoundType().getVolume() + 1.0F) / 2.0F, + converted.getSoundType().getPitch() * 0.8F); + + if (world.isRemote) + return ActionResultType.SUCCESS; + else { + world.setBlockState(pos, converted); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); + return ActionResultType.SUCCESS; + } + } + + return ActionResultType.PASS; } @Override public void inventoryTick(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) + if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) stack.setDamage(stack.getDamage() - 1); } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index f13626e47..97a5504f4 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -19,4 +19,7 @@ public final class LibObfuscation { // RecipeBookPage public static final String HOVERED_BUTTON = "field_194201_b"; + + // HoeItem + public static final String HOE_LOOKUP = "field_195973_b"; }