From c4c409dc1fce499b3eb4589f83dba1ff4488415d Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 17:48:21 -0500 Subject: [PATCH 1/3] Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis --- .../api/item/IManaProficiencyArmor.java | 32 ++++++++++-- .../api/mana/ManaProficiencyEvent.java | 49 +++++++++++++++++++ .../java/vazkii/botania/api/package-info.java | 2 +- 3 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java index bce037fa3..a5393eef5 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -10,10 +10,14 @@ */ package vazkii.botania.api.item; +import javax.annotation.Nullable; + +import vazkii.botania.api.mana.ManaProficiencyEvent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; /** * An armor item that implements this gives the player wearing it mana proficiency, by @@ -24,22 +28,42 @@ import net.minecraft.item.ItemStack; */ public interface IManaProficiencyArmor { - public boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer player); + @Deprecated + default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player) { + return false; + } + + default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player, @Nullable ItemStack rod) { + return shouldGiveProficiency(armorStack, slot, player); + } public final static class Helper { + @Deprecated public static boolean hasProficiency(EntityPlayer player) { + return hasProficiency(player, null); + } + + public static boolean hasProficiency(EntityPlayer player, @Nullable ItemStack rod) { + boolean proficient = false; + for(EntityEquipmentSlot e: EntityEquipmentSlot.values()) { if(e.getSlotType() != EntityEquipmentSlot.Type.ARMOR) continue; ItemStack armor = player.getItemStackFromSlot(e); if(armor != null) { Item item = armor.getItem(); - if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, e, player)) - return true; + if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, e, player, rod)) { + proficient = true; + break; + } } } - return false; + + ManaProficiencyEvent event = new ManaProficiencyEvent(player, rod, proficient); + MinecraftForge.EVENT_BUS.post(event); + + return event.isProficient(); } } diff --git a/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java b/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java new file mode 100644 index 000000000..0600c7b98 --- /dev/null +++ b/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java @@ -0,0 +1,49 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Oct 4, 2016, 10:46:12 PM (GMT)] + */ +package vazkii.botania.api.mana; + +import java.util.List; + +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class ManaProficiencyEvent extends Event { + + private final EntityPlayer entityPlayer; + private ItemStack rod; + private boolean proficient; + + public ManaProficiencyEvent(EntityPlayer entityPlayer, @Nullable ItemStack rod, boolean proficient) { + this.entityPlayer = entityPlayer; + this.rod = rod; + this.proficient = proficient; + } + + public EntityPlayer getEntityPlayer() { + return entityPlayer; + } + + @Nullable + public ItemStack getRod() { + return rod; + } + + public boolean isProficient() { + return proficient; + } + + public void setProficient(boolean proficient) { + this.proficient = proficient; + } +} diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index c73813258..042527895 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "81", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "82", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; From 21db152022c380423840a75b850c1682482c6e18 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:04:42 -0500 Subject: [PATCH 2/3] Updated package-info.java --- src/main/java/vazkii/botania/api/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 042527895..5a776f965 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "82", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "83", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; From 6a57c87a1ad80ac743d47eabba936edf011f50c5 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:20:41 -0500 Subject: [PATCH 3/3] Updated rods so they don't sue the deprecated methods --- .../java/vazkii/botania/common/item/rod/ItemDiviningRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemExchangeRod.java | 2 +- src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemGravityRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemMissileRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemRainbowRod.java | 2 +- src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemTerraformRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemTornadoRod.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 3d5da0aeb..f72a9bc79 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -54,7 +54,7 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer p, EnumHand hand) { if(ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { if(world.isRemote) { - int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 20 : 15; + int range = IManaProficiencyArmor.Helper.hasProficiency(p, stack) ? 20 : 15; long seedxor = world.rand.nextLong(); doHighlight(world, new BlockPos(p), range, seedxor); p.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 67327fa83..8e88fe8a9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -127,7 +127,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra EntityPlayer player = (EntityPlayer) entity; int extraRange = ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); - int extraRangeNew = IManaProficiencyArmor.Helper.hasProficiency(player) ? 3 : 1; + int extraRangeNew = IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? 3 : 1; if(extraRange != extraRangeNew) ItemNBTHelper.setInt(stack, TAG_EXTRA_RANGE, extraRangeNew); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index f99e18270..b92323c01 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -54,7 +54,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); player.worldObj.spawnEntityInWorld(entity); - player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.Helper.hasProficiency(player) ? COOLDOWN / 2 : COOLDOWN); + player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack) ? COOLDOWN / 2 : COOLDOWN); ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_BLAZE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 5a07b829a..9ab688c56 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -211,7 +211,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { Vector3 moveVector = new Vector3(player.getLookVec().normalize()); if(item instanceof EntityItem) { ((EntityItem) item).setPickupDelay(20); - float mot = IManaProficiencyArmor.Helper.hasProficiency(player) ? 2.25F : 1.5F; + float mot = IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? 2.25F : 1.5F; item.motionX = moveVector.x * mot; item.motionY = moveVector.y; item.motionZ = moveVector.z * mot; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index d77cd1c50..04b2eef02 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -62,7 +62,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi if(!(living instanceof EntityPlayer)) return; EntityPlayer player = (EntityPlayer) living; - if(count != getMaxItemUseDuration(stack) && count % (IManaProficiencyArmor.Helper.hasProficiency(player) ? 1 : 2) == 0 && !player.worldObj.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { + if(count != getMaxItemUseDuration(stack) && count % (IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? 1 : 2) == 0 && !player.worldObj.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { if(spawnMissile(player.worldObj, player, player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1))) ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, true); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index e93844731..d94b19bf3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -74,7 +74,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi BlockPos.MutableBlockPos lastChecker = new BlockPos.MutableBlockPos(); int count = 0; - boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player); + boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack); int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 70981faf5..03594bcda 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -117,7 +117,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } if(!decremented) - playerData.put(p, new SmeltData(pos, IManaProficiencyArmor.Helper.hasProficiency(p) ? (int) (TIME * 0.6) : TIME)); + playerData.put(p, new SmeltData(pos, IManaProficiencyArmor.Helper.hasProficiency(p, stack) ? (int) (TIME * 0.6) : TIME)); else { for(int i = 0; i < 2; i++) { double x = pos.getBlockPos().getX() + Math.random(); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 347bad1cf..f77f3a9f5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -107,7 +107,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } private void terraform(ItemStack par1ItemStack, World world, EntityPlayer player) { - int range = IManaProficiencyArmor.Helper.hasProficiency(player) ? 22 : 16; + int range = IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack) ? 22 : 16; BlockPos startCenter = new BlockPos(player).down(); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 162d93dcc..eb305e52f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -74,7 +74,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } else if(isFlying(par1ItemStack)) { if(holding) { player.fallDistance = 0F; - player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player) ? 1.6 : 1.25; + player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack) ? 1.6 : 1.25; player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); for(int i = 0; i < 5; i++)