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

Finished ModItems

Browse source
This commit is contained in:
Arcaratus 2015-07-30 15:53:50 -04:00
parent a9507b3b68
commit d88cc2d79e
9 changed files with 158 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
View file

@ -49,7 +49,7 @@ import WayofTime.alchemicalWizardry.api.event.TeleposeEvent;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.api.spell.APISpellHelper;
import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
import WayofTime.alchemicalWizardry.common.items.EnergySword;
import WayofTime.alchemicalWizardry.common.items.BoundBlade;
import WayofTime.alchemicalWizardry.common.items.armour.BoundArmour;
import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour;
import WayofTime.alchemicalWizardry.common.omega.OmegaParadigm;
@ -84,7 +84,7 @@ public class AlchemicalWizardryEventHooks
parad.onEmptyHandEntityInteract(player, event.target);
}else
{
if(heldItem.getItem() instanceof EnergySword)
if(heldItem.getItem() instanceof BoundBlade)
{
parad.onBoundSwordInteractWithEntity(player, event.target);
}

2
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockArmourForge.java
View file

@ -68,7 +68,7 @@ public class BlockArmourForge extends Block
{
case 0:
list = plateList;
armourPiece = new ItemStack(ModItems.boundPlate, 1, 0);
armourPiece = new ItemStack(ModItems.boundChestplate, 1, 0);
break;
case 1:

5
src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java
View file

@ -20,14 +20,13 @@ import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
public class ActivationCrystal extends EnergyItems
{
private static final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"Weak", "Awakened", "Creative"};
private static final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"weak", "awakened", "creative"};
public ActivationCrystal()
{
super();
this.maxStackSize = 1;
setEnergyUsed(100);
this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.hasSubtypes = true;
}
@ -101,7 +100,7 @@ public class ActivationCrystal extends EnergyItems
{
//This is what will do all the localisation things on the alchemy components so you dont have to set it :D
int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ACTIVATION_CRYSTAL_NAMES.length - 1);
return ("" + "item.activationCrystal" + ACTIVATION_CRYSTAL_NAMES[meta]);
return (getUnlocalizedName() + "_" + ACTIVATION_CRYSTAL_NAMES[meta]);
}
@Override

4
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java → src/main/java/WayofTime/alchemicalWizardry/common/items/BoundBlade.java
View file

@ -19,11 +19,11 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.omega.OmegaParadigm;
import WayofTime.alchemicalWizardry.common.omega.OmegaRegistry;
public class EnergySword extends ItemSword
public class BoundBlade extends ItemSword
{
private int energyUsed;
public EnergySword()
public BoundBlade()
{
super(AlchemicalWizardry.bloodBoundToolMaterial);
this.maxStackSize = 1;

6
src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java
View file

@ -209,7 +209,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
return 3;
}
if (armor.getItem() == ModItems.boundPlate)
if (armor.getItem() == ModItems.boundChestplate)
{
return 8;
}
@ -284,7 +284,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
{
if (this.getIsInvisible(stack))
{
if (this == ModItems.boundHelmet || this == ModItems.boundPlate || this == ModItems.boundBoots)
if (this == ModItems.boundHelmet || this == ModItems.boundChestplate || this == ModItems.boundBoots)
{
return "alchemicalwizardry:models/armor/boundArmour_invisible_layer_1.png";
}
@ -296,7 +296,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
}
}
if (this == ModItems.boundHelmet || this == ModItems.boundPlate || this == ModItems.boundBoots)
if (this == ModItems.boundHelmet || this == ModItems.boundChestplate || this == ModItems.boundBoots)
{
return "alchemicalwizardry:models/armor/boundArmour_layer_1.png";
}

2
src/main/java/WayofTime/alchemicalWizardry/common/omega/OmegaParadigm.java
View file

@ -48,7 +48,7 @@ public class OmegaParadigm
ItemStack leggingsStack = armours[1];
ItemStack bootsStack = armours[0];
if(helmetStack != null && helmetStack.getItem() == ModItems.boundHelmet && chestStack != null && chestStack.getItem() == ModItems.boundPlate && leggingsStack != null && leggingsStack.getItem() == ModItems.boundLeggings && bootsStack != null && bootsStack.getItem() == ModItems.boundBoots)
if(helmetStack != null && helmetStack.getItem() == ModItems.boundHelmet && chestStack != null && chestStack.getItem() == ModItems.boundChestplate && leggingsStack != null && leggingsStack.getItem() == ModItems.boundLeggings && bootsStack != null && bootsStack.getItem() == ModItems.boundBoots)
{
long worldSeed = player.worldObj.getSeed();
Random rand = new Random(worldSeed + stability * (affinity + 7) * 94 + 84321*x - 17423*y + 76*z - 1623451*enchantability + 2 * enchantmentLevel);

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java
View file

@ -84,7 +84,7 @@ public class RitualEffectUnbinding extends RitualEffect
if (itemStack.getItem() == ModItems.boundHelmet)
{
ritualStone.setVar1(5);
} else if (itemStack.getItem() == ModItems.boundPlate)
} else if (itemStack.getItem() == ModItems.boundChestplate)
{
ritualStone.setVar1(8);
} else if (itemStack.getItem() == ModItems.boundLeggings)