Cleanup
This commit is contained in:
@@ -32,10 +32,6 @@ public class Logic implements ApplicationListener{
|
|||||||
|
|
||||||
public Logic(){
|
public Logic(){
|
||||||
Events.on(WaveEvent.class, event -> {
|
Events.on(WaveEvent.class, event -> {
|
||||||
for(Player p : playerGroup.all()){
|
|
||||||
p.respawns = state.rules.respawns;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(world.isZone()){
|
if(world.isZone()){
|
||||||
world.getZone().updateWave(state.wave);
|
world.getZone().updateWave(state.wave);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ import java.util.*;
|
|||||||
|
|
||||||
import static mindustry.Vars.*;
|
import static mindustry.Vars.*;
|
||||||
|
|
||||||
@SuppressWarnings({"unused", "unused"})
|
@SuppressWarnings({"unused", "unchecked"})
|
||||||
public class EntityComps{
|
public class EntityComps{
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@@ -1331,20 +1331,14 @@ public class EntityComps{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
abstract class EffectComp implements Posc, Drawc, Timedc{
|
abstract class EffectComp implements Posc, Drawc, Timedc, Rotc{
|
||||||
Effect effect;
|
Effect effect;
|
||||||
Color color = new Color(Color.white);
|
Color color = new Color(Color.white);
|
||||||
Object data;
|
Object data;
|
||||||
float rotation = 0f;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(){
|
public void draw(){
|
||||||
|
effect.render(id(), color, time(), rotation(), x(), y(), data);
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update(){
|
|
||||||
//TODO fix effects, make everything poolable
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user