From 23f8f230065ba41d9d363cd77a261a03f050e079 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 27 Jun 2016 15:07:00 -0400 Subject: [PATCH] Fixed a stupid bug by a stupid Way. Also work on negative Living Armour Upgrades --- changelog.txt | 5 ++ .../upgrade/LivingArmourUpgradeSlowness.java | 61 +++++++++++++++++++ .../registry/ModArmourTrackers.java | 2 + .../bloodmagic/tile/TileAlchemyArray.java | 4 +- .../assets/bloodmagic/lang/en_US.lang | 1 + 5 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSlowness.java diff --git a/changelog.txt b/changelog.txt index b73f6ab5..c9212fbe 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +------------------------------------------------------ +Version 2.0.2-48 +------------------------------------------------------ +- Fixed a stupid bug by a stupid Way + ------------------------------------------------------ Version 2.0.2-47 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSlowness.java new file mode 100644 index 00000000..1eb04563 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSlowness.java @@ -0,0 +1,61 @@ +package WayofTime.bloodmagic.livingArmour.upgrade; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; + +public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade +{ + public static final int[] costs = new int[] { -50 }; + public static final int[] slownessDuration = new int[] { 30 * 20 }; + + public LivingArmourUpgradeSlowness(int level) + { + super(level); + } + + @Override + public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) + { + player.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 1, 0, true, false)); + } + + @Override + public String getUniqueIdentifier() + { + return Constants.Mod.MODID + ".upgrade.slowness"; + } + + @Override + public int getMaxTier() + { + return 1; + } + + @Override + public int getCostOfUpgrade() + { + return costs[this.level]; + } + + @Override + public void writeToNBT(NBTTagCompound tag) + { + } + + @Override + public void readFromNBT(NBTTagCompound tag) + { + } + + @Override + public String getUnlocalizedName() + { + return tooltipBase + "slowness"; + } +} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index 7fece75e..d2ff7ac6 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -36,6 +36,7 @@ import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; +import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSlowness; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; @@ -85,5 +86,6 @@ public class ModArmourTrackers LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeCriticalStrike(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeElytra(0)); LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeFireResist(0)); + LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeSlowness(0)); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index f6fa6f89..061600e3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -12,7 +12,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable public boolean isActive = false; public int activeCounter = 0; - private String key = ""; + private String key = "empty"; private AlchemyArrayEffect arrayEffect; public TileAlchemyArray() @@ -71,7 +71,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable isActive = false; activeCounter = 0; arrayEffect = null; - key = null; + key = "empty"; } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index bb583a81..81fb49ec 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -365,6 +365,7 @@ tooltip.BloodMagic.livingArmour.upgrade.graveDigger=Grave Digger tooltip.BloodMagic.livingArmour.upgrade.sprintAttack=Charging Strike tooltip.BloodMagic.livingArmour.upgrade.criticalStrike=True Strike tooltip.BloodMagic.livingArmour.upgrade.elytra=Elytra +tooltip.BloodMagic.livingArmour.upgrade.slowness=Limp Leg tooltip.BloodMagic.livingArmour.upgrade.level=%s (Level %d) tooltip.BloodMagic.livingArmour.upgrade.points=&6Upgrade points: %s / %s