From 6986bbcf0e5e3435e36039105aff180c9f1f2443 Mon Sep 17 00:00:00 2001 From: Zereff06 Date: Mon, 13 Feb 2023 22:54:45 +0200 Subject: [PATCH] add vis discount/warp to armor (#34) + 15 vis discount to draconic armor + 10 vis discount and 5 warp to wyvern armor Draconic/Wyvern armor through and through consists of magic (ichorium and BM armor)! Vis discount time ! --- .../common/items/armor/DraconicArmor.java | 16 ++++++--- .../common/items/armor/WyvernArmor.java | 36 +++++++++++++++++-- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index 8251e289..09e9bc14 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -16,6 +16,7 @@ import net.minecraft.item.*; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -227,9 +228,17 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { InfoHelper.addEnergyAndLore(stack, list); ToolBase.holdCTRLForUpgrades(list, stack); + if (Loader.isModLoaded("Thaumcraft")) { + list.add(""); + list.add( + EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + + ": " + + this.getVisDiscount(stack, player, (Aspect) null) + + "%"); + } } public boolean clearNegativeEffects(Entity par3Entity) { @@ -399,10 +408,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur @Override @Method(modid = "Thaumcraft") public int getVisDiscount(ItemStack itemStack, EntityPlayer entityPlayer, Aspect aspect) { - if (itemStack == null || itemStack.getItem() != ModItems.draconicHelm) { - return 0; - } - return IConfigurableItem.ProfileHelper.getBoolean(itemStack, "GogglesOfRevealing", true) ? 5 : 0; + return 15; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java index a1f38bb9..f50370d6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java @@ -13,11 +13,16 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.IWarpingGear; +import thaumcraft.api.aspects.Aspect; + import com.brandon3055.brandonscore.BrandonsCore; import com.brandon3055.brandonscore.common.utills.InfoHelper; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; @@ -36,6 +41,8 @@ import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -43,8 +50,11 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Created by Brandon on 3/07/2014. */ -public class WyvernArmor extends ItemArmor - implements ISpecialArmor, IConfigurableItem, IInventoryTool, IUpgradableItem, ICustomArmor { +@Optional.InterfaceList( + value = { @Optional.Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"), + @Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = "Thaumcraft"), }) +public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurableItem, IInventoryTool, IUpgradableItem, + ICustomArmor, IVisDiscountGear, IWarpingGear { @SideOnly(Side.CLIENT) private IIcon helmIcon; @@ -185,9 +195,17 @@ public class WyvernArmor extends ItemArmor @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { InfoHelper.addEnergyAndLore(stack, list); ToolBase.holdCTRLForUpgrades(list, stack); + if (Loader.isModLoaded("Thaumcraft")) { + list.add(""); + list.add( + EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + + ": " + + this.getVisDiscount(stack, player, (Aspect) null) + + "%"); + } } @Override @@ -467,4 +485,16 @@ public class WyvernArmor extends ItemArmor public boolean hasProfiles() { return false; } + + @Override + @Optional.Method(modid = "Thaumcraft") + public int getVisDiscount(ItemStack itemStack, EntityPlayer entityPlayer, Aspect aspect) { + return 10; + } + + @Override + @Optional.Method(modid = "Thaumcraft") + public int getWarp(ItemStack itemStack, EntityPlayer entityPlayer) { + return 5; + } }