lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java
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

9
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java
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

3
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java
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

6
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java
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

8
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java
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

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java
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

3
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java
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