From 504187dc5da7ad5fdacb32167f7937576f71652c Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 17:48:21 -0500 Subject: [PATCH 1/9] Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis --- .../api/item/IManaProficiencyArmor.java | 32 ++++++++++-- .../api/mana/ManaProficiencyEvent.java | 49 +++++++++++++++++++ 2 files changed, 77 insertions(+), 4 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 82f8bcd17..31890976d 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; + } +} From ca6361af2d217260248ef70562978ffad9eda504 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:04:42 -0500 Subject: [PATCH 2/9] 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 a63cbf44f63f655f7bf4e36afadc0b8f57cc6011 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:20:41 -0500 Subject: [PATCH 3/9] 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++) From b98af839fea7ae6ba5fc0f7b691627671d672939 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:24:36 -0500 Subject: [PATCH 4/9] Reworked getFullDiscountForTools to allow armor sets (or subscribers to ManaDiscountEvent) to adjust mana discount based on the item in use --- .../botania/api/mana/IManaDiscountArmor.java | 14 ++++++++++---- .../botania/api/mana/ManaDiscountEvent.java | 19 +++++++++++++++++-- .../botania/api/mana/ManaItemHandler.java | 15 +++++++++++---- .../armor/elementium/ItemElementiumHelm.java | 4 +++- .../armor/manaweave/ItemManaweaveHelm.java | 4 +++- .../armor/terrasteel/ItemTerrasteelHelm.java | 4 +++- 6 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java index ab004b62f..410db4720 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java +++ b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java @@ -10,6 +10,8 @@ */ package vazkii.botania.api.mana; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,12 +22,16 @@ import net.minecraft.item.ItemStack; */ public interface IManaDiscountArmor { + @Deprecated + public float getDiscount(ItemStack stack, int slot, EntityPlayer player); + /** - * Gets the mana discount that this piece of armor provides. This is added - * together to create the full discount. + * Gets the mana discount that this piece of armor provides for the specified + * tool. This is added together to create the full discount. * Value is to be from 0.0 to 1.0. 0.1 is 10% discount, as an example. * You can also return negative values to make tools cost more. */ - public float getDiscount(ItemStack stack, int slot, EntityPlayer player); - + default float getDiscount(ItemStack stack, int slot, EntityPlayer player, @Nullable ItemStack tool) { + return getDiscount(stack, slot, player); + } } diff --git a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java index f7ef8c640..27cb28664 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java @@ -10,17 +10,32 @@ */ package vazkii.botania.api.mana; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; public class ManaDiscountEvent extends Event { private final EntityPlayer entityPlayer; private float discount; - - public ManaDiscountEvent(EntityPlayer entityPlayer, float discount) { + private ItemStack tool; + + public ManaDiscountEvent(EntityPlayer entityPlayer, float discount, @Nullable ItemStack tool) { this.entityPlayer = entityPlayer; this.discount = discount; + this.tool = tool; + } + + @Deprecated + public ManaDiscountEvent(EntityPlayer entityPlayer, float discount) { + this(entityPlayer, discount, null); + } + + @Nullable + public ItemStack getTool() { + return tool; } public EntityPlayer getEntityPlayer() { diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index 7c7c76b53..e22673ed8 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -16,6 +16,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -317,19 +319,24 @@ public final class ManaItemHandler { return requestManaExact(stack, player, cost, remove); } + @Deprecated + public static float getFullDiscountForTools(EntityPlayer player) { + return getFullDiscountForTools(player, null); + } + /** * Gets the sum of all the discounts on IManaDiscountArmor items equipped - * on the player passed in. + * on the player passed in. This discount can vary based on what the passed tool is. */ - public static float getFullDiscountForTools(EntityPlayer player) { + public static float getFullDiscountForTools(EntityPlayer player, @Nullable ItemStack tool) { float discount = 0F; for(int i = 0; i < player.inventory.armorInventory.length; i++) { ItemStack armor = player.inventory.armorInventory[i]; if(armor != null && armor.getItem() instanceof IManaDiscountArmor) - discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player); + discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player, tool); } - ManaDiscountEvent event = new ManaDiscountEvent(player, discount); + ManaDiscountEvent event = new ManaDiscountEvent(player, discount, tool); MinecraftForge.EVENT_BUS.post(event); discount = event.getDiscount(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java index e1f510730..1ac1810cb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java @@ -1,5 +1,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; @@ -22,7 +24,7 @@ public class ItemElementiumHelm extends ItemElementiumArmor implements IManaDisc } @Override - public float getDiscount(ItemStack stack, int slot, EntityPlayer player) { + public float getDiscount(ItemStack stack, int slot, EntityPlayer player, @Nullable ItemStack tool) { return hasArmorSet(player) ? 0.1F : 0F; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index c6315da54..7ef3242cc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; +import javax.annotation.Nullable; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -31,7 +33,7 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou } @Override - public float getDiscount(ItemStack stack, int slot, EntityPlayer player) { + public float getDiscount(ItemStack stack, int slot, EntityPlayer player, @Nullable ItemStack tool) { return hasArmorSet(player) ? 0.35F : 0F; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 1d67284af..ad711c04b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -12,6 +12,8 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.List; +import javax.annotation.Nullable; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -64,7 +66,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } @Override - public float getDiscount(ItemStack stack, int slot, EntityPlayer player) { + public float getDiscount(ItemStack stack, int slot, EntityPlayer player, @Nullable ItemStack tool) { return hasArmorSet(player) ? 0.2F : 0F; } From 3f90dd940ac4784415b0a970265214c35e7a00a6 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:26:01 -0500 Subject: [PATCH 5/9] Revert "Updated rods so they don't sue the deprecated methods" This reverts commit a63cbf44f63f655f7bf4e36afadc0b8f57cc6011. --- .../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 f72a9bc79..3d5da0aeb 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, stack) ? 20 : 15; + int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 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 8e88fe8a9..67327fa83 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, stack) ? 3 : 1; + int extraRangeNew = IManaProficiencyArmor.Helper.hasProficiency(player) ? 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 b92323c01..f99e18270 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, par1ItemStack) ? COOLDOWN / 2 : COOLDOWN); + player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.Helper.hasProficiency(player) ? 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 9ab688c56..5a07b829a 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, stack) ? 2.25F : 1.5F; + float mot = IManaProficiencyArmor.Helper.hasProficiency(player) ? 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 04b2eef02..d77cd1c50 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, stack) ? 1 : 2) == 0 && !player.worldObj.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { + if(count != getMaxItemUseDuration(stack) && count % (IManaProficiencyArmor.Helper.hasProficiency(player) ? 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 d94b19bf3..e93844731 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, par1ItemStack); + boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player); 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 03594bcda..70981faf5 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, stack) ? (int) (TIME * 0.6) : TIME)); + playerData.put(p, new SmeltData(pos, IManaProficiencyArmor.Helper.hasProficiency(p) ? (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 f77f3a9f5..347bad1cf 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, par1ItemStack) ? 22 : 16; + int range = IManaProficiencyArmor.Helper.hasProficiency(player) ? 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 eb305e52f..162d93dcc 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, par1ItemStack) ? 1.6 : 1.25; + player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player) ? 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++) From ef3dceccc66a64e7efe0ebedacedb24f41b71ee2 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:26:09 -0500 Subject: [PATCH 6/9] Revert "Updated package-info.java" This reverts commit ca6361af2d217260248ef70562978ffad9eda504. --- 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 5a776f965..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 = "83", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "82", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; From 5157c646f7a85e2ce06d5e6cafd09847042f4548 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:26:17 -0500 Subject: [PATCH 7/9] Revert "Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis" This reverts commit 504187dc5da7ad5fdacb32167f7937576f71652c. --- .../api/item/IManaProficiencyArmor.java | 32 ++---------- .../api/mana/ManaProficiencyEvent.java | 49 ------------------- 2 files changed, 4 insertions(+), 77 deletions(-) delete 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 31890976d..82f8bcd17 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -10,14 +10,10 @@ */ 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 @@ -28,42 +24,22 @@ import net.minecraftforge.common.MinecraftForge; */ public interface IManaProficiencyArmor { - @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 boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer 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, rod)) { - proficient = true; - break; - } + if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, e, player)) + return true; } } - - ManaProficiencyEvent event = new ManaProficiencyEvent(player, rod, proficient); - MinecraftForge.EVENT_BUS.post(event); - - return event.isProficient(); + return false; } } diff --git a/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java b/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java deleted file mode 100644 index 0600c7b98..000000000 --- a/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * 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; - } -} From ab4b7b9e762a278fa93133d94880d34d25a6f426 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 22:31:14 -0500 Subject: [PATCH 8/9] Added default body to the deprecated getDiscount method to fix some errors being thrown --- src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java index 410db4720..75476a09b 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java +++ b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java @@ -23,7 +23,9 @@ import net.minecraft.item.ItemStack; public interface IManaDiscountArmor { @Deprecated - public float getDiscount(ItemStack stack, int slot, EntityPlayer player); + default float getDiscount(ItemStack stack, int slot, EntityPlayer player) { + return 0; + } /** * Gets the mana discount that this piece of armor provides for the specified From fc5d794b7927168de6443e72da73ee2af55bceeb Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Tue, 4 Oct 2016 23:11:18 -0500 Subject: [PATCH 9/9] Fixed manasteel helmet not implementing new version of getDiscount --- .../item/equipment/armor/manasteel/ItemManasteelHelm.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java index d059ef31c..5c0c03210 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; @@ -27,7 +29,7 @@ public class ItemManasteelHelm extends ItemManasteelArmor implements IManaDiscou } @Override - public float getDiscount(ItemStack stack, int slot, EntityPlayer player) { + public float getDiscount(ItemStack stack, int slot, EntityPlayer player, @Nullable ItemStack tool) { return hasArmorSet(player) ? 0.1F : 0F; }