From 995014c35d6f4520003eaf6bad861a7e2f1172ca Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Mon, 8 Jun 2015 11:03:30 -0400 Subject: [PATCH] 1.1-10 Update --- build.properties | 4 +- .../com/arc/bloodarsenal/BloodArsenal.java | 3 +- .../bloodarsenal/BloodArsenalEventHooks.java | 28 ++- .../arc/bloodarsenal/BloodArsenalRecipes.java | 8 +- .../com/arc/bloodarsenal/items/ModItems.java | 15 +- .../bloodarsenal/items/armor/GlassArmor.java | 46 ++++ .../items/armor/VampireCostume.java | 24 +- .../items/tool/GlassDaggerOfSacrifice.java | 197 +++++++++++++++ .../items/tool/GlassSacrificialDagger.java | 229 ++++++++++++++++++ .../assets/bloodarsenal/lang/en_US.lang | 9 + .../models/armor/glass_layer_1.png | Bin 0 -> 1447 bytes .../models/armor/glass_layer_2.png | Bin 0 -> 669 bytes .../textures/items/glass_boots.png | Bin 0 -> 349 bytes .../textures/items/glass_chestplate.png | Bin 0 -> 387 bytes .../items/glass_dagger_of_sacrifice.png | Bin 0 -> 466 bytes .../textures/items/glass_helmet.png | Bin 0 -> 326 bytes .../textures/items/glass_leggings.png | Bin 0 -> 343 bytes .../items/glass_sacrificial_dagger.png | Bin 0 -> 436 bytes .../textures/items/glass_sacrificial_orb.png | Bin 0 -> 523 bytes src/main/resources/mcmod.info | 2 +- 20 files changed, 532 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/arc/bloodarsenal/items/armor/GlassArmor.java create mode 100644 src/main/java/com/arc/bloodarsenal/items/tool/GlassDaggerOfSacrifice.java create mode 100644 src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java create mode 100644 src/main/resources/assets/bloodarsenal/models/armor/glass_layer_1.png create mode 100644 src/main/resources/assets/bloodarsenal/models/armor/glass_layer_2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/glass_boots.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/glass_chestplate.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/glass_dagger_of_sacrifice.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/glass_helmet.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/glass_leggings.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/glass_sacrificial_dagger.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/glass_sacrificial_orb.png diff --git a/build.properties b/build.properties index 3bde0d0..d833c62 100644 --- a/build.properties +++ b/build.properties @@ -13,5 +13,5 @@ nei_version=1.0.5.110 forgeMultipart_version=1.2.0.344 tconstruct_version=1.8.5.build958 -forge_version=10.13.3.1420 -build_number=8 \ No newline at end of file +forge_version=10.13.3.1428 +build_number=10 \ No newline at end of file diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/BloodArsenal.java index 9b7d4cc..93f92cb 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenal.java @@ -41,7 +41,7 @@ import java.util.Calendar; public class BloodArsenal { public final static String MODID = "BloodArsenal"; - public final static String VERSION = "1.1-9"; + public final static String VERSION = "1.1-10"; @SidedProxy(clientSide = "com.arc.bloodarsenal.ClientProxy", serverSide = "com.arc.bloodarsenal.CommonProxy") public static CommonProxy proxy; @@ -59,6 +59,7 @@ public class BloodArsenal public static ItemArmor.ArmorMaterial vampireArmor = EnumHelper.addArmorMaterial("VampireArmor", 0, new int[]{2, 7, 4, 2}, 0); public static ItemArmor.ArmorMaterial lifeImbuedArmor = EnumHelper.addArmorMaterial("ImbuedArmor", 0, new int[]{4, 10, 8, 4}, 7); + public static ItemArmor.ArmorMaterial glassArmor = EnumHelper.addArmorMaterial("GlassArmor", 0, new int[]{1, 4, 3, 1}, 4); public static Logger logger = LogManager.getLogger(MODID); public static CreativeTabs BA_TAB = new CreativeTabs("BA_TAB") diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java b/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java index 2e650c1..d48cf1a 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java @@ -5,11 +5,13 @@ import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.items.armor.GlassArmor; import com.arc.bloodarsenal.items.bauble.EmpoweredSacrificeAmulet; import com.arc.bloodarsenal.items.bauble.EmpoweredSelfSacrificeAmulet; import com.arc.bloodarsenal.items.bauble.SacrificeAmulet; import com.arc.bloodarsenal.items.bauble.SelfSacrificeAmulet; import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.block.Block; @@ -35,7 +37,7 @@ import java.util.Random; public class BloodArsenalEventHooks { - public static double rand = Math.random(); + public static Random rand = new Random(); @SubscribeEvent public void onEntityDamaged(LivingAttackEvent event) @@ -69,10 +71,24 @@ public class BloodArsenalEventHooks } } - if (BloodArsenalConfig.baublesIntegration) + if (BloodArsenalConfig.baublesIntegration && Loader.isModLoaded("Baubles")) { selfSacrificeHandler(event); } + + EntityPlayer player = (EntityPlayer) entityAttacked; + for (int i = 0; i < 4; i++) + { + ItemStack armorStack = player.inventory.armorInventory[3 - i]; + + if (armorStack.getItem() instanceof GlassArmor) + { + if (entityAttacking instanceof EntityLivingBase) + { + ((EntityLivingBase) entityAttacking).addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, rand.nextInt(5) * 20, rand.nextInt(1))); + } + } + } } } } @@ -87,7 +103,7 @@ public class BloodArsenalEventHooks { Entity killer = event.source.getEntity(); - if (killer != null && killer instanceof EntityPlayer && BloodArsenalConfig.baublesIntegration) + if (killer != null && killer instanceof EntityPlayer && BloodArsenalConfig.baublesIntegration && Loader.isModLoaded("Baubles")) { sacrificeHandler(event); } @@ -104,7 +120,7 @@ public class BloodArsenalEventHooks { int amplifier = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getAmplifier(); int duration = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getDuration(); - int damage = ((int)(rand * rand) * (amplifier + 1) + 3); + int damage = (rand.nextInt(5) * (amplifier + 1) + 3); if (entityLiving.worldObj.getWorldTime() % (20 / (amplifier + 1)) == 0) { @@ -195,7 +211,7 @@ public class BloodArsenalEventHooks { event.drops.add(new ItemStack(ModItems.glass_shard)); } - event.dropChance = 0.5F; + event.dropChance = 0.25F; } } } @@ -212,6 +228,7 @@ public class BloodArsenalEventHooks } } + @Optional.Method(modid = "Baubles") private void sacrificeHandler(LivingDeathEvent event) { Entity killer = event.source.getEntity(); @@ -262,6 +279,7 @@ public class BloodArsenalEventHooks } } + @Optional.Method(modid = "Baubles") private void selfSacrificeHandler(LivingAttackEvent event) { EntityLivingBase entityAttacked = event.entityLiving; diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java b/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java index c8db7f8..2694c89 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java @@ -28,7 +28,7 @@ public class BloodArsenalRecipes AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(Blocks.log), 2, 3000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_infused_iron_block), new ItemStack(Blocks.iron_block), 3, 54000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.item_blood_cake), new ItemStack(Items.cake), 3, 10000, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 3, 6000, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 2, 6000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_orange), new ItemStack(Items.dye, 1, 14), 1, 200, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_diamond_active), new ItemStack(ModItems.blood_infused_diamond_unactive), 4, 80000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.soul_fragment), new ItemStack(ModItems.heart), 4, 75000, 5, 5, false); @@ -93,6 +93,12 @@ public class BloodArsenalRecipes addOreDictBloodOrbRecipe(new ItemStack(ModItems.blood_burned_string, 4), "aaa", "aba", "aaa", 'a', Items.string, 'b', weakOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.sigil_of_augmented_holding), "aba", "cde", "fgf", 'a', demonicSlate, 'b', masterOrb, 'c', Items.blaze_rod, 'd', WayofTime.alchemicalWizardry.ModItems.sigilOfHolding, 'e', Items.ghast_tear, 'f', ModItems.blood_infused_iron, 'g', Blocks.chest); addOreDictBloodOrbRecipe(new ItemStack(ModItems.sigil_of_lightning), "aba", "cdc", "efg", 'a', new ItemStack(ModBlocks.blood_stone, 1, 3), 'b', Blocks.iron_block, 'c', ModBlocks.blood_infused_iron_block, 'd', etherealSlate, 'e', Items.nether_star, 'f', archmageOrb, 'g', ModItems.blood_infused_diamond_bound); + addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_sacrificial_dagger), "aaa", "aba", "cdc", 'a', ModItems.glass_shard, 'b', WayofTime.alchemicalWizardry.ModItems.sacrificialDagger, 'c', ModItems.blood_infused_iron, 'd', magicianOrb); + addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_dagger_of_sacrifice), "aaa", "aba", "cdc", 'a', ModItems.glass_shard, 'b', WayofTime.alchemicalWizardry.ModItems.daggerOfSacrifice, 'c', ModItems.blood_infused_iron, 'd', magicianOrb); + addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_helmet), "aaa", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb); + 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); addOreDictRecipe(new ItemStack(ModBlocks.blood_stone), "aaa", "aaa", "aaa", 'a', blankSlate); addOreDictRecipe(new ItemStack(ModBlocks.blood_stone, 1, 1), "aaa", "aaa", "aaa", 'a', reinforcedSlate); diff --git a/src/main/java/com/arc/bloodarsenal/items/ModItems.java b/src/main/java/com/arc/bloodarsenal/items/ModItems.java index 4dd9d8c..f22f552 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ModItems.java +++ b/src/main/java/com/arc/bloodarsenal/items/ModItems.java @@ -3,6 +3,7 @@ package com.arc.bloodarsenal.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import com.arc.bloodarsenal.BloodArsenal; 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.sigil.*; @@ -66,6 +67,12 @@ public class ModItems public static Item empowered_self_sacrifice_amulet; public static Item sigil_of_augmented_holding; public static Item sigil_of_lightning; + public static Item glass_sacrificial_dagger; + public static Item glass_dagger_of_sacrifice; + public static Item glass_helmet; + public static Item glass_chestplate; + public static Item glass_leggings; + public static Item glass_boots; public static void init() { @@ -94,7 +101,7 @@ public class ModItems blood_infused_sword_diamond = registerItem(new InfusedDiamondSword(), "blood_infused_sword_diamond"); heart = registerItem(new ItemBloodArsenal(), "heart"); soul_fragment = registerItem(new ItemBloodArsenal(), "soul_fragment"); - bound_igniter = registerItem(new BoundIgniter(), "bound_flint_and_steel"); + bound_igniter = registerItem(new BoundIgniter(), "bound_igniter"); soul_booster = registerItem(new ItemSoulBooster(), "soul_booster"); soul_nullifier = registerItem(new ItemSoulNullifier(), "soul_nullifier"); blood_cookie = registerItem(new ItemBloodCookie(), "blood_cookie"); @@ -116,6 +123,12 @@ public class ModItems glass_shard = registerItem(new ItemBloodArsenal(), "glass_shard"); sigil_of_augmented_holding = registerItem(new SigilAugmentedHolding(), "sigil_of_augmented_holding"); sigil_of_lightning = registerItem(new SigilLightning(), "sigil_of_lightning"); + glass_sacrificial_dagger = registerItem(new GlassSacrificialDagger(), "glass_sacrificial_dagger"); + glass_dagger_of_sacrifice = registerItem(new GlassDaggerOfSacrifice(), "glass_dagger_of_sacrifice"); + glass_helmet = registerItem(new GlassArmor(0), "glass_helmet"); + glass_chestplate = registerItem(new GlassArmor(1), "glass_chestplate"); + glass_leggings = registerItem(new GlassArmor(2), "glass_leggings"); + glass_boots = registerItem(new GlassArmor(3), "glass_boots"); vampire_ring = new VampireRing(); self_sacrifice_amulet = new SelfSacrificeAmulet(); diff --git a/src/main/java/com/arc/bloodarsenal/items/armor/GlassArmor.java b/src/main/java/com/arc/bloodarsenal/items/armor/GlassArmor.java new file mode 100644 index 0000000..4988c2a --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/armor/GlassArmor.java @@ -0,0 +1,46 @@ +package com.arc.bloodarsenal.items.armor; + +import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.items.ModItems; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import java.util.List; + +public class GlassArmor extends ItemArmor +{ + public GlassArmor(int armorType) + { + super(BloodArsenal.glassArmor, 1, armorType); + setMaxDamage(42); // The answer to everything in the universe + } + + @Override + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add(StatCollector.translateToLocal("tooltip.armor.glassArmor")); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) + { + if (this == ModItems.glass_helmet || this == ModItems.glass_chestplate || this == ModItems.glass_boots) + { + return "BloodArsenal:models/armor/glass_layer_1.png"; + } + else + { + return "BloodArsenal:models/armor/glass_layer_2.png"; + } + } + + @Override + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java b/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java index 1e98891..4591d58 100644 --- a/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java @@ -33,7 +33,6 @@ public class VampireCostume extends ItemArmor { super(BloodArsenal.vampireArmor, 0, armorType); setMaxDamage(0); - setCreativeTab(BloodArsenal.BA_TAB); } ModelBiped model1 = null; @@ -118,6 +117,7 @@ public class VampireCostume extends ItemArmor bootsIcon = iconRegister.registerIcon("BloodArsenal:vampire_boots"); } + @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1) { @@ -142,7 +142,7 @@ public class VampireCostume extends ItemArmor @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - if (this.tryComplexRendering) + if (tryComplexRendering) { return "BloodArsenal:models/armor/VampireCostume.png"; } @@ -190,26 +190,6 @@ public class VampireCostume extends ItemArmor return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); } - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) - { - if (armor.equals(ModItems.vampire_cape)) - { - return 8; - } - - if (armor.equals(ModItems.vampire_greaves)) - { - return 6; - } - - if (armor.equals(ModItems.vampire_boots)) - { - return 3; - } - - return 5; - } - @Override public void onArmorTick(World world, EntityPlayer player, ItemStack armor) { diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/GlassDaggerOfSacrifice.java b/src/main/java/com/arc/bloodarsenal/items/tool/GlassDaggerOfSacrifice.java new file mode 100644 index 0000000..a12e154 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/tool/GlassDaggerOfSacrifice.java @@ -0,0 +1,197 @@ +package com.arc.bloodarsenal.items.tool; + +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; +import WayofTime.alchemicalWizardry.common.IDemon; +import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.BloodArsenalConfig; +import com.google.common.collect.Multimap; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.boss.IBossDisplayData; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.entity.passive.EntityAnimal; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import java.util.List; + +public class GlassDaggerOfSacrifice extends EnergyItems +{ + private float weaponDamage; + + public GlassDaggerOfSacrifice() + { + super(); + setMaxStackSize(1); + setEnergyUsed(100); + setFull3D(); + setMaxDamage(100); + weaponDamage = 1.0F; + } + + @Override + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) + { + if (par3EntityLivingBase == null || par2EntityLivingBase == null || par3EntityLivingBase.worldObj.isRemote || (par3EntityLivingBase instanceof EntityPlayer && SpellHelper.isFakePlayer(par3EntityLivingBase.worldObj, (EntityPlayer) par3EntityLivingBase))) + { + return false; + } + + if(par2EntityLivingBase instanceof IHoardDemon) + { + return false; + } + + if (par2EntityLivingBase.isChild() || par2EntityLivingBase instanceof EntityPlayer || par2EntityLivingBase instanceof IBossDisplayData) + { + return false; + } + + World world = par2EntityLivingBase.worldObj; + + if (par2EntityLivingBase.isDead || par2EntityLivingBase.getHealth() < 0.5f) + { + return false; + } + + if (par2EntityLivingBase instanceof IDemon) + { + ((IDemon)par2EntityLivingBase).setDropCrystal(false); + this.findAndNotifyAltarOfDemon(world, par2EntityLivingBase); + } + + int lifeEssence = 500; + if (par2EntityLivingBase instanceof EntityVillager) lifeEssence = 3000; + else if (par2EntityLivingBase instanceof EntitySlime) lifeEssence = 225; + else if (par2EntityLivingBase instanceof EntityEnderman) lifeEssence = 300; + else if (par2EntityLivingBase instanceof EntityAnimal) lifeEssence = 375; + + if (findAndFillAltar(par2EntityLivingBase.worldObj, par2EntityLivingBase, lifeEssence)) + { + double posX = par2EntityLivingBase.posX; + double posY = par2EntityLivingBase.posY; + double posZ = par2EntityLivingBase.posZ; + + for (int i = 0; i < 8; i++) + { + SpellHelper.sendIndexedParticleToAllAround(world, posX, posY, posZ, 20, world.provider.dimensionId, 1, posX, posY, posZ); + } + + par2EntityLivingBase.setHealth(-1); + par2EntityLivingBase.onDeath(BloodArsenal.deathFromBlood); + } + + if (!par2EntityLivingBase.isDead) + { + par2EntityLivingBase.addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, 20, 0)); + } + + return false; + } + + @Override + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add(StatCollector.translateToLocal("tooltip.tool.glassDaggerOfSacrifice")); + } + + @Override + public float func_150893_a(ItemStack par1ItemStack, Block par2Block) + { + if (par2Block == Blocks.web) + { + return 15.0F; + } else + { + Material material = par2Block.getMaterial(); + return material != Material.plants && material != Material.vine && material != Material.coral && material != Material.leaves && material != Material.gourd ? 1.0F : 1.5F; + } + } + + @Override + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) + { + return false; + } + + @Override + public Multimap getItemAttributeModifiers() + { + Multimap multimap = super.getItemAttributeModifiers(); + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Tool modifier", 1.0d, 0)); + return multimap; + } + + public boolean findAndNotifyAltarOfDemon(World world, EntityLivingBase sacrifice) + { + int posX = (int) Math.round(sacrifice.posX - 0.5f); + int posY = (int) sacrifice.posY; + int posZ = (int) Math.round(sacrifice.posZ - 0.5f); + IBloodAltar altarEntity = this.getAltar(world, posX, posY, posZ); + + if (altarEntity == null) + { + return false; + } + + altarEntity.addToDemonBloodDuration(50); + + return true; + } + + public boolean findAndFillAltar(World world, EntityLivingBase sacrifice, int amount) + { + int posX = (int) Math.round(sacrifice.posX - 0.5f); + int posY = (int) sacrifice.posY; + int posZ = (int) Math.round(sacrifice.posZ - 0.5f); + IBloodAltar altarEntity = this.getAltar(world, posX, posY, posZ); + + if (altarEntity == null) + { + return false; + } + + altarEntity.sacrificialDaggerCall(amount, true); + altarEntity.startCycle(); + return true; + } + + public IBloodAltar getAltar(World world, int x, int y, int z) + { + TileEntity tileEntity; + + for (int i = -2; i <= 2; i++) + { + for (int j = -2; j <= 2; j++) + { + for (int k = -2; k <= 1; k++) + { + tileEntity = world.getTileEntity(i + x, k + y, j + z); + + if (tileEntity instanceof IBloodAltar) + { + return (IBloodAltar) tileEntity; + } + } + } + } + + return null; + } +} diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java b/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java new file mode 100644 index 0000000..ffb51ea --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java @@ -0,0 +1,229 @@ +package com.arc.bloodarsenal.items.tool; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; +import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.BloodArsenalConfig; +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.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; + +import java.util.List; +import java.util.Random; + +public class GlassSacrificialDagger extends Item +{ + public GlassSacrificialDagger() + { + super(); + setMaxStackSize(1); + setFull3D(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) + { + if (AlchemicalWizardry.wimpySettings) + { + this.itemIcon = iconRegister.registerIcon("BloodArsenal:glass_sacrificial_orb"); + } else + { + this.itemIcon = iconRegister.registerIcon("BloodArsenal:glass_sacrificial_dagger"); + } + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add(StatCollector.translateToLocal("tooltip.tool.glassSacrificeDagger")); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + if (this.canUseForSacrifice(stack)) + { + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + return stack; + } + + if (!player.capabilities.isCreativeMode) + { + SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2); + if(MinecraftForge.EVENT_BUS.post(evt)) + { + return stack; + } + + if(evt.shouldDrainHealth) + { + player.setHealth(player.getHealth() - 2); + } + + if(!evt.shouldFillAltar) + { + return stack; + } + } + + if (player instanceof FakePlayer) + { + return stack; + } + + double posX = player.posX; + double posY = player.posY; + double posZ = player.posZ; + world.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + float f = 1.0F; + float f1 = f * 0.6F + 0.4F; + float f2 = f * f * 0.7F - 0.5F; + float f3 = f * f * 0.6F - 0.7F; + + for (int l = 0; l < 8; ++l) + { + world.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); + } + + if (!world.isRemote && SpellHelper.isFakePlayer(world, player)) + { + return stack; + } + + if (player.isPotionActive(AlchemicalWizardry.customPotionSoulFray)) + { + findAndFillAltar(world, player, 20); + } else + { + findAndFillAltar(world, player, 200); + } + + if (player.getHealth() <= 0.001f) + { + player.onDeath(BloodArsenal.deathFromBlood); + } + + Random random = new Random(); + if (random.nextInt() + 18 <= 22) + { + player.addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, random.nextInt(5) * 20, 0)); + } + return stack; + } + + @Override + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) + { + PlayerSacrificeHandler.sacrificePlayerHealth(player); + } + + @Override + public int getMaxItemUseDuration(ItemStack stack) + { + return 72000; + } + + public void findAndFillAltar(World world, EntityPlayer player, int amount) + { + int posX = (int) Math.round(player.posX - 0.5f); + int posY = (int) player.posY; + int posZ = (int) Math.round(player.posZ - 0.5f); + IBloodAltar altarEntity = getAltar(world, posX, posY, posZ); + + if (altarEntity == null) + { + return; + } + + altarEntity.sacrificialDaggerCall(amount, false); + altarEntity.startCycle(); + } + + public IBloodAltar getAltar(World world, int x, int y, int z) + { + TileEntity tileEntity; + + for (int i = -2; i <= 2; i++) + { + for (int j = -2; j <= 2; j++) + { + for (int k = -2; k <= 1; k++) + { + tileEntity = world.getTileEntity(i + x, k + y, j + z); + + if ((tileEntity instanceof IBloodAltar)) + { + return (IBloodAltar) tileEntity; + } + } + } + } + + return null; + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + if (!world.isRemote && entity instanceof EntityPlayer) + { + this.setUseForSacrifice(stack, this.isPlayerPreparedForSacrifice(world, (EntityPlayer)entity)); + } + } + + @Override + public String getItemStackDisplayName(ItemStack stack) + { + if (AlchemicalWizardry.wimpySettings) + { + return "Glass Sacrificial Orb"; + } + return super.getItemStackDisplayName(stack); + } + + public boolean isPlayerPreparedForSacrifice(World world, EntityPlayer player) + { + return !world.isRemote && (PlayerSacrificeHandler.getPlayerIncense(player) > 0); + } + + public boolean canUseForSacrifice(ItemStack stack) + { + NBTTagCompound tag = stack.getTagCompound(); + + return tag != null && tag.getBoolean("sacrifice"); + } + + public void setUseForSacrifice(ItemStack stack, boolean sacrifice) + { + NBTTagCompound tag = stack.getTagCompound(); + if(tag == null) + { + tag = new NBTTagCompound(); + stack.setTagCompound(tag); + } + + tag.setBoolean("sacrifice", sacrifice); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack stack, int pass) + { + return this.canUseForSacrifice(stack) || super.hasEffect(stack, pass); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index 90ba8cd..a9261b4 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -84,6 +84,12 @@ item.empowered_sacrifice_amulet.name=Empowered Sacrifice Amulet item.empowered_self_sacrifice_amulet.name=Empowered Self Sacrifice Amulet item.sigil_of_augmented_holding.name=Sigil of Augmented Holding item.sigil_of_lightning.name=Lightning Sigil +item.glass_sacrificial_dagger.name=Glass Sacrificial Dagger +item.glass_dagger_of_sacrifice.name=Glass Dagger of Sacrifice +item.glass_helmet.name=Glass Helmet +item.glass_chestplate.name=Glass Chestplate +item.glass_leggings.name=Glass Leggings +item.glass_boots.name=Glass Boots #Death Texts death.attack.deathFromBlood=%1$s lost too much blood @@ -118,6 +124,8 @@ tooltip.tool.blood_infused_diamond_axe=Demonic deforestation! tooltip.tool.blood_infused_diamond_pickaxe=A handheld quarry tooltip.tool.blood_infused_diamond_shovel=Making a hole tooltip.tool.blood_infused_diamond_sword=Slices right through! +tooltip.tool.glassSacrificeDagger=Don't play with this! +tooltip.tool.glassDaggerOfSacrifice=Making it hurt tooltip.sigil.swimming=Just keep swimming! tooltip.sigil.ender1=Sticking your hand tooltip.sigil.ender2=into the End! @@ -126,6 +134,7 @@ tooltip.sigil.augmentedHolding=Hold all the sigils! tooltip.sigil.lightning=Let 'er rip! tooltip.sigil.lightning2=Mode: tooltip.bloodMoney.money=Pay your debts in blood! +tooltip.armor.glassArmor=More painful than it looks tooltip.shiftinfo=Press &cSHIFT&7 for more info diff --git a/src/main/resources/assets/bloodarsenal/models/armor/glass_layer_1.png b/src/main/resources/assets/bloodarsenal/models/armor/glass_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a8aaef4b9e94716f4cbb6d391230e3283723e821 GIT binary patch literal 1447 zcmV;Y1z7rtP)^V|k_}Rk$diI5n3MP_AqWC- zU6;MP3tB3bxC(Zv8nC&!DaIIE5V`q2kl1k!6~`-U`rQt-Kl|QQ*dSw@I<(>BI==aF zZZQ6uao-8|;37m&l7|q0t*tGF!y&tWRJB%?v;)-2g75nh$1(PAVPV03PXVd-RgNB8tT#BErGJ0V^vjX}Y|6^@_#CMF7^;)`;U6fH;nEU6)Fw z!h;77$RNU^LT#|^6_E30lJerk3r3?600##LJbU)+Sm&27U*b3pj~+cb)~C^E;5ZH< z!s6m0Yiny%Dir`qr4p)&^R0uhx3|aA($dA&0zYccpFaoS`t|E*0{u9S`TF%MBEr+B zPp@_WvdC~<7ZG7J8u8@Glgq&YxZ-vq0$#sV4%$+vtf}U@#aE zMG?!(%bEzFbG3w<$eTBBB*QO$o))N7D$LK%Ypd0ga=Co&0jQNln$0GKLg9bWB61Sk z8jXfn_{&o5+?iWuLUkc{#6*EKsd$dh6psjlV?@}b-=3r`?0R>1morssRxGvK?IQxn z`mFY14T9j1vg~v^6N55Aa4{yx()F0{xN>E+7wZof!PCUR^So3vWztIQ=4xe;Bpw3L z>2%T*%+h7g^W^r2t^o4(?c3~365sdjJrp1afMTZnxRk*f`>!f&O@E zjMs-FbBmvjfLd9k*XuDD4AK+5`96?pwW^z&n_`g>$8p-jMTEg%kV4pT99-9BZf;JC z#Uf!CiWN+f*veGSz8=3yW=-OozIS2(CQW&cndD3?Q~*;`QxuEEH0P?-DxFS8j4|x| zepfxull%AYTY0RiO0if>Q^puW6h(NRCxgL&;c$pC=4__I37e94@7|?32FUvQ`XSxE zv9Xbz5J|Jyw9_EXAOJvYk#ih}TYrTjBDC9Wu}sb)z!uIAw`bLLT?&N)#bS{{p@8E! z+2{GGQ(?8IRlDV4H;dOfD5rcyLyD6rbij7B5sea$jM$&wh~ z_tUj8hWYvV^d6I@QdzXwZZUrbG%sK8E4T8gB>0x64<8bSVVa}2R3(a{G$ney9;H(0 z*b@>-`+mBy|Efq6K07;pdrX0w#L}2h954Mm;9s;=9)@Mv0J{JH002ovPDHLkV1j>9 B!TSIJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/models/armor/glass_layer_2.png b/src/main/resources/assets/bloodarsenal/models/armor/glass_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3807fa7ece775ed7361e2e76c116585be654370b GIT binary patch literal 669 zcmV;O0%HA%P)VGd000McNliru-v$T`EeF%yg$e)w0xC&F zK~!ko?Uuo6<1i40zmb%Lm|l9?9(!p_=%J6`SFhipnAkBiY~LVl4aP*Xheq1OqCGhQe=1(3FFWq<$k z6tLNB1mO1eRxe!vrw9PhAL0Ovs`B{mH6SD(SFbwhZ0U3sYx3@QnOa#!~Zils&A`=c< z@=u^x~}ow%W}EY)oK;Gh?bpl^U~nG zj|$t*7KjMTb*aY8gt4zho1iA9jEHVp})euum1l(x<4~cte|nU00000NkvXXu0mjf D0=zPr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/glass_boots.png b/src/main/resources/assets/bloodarsenal/textures/items/glass_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..6d8f56848d90a7c539e3679070d39bfde04f72e1 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~8wal#PsP5?yMRKkJY5_^EKc8@WY~AufQMyzli-09 z>34P+zEi*c%d^UFftyyTZ=KMJ$ICc0PIon{yxk}>(OcK^!T;7(pNfK4X+@{)IWPa~ z(UeIs#cXxgV>cCsE-m)!*&SCnFP-6lQJ&6}-gc%5Py7xzXgKtIJbBG1uSSwlP;j#` z1OEYc1=Cg)O(h|&f>$o}=lnc2MF|MLw3g0(%W&Z7GLypVhr(2*{N-Utn5DL4%8{Ha zk}I_Q>phctPFTKg^O$tH;}qk8YW;1`4qC;`ZYhm@y=u+mRhO#ke;lsTSl{>b#fe+a q&7xa>+j3RgpQ#T2lY8%YA$zXZq2gRuxiFxw89ZJ6T-G@yGywpcw~G}3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/glass_chestplate.png b/src/main/resources/assets/bloodarsenal/textures/items/glass_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..d0f8bd67ee68ce428c887a6283ef82af9868986f GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~8wal>d&ZZtzYGkF0-i38Ar`0C1{+Q~WWW=XY9#Vd z-DJm+&>x(-braV=RbO&x>OM7lMOIdC;h%4OE)^_yo7q{mRonYO{gJ;Pl|1Ww5)#f8 z*6-O7w)xr;Rt7;q=9Q~@G#gc1U3k{43NqVVpBuSAnybC@#@YL;v{q(ZSi?A{I3RT6 z%{O)XQhQCbCDf99IL}#Dyk}Intr=SRUNTvP;f3{2Rg3r1nzd2K*eqHmJP(fa&~yyd zp73OH0&$29lIU=EzWMK z&UDRV8s{u^*0u^{ob_S!+!hw17wolCi9<1jS>Aga_Xg9=*eT^7 emM@O(HeYq}d;cr83UOd?F?hQAxvXEak-ae8m?Mz6yGBDUL?v087Hoh|RdRw!h?)S~0T zi})|%Z=T3|u$!khcPp@JFE#aWjao4)P{62U%Sy+~j=%bvZ>agMW;@88zH3hLJKOhm zike< zmwB!E(e?M%pV(Vg>lBvdr6w7F(8#xq`SsS#s8*}@4or*3VV0U8g6W62)#bn`l!nRBVVh1{Qj2%N@G{P zu(Ew?yy)<9cTe5a4{IG(O0 zk}h}^xapZo+4Vark!P+3^G~o=Ssc$cz3t5@*NaLW42~j4|J$nuT{1rQ)9gdKfy27Y z>q(z-HrtpOGw--FbCV_`Lt2{T{*2 zm6xBtB+m2{I?JI~?sinafa&+X|7B;lr00M5XZB0kDfwC7?#=cxnyz&^@z+b4cJQs3 z!{B>4BXVXIo9R^3r)M|)Qw{8`*?RF3X8?D^uk>(D^X$9dSBw3-E?;r8f+0J1n`PtDJnL^saaDZZoUe zYE4$-%~LLQduu-YlgYd{bE$}p!AIbZ9>=I?% znI|my{Ww#)`NgY4wngV|g+NtH+`PY7Uve>d? lx4?Oh-yiEP|Jyb9{_klYGkzEg+y(lV!PC{xWt~$(69Bk)kGTK< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/glass_sacrificial_dagger.png b/src/main/resources/assets/bloodarsenal/textures/items/glass_sacrificial_dagger.png new file mode 100644 index 0000000000000000000000000000000000000000..f7c5915ac517f4c4b5421cf989a9485c107df540 GIT binary patch literal 436 zcmV;l0ZaagP)3O9oNC>dSYPMN1q|WR3r~3nRS6Alv0>tiXny=VFUnB3#BHHcfhvokY(e*_xThYp@$yE z7~|I0F#8qe!Iq5%hMz&en{t^+uAwy>T63Mv891qVwI_)~c>?KIuB$o$pv$h>WIT$` e!kQ@IpYaW9Bz*t9$rl^|0000jM05W4!9T|%}7?Fxt)vA@hmy?JVMV)5QNdnG;nqOfkX#$>q<2( zw_ttu*-m@}Ha8Af-`ZLLPJmOb86#vOz`D6ND;i&;>I}+m!~RLtvH%zh_*!Ebw+SD^ z2`^e%@;hgqO=fSN06_J==G|IF^Tae6ieMQA8K4zTc>T$s^e9MZVX2Vnc7Q}PuL93M z=XhNH{!byz1ob0$CGCDu+Wn&Rf4^N2(A1X^AR;Q#zgl(&skd-n`wM*-J9OgI?E(M* N002ovPDHLkV1kHU;WPjM literal 0 HcmV?d00001 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index e94e1c6..b31129e 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "BloodArsenal", "name": "Blood Arsenal", "description": "Blood-themed tools, weapons, armor and much more!", - "version": "1.1-9", + "version": "1.1-10", "mcversion": "1.7.10", "url": "", "updateUrl": "",