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

Fixed the projectile so that it actually work

Browse source 
Amazing, eh?
This commit is contained in:
WayofTime 2014-01-25 14:41:50 -05:00
parent 112b4e6b53
commit eb46185dc8
8 changed files with 93 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

73
BM_src/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmProjectile.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.spell.complex;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
@ -12,17 +11,29 @@ import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellEffect;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IProjectileImpactEffect;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IProjectileUpdateEffect;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileDefaultFire;
import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement;
public class SpellParadigmProjectile extends SpellParadigm
{
public DamageSource damageSource = DamageSource.generic;
public float damage = 1;
public int cost = 0;
public List<IProjectileImpactEffect> impactList = new ArrayList();
public List<IProjectileUpdateEffect> updateEffectList = new ArrayList();
public boolean penetration = false;
public int ricochetMax = 0;
public DamageSource damageSource;
public float damage;
public int cost;
public List<IProjectileImpactEffect> impactList;
public List<IProjectileUpdateEffect> updateEffectList;
public boolean penetration;
public int ricochetMax;
public SpellParadigmProjectile()
{
this.damageSource = DamageSource.generic;
this.damage = 1;
this.cost = 0;
this.impactList = new ArrayList();
this.updateEffectList = new ArrayList();
this.penetration = false;
this.ricochetMax = 0;
}
@Override
public void enhanceParadigm(SpellEnhancement enh)
@ -41,51 +52,6 @@ public class SpellParadigmProjectile extends SpellParadigm
EnergyItems.syphonBatteries(itemStack, entityPlayer, cost);
}
public static SpellParadigmProjectile getParadigmForStringArray(List<String> stringList)
{
SpellParadigmProjectile parad = new SpellParadigmProjectile();
try
{
for(String str : stringList)
{
Class clazz = Class.forName(str);
if(clazz!=null)
{
Object obj = clazz.newInstance();
if(obj instanceof SpellEffect)
{
parad.addBufferedEffect((SpellEffect)obj);
continue;
}
if(obj instanceof SpellModifier)
{
parad.modifyBufferedEffect((SpellModifier)obj);
continue;
}
if(obj instanceof SpellEnhancement)
{
parad.applyEnhancement((SpellEnhancement)obj);
continue;
}
}
}
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
return parad;
}
public static SpellParadigmProjectile getParadigmForEffectArray(List<SpellEffect> effectList)
{
SpellParadigmProjectile parad = new SpellParadigmProjectile();
@ -104,7 +70,6 @@ public class SpellParadigmProjectile extends SpellParadigm
proj.setImpactList(impactList);
proj.setUpdateEffectList(updateEffectList);
proj.setPenetration(penetration);
proj.setEffectList(effectList);
proj.setRicochetMax(ricochetMax);
proj.setSpellEffectList(bufferedEffectList);
}