this doesn't compile yet, but have something to peek at

This commit is contained in:
Nicholas Ignoffo 2017-08-14 20:53:42 -07:00
parent 973f1019a5
commit 5fcdd978d7
329 changed files with 3247 additions and 2953 deletions

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -43,7 +43,7 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.battleHunger";
return BloodMagic.MODID + ".upgrade.battleHunger";
}
@Override

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -25,7 +25,7 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.crippledArm";
return BloodMagic.MODID + ".upgrade.crippledArm";
}
@Override

View file

@ -2,13 +2,12 @@ package WayofTime.bloodmagic.livingArmour.downgrade;
import java.util.HashMap;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade
{
@ -38,7 +37,7 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.digSlowdown";
return BloodMagic.MODID + ".upgrade.digSlowdown";
}
@Override

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -36,7 +36,7 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.disoriented";
return BloodMagic.MODID + ".upgrade.disoriented";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -46,7 +46,7 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.meleeDecrease";
return BloodMagic.MODID + ".upgrade.meleeDecrease";
}
@Override

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -25,7 +25,7 @@ public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.quenched";
return BloodMagic.MODID + ".upgrade.quenched";
}
@Override

View file

@ -1,10 +1,10 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -34,8 +34,8 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade
f6 = world.getBlockState(blockpos$pooledmutableblockpos).getBlock().slipperiness * 0.91F;
}
player.motionX /= (double) (f6 / 0.91);
player.motionZ /= (double) (f6 / 0.91);
player.motionX /= f6 / 0.91;
player.motionZ /= f6 / 0.91;
float f7 = 0.16277136F / (f6 * f6 * f6);
float f8;
@ -48,9 +48,9 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade
f8 = player.jumpMovementFactor;
}
player.moveRelative(-player.moveStrafing, -player.moveForward, f8);
player.moveRelative(-player.moveStrafing, -player.moveForward, f8, 0.02F);
player.moveRelative(player.moveStrafing, player.moveForward, f8 / 10);
player.moveRelative(player.moveStrafing, player.moveForward, f8 / 10, 0.02F);
player.motionX *= 0.90;
player.motionY *= 0.90;
@ -67,7 +67,7 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.slippery";
return BloodMagic.MODID + ".upgrade.slippery";
}
@Override

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -32,7 +32,7 @@ public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.slowHeal";
return BloodMagic.MODID + ".upgrade.slowHeal";
}
@Override

View file

@ -2,12 +2,12 @@ package WayofTime.bloodmagic.livingArmour.downgrade;
import java.util.UUID;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -45,7 +45,7 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.slowness";
return BloodMagic.MODID + ".upgrade.slowness";
}
@Override

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.downgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -31,7 +31,7 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.stormTrooper";
return BloodMagic.MODID + ".upgrade.stormTrooper";
}
@Override

View file

@ -4,11 +4,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.util.Utils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerArrowProtect extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.arrowProtect";
return BloodMagic.MODID + ".tracker.arrowProtect";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerArrowProtect extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamage = tag.getInteger(Constants.Mod.MODID + ".tracker.arrowProtect");
totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.arrowProtect");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.arrowProtect", totalDamage);
tag.setInteger(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerArrowProtect extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.arrowProtect");
return key.equals(BloodMagic.MODID + ".upgrade.arrowProtect");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerArrowShot extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.trickShot";
return BloodMagic.MODID + ".tracker.trickShot";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerArrowShot extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalShots = tag.getInteger(Constants.Mod.MODID + ".tracker.trickShot");
totalShots = tag.getInteger(BloodMagic.MODID + ".tracker.trickShot");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.trickShot", totalShots);
tag.setInteger(BloodMagic.MODID + ".tracker.trickShot", totalShots);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerArrowShot extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.arrowShot");
return key.equals(BloodMagic.MODID + ".upgrade.arrowShot");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerCriticalStrike extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.criticalStrike";
return BloodMagic.MODID + ".tracker.criticalStrike";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerCriticalStrike extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.criticalStrike");
totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.criticalStrike");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.criticalStrike", totalDamageDealt);
tag.setDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerCriticalStrike extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.criticalStrike");
return key.equals(BloodMagic.MODID + ".upgrade.criticalStrike");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerDigging extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.digging";
return BloodMagic.MODID + ".tracker.digging";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerDigging extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalBlocksDug = tag.getInteger(Constants.Mod.MODID + ".tracker.digging");
totalBlocksDug = tag.getInteger(BloodMagic.MODID + ".tracker.digging");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.digging", totalBlocksDug);
tag.setInteger(BloodMagic.MODID + ".tracker.digging", totalBlocksDug);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerDigging extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.digging");
return key.equals(BloodMagic.MODID + ".upgrade.digging");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerExperience extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.experienced";
return BloodMagic.MODID + ".tracker.experienced";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerExperience extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalExperienceGained = tag.getDouble(Constants.Mod.MODID + ".tracker.experienced");
totalExperienceGained = tag.getDouble(BloodMagic.MODID + ".tracker.experienced");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.experienced", totalExperienceGained);
tag.setDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerExperience extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.experienced");
return key.equals(BloodMagic.MODID + ".upgrade.experienced");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerFallProtect extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.fallProtect";
return BloodMagic.MODID + ".tracker.fallProtect";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerFallProtect extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamage = tag.getInteger(Constants.Mod.MODID + ".tracker.fallProtect");
totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.fallProtect");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.fallProtect", totalDamage);
tag.setInteger(BloodMagic.MODID + ".tracker.fallProtect", totalDamage);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerFallProtect extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.fallProtect");
return key.equals(BloodMagic.MODID + ".upgrade.fallProtect");
}
@Override

