From 4abb66a9d93e0c5956ec03e3231ffe7a53ee3cdf Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 13 Feb 2017 20:08:30 +0000 Subject: [PATCH 1/3] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index b56f6913d..10c913b13 100644 --- a/contributors.properties +++ b/contributors.properties @@ -72,3 +72,4 @@ tamaized=6 lerazzer=10 akirakujo=5 gamerofyoyos=12 +seanvanpelt2=6 From 87484f0db37b960e21754873ff061e82b58db1cc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Feb 2017 20:42:13 -0600 Subject: [PATCH 2/3] Fix bad armor values, closes #2166 --- src/main/java/vazkii/botania/api/BotaniaAPI.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 6db95d0ff..d32e99367 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -102,15 +102,15 @@ public final class BotaniaAPI { public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, - new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); + new int[] { 2, 5, 6, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); public static final ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, - new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); + new int[] { 2, 5, 6, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); public static final ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, - new int[] { 3, 8, 6, 3 }, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 3F); + new int[] { 3, 6, 8, 3 }, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 3F); public static final ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, From 59a59217134f2602bdf9c61d4b04bfb72780cd3d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Feb 2017 00:09:21 -0600 Subject: [PATCH 3/3] AoE mining now properly fires break events and drops xp. Closes #2171 --- .../common/item/equipment/tool/ToolCommons.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 28a813d78..c021bd6b5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -17,6 +17,7 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Enchantments; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; @@ -28,6 +29,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.handler.ConfigHandler; @@ -90,6 +92,12 @@ public final class ToolCommons { return; } + int exp = ForgeHooks.onBlockBreakEvent(world, ((EntityPlayerMP) player).interactionManager.getGameType(), (EntityPlayerMP) player, pos); + if(exp == -1) + return; + + boolean spawnedDrops = false; + if(!player.capabilities.isCreativeMode) { TileEntity tile = world.getTileEntity(pos); IBlockState localState = world.getBlockState(pos); @@ -98,15 +106,20 @@ public final class ToolCommons { if(blk.removedByPlayer(state, world, pos, player, true)) { blk.onBlockDestroyedByPlayer(world, pos, state); - if(!dispose || !ItemElementiumPick.isDisposable(blk)) + if(!dispose || !ItemElementiumPick.isDisposable(blk)) { blk.harvestBlock(world, player, pos, state, tile, stack); + spawnedDrops = true; + } } damageItem(stack, 1, player, 80); } else world.setBlockToAir(pos); - if(particles && !world.isRemote && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) + if(particles && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) world.playEvent(2001, pos, Block.getStateId(state)); + + if(spawnedDrops) + blk.dropXpOnBlockBreak(world, pos, exp); } }