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

48
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -45,7 +45,7 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing;
import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra;
import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
import WayofTime.bloodmagic.network.PlayerFallDistancePacketProcessor;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.Utils;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -69,16 +69,16 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
public ItemLivingArmour(EntityEquipmentSlot armorType)
{
super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
setUnlocalizedName(Constants.Mod.MODID + ".livingArmour.");
setUnlocalizedName(BloodMagic.MODID + ".livingArmour.");
// setMaxDamage(250);
setMaxDamage((int) (getMaxDamage() * 1.5));
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
public void onCreated(ItemStack stack, World world, EntityPlayer player)
{
if (stack != null && !world.isRemote && stack.getItem() == ModItems.LIVING_ARMOUR_CHEST)
if (stack != null && !world.isRemote && stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
Utils.setUUID(stack);
}
@ -87,12 +87,12 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
{
if (this == ModItems.LIVING_ARMOUR_CHEST || this == ModItems.LIVING_ARMOUR_HELMET || this == ModItems.LIVING_ARMOUR_BOOTS)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET || this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)
{
return "bloodmagic:models/armor/livingArmour_layer_1.png";
}
if (this == ModItems.LIVING_ARMOUR_LEGS)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
{
return "bloodmagic:models/armor/livingArmour_layer_2.png";
} else
@ -125,13 +125,13 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
double armourReduction = 0.0;
double damageAmount = 0.25;
if (this == ModItems.LIVING_ARMOUR_BOOTS || this == ModItems.LIVING_ARMOUR_HELMET)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
{
damageAmount = 3d / 20d * 0.6;
} else if (this == ModItems.LIVING_ARMOUR_LEGS)
} else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
{
damageAmount = 6d / 20d * 0.6;
} else if (this == ModItems.LIVING_ARMOUR_CHEST)
} else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
damageAmount = 0.64;
}
@ -150,7 +150,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
return new ArmorProperties(-1, 0, 0);
}
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
armourReduction = 0.24 / 0.64; // This values puts it at iron level
@ -208,22 +208,22 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
{
if (armor.getItem() == ModItems.LIVING_ARMOUR_HELMET)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
{
return 3;
}
if (armor.getItem() == ModItems.LIVING_ARMOUR_CHEST)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
return 8;
}
if (armor.getItem() == ModItems.LIVING_ARMOUR_LEGS)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
{
return 6;
}
if (armor.getItem() == ModItems.LIVING_ARMOUR_BOOTS)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)
{
return 3;
}
@ -234,7 +234,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
{
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
int preDamage = stack.getItemDamage();
if (source.isUnblockable())
@ -286,7 +286,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
if (!stack.hasTagCompound())
return;
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
LivingArmour armour = getLivingArmourFromStack(stack);
for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet())
@ -333,7 +333,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
{
super.onArmorTick(world, player, stack);
if (world.isRemote && this == ModItems.LIVING_ARMOUR_CHEST)
if (world.isRemote && this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
if (player instanceof EntityPlayerSP) //Sanity check
{
@ -358,7 +358,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
if (LivingArmour.hasFullSet(player))
{
ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(Constants.Mod.MODID + ".upgrade.elytra", chestStack);
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.elytra", chestStack);
if (upgrade instanceof LivingArmourUpgradeElytra)
{
if (spPlayer.movementInput.jump && !spPlayer.onGround && spPlayer.motionY < 0.0D && !spPlayer.capabilities.isFlying)
@ -384,7 +384,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
}
}
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
if (!hasLivingArmour(stack))
{
@ -405,7 +405,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack)
{
if (this == ModItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST)
{
LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(stack);
@ -431,11 +431,11 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
public ModelResourceLocation getModelLocation(ItemStack stack)
{
assert getCustomLocation() != null;
if (stack.getItem() == ModItems.LIVING_ARMOUR_HELMET)
if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
return new ModelResourceLocation(getCustomLocation(), "armour=head");
else if (stack.getItem() == ModItems.LIVING_ARMOUR_CHEST)
else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
return new ModelResourceLocation(getCustomLocation(), "armour=body");
else if (stack.getItem() == ModItems.LIVING_ARMOUR_LEGS)
else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
return new ModelResourceLocation(getCustomLocation(), "armour=leg");
else
return new ModelResourceLocation(getCustomLocation(), "armour=feet");
@ -446,7 +446,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public ResourceLocation getCustomLocation()
{
return new ResourceLocation(Constants.Mod.MODID, "item/ItemLivingArmour");
return new ResourceLocation(BloodMagic.MODID, "item/ItemLivingArmour");
}
@Override

44
src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
View file

@ -31,7 +31,7 @@ import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
@ -56,15 +56,15 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
public ItemSentientArmour(EntityEquipmentSlot armorType)
{
super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
setUnlocalizedName(Constants.Mod.MODID + ".sentientArmour.");
setUnlocalizedName(BloodMagic.MODID + ".sentientArmour.");
setMaxDamage(250);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
{
if (this == ModItems.SENTIENT_ARMOUR_CHEST || this == ModItems.SENTIENT_ARMOUR_HELMET || this == ModItems.SENTIENT_ARMOUR_BOOTS)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS)
{
switch (this.getCurrentType(stack))
{
@ -82,7 +82,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
return "bloodmagic:models/armor/sentientArmour_layer_1.png";
}
if (this == ModItems.SENTIENT_ARMOUR_LEGS)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
{
switch (this.getCurrentType(stack))
{
@ -159,13 +159,13 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
double armourReduction = 0.0;
double damageAmount = 0.25;
if (this == ModItems.SENTIENT_ARMOUR_BOOTS || this == ModItems.SENTIENT_ARMOUR_HELMET)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
{
damageAmount = 3d / 20d * 0.6;
} else if (this == ModItems.SENTIENT_ARMOUR_LEGS)
} else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
{
damageAmount = 6d / 20d * 0.6;
} else if (this == ModItems.SENTIENT_ARMOUR_CHEST)
} else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
{
damageAmount = 0.64;
}
@ -184,7 +184,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
return new ArmorProperties(-1, 0, 0);
}
if (this == ModItems.SENTIENT_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
{
armourReduction = 0.24 / 0.64; // This values puts it at iron level
@ -230,22 +230,22 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
@Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
{
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_HELMET)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
{
return 3;
}
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_CHEST)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
{
return 8;
}
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_LEGS)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
{
return 6;
}
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_BOOTS)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS)
{
return 3;
}
@ -329,13 +329,13 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
public ModelResourceLocation getModelLocation(ItemStack stack)
{
assert getCustomLocation() != null;
EnumDemonWillType type = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_HELMET).getCurrentType(stack);
EnumDemonWillType type = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getCurrentType(stack);
String additional = "_" + type.getName().toLowerCase();
if (stack.getItem() == ModItems.SENTIENT_ARMOUR_HELMET)
if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
return new ModelResourceLocation(getCustomLocation(), "armour=head" + additional);
else if (stack.getItem() == ModItems.SENTIENT_ARMOUR_CHEST)
else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
return new ModelResourceLocation(getCustomLocation(), "armour=body" + additional);
else if (stack.getItem() == ModItems.SENTIENT_ARMOUR_LEGS)
else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
return new ModelResourceLocation(getCustomLocation(), "armour=leg" + additional);
else
return new ModelResourceLocation(getCustomLocation(), "armour=feet" + additional);
@ -346,7 +346,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
@Override
public ResourceLocation getCustomLocation()
{
return new ResourceLocation(Constants.Mod.MODID, "item/ItemSentientArmour");
return new ResourceLocation(BloodMagic.MODID, "item/ItemSentientArmour");
}
@Override
@ -440,10 +440,10 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
ItemStack bootsStack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET);
{
ItemStack omegaHelmetStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack);
ItemStack omegaChestStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_CHEST).getSubstituteStack(type, will, chestStack);
ItemStack omegaLeggingsStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_LEGS).getSubstituteStack(type, will, leggingsStack);
ItemStack omegaBootsStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack);
ItemStack omegaHelmetStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack);
ItemStack omegaChestStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST).getSubstituteStack(type, will, chestStack);
ItemStack omegaLeggingsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS).getSubstituteStack(type, will, leggingsStack);
ItemStack omegaBootsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack);
player.setItemStackToSlot(EntityEquipmentSlot.HEAD, omegaHelmetStack);
player.setItemStackToSlot(EntityEquipmentSlot.CHEST, omegaChestStack);