View file

@ -3,10 +3,10 @@ package WayofTime.bloodmagic.livingArmour.tracker;
import java.util.ArrayList;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -22,7 +22,7 @@ public class StatTrackerFireResist extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.fire";
return BloodMagic.MODID + ".tracker.fire";
}
@Override
@ -34,13 +34,13 @@ public class StatTrackerFireResist extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalFireTicks = tag.getInteger(Constants.Mod.MODID + ".tracker.fire");
totalFireTicks = tag.getInteger(BloodMagic.MODID + ".tracker.fire");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.fire", totalFireTicks);
tag.setInteger(BloodMagic.MODID + ".tracker.fire", totalFireTicks);
}
@Override
@ -87,7 +87,7 @@ public class StatTrackerFireResist extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.fireResist");
return key.equals(BloodMagic.MODID + ".upgrade.fireResist");
}
@Override

View file

@ -5,10 +5,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -26,7 +26,7 @@ public class StatTrackerFood extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.foodEaten";
return BloodMagic.MODID + ".tracker.foodEaten";
}
@Override
@ -38,13 +38,13 @@ public class StatTrackerFood extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
foodEaten = tag.getInteger(Constants.Mod.MODID + ".tracker.foodEaten");
foodEaten = tag.getInteger(BloodMagic.MODID + ".tracker.foodEaten");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.foodEaten", foodEaten);
tag.setInteger(BloodMagic.MODID + ".tracker.foodEaten", foodEaten);
}
@ -107,7 +107,7 @@ public class StatTrackerFood extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.knockback");
return key.equals(BloodMagic.MODID + ".upgrade.knockback");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerGraveDigger extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.graveDigger";
return BloodMagic.MODID + ".tracker.graveDigger";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerGraveDigger extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.graveDigger");
totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.graveDigger");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.graveDigger", totalDamageDealt);
tag.setDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerGraveDigger extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.graveDigger");
return key.equals(BloodMagic.MODID + ".upgrade.graveDigger");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -23,7 +23,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker
public static void incrementCounter(LivingArmour armour)
{
StatTracker tracker = armour.getTracker(Constants.Mod.MODID + ".tracker.grimReaper");
StatTracker tracker = armour.getTracker(BloodMagic.MODID + ".tracker.grimReaper");
if (tracker instanceof StatTrackerGrimReaperSprint)
{
((StatTrackerGrimReaperSprint) tracker).totalDeaths++;
@ -36,7 +36,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.grimReaper";
return BloodMagic.MODID + ".tracker.grimReaper";
}
@Override
@ -48,13 +48,13 @@ public class StatTrackerGrimReaperSprint extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDeaths = tag.getInteger(Constants.Mod.MODID + ".tracker.grimReaper");
totalDeaths = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.grimReaper", totalDeaths);
tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths);
}
@Override
@ -112,7 +112,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.grimReaper");
return key.equals(BloodMagic.MODID + ".upgrade.grimReaper");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerHealthboost extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.health";
return BloodMagic.MODID + ".tracker.health";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerHealthboost extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalHealthGenned = tag.getDouble(Constants.Mod.MODID + ".tracker.health");
totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.health");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.health", totalHealthGenned);
tag.setDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerHealthboost extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.health");
return key.equals(BloodMagic.MODID + ".upgrade.health");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerJump extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.jump";
return BloodMagic.MODID + ".tracker.jump";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerJump extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalJumps = tag.getInteger(Constants.Mod.MODID + ".tracker.jump");
totalJumps = tag.getInteger(BloodMagic.MODID + ".tracker.jump");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.jump", totalJumps);
tag.setInteger(BloodMagic.MODID + ".tracker.jump", totalJumps);
}
@ -106,7 +106,7 @@ public class StatTrackerJump extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.jump");
return key.equals(BloodMagic.MODID + ".upgrade.jump");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerMeleeDamage extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.meleeDamage";
return BloodMagic.MODID + ".tracker.meleeDamage";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerMeleeDamage extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.meleeDamage");
totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.meleeDamage");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.meleeDamage", totalDamageDealt);
tag.setDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerMeleeDamage extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.meleeDamage");
return key.equals(BloodMagic.MODID + ".upgrade.meleeDamage");
}
@Override

