1.1-11 Update

This commit is contained in:
Arcaratus committed 2015-06-10 19:55:28 -04:00
1 parent 7ec9ec1be6
commit 29336b1862
42 files changed
+217 -50

No files matched your search

@@ -29,7 +29,6 @@ import net.minecraft.util.ChatComponentText;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingEvent;
import net.minecraftforge.event.entity.living.LivingHealEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.world.BlockEvent;
@@ -37,7 +36,7 @@ import java.util.Random;
public class BloodArsenalEventHooks
{
public static Random rand = new Random();
private Random rand = new Random();
@SubscribeEvent
public void onEntityDamaged(LivingAttackEvent event)
@@ -46,7 +45,7 @@ public class BloodArsenalEventHooks
Entity entityAttacking = event.source.getSourceOfDamage();
float damageDone = event.ammount;
if (entityAttacking != null)
if (entityAttacking != null && entityAttacked != null)
{
if (entityAttacking instanceof EntityLivingBase)
{
@@ -76,16 +75,20 @@ public class BloodArsenalEventHooks
selfSacrificeHandler(event);
}
EntityPlayer player = (EntityPlayer) entityAttacked;
for (int i = 0; i < 4; i++)
{
ItemStack armorStack = player.inventory.armorInventory[3 - i];
EntityPlayerMP player = (EntityPlayerMP) entityAttacked;
if (armorStack.getItem() instanceof GlassArmor)
if (player.inventory.armorInventory != null)
{
for (int i = 0; i < 4; i++)
{
if (entityAttacking instanceof EntityLivingBase)
ItemStack armorStack = player.inventory.armorInventory[3 - i];
if (armorStack != null && armorStack.getItem() instanceof GlassArmor)
{
((EntityLivingBase) entityAttacking).addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, rand.nextInt(5) * 20, rand.nextInt(1)));
if (entityAttacking instanceof EntityLivingBase)
{
((EntityLivingBase) entityAttacking).addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, rand.nextInt(3) * 20, rand.nextInt(1)));
}
}
}
}
@@ -120,7 +123,7 @@ public class BloodArsenalEventHooks
{
int amplifier = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getAmplifier();
int duration = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getDuration();
int damage = (rand.nextInt(5) * (amplifier + 1) + 3);
int damage = (rand.nextInt(2) * (amplifier + 1) + rand.nextInt(3));
if (entityLiving.worldObj.getWorldTime() % (20 / (amplifier + 1)) == 0)
{
@@ -9,6 +9,7 @@ import baubles.common.Config;
import com.arc.bloodarsenal.block.ModBlocks;
import com.arc.bloodarsenal.items.ModItems;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -99,6 +100,7 @@ public class BloodArsenalRecipes
addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_chestplate), "aba", "aaa", "aaa", 'a', ModItems.glass_shard, 'b', apprenticeOrb);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_leggings), "aaa", "aba", "a a", 'a', ModItems.glass_shard, 'b', apprenticeOrb);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_boots), "a a", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb);
addOreDictBloodOrbRecipe(new ItemStack(ModItems.transparent_orb), "aba", "bcb", "ded", 'a', ModBlocks.blood_stained_glass, 'b', Blocks.glass, 'c', transcendentOrb, 'd', ModItems.blood_burned_string, 'e', WayofTime.alchemicalWizardry.ModItems.divinationSigil);
addOreDictRecipe(new ItemStack(ModBlocks.blood_stone), "aaa", "aaa", "aaa", 'a', blankSlate);
addOreDictRecipe(new ItemStack(ModBlocks.blood_stone, 1, 1), "aaa", "aaa", "aaa", 'a', reinforcedSlate);
@@ -132,6 +134,7 @@ public class BloodArsenalRecipes
addShapelessOreDictRecipe(new ItemStack(ModItems.juice_and_cookies), Items.cookie, ModItems.orange_juice);
}
@Optional.Method(modid = "Baubles")
public static void addBaublesRecipe()
{
int craftingConstant = OreDictionary.WILDCARD_VALUE;
@@ -6,9 +6,11 @@ import com.arc.bloodarsenal.block.ModBlocks;
import com.arc.bloodarsenal.items.armor.GlassArmor;
import com.arc.bloodarsenal.items.armor.VampireCostume;
import com.arc.bloodarsenal.items.bauble.*;
import com.arc.bloodarsenal.items.orb.TransparentOrb;
import com.arc.bloodarsenal.items.sigil.*;
import com.arc.bloodarsenal.items.sigil.holding.SigilAugmentedHolding;
import com.arc.bloodarsenal.items.tool.*;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
import net.minecraft.item.ItemReed;
@@ -73,6 +75,7 @@ public class ModItems
public static Item glass_chestplate;
public static Item glass_leggings;
public static Item glass_boots;
public static Item transparent_orb;
public static void init()
{
@@ -129,6 +132,7 @@ public class ModItems
glass_chestplate = registerItem(new GlassArmor(1), "glass_chestplate");
glass_leggings = registerItem(new GlassArmor(2), "glass_leggings");
glass_boots = registerItem(new GlassArmor(3), "glass_boots");
transparent_orb = registerItem(new TransparentOrb(30000000), "transparent_orb");
vampire_ring = new VampireRing();
self_sacrifice_amulet = new SelfSacrificeAmulet();
@@ -137,6 +141,7 @@ public class ModItems
empowered_self_sacrifice_amulet = new EmpoweredSelfSacrificeAmulet();
}
@Optional.Method(modid = "Baubles")
public static void registerBaubles()
{
GameRegistry.registerItem(vampire_ring, "vampire_ring");
@@ -193,15 +193,38 @@ public class VampireCostume extends ItemArmor
@Override
public void onArmorTick(World world, EntityPlayer player, ItemStack armor)
{
if (player.getActivePotionEffect(Potion.damageBoost) != null)
if (hasArmorSetItem(player, 1) && hasArmorSetItem(player, 2) && hasArmorSetItem(player, 3))
{
player.removePotionEffect(Potion.damageBoost.id);
if (player.getActivePotionEffect(Potion.damageBoost) != null)
{
player.removePotionEffect(Potion.damageBoost.id);
}
player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2, 1));
}
player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2, 1));
setIsInvisible(armor, player.isPotionActive(Potion.invisibility.id));
}
public boolean hasArmorSetItem(EntityPlayer player, int i)
{
ItemStack stack = player.inventory.armorInventory[3 - i];
if (stack == null)
{
return false;
}
switch (i)
{
case 1: return stack.getItem() == ModItems.vampire_cape;
case 2: return stack.getItem() == ModItems.vampire_greaves;
case 3: return stack.getItem() == ModItems.vampire_boots;
}
return false;
}
public boolean getIsInvisible(ItemStack itemStack)
{
NBTTagCompound tag = itemStack.getTagCompound();
@@ -1,5 +1,6 @@
package com.arc.bloodarsenal.items.bauble;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
@@ -152,6 +153,19 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble
return itemStack;
}
@Override
public String getItemStackDisplayName(ItemStack stack)
{
if (stack.getItemDamage() == 1)
{
return super.getItemStackDisplayName(stack) + " " + StatCollector.translateToLocal("item.empowered_amulet_soul_network");
}
else
{
return super.getItemStackDisplayName(stack) + " " + StatCollector.translateToLocal("item.empowered_amulet_containing");
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
@@ -159,9 +173,9 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble
this.itemIcon = iconRegister.registerIcon("BloodArsenal:sacrifice_amulet");
}
@Override
@SideOnly(Side.CLIENT)
@Deprecated
public boolean hasEffect(ItemStack p_77636_1_)
public boolean hasEffect(ItemStack p_77636_1_, int pass)
{
return true;
}
@@ -158,9 +158,9 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements
this.itemIcon = iconRegister.registerIcon("BloodArsenal:self_sacrifice_amulet");
}
@Override
@SideOnly(Side.CLIENT)
@Deprecated
public boolean hasEffect(ItemStack p_77636_1_)
public boolean hasEffect(ItemStack p_77636_1_, int pass)
{
return true;
}
@@ -170,4 +170,17 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements
{
return EnumRarity.rare;
}
@Override
public String getItemStackDisplayName(ItemStack stack)
{
if (stack.getItemDamage() == 1)
{
return super.getItemStackDisplayName(stack) + " " + StatCollector.translateToLocal("item.empowered_amulet_soul_network");
}
else
{
return super.getItemStackDisplayName(stack) + " " + StatCollector.translateToLocal("item.empowered_amulet_containing");
}
}
}
@@ -0,0 +1,94 @@
package com.arc.bloodarsenal.items.orb;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import java.util.List;
public class TransparentOrb extends EnergyBattery
{
IIcon icons[] = new IIcon[23];
public TransparentOrb(int damage)
{
super(damage);
orbLevel = 6;
}
@Override
public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean something)
{
list.add(StatCollector.translateToLocal("tooltip.energybattery.desc"));
if (itemStack.getTagCompound() != null)
{
list.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + itemStack.getTagCompound().getString("ownerName"));
list.add(StatCollector.translateToLocal("tooltip.energybattery.currentLP") + " " + this.getCurrentEssence(itemStack));
}
}
@Override
public void onUpdate(ItemStack itemStack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_)
{
if (itemStack.getTagCompound() == null)
{
return;
}
int maxEssence = this.getMaxEssence();
int section = maxEssence / 23;
int currentEssence = this.getCurrentEssence(itemStack);
if (currentEssence != 0)
{
int metaToBe = (currentEssence / section);
itemStack.setItemDamage(metaToBe);
}
else
{
itemStack.setItemDamage(0);
}
}
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses()
{
return true;
}
@Override
public IIcon getIcon(ItemStack stack, int pass)
{
int i = stack.getItemDamage() + 1;
if (i == stack.getItemDamage() || i == stack.getItemDamage() + 2)
{
i = stack.getItemDamage() + 1;
return icons[i - 1];
}
return icons[stack.getItemDamage()];
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{
itemIcon = iconRegister.registerIcon("BloodArsenal:orb/orb_0");
icons[0] = iconRegister.registerIcon("BloodArsenal:orb/orb_0");
for (int i = 0; i < 23; i++)
{
icons[i] = iconRegister.registerIcon("BloodArsenal:orb/orb_" + i);
}
}
}
@@ -61,6 +61,7 @@ public class BoundBow extends ItemBow implements IBindable
return true;
}
@Override
public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4)
{
int j = getMaxItemUseDuration(par1ItemStack) - par4;
@@ -141,6 +142,7 @@ public class BoundBow extends ItemBow implements IBindable
}
}
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
@@ -172,21 +174,25 @@ public class BoundBow extends ItemBow implements IBindable
return par1ItemStack;
}
@Override
public int getItemEnchantability()
{
return 1;
}
@Override
public EnumAction getItemUseAction(ItemStack par1ItemStack)
{
return EnumAction.bow;
}
@Override
public int getMaxItemUseDuration(ItemStack par1ItemStack)
{
return 36000;
}
@Override
public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
return par1ItemStack;
@@ -216,7 +222,6 @@ public class BoundBow extends ItemBow implements IBindable
}
par1ItemStack.setItemDamage(0);
return;
}
public void setActivated(ItemStack par1ItemStack, boolean newActivated)
@@ -42,7 +42,7 @@ public class GlassDaggerOfSacrifice extends EnergyItems
setEnergyUsed(100);
setFull3D();
setMaxDamage(100);
weaponDamage = 1.0F;
weaponDamage = 3.0F;
}
@Override
@@ -53,7 +53,7 @@ public class GlassDaggerOfSacrifice extends EnergyItems
return false;
}
if(par2EntityLivingBase instanceof IHoardDemon)
if (par2EntityLivingBase instanceof IHoardDemon)
{
return false;
}
@@ -134,7 +134,7 @@ public class GlassDaggerOfSacrifice extends EnergyItems
public Multimap getItemAttributeModifiers()
{
Multimap multimap = super.getItemAttributeModifiers();
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Tool modifier", 1.0d, 0));
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Tool modifier", 2.0d, 0));
return multimap;
}
@@ -41,7 +41,8 @@ public class GlassSacrificialDagger extends Item
if (AlchemicalWizardry.wimpySettings)
{
this.itemIcon = iconRegister.registerIcon("BloodArsenal:glass_sacrificial_orb");
} else
}
else
{
this.itemIcon = iconRegister.registerIcon("BloodArsenal:glass_sacrificial_dagger");
}
@@ -65,17 +66,17 @@ public class GlassSacrificialDagger extends Item
if (!player.capabilities.isCreativeMode)
{
SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2);
if(MinecraftForge.EVENT_BUS.post(evt))
if (MinecraftForge.EVENT_BUS.post(evt))
{
return stack;
}
if(evt.shouldDrainHealth)
if (evt.shouldDrainHealth)
{
player.setHealth(player.getHealth() - 2);
}
if(!evt.shouldFillAltar)
if (!evt.shouldFillAltar)
{
return stack;
}
@@ -107,10 +108,10 @@ public class GlassSacrificialDagger extends Item
if (player.isPotionActive(AlchemicalWizardry.customPotionSoulFray))
{
findAndFillAltar(world, player, 20);
findAndFillAltar(world, player, 50);
} else
{
findAndFillAltar(world, player, 200);
findAndFillAltar(world, player, 500);
}
if (player.getHealth() <= 0.001f)
@@ -119,7 +120,7 @@ public class GlassSacrificialDagger extends Item
}
Random random = new Random();
if (random.nextInt() + 18 <= 22)
if (random.nextInt(2) < 2)
{
player.addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, random.nextInt(5) * 20, 0));
}
@@ -191,7 +192,7 @@ public class GlassSacrificialDagger extends Item
{
if (AlchemicalWizardry.wimpySettings)
{
return "Glass Sacrificial Orb";
return StatCollector.translateToLocal("item.glass_sacrificial_orb.name");
}
return super.getItemStackDisplayName(stack);
}
@@ -211,7 +212,7 @@ public class GlassSacrificialDagger extends Item
public void setUseForSacrifice(ItemStack stack, boolean sacrifice)
{
NBTTagCompound tag = stack.getTagCompound();
if(tag == null)
if (tag == null)
{
tag = new NBTTagCompound();
stack.setTagCompound(tag);
@@ -22,6 +22,7 @@ public class InfusedDiamond extends Item
setCreativeTab(BloodArsenal.BA_TAB);
}
@Override
public void registerIcons(IIconRegister iconRegister)
{
if (equals(ModItems.blood_diamond))
@@ -76,15 +77,8 @@ public class InfusedDiamond extends Item
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack par1ItemStack)
public boolean hasEffect(ItemStack par1ItemStack, int pass)
{
if (equals(ModItems.blood_infused_diamond_bound))
{
return true;
}
else
{
return false;
}
return equals(ModItems.blood_infused_diamond_bound);
}
}
@@ -149,6 +149,7 @@ public class InfusedDiamondAxe extends ItemAxe implements IBindable
return false;
}
@Override
@SideOnly(Side.CLIENT)
public boolean isFull3D()
{
@@ -157,11 +158,12 @@ public class InfusedDiamondAxe extends ItemAxe implements IBindable
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack par1ItemStack)
public boolean hasEffect(ItemStack par1ItemStack, int pass)
{
return true;
}
@Override
@SideOnly(Side.CLIENT)
public EnumRarity getRarity(ItemStack par1ItemStack)
{
@@ -156,6 +156,7 @@ public class InfusedDiamondPickaxe extends ItemPickaxe implements IBindable
return false;
}
@Override
@SideOnly(Side.CLIENT)
public boolean isFull3D()
{
@@ -164,11 +165,12 @@ public class InfusedDiamondPickaxe extends ItemPickaxe implements IBindable
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack par1ItemStack)
public boolean hasEffect(ItemStack par1ItemStack, int pass)
{
return true;
}
@Override
@SideOnly(Side.CLIENT)
public EnumRarity getRarity(ItemStack par1ItemStack)
{
@@ -19,8 +19,6 @@ import java.util.List;
public class InfusedDiamondShovel extends ItemSpade implements IBindable
{
private int energyUsed;
public InfusedDiamondShovel()
{
super(BloodArsenal.infusedIron);
@@ -132,6 +130,7 @@ public class InfusedDiamondShovel extends ItemSpade implements IBindable
return false;
}
@Override
@SideOnly(Side.CLIENT)
public boolean isFull3D()
{
@@ -140,11 +139,12 @@ public class InfusedDiamondShovel extends ItemSpade implements IBindable
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack par1ItemStack)
public boolean hasEffect(ItemStack par1ItemStack, int pass)
{
return true;
}
@Override
@SideOnly(Side.CLIENT)
public EnumRarity getRarity(ItemStack par1ItemStack)
{
@@ -136,6 +136,7 @@ public class InfusedDiamondSword extends ItemSword implements IBindable
return par1ItemStack;
}
@Override
@SideOnly(Side.CLIENT)
public boolean isFull3D()
{
@@ -144,11 +145,12 @@ public class InfusedDiamondSword extends ItemSword implements IBindable
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack par1ItemStack)
public boolean hasEffect(ItemStack par1ItemStack, int pass)
{
return true;
}
@Override
@SideOnly(Side.CLIENT)
public EnumRarity getRarity(ItemStack par1ItemStack)
{