From b9cc4b780fdedb4f87c930dc09d14db0b4a4cf7b Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Wed, 15 Jun 2016 10:13:28 +0300 Subject: [PATCH] Now Draconic Armor protects from bees' stings. --- .../common/items/armor/DraconicArmor.java | 75 +++++++++++++++++-- .../assets/draconicevolution/lang/en_US.lang | 4 +- 2 files changed, 72 insertions(+), 7 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 fd45568a..8d11b78b 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 @@ -23,11 +23,15 @@ import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import com.brandon3055.draconicevolution.integration.ModHelper; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; +import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IArmorApiarist; +import forestry.api.core.IArmorNaturalist; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -45,13 +49,25 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import thaumcraft.api.IGoggles; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; /** * Created by Brandon on 3/07/2014. */ -@Optional.InterfaceList(value = {@Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft")}) -public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigurableItem, IInventoryTool, IGoggles, IRevealer, IUpgradableItem, ICustomArmor {//TODO Wings +@InterfaceList(value = { + @Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), + @Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"), + @Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), + @Interface(iface = "forestry.api.apiculture.IArmorApiarist", modid = "Forestry"), + @Interface(iface = "forestry.api.core.IArmorNaturalist", modid = "Forestry") +}) +public class DraconicArmor + extends ItemArmor + implements ISpecialArmor, IConfigurableItem, IInventoryTool, IGoggles, IVisDiscountGear, IRevealer, IUpgradableItem, ICustomArmor, IArmorNaturalist, IArmorApiarist { + + //TODO Wings @SideOnly(Side.CLIENT) private IIcon helmIcon; @SideOnly(Side.CLIENT) @@ -292,21 +308,35 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur if (armorType == 0) { list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVActive").readFromItem(stack, false)); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVLock").readFromItem(stack, true)); - if (Loader.isModLoaded("Thaumcraft")) + if (Loader.isModLoaded("Thaumcraft")) { list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "GogglesOfRevealing").readFromItem(stack, true)); + } + if (Loader.isModLoaded("Forestry")) { + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ApiaristArmor").readFromItem(stack, true)); + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "NaturalistArmor").readFromItem(stack, true)); + } } else if (armorType == 1) { list.add(new ItemConfigField(References.FLOAT_ID, slot, "VerticalAcceleration").setMinMaxAndIncromente(0f, 8f, 0.1f).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorFlightSpeedMult").setMinMaxAndIncromente(0f, 6f, 0.1f).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "EffectiveOnSprint").readFromItem(stack, false)); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorFlightLock").readFromItem(stack, false)); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorInertiaCancellation").readFromItem(stack, false)); + if (Loader.isModLoaded("Forestry")) { + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ApiaristArmor").readFromItem(stack, true)); + } } else if (armorType == 2) { list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorSpeedMult").setMinMaxAndIncromente(0f, 8f, 0.1f).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorSprintOnly").readFromItem(stack, false)); + if (Loader.isModLoaded("Forestry")) { + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ApiaristArmor").readFromItem(stack, true)); + } } else if (armorType == 3) { list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorJumpMult").setMinMaxAndIncromente(0f, 15f, 0.1f).readFromItem(stack, 0f).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorSprintOnly").readFromItem(stack, false)); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorHillStep").readFromItem(stack, true)); + if (Loader.isModLoaded("Forestry")) { + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ApiaristArmor").readFromItem(stack, true)); + } } return list; } @@ -326,18 +356,27 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur return enchant.type == EnumEnchantmentType.armor || (armorType == 0 && enchant.type == EnumEnchantmentType.armor_head) || (armorType == 1 && enchant.type == EnumEnchantmentType.armor_torso) || (armorType == 2 && enchant.type == EnumEnchantmentType.armor_legs) || (armorType == 3 && enchant.type == EnumEnchantmentType.armor_feet); } - @Optional.Method(modid = "Thaumcraft") @Override + @Method(modid = "Thaumcraft") public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { return IConfigurableItem.ProfileHelper.getBoolean(itemstack, "GogglesOfRevealing", true); } - @Optional.Method(modid = "Thaumcraft") @Override + @Method(modid = "Thaumcraft") public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { return IConfigurableItem.ProfileHelper.getBoolean(itemstack, "GogglesOfRevealing", true); } + @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; + } @SideOnly(Side.CLIENT) public ModelBiped model; @@ -523,4 +562,28 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur public boolean hasProfiles() { return false; } + + @Override + @Method(modid = "Forestry") + public boolean canSeePollination(EntityPlayer entityPlayer, ItemStack itemStack, boolean flag) + { + if (itemStack == null || itemStack.getItem() != ModItems.draconicHelm) + { + return false; + } + return IConfigurableItem.ProfileHelper.getBoolean(itemStack, "NaturalistArmor", true) || + IConfigurableItem.ProfileHelper.getBoolean(itemStack, "ApiaristArmor", true); + } + @Override + @Method(modid = "Forestry") + public boolean protectEntity(EntityLivingBase entityLivingBase, ItemStack itemStack, String s, boolean b) + { + return IConfigurableItem.ProfileHelper.getBoolean(itemStack, "ApiaristArmor", true); + } + @Override + @Method(modid = "Forestry") + public boolean protectPlayer(EntityPlayer entityPlayer, ItemStack itemStack, String s, boolean b) + { + return protectEntity(entityPlayer, itemStack, s, b); + } } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index ac3e1ace..68550305 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -110,7 +110,7 @@ item.draconicevolution:magnet.wyvern.name=Item Dislocator item.draconicevolution:magnet.draconic.name=Awakened Item Dislocator //Item Groups ---------------------------------------------------------------------------------------------------------------------------------------- -itemGroup.toolsAndWeapons=Draconic Evolution Tools & Weapons +itemGroup.toolsAndWeapons=Draconic Evolution Tools & Weapons itemGroup.blocksAndItems=Draconic Evolution Blocks & Items //Chat Messages ---------------------------------------------------------------------------------------------------------------------------------------- @@ -481,6 +481,8 @@ button.de.BaseSafeAOE.name=AOE Safe Mode button.de.VerticalAcceleration.name=Vertical Acceleration button.de.EffectiveOnSprint.name=Effective while sprinting button.de.GogglesOfRevealing.name=Magical Sense +button.de.ApiaristArmor.name=Apiarist's Protection +button.de.NaturalistArmor.name=Naturalist's Vision button.de.BowArrowSpeedModifier.name=Arrow Velocity Modifier button.de.BowAutoFire.name=Auto Fire button.de.BowArrowDamage.name=Base Damage