View file

@ -5,10 +5,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -27,7 +27,7 @@ public class StatTrackerMovement extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.movement";
return BloodMagic.MODID + ".tracker.movement";
}
@Override
@ -39,13 +39,13 @@ public class StatTrackerMovement extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalMovement = tag.getDouble(Constants.Mod.MODID + ".tracker.movement");
totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.movement");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.movement", totalMovement);
tag.setDouble(BloodMagic.MODID + ".tracker.movement", totalMovement);
}
@ -115,7 +115,7 @@ public class StatTrackerMovement extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.movement");
return key.equals(BloodMagic.MODID + ".upgrade.movement");
}
@Override

View file

@ -4,11 +4,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -33,7 +33,7 @@ public class StatTrackerNightSight extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.nightSight";
return BloodMagic.MODID + ".tracker.nightSight";
}
@Override
@ -46,15 +46,15 @@ public class StatTrackerNightSight extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.nightSight");
totalNightVision = tag.getInteger(Constants.Mod.MODID + ".tracker.nightSightVision");
totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.nightSight");
totalNightVision = tag.getInteger(BloodMagic.MODID + ".tracker.nightSightVision");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.nightSight", totalDamageDealt);
tag.setInteger(Constants.Mod.MODID + ".tracker.nightSightVision", totalNightVision);
tag.setDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt);
tag.setInteger(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision);
}
@Override
@ -128,7 +128,7 @@ public class StatTrackerNightSight extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.nightSight");
return key.equals(BloodMagic.MODID + ".upgrade.nightSight");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerPhysicalProtect extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.physicalProtect";
return BloodMagic.MODID + ".tracker.physicalProtect";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerPhysicalProtect extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamage = tag.getInteger(Constants.Mod.MODID + ".tracker.physicalProtect");
totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.physicalProtect");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.physicalProtect", totalDamage);
tag.setInteger(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerPhysicalProtect extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.physicalProtect");
return key.equals(BloodMagic.MODID + ".upgrade.physicalProtect");
}
@Override

View file

