diff --git a/dependencies.gradle b/dependencies.gradle index 0c66032..63ac28c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,5 @@ dependencies { - compileOnlyApi('mods.flammpfeil.slashblade:SlashBlade:1.0.0-stub') + compileOnlyApi('mods.flammpfeil.slashblade:SlashBlade:mc1.7.10-r87') } repositories { diff --git a/src/main/java/com/tanzanite/birdblade/SA/SAslashPierce.java b/src/main/java/com/tanzanite/birdblade/SA/SAslashPierce.java index 618a99b..53a7682 100644 --- a/src/main/java/com/tanzanite/birdblade/SA/SAslashPierce.java +++ b/src/main/java/com/tanzanite/birdblade/SA/SAslashPierce.java @@ -57,7 +57,7 @@ extends SpecialAttackBase { player.addPotionEffect(new PotionEffect(5, 4, 3, true)); player.addPotionEffect(new PotionEffect(10, 6, 3, true)); player.addPotionEffect(new PotionEffect(1, 10, 2, true)); - EntityDirectAttackDummy entityDA = new EntityDirectAttackDummy(world, (EntityLivingBase)player, attackDist); + EntityDirectAttackDummy entityDA = new EntityDirectAttackDummy(world, (EntityLivingBase)player, false); entityDA.setLifeTime(7); if (entityDA != null) { world.spawnEntityInWorld((Entity)entityDA); diff --git a/src/main/java/com/tanzanite/birdblade/blade/ItemSlashBlade_Bifang.java b/src/main/java/com/tanzanite/birdblade/blade/ItemSlashBlade_Bifang.java index 08e1c6b..14b5221 100644 --- a/src/main/java/com/tanzanite/birdblade/blade/ItemSlashBlade_Bifang.java +++ b/src/main/java/com/tanzanite/birdblade/blade/ItemSlashBlade_Bifang.java @@ -44,12 +44,12 @@ public class ItemSlashBlade_Bifang { public void init(LoadEvent.InitEvent event) { ItemSlashBlade.specialAttacks.put(4000, new SAslashPierce()); String name = "flammpfeil.slashblade.named.bifang"; - ItemStack customblade = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); + ItemStack customblade = new ItemStack(SlashBlade.bladeNamed, 1, 0); NBTTagCompound tag = new NBTTagCompound(); customblade.setTagCompound(tag); ItemSlashBladeNamed.CurrentItemName.set(tag, name); ItemSlashBladeNamed.CustomMaxDamage.set(tag, Integer.valueOf(163)); - ItemSlashBlade.AttackAmplifier.set(tag, Integer.valueOf(3)); + ItemSlashBlade.AttackAmplifier.set(tag, Float.valueOf(3.0f)); ItemSlashBladeNamed.IsDefaultBewitched.set(tag, Boolean.valueOf(true)); ItemSlashBlade.setBaseAttackModifier(tag, 8.0f); ItemSlashBlade.TextureName.set(tag, "named/bifang/texture"); @@ -65,7 +65,7 @@ public class ItemSlashBlade_Bifang { customblade.addEnchantment(Enchantment.efficiency, 3); customblade.addEnchantment(Enchantment.fortune, 10); customblade.addEnchantment(Enchantment.silkTouch, 5); - ItemStack custombladeRequired = new ItemStack(SlashBlade.bladeNamed.getItem(), 1, 0); + ItemStack custombladeRequired = new ItemStack(SlashBlade.bladeNamed, 1, 0); NBTTagCompound reqTag = ItemSlashBlade.getItemTagCompound((ItemStack)custombladeRequired); ItemSlashBlade.KillCount.set(reqTag, Integer.valueOf(2000)); ItemSlashBlade.ProudSoul.set(reqTag, Integer.valueOf(15000));