diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 629878036..b994afc05 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -94,6 +94,8 @@ public final class BotaniaAPI { public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); + public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", 5, new int[] { 1, 2, 2, 1 }, 18); + public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic"); public static KnowledgeType basicKnowledge; diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java new file mode 100644 index 000000000..7af710f71 --- /dev/null +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -0,0 +1,44 @@ +/** + * 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 @ [Aug 28, 2015, 9:04:53 PM (GMT)] + */ +package vazkii.botania.api.item; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +/** + * An armor item that implements this gives the player wearing it mana proficiency, by + * which it makes Rods the player use have a stronger effect. This is a boolean, and only + * one armor piece with this returning true is required for the player to be considered + * to be having proficiency, by which it's suggested that this is used alongside an + * armor set, where only one piece implements it. + */ +public interface IManaProficiencyArmor { + + public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player); + + public final static class Helper { + + public static boolean hasProficiency(EntityPlayer player) { + for(int i = 0; i < 4; i++) { + ItemStack armor = player.getCurrentArmor(i); + if(armor != null) { + Item item = armor.getItem(); + if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, i, player)) + return true; + } + } + return false; + } + + } + +} diff --git a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java index e58093950..56a9683f9 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java +++ b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java @@ -15,7 +15,8 @@ import net.minecraft.item.ItemStack; /** * An armor item that implements this can provide a mana discount for mana tools. - * Mana tools are the ones on the main toolset (Pick, Shovel, Axe, Sword and Shovel). + * Mana tools are the ones on the main toolset (Pick, Shovel, Axe, Sword and Shovel) + * as well as Rods. */ public interface IManaDiscountArmor { diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 946086cca..d8a672b1f 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 = "60", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "61", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index bc77e7afb..41f614f4b 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -86,6 +86,8 @@ public final class LibResources { public static final String MODEL_ELEMENTIUM_0 = PREFIX_MODEL + "elementium0.png"; public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium1.png"; public static final String MODEL_ELEMENTIUM_2 = PREFIX_MODEL + "elementium2.png"; + public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave0.png"; + public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave1.png"; public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png"; public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png"; public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tinyPotatoGray.png"; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 94d570016..df0e92212 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -165,6 +165,10 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manasteelChest); addItem(ModItems.manasteelLegs); addItem(ModItems.manasteelBoots); + addItem(ModItems.manaweaveHelm); + addItem(ModItems.manaweaveChest); + addItem(ModItems.manaweaveLegs); + addItem(ModItems.manaweaveBoots); addItem(ModItems.elementiumPick); addItem(ModItems.elementiumShovel); addItem(ModItems.elementiumAxe); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 4f0134800..90a798907 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1534,8 +1534,8 @@ public final class ModCraftingRecipes { // Spellbinding Cloth Recipe addOreDictRecipe(new ItemStack(ModItems.spellCloth), - "WWW", "WPW", "WWW", - 'W', new ItemStack(Blocks.wool, 1, -1), + " C ", "CPC", " C ", + 'C', LibOreDict.MANAWEAVE_CLOTH, 'P', LibOreDict.MANA_PEARL); recipeSpellCloth = BotaniaAPI.getLatestAddedRecipe(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 22e5c1bb0..b77f34f00 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -29,7 +29,6 @@ public class EntityFlameRing extends Entity { super(world); } - @Override protected void entityInit() { setSize(0F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 8c34002b9..08a7a28bf 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -27,6 +27,10 @@ import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelBoots; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelChest; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelLegs; +import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveBoots; +import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveChest; +import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveHelm; +import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveLegs; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; @@ -255,7 +259,11 @@ public final class ModItems { public static Item exchangeRod; public static Item magnetRingGreater; public static Item thunderSword; - + public static Item manaweaveHelm; + public static Item manaweaveChest; + public static Item manaweaveLegs; + public static Item manaweaveBoots; + public static void init() { lexicon = new ItemLexicon(); petal = new ItemPetal(); @@ -396,6 +404,10 @@ public final class ModItems { exchangeRod = new ItemExchangeRod(); magnetRingGreater = new ItemGreaterMagnetRing(); thunderSword = new ItemThunderSword(); + manaweaveHelm = new ItemManaweaveHelm(); + manaweaveLegs = new ItemManaweaveLegs(); + manaweaveChest = new ItemManaweaveChest(); + manaweaveBoots = new ItemManaweaveBoots(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java new file mode 100644 index 000000000..96cc02587 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -0,0 +1,81 @@ +/** + * 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 @ [Aug 28, 2015, 8:30:19 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.armor.manaweave; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.item.IPixieSpawner; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; + +public class ItemManaweaveArmor extends ItemManasteelArmor { + + public ItemManaweaveArmor(int type, String name) { + super(type, name, BotaniaAPI.manaweaveArmorMaterial); + } + + @Override + public String getArmorTextureAfterInk(ItemStack stack, int slot) { + return slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; + } + + @Override + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + } + + static ItemStack[] armorset; + + @Override + public ItemStack[] getArmorSetStacks() { + if(armorset == null) + armorset = new ItemStack[] { + new ItemStack(ModItems.manaweaveHelm), + new ItemStack(ModItems.manaweaveChest), + new ItemStack(ModItems.manaweaveLegs), + new ItemStack(ModItems.manaweaveBoots) + }; + + return armorset; + } + + @Override + public boolean hasArmorSetItem(EntityPlayer player, int i) { + ItemStack stack = player.inventory.armorInventory[3 - i]; + if(stack == null) + return false; + + switch(i) { + case 0: return stack.getItem() == ModItems.manaweaveHelm; + case 1: return stack.getItem() == ModItems.manaweaveChest; + case 2: return stack.getItem() == ModItems.manaweaveLegs; + case 3: return stack.getItem() == ModItems.manaweaveBoots; + } + + return false; + } + + @Override + public String getArmorSetName() { + return StatCollector.translateToLocal("botania.armorset.manaweave.name"); + } + + @Override + public void addArmorSetDescription(ItemStack stack, List list) { + addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc0"), list); + addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc1"), list); } + +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java new file mode 100644 index 000000000..4b39560a4 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java @@ -0,0 +1,21 @@ +/** + * 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 @ [Aug 28, 2015, 8:48:58 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.armor.manaweave; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManaweaveBoots extends ItemManaweaveArmor { + + public ItemManaweaveBoots() { + super(3, LibItemNames.MANAWEAVE_BOOTS); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java new file mode 100644 index 000000000..3338158a8 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java @@ -0,0 +1,22 @@ +/** + * 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 @ [Aug 28, 2015, 8:48:17 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.armor.manaweave; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManaweaveChest extends ItemManaweaveArmor { + + public ItemManaweaveChest() { + super(1, LibItemNames.MANAWEAVE_CHEST); + } + + +} 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 new file mode 100644 index 000000000..464446a04 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -0,0 +1,35 @@ +/** + * 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 @ [Aug 28, 2015, 8:47:04 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.armor.manaweave; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.item.IManaProficiencyArmor; +import vazkii.botania.api.mana.IManaDiscountArmor; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscountArmor, IManaProficiencyArmor { + + public ItemManaweaveHelm() { + super(0, LibItemNames.MANAWEAVE_HELM); + } + + @Override + public float getDiscount(ItemStack stack, int slot, EntityPlayer player) { + return hasArmorSet(player) ? 0.35F : 0F; + } + + @Override + public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player) { + return hasArmorSet(player); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java new file mode 100644 index 000000000..913f34704 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java @@ -0,0 +1,21 @@ +/** + * 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 @ [Aug 28, 2015, 8:48:36 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.armor.manaweave; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemManaweaveLegs extends ItemManaweaveArmor { + + public ItemManaweaveLegs() { + super(2, LibItemNames.MANAWEAVE_LEGS); + } + +} 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 3b4754895..d9f31e935 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -40,7 +41,7 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem { int x = MathHelper.floor_double(p.posX); int y = MathHelper.floor_double(p.posY); int z = MathHelper.floor_double(p.posZ); - int range = 15; + int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 20 : 15; long seedxor = world.rand.nextLong(); Botania.proxy.setWispFXDepthTest(false); 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 685b658dc..4e433a2e1 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -33,6 +33,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.item.IBlockProvider; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -58,6 +59,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra private static final String TAG_SELECT_X = "selectX"; private static final String TAG_SELECT_Y = "selectY"; private static final String TAG_SELECT_Z = "selectZ"; + private static final String TAG_EXTRA_RANGE = "extraRange"; public ItemExchangeRod() { setMaxStackSize(1); @@ -118,6 +120,12 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return; EntityPlayer player = (EntityPlayer) entity; + + int extraRange = ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); + int extraRangeNew = IManaProficiencyArmor.Helper.hasProficiency(player) ? 3 : 1; + if(extraRange != extraRangeNew) + ItemNBTHelper.setInt(stack, TAG_EXTRA_RANGE, extraRangeNew); + Block block = getBlock(stack); int meta = getBlockMeta(stack); if(ItemNBTHelper.getBoolean(stack, TAG_SWAPPING, false)) { @@ -151,7 +159,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra targetMeta = world.getBlockMetadata(xc, yc, zc); } - int effrange = RANGE + 1; + int effrange = RANGE + ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); int diameter = effrange * 2 + 1; Boolean[][][] matrix = new Boolean[diameter][diameter][diameter]; for(int i = 0; i < diameter; i++) @@ -177,7 +185,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra List coordsList = new ArrayList(); Boolean[][][] matrix = createMatrix(world, stack, blockToSwap, metaToSwap, xc, yc, zc, targetBlock, targetMeta); - int effrange = RANGE + 1; + int effrange = RANGE + ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); int diameter = effrange * 2; for(int i = 1; i < diameter; i++) for(int j = 1; j < diameter; j++) 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 ee97a618f..3fab22ce0 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -14,6 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.entity.EntityFlameRing; @@ -48,8 +49,8 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem { @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + if(par1ItemStack.isItemDamaged() && par3Entity instanceof EntityPlayer) + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - (IManaProficiencyArmor.Helper.hasProficiency((EntityPlayer) par3Entity) ? 2 : 1)); } @Override 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 16977a831..34b254266 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -22,6 +22,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -209,9 +210,10 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { Vector3 moveVector = new Vector3(player.getLookVec().normalize()); if(item instanceof EntityItem) { ((EntityItem)item).delayBeforeCanPickup = 20; - item.motionX = moveVector.x * 1.5F; - item.motionY = moveVector.y * 1.0F; - item.motionZ = moveVector.z * 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; if(!player.worldObj.isRemote) { EntityThrownItem thrown = new EntityThrownItem(item.worldObj, item.posX, item.posY, item.posZ, (EntityItem) item); item.worldObj.spawnEntityInWorld(thrown); 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 971d21d8a..61a9ead10 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -43,7 +44,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem { @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { - if(count != getMaxItemUseDuration(stack) && count % 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)) { EntityMagicMissile missile = new EntityMagicMissile(player, false); missile.setPosition(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)); if(missile.getTarget()) { 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 ed72f60ff..8660887e6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -15,6 +15,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -27,7 +28,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemRainbowRod extends ItemMod implements IManaUsingItem { private static final int MANA_COST = 750; - private static final int TIME = 300; + private static final int TIME = 600; public ItemRainbowRod() { setMaxDamage(TIME); @@ -50,8 +51,11 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem { double lz = 0; int count = 0; - - while(count < 100 && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlock((int) x, (int) y, (int) z).isAir(par2World, (int) x, (int) y, (int) z) || par2World.getBlock((int) x, (int) y, (int) z) == place) { + boolean prof = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer); + int maxlen = prof ? 160 : 100; + int time = prof ? (int) (TIME * 1.6) : TIME; + + while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlock((int) x, (int) y, (int) z).isAir(par2World, (int) x, (int) y, (int) z) || par2World.getBlock((int) x, (int) y, (int) z) == place) { if(y >= 256 || y <= 0) break; @@ -63,7 +67,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem { if(tile != null) { for(int k = 0; k < 4; k++) Botania.proxy.sparkleFX(par2World, tile.xCoord + Math.random(), tile.yCoord + Math.random(), tile.zCoord + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); - tile.ticks = TIME; + tile.ticks = 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 a74fdc891..6a72d4671 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -103,7 +104,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } if(!decremented) - playerData.put(p, new SmeltData(pos, 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.blockX + 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 f0d166aab..88706cb8f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -25,6 +25,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.item.IBlockProvider; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.subtile.ISpecialFlower; @@ -79,7 +80,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } public void terraform(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int range = 16; + int range = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer) ? 22 : 16; int xCenter = (int) par3EntityPlayer.posX; int yCenter = (int) par3EntityPlayer.posY - (par2World.isRemote ? 2 : 1); 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 ded145659..dbb961f84 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -17,6 +17,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; @@ -61,7 +62,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem { player.stopUsingItem(); } else if(isFlying(par1ItemStack)) { player.fallDistance = 0F; - player.motionY = 1.25; + player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player) ? 1.6 : 1.25; par1ItemStack.setItemDamage(Math.min(max, par1ItemStack.getItemDamage() + FALL_MULTIPLIER)); if(par1ItemStack.getItemDamage() == MAX_DAMAGE) setFlying(par1ItemStack, false); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index a361fefb4..829d52bf1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -152,7 +152,11 @@ public final class LibItemNames { public static final String EXCHANGE_ROD = "exchangeRod"; public static final String MAGNET_RING_GREATER = "magnetRingGreater"; public static final String THUNDER_SWORD = "thunderSword"; - + public static final String MANAWEAVE_HELM = "manaweaveHelm"; + public static final String MANAWEAVE_CHEST = "manaweaveChest"; + public static final String MANAWEAVE_LEGS = "manaweaveLegs"; + public static final String MANAWEAVE_BOOTS = "manaweaveBoots"; + public static final String[] LENS_NAMES = new String[] { "lensNormal", "lensSpeed", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 64be5ce0a..eec473668 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -221,6 +221,9 @@ botania.armorset.elementium.desc=Chance for pixies to apply potion effects botania.armorset.terrasteel.name=Will of the Ancients botania.armorset.terrasteel.desc0=20% less Mana cost on Mana Tools and Rods botania.armorset.terrasteel.desc1=Regen even if hunger isn't topped off +botania.armorset.manaweave.name=Manatide Prowess +botania.armorset.manaweave.desc0=35% less Mana cost on Mana Tools and Rods +botania.armorset.manaweave.desc1=Increased proficiency with Magical Rods botania.armorset.will0.desc=Critical Hits apply a strong weakness effect (Will of Ahrim) botania.armorset.will1.desc=Critical Hit damage increases with lower HP (Will of Dharok) @@ -1446,6 +1449,10 @@ item.botania:exchangeRod.name=Rod of the Shifting Crust item.botania:magnetRingGreater.name=Greater Ring of Magnetization item.botania:thunderSword.name=Thundercaller item.botania:manaweaveCloth.name=Manaweave Cloth +item.botania:manaweaveHelm.name=Manaweave Cowl +item.botania:manaweaveChest.name=Manaweave Robe Top +item.botania:manaweaveLegs.name=Manaweave Robe Bottom +item.botania:manaweaveBoots.name=Manaweave Boots # BREW NAMES botania.brew.fallback=Fallback