@ -3,11 +3,11 @@ package WayofTime.bloodmagic.livingArmour.tracker;
import java.util.ArrayList;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -23,7 +23,7 @@ public class StatTrackerPoison extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.poison";
return BloodMagic.MODID + ".tracker.poison";
}
@Override
@ -35,13 +35,13 @@ public class StatTrackerPoison extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalPoisonTicks = tag.getInteger(Constants.Mod.MODID + ".tracker.poison");
totalPoisonTicks = tag.getInteger(BloodMagic.MODID + ".tracker.poison");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.poison", totalPoisonTicks);
tag.setInteger(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks);
}
@Override
@ -88,7 +88,7 @@ public class StatTrackerPoison extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.poisonResist");
return key.equals(BloodMagic.MODID + ".upgrade.poisonResist");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerRepairing extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.repair";
return BloodMagic.MODID + ".tracker.repair";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerRepairing extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamage = tag.getDouble(Constants.Mod.MODID + ".tracker.repair");
totalDamage = tag.getDouble(BloodMagic.MODID + ".tracker.repair");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.repair", totalDamage);
tag.setDouble(BloodMagic.MODID + ".tracker.repair", totalDamage);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerRepairing extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.repair");
return key.equals(BloodMagic.MODID + ".upgrade.repair");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerSelfSacrifice extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.selfSacrifice";
return BloodMagic.MODID + ".tracker.selfSacrifice";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerSelfSacrifice extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalSacrifices = tag.getInteger(Constants.Mod.MODID + ".tracker.selfSacrifice");
totalSacrifices = tag.getInteger(BloodMagic.MODID + ".tracker.selfSacrifice");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.selfSacrifice", totalSacrifices);
tag.setInteger(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices);
}
@ -106,7 +106,7 @@ public class StatTrackerSelfSacrifice extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.selfSacrifice");
return key.equals(BloodMagic.MODID + ".upgrade.selfSacrifice");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerSolarPowered extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.solarPowered";
return BloodMagic.MODID + ".tracker.solarPowered";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerSolarPowered extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalHealthGenned = tag.getDouble(Constants.Mod.MODID + ".tracker.solarPowered");
totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.solarPowered");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.solarPowered", totalHealthGenned);
tag.setDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerSolarPowered extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.solarPowered");
return key.equals(BloodMagic.MODID + ".upgrade.solarPowered");
}
@Override

View file

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -29,7 +29,7 @@ public class StatTrackerSprintAttack extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.sprintAttack";
return BloodMagic.MODID + ".tracker.sprintAttack";
}
@Override
@ -41,13 +41,13 @@ public class StatTrackerSprintAttack extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.sprintAttack");
totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.sprintAttack");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.sprintAttack", totalDamageDealt);
tag.setDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt);
}
@Override
@ -105,7 +105,7 @@ public class StatTrackerSprintAttack extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.sprintAttack");
return key.equals(BloodMagic.MODID + ".upgrade.sprintAttack");
}
@Override

View file

@ -5,10 +5,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -26,7 +26,7 @@ public class StatTrackerStepAssist extends StatTracker
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".tracker.stepAssist";
return BloodMagic.MODID + ".tracker.stepAssist";
}
@Override
@ -38,13 +38,13 @@ public class StatTrackerStepAssist extends StatTracker
@Override
public void readFromNBT(NBTTagCompound tag)
{
totalMovement = tag.getDouble(Constants.Mod.MODID + ".tracker.stepAssist");
totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.stepAssist");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setDouble(Constants.Mod.MODID + ".tracker.stepAssist", totalMovement);
tag.setDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement);
}
@ -115,7 +115,7 @@ public class StatTrackerStepAssist extends StatTracker
@Override
public boolean providesUpgrade(String key)
{
return key.equals(Constants.Mod.MODID + ".upgrade.stepAssist");
return key.equals(BloodMagic.MODID + ".upgrade.stepAssist");
}
@Override

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade
@ -30,7 +30,7 @@ public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.arrowProtect";
return BloodMagic.MODID + ".upgrade.arrowProtect";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import net.minecraft.entity.player.EntityPlayer;
@ -26,7 +26,7 @@ public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.arrowShot";
return BloodMagic.MODID + ".upgrade.arrowShot";
}
@Override

View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade
@ -39,7 +39,7 @@ public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.criticalStrike";
return BloodMagic.MODID + ".upgrade.criticalStrike";
}
@Override

View file

@ -2,12 +2,12 @@ package WayofTime.bloodmagic.livingArmour.upgrade;
import java.util.HashMap;
import WayofTime.bloodmagic.BloodMagic;
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;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
@ -55,7 +55,7 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.digging";
return BloodMagic.MODID + ".upgrade.digging";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import net.minecraft.entity.player.EntityPlayer;
@ -25,7 +25,7 @@ public class LivingArmourUpgradeElytra extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.elytra";
return BloodMagic.MODID + ".upgrade.elytra";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import net.minecraft.nbt.NBTTagCompound;
@ -22,7 +22,7 @@ public class LivingArmourUpgradeExperience extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.experienced";
return BloodMagic.MODID + ".upgrade.experienced";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
@ -30,7 +30,7 @@ public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.fallProtect";
return BloodMagic.MODID + ".upgrade.fallProtect";
}
@Override

