Refactored almost every class, somehow didn't break game yet

core/src/io/anuke/mindustry/game/EnemySpawn.java

@@ -1,9 +1,10 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.enemies.EnemyType;
 import io.anuke.ucore.util.Mathf;
 
+import static io.anuke.mindustry.Vars.state;
+
 public class EnemySpawn{
 	/**The enemy type spawned*/
 	public final EnemyType type;
@@ -34,7 +35,7 @@ public class EnemySpawn{
 		if(wave < after || wave > before || (wave - after) % spacing != 0){
 			return 0;
 		}
-		float scaling = this.scaling * Vars.control.getDifficulty().enemyScaling;
+		float scaling = this.scaling * state.difficulty.enemyScaling;
 		
 		return Math.min(amount-1 + Math.max((int)((wave / spacing) / scaling), 1) + (tier(wave, lane)-1) * tierscaleback, max);
 	}

core/src/io/anuke/mindustry/game/EventType.java

@@ -1,6 +1,13 @@
 package io.anuke.mindustry.game;
 
 import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.entities.BulletType;
+import io.anuke.mindustry.entities.TileEntity;
+import io.anuke.mindustry.entities.enemies.Enemy;
+import io.anuke.mindustry.resource.Weapon;
+import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.Tile;
+import io.anuke.ucore.entities.Entity;
 import io.anuke.ucore.function.Event;
 
 public class EventType {
@@ -17,11 +24,67 @@ public class EventType {
         void handle();
     }
 
-    public interface GameOver extends Event{
+    public interface GameOverEvent extends Event{
         void handle();
     }
 
-    public interface StateChange extends Event{
+    public interface StateChangeEvent extends Event{
         void handle(State from, State to);
     }
+
+    public interface FriendlyFireChange extends Event{
+        void handle(boolean on);
+    }
+
+    public interface BulletEvent extends Event{
+        void handle(BulletType type, Entity owner, float x, float y, float angle, short damage);
+    }
+
+    public interface EnemyDeathEvent extends Event{
+        void handle(Enemy enemy);
+    }
+
+    public interface BlockDestroyEvent extends Event{
+        void handle(TileEntity entity);
+    }
+
+    public interface BlockDamageEvent extends Event{
+        void handle(TileEntity entity);
+    }
+
+    public interface PlayerDeathEvent extends Event{
+        void handle();
+    }
+
+    public interface BlockConfigEvent extends Event{
+        void handle(Tile tile, byte data);
+    }
+
+    public interface BlockTapEvent extends Event{
+        void handle(Tile tile);
+    }
+
+    public interface WeaponSwitchEvent extends Event{
+        void handle();
+    }
+
+    public interface UpgradeEvent extends Event{
+        void handle(Weapon weapon);
+    }
+
+    public interface MessageSendEvent extends Event{
+        void handle(String message);
+    }
+
+    public interface ShootEvent extends Event{
+        void handle(Weapon weapon, float x, float y, float angle);
+    }
+
+    public interface PlaceEvent extends Event{
+        void handle(int x, int y, Block block, int rotation);
+    }
+
+    public interface BreakEvent extends Event{
+        void handle(int x, int y);
+    }
 }