Spell hierarchisation and refactoring, plus miscellaneous renaming and minor refactoring

- Adds new generic spell superclasses which aim to group spells such that duplicate code is eliminated, and functions standardised, as much as possible.
- Removes numerous spell classes which are no longer required as a result of this change, and replaces them with instances of the relevant generic spell classes.
- Changes the remaining spell classes to fit with the new system, mostly by having them extend the generic spell classes.
- Completes the transfer of particle spawning to the ParticleBuilder system.
This commit is contained in:
Electroblob
2018-06-20 22:25:54 +01:00
parent b6400c72a7
commit 29261082f1
222 changed files with 4412 additions and 9016 deletions
@@ -15,32 +15,14 @@ import net.minecraft.world.World;
public class EntitySpark extends EntityMagicProjectile {
public EntitySpark(World par1World){
super(par1World);
public EntitySpark(World world){
super(world);
}
public EntitySpark(World par1World, EntityLivingBase par2EntityLivingBase){
super(par1World, par2EntityLivingBase);
}
public EntitySpark(World par1World, EntityLivingBase par2EntityLivingBase, float damageMultiplier){
super(par1World, par2EntityLivingBase, damageMultiplier);
}
public EntitySpark(World par1World, double par2, double par4, double par6){
super(par1World, par2, par4, par6);
}
/** This is the speed */
protected float getSpeed(){
return 0.5F;
}
/**
* Called when this EntityThrowable hits a block or entity.
*/
protected void onImpact(RayTraceResult par1RayTraceResult){
Entity entityHit = par1RayTraceResult.entityHit;
@Override
protected void onImpact(RayTraceResult rayTrace){
Entity entityHit = rayTrace.entityHit;
if(entityHit != null){
@@ -98,17 +80,13 @@ public class EntitySpark extends EntityMagicProjectile {
this.setDead();
}
}
/**
* Gets the amount of gravity to apply to the thrown entity with each tick.
*/
protected float getGravityVelocity(){
return 0.0F;
@Override
public boolean hasNoGravity(){
return true;
}
/**
* Return whether this entity should be rendered as on fire.
*/
@Override
public boolean canRenderOnFire(){
return false;
}