View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound;
@ -9,7 +10,6 @@ import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade
@ -45,7 +45,7 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.fireResist";
return BloodMagic.MODID + ".upgrade.fireResist";
}
@Override

View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade
@ -37,7 +37,7 @@ public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.graveDigger";
return BloodMagic.MODID + ".upgrade.graveDigger";
}
@Override

View file

@ -1,15 +1,14 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade
@ -41,7 +40,7 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.grimReaper";
return BloodMagic.MODID + ".upgrade.grimReaper";
}
@Override
@ -59,13 +58,13 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade
@Override
public void readFromNBT(NBTTagCompound tag)
{
deathTimer = tag.getInteger(Constants.Mod.MODID + ".tracker.grimReaper");
deathTimer = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper");
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.grimReaper", deathTimer);
tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", deathTimer);
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import com.google.common.collect.HashMultimap;
@ -44,7 +44,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.health";
return BloodMagic.MODID + ".upgrade.health";
}
@Override

View file

@ -1,9 +1,9 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -26,7 +26,7 @@ public class LivingArmourUpgradeJump extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.jump";
return BloodMagic.MODID + ".upgrade.jump";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
@ -42,7 +42,7 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.knockback";
return BloodMagic.MODID + ".upgrade.knockback";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import com.google.common.collect.HashMultimap;
@ -44,7 +44,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.meleeDamage";
return BloodMagic.MODID + ".upgrade.meleeDamage";
}
@Override

View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
@ -55,7 +56,7 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.nightSight";
return BloodMagic.MODID + ".upgrade.nightSight";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
@ -19,7 +19,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade
@Override
public double getArmourProtection(EntityLivingBase wearer, DamageSource source)
{
if (source.getEntity() != null && !source.isMagicDamage() && !source.isProjectile())
if (source.getTrueSource() != null && !source.isMagicDamage() && !source.isProjectile())
{
return protectionLevel[this.level];
}
@ -30,7 +30,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.physicalProtect";
return BloodMagic.MODID + ".upgrade.physicalProtect";
}
@Override

View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.nbt.NBTTagCompound;
@ -9,7 +10,6 @@ import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade
@ -47,7 +47,7 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.poisonResist";
return BloodMagic.MODID + ".upgrade.poisonResist";
}
@Override

View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -52,7 +52,7 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.repair";
return BloodMagic.MODID + ".upgrade.repair";
}
@Override

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import net.minecraft.nbt.NBTTagCompound;
@ -23,7 +23,7 @@ public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.selfSacrifice";
return BloodMagic.MODID + ".upgrade.selfSacrifice";
}
@Override

View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
@ -7,7 +8,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -58,7 +58,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.solarPowered";
return BloodMagic.MODID + ".upgrade.solarPowered";
}
@Override
@ -76,13 +76,13 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade
@Override
public void writeToNBT(NBTTagCompound tag)
{
tag.setInteger(Constants.Mod.MODID + ".tracker.solarPowered", counter);
tag.setInteger(BloodMagic.MODID + ".tracker.solarPowered", counter);
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
counter = tag.getInteger(Constants.Mod.MODID + ".tracker.solarPowered");
counter = tag.getInteger(BloodMagic.MODID + ".tracker.solarPowered");
}
@Override

View file

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade;
import java.util.UUID;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
@ -9,7 +10,6 @@ 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;
@ -72,7 +72,7 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.movement";
return BloodMagic.MODID + ".upgrade.movement";
}
@Override

View file

@ -1,10 +1,10 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade
@ -53,7 +53,7 @@ public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.sprintAttack";
return BloodMagic.MODID + ".upgrade.sprintAttack";
}
@Override

View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.livingArmour.upgrade;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import net.minecraft.nbt.NBTTagCompound;
@ -23,7 +24,7 @@ public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade
@Override
public String getUniqueIdentifier()
{
return Constants.Mod.MODID + ".upgrade.stepAssist";
return BloodMagic.MODID + ".upgrade.stepAssist";
}
@Override