Code cleanup

This commit is contained in:
Anuken
2018-10-06 11:56:39 -04:00
parent 0ce226d0c9
commit fd107ab5b8
48 changed files with 94 additions and 195 deletions
@@ -12,14 +12,14 @@ import io.anuke.ucore.entities.impl.BaseBulletType;
import io.anuke.ucore.util.Translator;
public abstract class BulletType extends Content implements BaseBulletType<Bullet>{
public float lifetime = 100;
public float speed = 1f;
public float damage = 1;
public float lifetime;
public float speed;
public float damage;
public float hitsize = 4;
public float drawSize = 20f;
public float drag = 0f;
public boolean pierce;
public Effect hiteffect = null, despawneffect = null;
public Effect hiteffect, despawneffect;
/**Knockback in velocity.*/
public float knockback;
@@ -32,7 +32,6 @@ import io.anuke.ucore.util.SeedRandom;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import static io.anuke.mindustry.Vars.bulletGroup;
import static io.anuke.mindustry.Vars.world;
@@ -161,14 +160,10 @@ public class Lightning extends SolidEntity implements Poolable, DrawTrait, SyncT
}
@Override
public void write(DataOutput data) throws IOException{
}
public void write(DataOutput data){}
@Override
public void read(DataInput data, long time) throws IOException{
}
public void read(DataInput data, long time){}
@Override
public float lifetime(){
@@ -334,16 +334,6 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
}
@Override
public void drawUnder(){
}
@Override
public void drawOver(){
}
@Override
public float getMaxVelocity(){
return type.maxVelocity;
@@ -39,7 +39,6 @@ import static io.anuke.mindustry.Vars.*;
public class Drone extends FlyingUnit implements BuilderTrait{
protected static float discoverRange = 120f;
protected static boolean initialized;
protected static int timerRepairEffect = timerIndex++;
protected Item targetItem;
@@ -234,17 +233,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
}
};
{
initEvents();
}
/**
* Initialize placement event notifier system.
* Static initialization is to be avoided, thus, this is done lazily.
*/
private static void initEvents(){
if(initialized) return;
static{
Events.on(BlockBuildEvent.class, event -> {
EntityGroup<BaseUnit> group = unitGroups[event.team.ordinal()];
@@ -257,8 +246,6 @@ public class Drone extends FlyingUnit implements BuilderTrait{
}
}
});
initialized = true;
}
private void notifyPlaced(BuildEntity entity){