.woodpecker.yml

@@ -1,5 +0,0 @@
-pipeline:
-  build:
-    image: maven:3-openjdk-18-slim
-    commands:
-      - mvn package

TODO.md

@@ -2,73 +2,19 @@
 
 [X] Mobs spawn in waves
 [X] Mobs move towards goal
-[X] Mobs carry bomb to goal
+[ ] Mobs carry bomb to goal
 [X] Mobs arm bomb
 [X] Bomb explodes
 
-# Malloc Beta
-
-[X] One arena config
-[X] Config reload
-[X] Leave games
-[X] Join games
-[X] Drop back to lobby on game over
-[X] Grist drops
-[X] Chat colors + clickables
-[X] Title colors
-[X] Command tab completion
-[X] Mob AI categories
-[X] Never hungry
-[X] Mobs don't drop bomb items
-[ ] Execute commands on game/wave end
-[X] Player Respawning
-[ ] Difficulty
-
-# QOL
-
-[ ] Players can't pick up bomb items
-[ ] "Get ready" nag
-[ ] "Click here to leave" at end of game
-[ ] Hidden armor stands
-[ ] Small/nonexistent prop collision boxes
-[ ] Leave game when leaving game world
-[ ] Bomb and target glow different colors
-[ ] Play sound once bomb is close to / at target
-[X] Expose coins under vault API
-[ ] Animations framework
-
-# Malloc beta map
-
-[ ] Lobby with instructions
-[X] Item shoppes
-[ ] Indestructible weapons/armor
-
-# Scaled waves
-
-[X] Limit ranged mobs and Ravagers to non-bomb-carrier state
-[X] Weaker mobs, more of them
-[X] Mob AI categories
-
 # UX
 
 [X] Wave boss bar
 [X] Mob count boss bar
 [X] Stage titles
-[X] EXPLOSIONS
+[ ] EXPLOSIONS
-[X] Bomb model
-[X] "Player $X is ready" message in chat
-[X] Clickable /ready in chat
-[ ] Post-Round summary in chat
-[X] Clickable join links in /list
-[X] Sidebar
-[X] Coin pickup status in sidebar
-[ ] Target catches on fire more it is lit
 [ ] Colored titles
-[ ] Clickable /leave action
+[ ] Clickable /ready in chat
-[ ] Countdown while in warmup
+[ ] Sidebar
-[ ] Countdown shrinks w/ every /ready player
-[ ] List of mobs in next wave
-[ ] Pretty bomb model
 
 # Social
 
@@ -77,16 +23,13 @@
 [ ] Plan stats
 [ ] /invite friends to games
 [ ] /voterestart
-[ ] Medals/awards/scoreboards/cosmetics
 
 # Mechanics
 
-[X] Mob tracking should prioritize bomb
+[ ] Coin drops
-[X] Mobs recover dropped bombs
+[ ] Mob tracking should prioritize bomb
-[X] Bomb carriers are slower
+[ ] Mobs recover dropped bombs
-[X] Coin drops
+[ ] Bomb carriers are slower
-[X] Mob categories
-[X] Mobs split between bomb and player priorities
 [ ] Bonus coins for complete coin pickup
 [ ] Infinite weapons + armor
 [ ] Ammo/health spawns
@@ -97,49 +40,39 @@
 [X] Randomized spawn locations
 [X] Weighted distributions
 [X] Batch overlap
-[X] Spawnpoint categories
 [ ] Scripted batch overlap/timings
 [ ] Scripted spawn locations
-[ ] Scripted waypoint paths
-[ ] Execute commands on game/wave end
-[ ] Coin reward curve
-[ ] Mob number curves with player count
 [ ] Bosses
 
 # Mapping
 
-[X] Load arenas from config file
+[ ] Load arenas from config file
 [ ] Live map editing
 
 # Game lifecycle
 
-[X] /list arenas and games
+[ ] /list arenas and games
-[X] /join games
+[ ] /start a game on an arena
+[ ] /join games
 [X] /ready
-[X] /leave games
+[ ] /leave games
+[ ] /restart games
 [X] Spectator mode on death
 [X] Player readiness starts countdown
-[X] Game is automatically closed some time after game over
+[ ] Game is automatically closed some time after game over
-[X] Return to lobby on leave/close
+[ ] Return to lobby on leave/close
-[X] Restore health+hunger on respawn/game start
-[ ] /restart games
 [ ] Instancing
-[X] Respawn during games
-[ ] Player revival items
-[X] Clear inventory on join/leave
 
 # Powerups
 
-[ ] Enchantments
-[ ] Better items
 [ ] Coin pickup range
 [ ] Coin boost
 [ ] Knockback on weapons
 [ ] Damage boost
 [ ] Speed boost
 [ ] Health boost
+[ ] Repair barriers
 
 # Fantasy
 
 [ ] Totems/turrets/stationary weapons
-[ ] Repair barriers

pom.xml

@@ -37,18 +37,6 @@
             <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>de.tr7zw</groupId>
-            <artifactId>item-nbt-api-plugin</artifactId>
-            <version>2.9.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.MilkBowl</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
     
 </project>

src/main/java/gg/malloc/defense/GameEconomy.java

@@ -1,198 +0,0 @@
-package gg.malloc.defense;
-
-import net.milkbowl.vault.economy.AbstractEconomy;
-import net.milkbowl.vault.economy.Economy;
-import net.milkbowl.vault.economy.EconomyResponse;
-import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
-
-import org.bukkit.plugin.ServicesManager;
-import org.bukkit.plugin.ServicePriority;
-import org.bukkit.entity.Player;
-import org.bukkit.OfflinePlayer;
-
-import gg.malloc.defense.model.Instance;
-
-import java.util.List;
-import java.util.ArrayList;
-
-public class GameEconomy extends AbstractEconomy {
-
-  Plugin m_plugin;
-
-  public GameEconomy(Plugin plugin) {
-    m_plugin = plugin;
-  }
-
-  public void register() {
-    ServicesManager manager = m_plugin.getServer().getServicesManager();
-    manager.register(Economy.class, this, m_plugin, ServicePriority.Highest);
-  }
-
-  @Override
-  public EconomyResponse withdrawPlayer(String playerName, double amount) {
-    Instance runner = m_plugin.getRunnerForPlayer(playerName);
-    if (runner != null) {
-      Player p = m_plugin.getServer().getPlayer(playerName);
-      if (!has(playerName, amount)) {
-        int newBalance = runner.getState().getPlayerBalance(p);
-        return new EconomyResponse(amount, newBalance, ResponseType.FAILURE, "Not enough money!");
-      } else {
-        runner.spendMoney(p, (int)Math.floor(amount));
-        int newBalance = runner.getState().getPlayerBalance(p);
-        return new EconomyResponse(amount, newBalance, ResponseType.SUCCESS, "");
-      }
-    } else {
-      return new EconomyResponse(0, 0, ResponseType.FAILURE, "Not in a game!");
-    }
-  }
-
-  @Override
-  public EconomyResponse depositPlayer(String playerName, double amount) {
-    Instance runner = m_plugin.getRunnerForPlayer(playerName);
-    if (runner != null) {
-      Player p = m_plugin.getServer().getPlayer(playerName);
-      runner.spendMoney(p, -(int)Math.floor(amount));
-      int newBalance = runner.getState().getPlayerBalance(p);
-      return new EconomyResponse(amount, newBalance, ResponseType.SUCCESS, "");
-    } else {
-      return new EconomyResponse(0, 0, ResponseType.FAILURE, "Not in a game!");
-    }
-  }
-
-  @Override
-  public double getBalance(String playerName) {
-    Instance runner = m_plugin.getRunnerForPlayer(playerName);
-    if (runner != null) {
-      Player p = m_plugin.getServer().getPlayer(playerName);
-      return runner.getState().getPlayerBalance(p);
-    } else {
-      return 0.0;
-    }
-  }
-
-  @Override
-  public double getBalance(String playerName, String worldName) {
-    return getBalance(playerName);
-  }
-  @Override
-  public boolean isEnabled() {
-    return true;
-  }
-
-  @Override
-  public String getName() {
-    return "Malloc Defense";
-  }
-
-  @Override
-  public boolean hasBankSupport() {
-    return false;
-  }
-
-  @Override
-  public int fractionalDigits() {
-    return 0;
-  }
-
-  @Override
-  public String format(double amount) {
-    return amount + " grist";
-  }
-
-  @Override
-  public String currencyNamePlural() {
-    return "Grist";
-  }
-
-  @Override
-  public String currencyNameSingular() {
-    return "Grist";
-  }
-
-  @Override
-  public boolean hasAccount(String playerName) {
-    return true;
-  }
-
-  @Override
-  public boolean hasAccount(String playerName, String worldName) {
-    return hasAccount(playerName);
-  }
-
-  @Override
-  public boolean has(String playerName, double amount) {
-    return getBalance(playerName) >= amount;
-  }
-
-  @Override
-  public boolean has(String playerName, String worldName, double amount) {
-    return has(playerName, amount);
-  }
-
-  @Override
-  public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
-    return withdrawPlayer(playerName, amount);
-  }
-
-  @Override
-  public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
-    return depositPlayer(playerName, amount);
-  }
-
-  private static final EconomyResponse NO_IMPL_RESPONSE = new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "Not implemented.");
-
-  @Override
-  public EconomyResponse createBank(String name, String player) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public EconomyResponse deleteBank(String name) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public EconomyResponse bankBalance(String name) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public EconomyResponse bankHas(String name, double amount) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public EconomyResponse bankWithdraw(String name, double amount) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public EconomyResponse bankDeposit(String name, double amount) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public EconomyResponse isBankOwner(String name, String player) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public EconomyResponse isBankMember(String name, String player) {
-    return NO_IMPL_RESPONSE;
-  }
-
-  @Override
-  public boolean createPlayerAccount(String name) {
-    return true;
-  }
-
-  @Override
-  public boolean createPlayerAccount(String name, String worldName) {
-    return true;
-  }
-
-  @Override
-  public List<String> getBanks() {
-    return new ArrayList<String>();
-  }
-}

src/main/java/gg/malloc/defense/GameEventHandler.java

@@ -2,55 +2,30 @@ package gg.malloc.defense;
 
 import gg.malloc.defense.engine.GameRunner;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.ArrayList;
-
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.world.LootGenerateEvent;
-import org.bukkit.Sound;
-import org.bukkit.SoundCategory;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 
-import de.tr7zw.nbtapi.NBTItem;
-import de.tr7zw.nbtapi.NBTCompound;
-
 public class GameEventHandler implements Listener {
-  Collection<GameRunner> m_runners;
+  GameRunner m_runner;
 
-  public GameEventHandler() {
+  public GameEventHandler(GameRunner runner) {
-    m_runners = new HashSet<GameRunner>();
+    m_runner = runner;
-  }
-
-  public void addRunner(GameRunner runner) {
-    m_runners.add(runner);
-  }
-
-  public void clear() {
-    m_runners.clear();
   }
 
   @EventHandler
   public void onEntityDeath(EntityDeathEvent evt) {
-    for(GameRunner r : m_runners) {
+    m_runner.handleEntityDeath(evt.getEntity());
-      r.handleEntityDeath(evt.getEntity());
-    }
   }
 
   @EventHandler
   public void onPlayerQuit(PlayerQuitEvent evt) {
-    for(GameRunner r : m_runners) {
+    m_runner.removePlayer(evt.getPlayer());
-      r.removePlayer(evt.getPlayer());
-    }
   }
 
   @EventHandler
@@ -60,49 +35,19 @@ public class GameEventHandler implements Listener {
 
   @EventHandler
   public void onEntityTarget(EntityTargetEvent evt) {
-    for(GameRunner r : m_runners) {
+    m_runner.handleEntityRetargeting(evt);
-      r.handleEntityRetargeting(evt);
-    }
   }
 
   @EventHandler
   public void onEntityDamage(EntityDamageEvent evt) {
-    for(GameRunner r : m_runners) {
+    if (evt.getEntity() instanceof Player) {
-      r.handleEntityDamage(evt);
+      Player player = (Player)evt.getEntity();
-    }
+      if (player.getHealth() - evt.getFinalDamage() <= 0) {
-  }
-
-  @EventHandler
-  public void onLootGenerated(LootGenerateEvent evt) {
-    if (evt.getEntity() != null) {
-      ArrayList<ItemStack> emptyLoot = new ArrayList<>();
-      evt.setLoot(emptyLoot);
-    }
-  }
-
-  @EventHandler
-  public void onFoodLevelChange(FoodLevelChangeEvent evt) {
-    evt.setCancelled(true);
-  }
-
-  @EventHandler
-  public void onItemPickup(PlayerPickupItemEvent evt) {
-    NBTItem nbt = new NBTItem(evt.getItem().getItemStack());
-    if (nbt.hasKey("malloc")) {
-      NBTCompound mallocData = nbt.getCompound("malloc");
-      if (mallocData.hasKey("coinValue")) {
         evt.setCancelled(true);
-        Player player = evt.getPlayer();
+        m_runner.handlePlayerDeath(player);
-        int coinValue = mallocData.getInteger("coinValue") * evt.getItem().getItemStack().getAmount();
-        player.getWorld().playSound(evt.getPlayer(), Sound.BLOCK_CHAIN_PLACE, SoundCategory.PLAYERS, (float)1.0, (float)1.0);
-        evt.getItem().remove();
-        for(GameRunner runner : m_runners) {
-          if (runner.getPlayers().contains(player)) {
-            runner.depositCoins(coinValue);
-            return;
-          }
-        }
       }
+    } else {
+      m_runner.handleEntityDamage(evt);
     }
   }
 }

src/main/java/gg/malloc/defense/MemoryArena.java

@@ -0,0 +1,41 @@
+package gg.malloc.defense;
+
+import gg.malloc.defense.model.Arena;
+import gg.malloc.defense.model.Spawnpoint;
+
+import org.bukkit.World;
+
+public class MemoryArena implements Arena {
+
+  Spawnpoint[] m_spawnpoints;
+  Spawnpoint m_bombTarget;
+  World m_world;
+  String m_name;
+
+  public MemoryArena(String name, World world, Spawnpoint[] spawnpoints, Spawnpoint bombTarget) {
+    m_world = world;
+    m_spawnpoints = spawnpoints;
+    m_name = name;
+    m_bombTarget = bombTarget;
+  }
+
+  @Override
+  public String name() {
+    return m_name;
+  }
+
+  @Override
+  public Spawnpoint[] spawnpoints() {
+    return m_spawnpoints;
+  }
+
+  @Override
+  public World getWorld() {
+    return m_world;
+  }
+  
+  @Override
+  public Spawnpoint bombTarget() {
+    return m_bombTarget;
+  }
+}

src/main/java/gg/malloc/defense/Plugin.java

@@ -5,62 +5,54 @@ import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
 
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
 
 import gg.malloc.defense.model.Arena;
+import gg.malloc.defense.model.Spawnpoint;
 import gg.malloc.defense.model.Game;
-import gg.malloc.defense.model.Instance;
 
 import gg.malloc.defense.games.LinearGame;
 import gg.malloc.defense.games.ScaledWaves;
 
 import gg.malloc.defense.engine.GameRunner;
 
-import gg.malloc.defense.config.Configuration;
-
 import gg.malloc.defense.commands.AddPlayerCommand;
 import gg.malloc.defense.commands.SetStageCommand;
 import gg.malloc.defense.commands.PlayerReadyCommand;
-import gg.malloc.defense.commands.ListGamesCommand;
-import gg.malloc.defense.commands.JoinGameCommand;
-import gg.malloc.defense.commands.LeaveGameCommand;
-import gg.malloc.defense.commands.ReloadCommand;
 
 public class Plugin extends JavaPlugin {
-  HashMap<String, Arena> m_arenas = new HashMap<>();
+  ArrayList<Arena> m_arenas = new ArrayList<>();
   ArrayList<Game> m_games = new ArrayList<>();
-  HashMap<String, GameRunner> m_runningGames = new HashMap<>();
+  HashMap<World, GameRunner> m_runningGames = new HashMap<>();
-  HashMap<Player, GameRunner> m_playerGames = new HashMap<>();
-  GameEventHandler m_handler = new GameEventHandler();
-  GameEconomy m_economy = new GameEconomy(this);
 
-  public Collection<Instance> getInstances() {
+  private class TestSpawn implements Spawnpoint {
-    ArrayList<Instance> ret = new ArrayList<>();
+    Location m_location;
-    for(GameRunner runner : m_runningGames.values()) {
+
-      ret.add(runner);
+    public TestSpawn(Location location) {
+      m_location = location;
     }
-    return ret;
-  }
 
-  public Collection<String> arenaNames() {
+    @Override
-    return m_arenas.keySet();
+    public Location getLocation() {
+      return m_location;
+    }
+
+    @Override
+    public String getName() {
+      return "Mob Spawner";
+    }
+
+    @Override
+    public String getID() {
+      return "mob-spawner";
+    }
   }
 
   public void debuginfo() {
@@ -71,120 +63,37 @@ public class Plugin extends JavaPlugin {
   public void onEnable() {
     getLogger().info("Malloc Defense registered");
     getLogger().setLevel(Level.FINEST);
-    m_games.add(new ScaledWaves());
+    setupDemoGame();
-    reloadArenas();
-    getCommand("join").setExecutor(new JoinGameCommand(this));
-    getCommand("leave").setExecutor(new LeaveGameCommand(this));
-    getCommand("ready").setExecutor(new PlayerReadyCommand(this));
-    getCommand("list").setExecutor(new ListGamesCommand(this));
-
-    getCommand("addplayer").setExecutor(new AddPlayerCommand(this));
     getCommand("setstage").setExecutor(new SetStageCommand(this));
+    getCommand("addplayer").setExecutor(new AddPlayerCommand(this));
     getCommand("debuginfo").setExecutor(new DebuginfoCommand(this));
-    getCommand("reload").setExecutor(new ReloadCommand(this));
+    getCommand("ready").setExecutor(new PlayerReadyCommand(this));
-
-    getServer().getPluginManager().registerEvents(new PlayerQuitHandler(), this);
-    getServer().getPluginManager().registerEvents(m_handler, this);
-
-    getLogger().info("Registering economy");
-    m_economy.register();
   }
 
-  public void onDisable() {
+  public GameRunner getRunnerForWorld(World world) {
-    getLogger().info("Unloading games...");
+    GameRunner ret;
-    for(GameRunner runner : m_runningGames.values()) {
+    if (m_runningGames.containsKey(world)) {
-      runner.requestTransition(GameRunner.Stage.Idle);
+      ret = m_runningGames.get(world);
-    }
+    } else {
-    for(Player player : m_playerGames.keySet()) {
+      ret = new GameRunner(this, m_games.get(0), m_arenas.get(0));
-      m_playerGames.get(player).removePlayer(player);
+      m_runningGames.put(world, ret);
-      returnPlayerToLobby(player);
+      getServer().getPluginManager().registerEvents(new GameEventHandler(ret), this);
-    }
-    m_runningGames.clear();
-    m_playerGames.clear();
-    m_handler.clear();
-    m_arenas.clear();
-  }
-
-  public void reloadArenas() {
-    getLogger().info("Loading arenas...");
-    saveDefaultConfig();
-    reloadConfig();
-    Configuration config = new Configuration(getConfig());
-
-    for(GameRunner runner : m_runningGames.values()) {
-      runner.requestTransition(GameRunner.Stage.Idle);
-    }
-    for(Player player : m_playerGames.keySet()) {
-      m_playerGames.get(player).removePlayer(player);
-      returnPlayerToLobby(player);
-    }
-    m_runningGames.clear();
-    m_playerGames.clear();
-    m_handler.clear();
-    m_arenas.clear();
-    for(String mapName : config.getMapNames()) {
-      m_arenas.put(mapName, config.getArenaForMap(mapName));
-    }
-  }
-
-  public boolean hasRunnerForArenaName(String arenaName) {
-    return m_runningGames.containsKey(arenaName);
-  }
-
-  public void addPlayerToArena(String arenaName, Player player) {
-    GameRunner runner = getRunnerForArenaName(arenaName);
-    runner.addPlayer(player);
-    m_playerGames.put(player, runner);
-  }
-
-  class PlayerQuitHandler implements Listener {
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent evt) {
-      m_playerGames.remove(evt.getPlayer());
-    }
-  }
-
-  public GameRunner getRunnerForArenaName(String arenaName) {
-    GameRunner ret = null;
-    if (m_runningGames.containsKey(arenaName)) {
-      ret = m_runningGames.get(arenaName);
-    } else if (m_arenas.containsKey(arenaName)) {
-      getLogger().info("Loading game world " + arenaName);
-      World gameWorld = getServer().getWorld(arenaName);
-      if (gameWorld == null) {
-        getLogger().info("Creating game world " + arenaName);
-        gameWorld = new WorldCreator(arenaName).generateStructures(false).createWorld();
-      }
-      ret = new GameRunner(this, m_games.get(0), m_arenas.get(arenaName), gameWorld);
-      m_handler.addRunner(ret);
-      m_runningGames.put(arenaName, ret);
-      getLogger().info("Game ready for " + arenaName);
     }
     return ret;
   }
 
-  public void returnPlayerToLobby(Player p) {
+  void setupDemoGame() {
-    Configuration config = new Configuration(getConfig());
+    getLogger().info("Setting up demo data'");
-    World lobby = getServer().getWorld(config.getLobbyName());
+    World testWorld = getServer().getWorld("quarry");
-    if (lobby == null) {
+    if (testWorld == null) {
-      lobby = new WorldCreator(config.getLobbyName()).generateStructures(false).createWorld();
+      testWorld = new WorldCreator("quarry").generateStructures(false).createWorld();
     }
-    p.teleport(lobby.getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
+    Spawnpoint[] spawnpoints = new Spawnpoint[3];
-  }
+    spawnpoints[0] = new TestSpawn(new Location(testWorld, -15, 80, -46));
-
+    spawnpoints[1] = new TestSpawn(new Location(testWorld, -1, 80, -45));
-  public GameRunner getRunnerForPlayer(String playerName) {
+    spawnpoints[2] = new TestSpawn(new Location(testWorld, 12, 81, -42));
-    return getRunnerForPlayer(getServer().getPlayer(playerName));
+    Spawnpoint bombTarget = new TestSpawn(new Location(testWorld, -20, 80, 31));
-  }
+    m_arenas.add(new MemoryArena("Test Arena", testWorld, spawnpoints, bombTarget));
-
+    m_games.add(new ScaledWaves());
-  public void removePlayerFromGames(Player player) {
-    m_playerGames.get(player).removePlayer(player);
-  }
-
-  public GameRunner getRunnerForPlayer(Player p) {
-    GameRunner ret = null;
-    if (m_playerGames.containsKey(p)) {
-      ret = m_playerGames.get(p);
-    }
-    return ret;
   }
 }

src/main/java/gg/malloc/defense/commands/AddPlayerCommand.java

@@ -5,7 +5,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import gg.malloc.defense.model.Instance;
+import gg.malloc.defense.engine.GameRunner;
 
 import gg.malloc.defense.Plugin;
 
@@ -18,12 +18,8 @@ public class AddPlayerCommand implements CommandExecutor {
 
   @Override
   public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
-    String arenaName = args[0];
+    String worldName = args[0];
-    Instance runner = m_plugin.getRunnerForArenaName(arenaName);
+    GameRunner runner = m_plugin.getRunnerForWorld(m_plugin.getServer().getWorld(worldName));
-    if (runner == null) {
-      sender.sendMessage("No such arena '" + arenaName + "'");
-      return true;
-    }
     Player player = m_plugin.getServer().getPlayer(args[1]);
     runner.addPlayer(player);
     return true;

src/main/java/gg/malloc/defense/commands/JoinGameCommand.java

@@ -1,60 +0,0 @@
-package gg.malloc.defense.commands;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import gg.malloc.defense.model.Instance;
-
-import gg.malloc.defense.Plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class JoinGameCommand implements TabExecutor {
-  Plugin m_plugin;
-
-  public JoinGameCommand(Plugin plugin) {
-    m_plugin = plugin;
-  }
-
-  public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
-    ArrayList<String> ret = new ArrayList<>();
-    if (args.length == 1) {
-      String proposal = args[0].toLowerCase();
-      for(String arena : m_plugin.arenaNames()) {
-        if (arena.toLowerCase().startsWith(proposal.toLowerCase())) {
-          ret.add(arena);
-        }
-      }
-    } else if (args.length == 0) {
-      for(String arena : m_plugin.arenaNames()) {
-        ret.add(arena);
-      }
-    }
-    return ret;
-  }
-
-  @Override
-  public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
-    if (args.length != 1) {
-      sender.sendMessage("Usage: join <game>");
-      return true;
-    }
-    if (sender instanceof Player) {
-      Player player = (Player)sender;
-      String arenaName = args[0];
-      sender.sendMessage("Joining arena '" + arenaName + "'...");
-      Instance runner = m_plugin.getRunnerForArenaName(arenaName);
-      if (runner == null) {
-        sender.sendMessage("No such arena '" + arenaName + "'");
-        return true;
-      }
-      m_plugin.addPlayerToArena(arenaName, player);
-    } else {
-      sender.sendMessage("Only players may use this command.");
-    }
-    return true;
-  }
-}

src/main/java/gg/malloc/defense/commands/LeaveGameCommand.java

@@ -1,37 +0,0 @@
-package gg.malloc.defense.commands;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import gg.malloc.defense.model.Instance;
-
-import gg.malloc.defense.Plugin;
-
-public class LeaveGameCommand implements CommandExecutor {
-  Plugin m_plugin;
-
-  public LeaveGameCommand(Plugin plugin) {
-    m_plugin = plugin;
-  }
-
-  @Override
-  public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
-    if (sender instanceof Player) {
-      Player player = (Player)sender;
-      Instance runner = m_plugin.getRunnerForPlayer(player);
-      if (runner == null) {
-        sender.sendMessage("You are not currently in a game.");
-        return true;
-      }
-      runner.removePlayer(player);
-      m_plugin.removePlayerFromGames(player);
-      m_plugin.returnPlayerToLobby(player);
-    } else {
-      sender.sendMessage("Only players may use this command.");
-    }
-    return true;
-  }
-}
-

src/main/java/gg/malloc/defense/commands/ListGamesCommand.java

@@ -1,54 +0,0 @@
-package gg.malloc.defense.commands;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.ClickEvent;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.ComponentBuilder;
-
-import gg.malloc.defense.model.Instance;
-
-import gg.malloc.defense.Plugin;
-
-public class ListGamesCommand implements CommandExecutor {
-  Plugin m_plugin;
-
-  public ListGamesCommand(Plugin plugin) {
-    m_plugin = plugin;
-  }
-
-  @Override
-  public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
-    sender.sendMessage("Available games:");
-    for(String arenaName : m_plugin.arenaNames()) {
-      String stageName = "Ready to play";
-      ChatColor stageColor = ChatColor.WHITE;
-      if (m_plugin.hasRunnerForArenaName(arenaName)) {
-        Instance runner = m_plugin.getRunnerForArenaName(arenaName);
-        switch(runner.getStage()) {
-          case Idle: stageColor = ChatColor.WHITE;stageName = "Open";break;
-          case Warmup: stageColor = ChatColor.YELLOW;stageName = "" + runner.getPlayers().size() + " players warming up";break;
-          case Countdown: stageColor = ChatColor.YELLOW;stageName = "" + runner.getPlayers().size() + " players warming up";break;
-          case Playing: stageColor = ChatColor.GOLD;stageName = "" + runner.getPlayers().size() + " players";break;
-          case GameOver: stageColor = ChatColor.RED;stageName = "Cleaning up...";break;
-        }
-      }
-
-
-      BaseComponent[] message = new ComponentBuilder()
-        .append(" " + arenaName).color(ChatColor.LIGHT_PURPLE).bold(true)
-        .append(" - ").color(ChatColor.WHITE)
-        .append(stageName).color(stageColor).italic(true)
-        .append(" [Join] ").color(ChatColor.GOLD).bold(true)
-        .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/malloc-defense:join " + arenaName))
-        .create();
-        sender.spigot().sendMessage(message);
-    }
-    return true;
-  }
-}
-

src/main/java/gg/malloc/defense/commands/PlayerReadyCommand.java

@@ -5,7 +5,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import gg.malloc.defense.model.Instance;
+import gg.malloc.defense.engine.GameRunner;
 
 import gg.malloc.defense.Plugin;
 
@@ -20,12 +20,9 @@ public class PlayerReadyCommand implements CommandExecutor {
   public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
     if (sender instanceof Player) {
       Player player = (Player)sender;
-      Instance runner = m_plugin.getRunnerForPlayer(player);
+      GameRunner runner = m_plugin.getRunnerForWorld(player.getLocation().getWorld());
-      if (runner != null) {
+      runner.addPlayer(player);
-        runner.togglePlayerReady(player);
+      runner.togglePlayerReady(player);
-      } else {
-        sender.sendMessage("You are not part of any game.");
-      }
       return true;
     } else {
       sender.sendMessage("You must be a player to use this command.");

src/main/java/gg/malloc/defense/commands/ReloadCommand.java

@@ -1,22 +0,0 @@
-package gg.malloc.defense.commands;
-
-import gg.malloc.defense.Plugin;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-public class ReloadCommand implements CommandExecutor {
-  Plugin m_plugin;
-
-  public ReloadCommand(Plugin plugin) {
-    m_plugin = plugin;
-  }
-
-  @Override
-  public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
-    sender.sendMessage("Reloading arenas...");
-    m_plugin.reloadArenas();
-    return true;
-  }
-}

src/main/java/gg/malloc/defense/commands/SetStageCommand.java

@@ -1,80 +1,42 @@
 package gg.malloc.defense.commands;
 
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
 import org.bukkit.World;
 
-import gg.malloc.defense.model.Instance;
+import gg.malloc.defense.engine.GameRunner;
 
 import gg.malloc.defense.Plugin;
 
-import java.util.ArrayList;
+public class SetStageCommand implements CommandExecutor {
-import java.util.List;
-
-public class SetStageCommand implements TabExecutor {
   Plugin m_plugin;
 
   public SetStageCommand(Plugin plugin) {
     m_plugin = plugin;
   }
 
-  public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
-    ArrayList<String> ret = new ArrayList<>();
-    if (args.length == 1) {
-      String proposal = args[0].toLowerCase();
-      Instance.Stage stages[] = Instance.Stage.Idle.getDeclaringClass().getEnumConstants();
-      for(Instance.Stage stage : stages) {
-        if (stage.toString().toLowerCase().startsWith(proposal)) {
-          ret.add(stage.toString());
-        }
-      }
-    } else if (args.length == 2) {
-      String proposal = args[1].toLowerCase();
-      for(String arena : m_plugin.arenaNames()) {
-        if (arena.toLowerCase().startsWith(proposal)) {
-          ret.add(arena);
-        }
-      }
-    } else if (args.length == 0) {
-      for(String arena : m_plugin.arenaNames()) {
-        ret.add(arena);
-      }
-    }
-    return ret;
-  }
-
   @Override
   public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
-    if (args.length != 2) {
+    World world = m_plugin.getServer().getWorld(args[1]);
-      sender.sendMessage("Usage: setstage <stage> <arena>");
+    GameRunner runner = m_plugin.getRunnerForWorld(world);
-      return true;
-    }
-    Instance runner = m_plugin.getRunnerForArenaName(args[1]);
-    if (runner == null) {
-      sender.sendMessage("Unknown arena " + args[1]);
-      return true;
-    }
     String stateName = args[0].toLowerCase();
     boolean ret = false;
-    Instance.Stage decodedStage = null;
+    if (stateName.equals("idle")) {
-    Instance.Stage stages[] = Instance.Stage.Idle.getDeclaringClass().getEnumConstants();
+      ret = runner.requestTransition(GameRunner.Stage.Idle);
-    for(Instance.Stage stage : stages) {
+    } else if (stateName.equals("warmup")) {
-      if (stage.toString().toLowerCase().equals(stateName)) {
+      ret = runner.requestTransition(GameRunner.Stage.Warmup);
-        decodedStage = stage;
+    } else if (stateName.equals("playing")) {
-        break;
+      ret = runner.requestTransition(GameRunner.Stage.Playing);
-      }
+    } else if (stateName.equals("gameover")) {
-    }
+      ret = runner.requestTransition(GameRunner.Stage.GameOver);
-    if (decodedStage != null) {
-      sender.sendMessage("Requesting transition to " + decodedStage);
-      if (!runner.requestTransition(decodedStage)) {
-        sender.sendMessage("Could not transition to " + decodedStage);
-        return false;
-      }
-      return true;
     } else {
       sender.sendMessage("Unknown state " + stateName);
       return false;
     }
+    if (!ret) {
+      sender.sendMessage("Could not set state to " + stateName);
+    }
+    return ret;
   }
 }

src/main/java/gg/malloc/defense/config/Configuration.java

@@ -1,57 +0,0 @@
-package gg.malloc.defense.config;
-
-import java.util.List;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import gg.malloc.defense.model.Arena;
-import gg.malloc.defense.model.Waypoint;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-public class Configuration {
-
-  ConfigurationSection m_root;
-
-  public Configuration(ConfigurationSection rootConfig) {
-    m_root = rootConfig;
-  }
-
-  public String getLobbyName() {
-    ConfigurationSection lobbyConf = m_root.getConfigurationSection("lobby");
-    return lobbyConf.getString("world");
-  }
-
-  public Collection<String> getMapNames() {
-    ConfigurationSection mapList = m_root.getConfigurationSection("maps");
-    return mapList.getKeys(false);
-  }
-
-  public Arena getArenaForMap(String name) {
-    ConfigurationSection mapList = m_root.getConfigurationSection("maps");
-    return makeArena(mapList.getConfigurationSection(name));
-  }
-
-  MemoryArena makeArena(ConfigurationSection mapConfig) {
-    List<Map<?, ?>> spawnpointList = mapConfig.getMapList("spawnpoints");
-    ArrayList<Waypoint> spawnpoints = new ArrayList<>();
-
-    for(Map<?, ?> spawnerObj : spawnpointList) {
-      Map<String, Double> thisSpawner = (Map<String, Double>)spawnerObj;
-      double x = thisSpawner.get("x");
-      double y = thisSpawner.get("y");
-      double z = thisSpawner.get("z");
-      spawnpoints.add(new Waypoint(x, y, z));
-    }
-
-    ConfigurationSection targetConfig = mapConfig.getConfigurationSection("target");
-    double x = targetConfig.getDouble("x");
-    double y = targetConfig.getDouble("y");
-    double z = targetConfig.getDouble("z");
-    Waypoint bombTarget = new Waypoint(x, y, z);
-    Waypoint[] spawnArray = new Waypoint[spawnpoints.size()];
-    spawnpoints.toArray(spawnArray);
-    return new MemoryArena(spawnArray, bombTarget);
-  }
-}

src/main/java/gg/malloc/defense/config/MemoryArena.java

@@ -1,27 +0,0 @@
-package gg.malloc.defense.config;
-
-import gg.malloc.defense.model.Arena;
-import gg.malloc.defense.model.Waypoint;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-public class MemoryArena implements Arena {
-
-  Waypoint[] m_spawnpoints;
-  Waypoint m_bombTarget;
-
-  public MemoryArena(Waypoint[] spawnpoints, Waypoint bombTarget) {
-    m_spawnpoints = spawnpoints;
-    m_bombTarget = bombTarget;
-  }
-
-  @Override
-  public Waypoint[] spawnpoints() {
-    return m_spawnpoints;
-  }
-
-  @Override
-  public Waypoint bombTarget() {
-    return m_bombTarget;
-  }
-}

src/main/java/gg/malloc/defense/engine/BombFuse.java

@@ -1,40 +0,0 @@
-package gg.malloc.defense.engine;
-
-import gg.malloc.defense.model.Progress;
-
-public class BombFuse implements Progress {
-  int m_bombFuseCount = 0;
-  int m_bombFuseTarget = 10;
-
-  public double toDouble() {
-    return Math.max(0.0, Math.min(1.0, (double)m_bombFuseCount / (double)m_bombFuseTarget));
-  }
-
-  public boolean isLit() {
-    return m_bombFuseCount > 0;
-  }
-
-  public boolean isExploded() {
-    return m_bombFuseCount > m_bombFuseTarget;
-  }
-
-  public void reset() {
-    m_bombFuseCount = 0;
-  }
-
-  public void tickLit() {
-    m_bombFuseCount += 1;
-  }
-
-  public void tickDecay() {
-    m_bombFuseCount -= 1;
-  }
-
-  public int value() {
-    return m_bombFuseCount;
-  }
-
-  public int maximum() {
-    return m_bombFuseTarget;
-  }
-}

src/main/java/gg/malloc/defense/engine/GameRunner.java

@@ -1,289 +1,193 @@
 package gg.malloc.defense.engine;
 
-import gg.malloc.defense.model.Arena;
 import gg.malloc.defense.model.Game;
+import gg.malloc.defense.model.Arena;
 import gg.malloc.defense.model.Spawner;
-import gg.malloc.defense.model.Waypoint;
+import gg.malloc.defense.model.Wave;
-import gg.malloc.defense.model.Instance;
-
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.ClickEvent;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.ComponentBuilder;
-
-import gg.malloc.defense.ui.BossBars;
-import gg.malloc.defense.ui.Items;
-import gg.malloc.defense.ui.Sidebars;
 
 import gg.malloc.defense.Plugin;
 
 import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Collection;
-import java.util.UUID;
 
 import org.bukkit.Bukkit;
-import org.bukkit.GameRule;
-import org.bukkit.Location;
-import org.bukkit.Particle;
 import org.bukkit.Sound;
-import org.bukkit.SoundCategory;
 import org.bukkit.World;
+import org.bukkit.boss.BarColor;
+import org.bukkit.boss.BarStyle;
+import org.bukkit.boss.BossBar;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
+import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.inventory.ItemStack;
-
-public class GameRunner implements Instance {
-  GameState m_state;
 
+public class GameRunner {
   Arena m_arena;
   Game m_game;
   Stage m_stage;
   Plugin m_plugin;
 
+  BossBar m_gameBar = Bukkit.createBossBar("Malloc Defense", BarColor.PURPLE, BarStyle.SOLID);
+  BossBar m_waveBar = Bukkit.createBossBar("Malloc Defense", BarColor.PURPLE, BarStyle.SOLID);
+  BossBar m_bombBar = Bukkit.createBossBar("Bomb HP", BarColor.RED, BarStyle.SOLID);
+
+  BukkitTask m_countdownTask;
+
   MobManager m_mobs;
   WaveManager m_waves;
   PlayerManager m_players;
 
-  BombFuse m_bombFuse;
+  LivingEntity m_bombTarget = null;
+  int m_bombHP = 100;
 
   Logger m_log;
 
-  TickTask m_fuseTask;
+  public enum Stage {
-  TickTask m_countdownTask;
+    Idle,
-  TickTask m_lobbyReturnTask;
+    Warmup,
-  TickTask m_bombSmokeTask;
+    Countdown,
-  TickTask m_bombCrackleTask;
+    Playing,
-  TickTask m_playerRespawnTask;
+    GameOver
-
-  BossBars m_bars;
-  Sidebars m_sidebars;
-
-  World m_world;
-
-  Location getLocation(Waypoint waypoint) {
-    return new Location(m_world, waypoint.getX(), waypoint.getY(), waypoint.getZ());
   }
 
-  void validateGameRule(GameRule rule, boolean value) {
+  class WaveManager {
-    if (!m_world.getGameRuleValue(rule).equals(value)) {
+    int m_currentWaveNum = 0;
-      m_log.warning("Game rule " + rule + " is not " + value);
+    int m_currentBatch = 0;
+    Wave m_currentWave = null;
+    Game m_game;
+
+    WaveManager(Game game) {
+      m_game = game;
+    }
+
+    void reset() {
+      m_currentWaveNum = 0;
+      m_currentBatch = 0;
+      m_currentWave = null;
+    }
+
+    Wave currentWave() {
+      return m_currentWave;
+    }
+
+    int currentWaveNum() {
+      return m_currentWaveNum;
+    }
+
+    int currentBatchNum() {
+      return m_currentBatch;
+    }
+
+    double progress() {
+      return (double)m_currentWaveNum / (double)m_game.getWaveCount();
+    }
+
+    boolean isLastWave() {
+      return m_currentWaveNum >= m_game.getWaveCount();
+    }
+
+    boolean isLastBatch() {
+      return m_currentBatch >= m_currentWave.batchCount();
+    }
+
+    void nextBatch() {
+      m_currentBatch += 1;
+    }
+
+    void next() {
+      m_currentWaveNum += 1;
+      m_currentBatch = 0;
+      m_currentWave = m_game.getWave(m_currentWaveNum);
     }
   }
 
-  void validateGameRules() {
-    validateGameRule(GameRule.DO_MOB_LOOT, false);
-    validateGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false);
-    validateGameRule(GameRule.DISABLE_RAIDS, true);
-    validateGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
-    validateGameRule(GameRule.DO_ENTITY_DROPS, false);
-    validateGameRule(GameRule.DO_FIRE_TICK, false);
-    validateGameRule(GameRule.DO_INSOMNIA, false);
-    validateGameRule(GameRule.DO_WEATHER_CYCLE, false);
-    validateGameRule(GameRule.SPECTATORS_GENERATE_CHUNKS, false);
-  }
 
-  public GameState getState() {
+  public GameRunner(Plugin plugin, Game game, Arena arena) {
-    return m_state;
-  }
-
-  public GameRunner(Plugin plugin, Game game, Arena arena, World world) {
     m_plugin = plugin;
     m_game = game;
-    m_world = world;
     m_arena = arena;
     m_stage = Stage.Idle;
-    m_mobs = new MobManager();
+    m_gameBar.setVisible(true);
+    m_waveBar.setVisible(false);
+    m_bombBar.setVisible(false);
+    m_mobs = new MobManager(m_game);
     m_waves = new WaveManager(m_game);
     m_players = new PlayerManager();
-    m_bombFuse = new BombFuse();
-
-    m_state = new GameState(this, m_waves, m_game, m_mobs, m_bombFuse, m_players);
-
-    m_bars = new BossBars(m_state);
-    m_sidebars = new Sidebars(m_state, m_plugin.getServer().getScoreboardManager());
-
     m_log = m_plugin.getLogger();
-
-    m_fuseTask = new TickTask(m_plugin, () -> {
-      if (m_bombFuse.isLit()) {
-        m_bombFuse.tickDecay();
-        m_bars.update();
-        m_sidebars.update();
-      }
-    }, 80);
-
-    m_playerRespawnTask = new TickTask(m_plugin, () -> {
-      m_players.tickRespawnCounters();
-      for (Player p : m_players.getPlayers()) {
-        if (m_players.readyToRespawn(p)) {
-          if (m_players.requestTransition(p, PlayerManager.State.Playing)) {
-            sendRespawnTitle(p);
-            p.teleport(m_world.getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
-          }
-        }
-      }
-      m_bars.update();
-    }, 20);
-
-    m_countdownTask = new TickTask(m_plugin, () -> {
-      if (m_warmupCountdown == 0) {
-        requestTransition(Stage.Playing);
-      } else {
-        BaseComponent[] message = new ComponentBuilder()
-          .append("Starting game in ").color(ChatColor.LIGHT_PURPLE)
-          .append("" + m_warmupCountdown).color(ChatColor.AQUA).bold(true)
-          .create();
-        broadcastMessage(message);
-        m_warmupCountdown--;
-        m_bars.setCountdownProgress((double)m_warmupCountdown / 10.0);
-        m_bars.update();
-        m_sidebars.update();
-      }
-    }, 20);
-
-    m_lobbyReturnTask = new TickTask(m_plugin, () -> {
-      if (m_gameEndCountdown == 0) {
-        for(Player p : new ArrayList<Player>(m_players.getPlayers())) {
-          removePlayer(p);
-          m_plugin.returnPlayerToLobby(p);
-        }
-        requestTransition(Stage.Idle);
-      } else {
-        BaseComponent[] message = new ComponentBuilder()
-          .append("Game is ending in ").color(ChatColor.LIGHT_PURPLE)
-          .append("" + m_gameEndCountdown).color(ChatColor.RED).bold(true)
-          .create();
-        broadcastMessage(message);
-        m_gameEndCountdown--;
-        m_bars.setCountdownProgress((double)m_gameEndCountdown / 60.0);
-        m_bars.update();
-        m_sidebars.update();
-      }
-    }, 20);
-
-    m_bombSmokeTask = new TickTask(m_plugin, () -> {
-      Location targetLoc = getLocation(m_arena.bombTarget());
-      m_world.spawnParticle(Particle.SMOKE_LARGE, targetLoc, 135, 4, 2, 4, 1);
-      m_world.spawnParticle(Particle.SMALL_FLAME, targetLoc, 130, 3, 2, 3, 1);
-    }, 5);
-    m_bombCrackleTask = new TickTask(m_plugin, () -> {
-      Location targetLoc = getLocation(m_arena.bombTarget());
-      m_world.playSound(targetLoc, Sound.BLOCK_CAMPFIRE_CRACKLE, SoundCategory.NEUTRAL, 1.0f, 1.0f);
-    }, 35);
-
-    validateGameRules();
   }
 
   int m_warmupCountdown = 0;
-  int m_gameEndCountdown = 0;
 
   public void handleEntityRetargeting(EntityTargetEvent evt) {
-    m_mobs.handleEntityRetarget(evt);
+    if (m_mobs.contains(evt.getEntity()) && evt.getReason() == EntityTargetEvent.TargetReason.FORGOT_TARGET) {
-  }
+      evt.setTarget(m_bombTarget);
-
+    }
-  public void spendMoney(Player p, int amount) {
-    m_players.addPlayerExpenses(p, amount);
-    m_sidebars.update();
-  }
-
-  public void depositCoins(int amount) {
-    m_state.addPickedUpCoins(amount);
-    m_sidebars.update();
   }
 
   public void handleEntityDamage(EntityDamageEvent evt) {
-    m_mobs.handleEntityDamage(evt);
+    if (evt.getEntity() == m_bombTarget && evt instanceof EntityDamageByEntityEvent) {
-    if (m_mobs.bombWasHit() && !m_bombFuse.isExploded()) {
       EntityDamageByEntityEvent entityEvt = (EntityDamageByEntityEvent)evt;
-      m_log.info("Target attacked!");
+      if (m_mobs.contains(entityEvt.getDamager())) {
-      entityEvt.getDamager().setGlowing(true);
+        entityEvt.getDamager().setGlowing(true);
-      m_bombFuse.tickLit();
+        m_bombHP -= 1;
-      m_world.playSound(getLocation(m_arena.bombTarget()), Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 1.5f, 0.9f);
+        broadcastMessage("The bomb has been struck!");
-      m_bars.update();
+        m_arena.getWorld().playSound(m_bombTarget.getLocation(), Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 1.5f, 0.9f);
-      m_sidebars.update();
+        updateMobBars();
-      if (m_bombFuse.isExploded()) {
+        if (m_bombHP <= 0) {
-        m_world.strikeLightningEffect(getLocation(m_arena.bombTarget()));
+          m_arena.getWorld().strikeLightningEffect(m_bombTarget.getLocation());
-        m_world.playSound(getLocation(m_arena.bombTarget()), Sound.ENTITY_GENERIC_EXPLODE, SoundCategory.NEUTRAL, 1.3f, 1.0f);
+          requestTransition(Stage.GameOver);
-        m_world.spawnParticle(Particle.EXPLOSION_HUGE, getLocation(m_arena.bombTarget()), 8, 5, 2, 5);
-        BaseComponent[] message = new ComponentBuilder()
-          .append("The bomb blew up!").color(ChatColor.RED).bold(true)
-          .create();
-        broadcastMessage(message);
-        requestTransition(Stage.GameOver);
-        m_bombSmokeTask.start();
-        m_bombCrackleTask.start();
-      }
-    } else if (evt.getEntity() instanceof Player) {
-      Player player = (Player)evt.getEntity();
-      if (evt instanceof EntityDamageByEntityEvent) {
-        EntityDamageByEntityEvent entityEvt = (EntityDamageByEntityEvent)evt;
-        if (entityEvt.getDamager() instanceof Player) {
-          evt.setCancelled(true);
-          return;
-        } else if (entityEvt.getDamager() instanceof Projectile) {
-          Projectile asProjectile = (Projectile)entityEvt.getDamager();
-          if (asProjectile.getShooter()  instanceof Player) {
-            evt.setCancelled(true);
-          }
         }
       }
-      if (m_players.contains(player) && player.getHealth() - evt.getFinalDamage() <= 0 && m_stage == Stage.Playing) {
+      evt.setCancelled(true);
-        evt.setCancelled(true);
+    } else {
-        handlePlayerDeath(player);
+      m_mobs.handleEntityDamage(evt);
-      }
+    }
+  }
+
+  private void countdownTick() {
+    if (m_warmupCountdown == 0) {
+      requestTransition(Stage.Playing);
+    } else {
+      updateMobBars();
+      broadcastMessage("Starting game in " + m_warmupCountdown);
+      m_warmupCountdown--;
+      m_countdownTask = m_plugin.getServer().getScheduler().runTaskLater(m_plugin, () -> {
+        countdownTick();
+      }, 20);
     }
   }
 
   private boolean enterIdle() {
-    m_bombFuse.reset();
+    m_bombHP = 100;
     m_waves.reset();
     m_mobs.clear();
-    m_bombSmokeTask.stop();
-    m_bombCrackleTask.stop();
     m_players.requestTransitionForAll(PlayerManager.State.Idle);
-    m_fuseTask.stop();
+    if (m_bombTarget != null) {
-    m_countdownTask.stop();
+      m_bombTarget.remove();
-    m_lobbyReturnTask.stop();
+      m_bombTarget = null;
-    m_playerRespawnTask.stop();
+    }
-    m_state.resetBalances();
+    if (m_countdownTask != null) {
+      m_countdownTask.cancel();
+      m_countdownTask = null;
+    }
     return true;
   }
 
-  UUID m_id = UUID.randomUUID();
-
-  public UUID getId() {
-    return m_id;
-  }
-
-  public Collection<Player> getPlayers() {
-    return m_players.getPlayers();
-  }
-
   private boolean enterWarmup() {
     m_waves.next();
     for(Player p : m_players.getPlayers()) {
         if (m_players.requestTransition(p, PlayerManager.State.Playing)) {
-          p.teleport(m_world.getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
+          p.teleport(m_arena.getWorld().getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
         }
         m_players.setReady(p, false);
-        m_players.healPlayer(p);
     }
-    BaseComponent[] message = new ComponentBuilder()
+    broadcastTitle("Warmup", "Prepare yourself for wave " + m_waves.currentWaveNum());
-      .append("Click").color(ChatColor.LIGHT_PURPLE)
-      .append(" [Here] ").color(ChatColor.GOLD).bold(true)
-      .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/malloc-defense:ready"))
-      .append("when ready.").color(ChatColor.LIGHT_PURPLE)
-      .create();
-    broadcastMessage(message);
     m_mobs.clear();
-    m_playerRespawnTask.start();
     return true;
   }
 
@@ -291,25 +195,8 @@ public class GameRunner implements Instance {
     setPlayerReady(p, !m_players.isReady(p));
   }
 
-  void clearReadyState() {
-    for(Player p : m_players.getPlayers()) {
-      setPlayerReady(p, false);
-    }
-  }
-
   public void setPlayerReady(Player p, boolean isReady) {
-    if (isReady != m_players.isReady(p)) {
+    m_players.setReady(p, isReady);
-      if (isReady) {
-        BaseComponent[] message = new ComponentBuilder()
-          .append(p.getName()).bold(true)
-          .append(" is ready!").color(ChatColor.AQUA).italic(true)
-          .create();
-        broadcastMessage(message);
-      }
-      m_players.setReady(p, isReady);
-    }
-    m_bars.update();
-    m_sidebars.update();
     if (m_players.isEveryoneReady()) {
       requestTransition(Stage.Countdown);
     }
@@ -317,99 +204,125 @@ public class GameRunner implements Instance {
 
   private boolean enterCountdown() {
     m_warmupCountdown = 10;
-    m_bars.setCountdownProgress(1.0);
+    countdownTick();
-    m_countdownTask.start();
-    m_playerRespawnTask.start();
     return true;
   }
 
   private boolean enterPlaying() {
     m_log.info("Starting wave " + m_waves.currentWaveNum());
-    m_mobs.spawnTarget(getLocation(m_arena.bombTarget()));
+    if (m_bombTarget == null) {
-    // TODO: Set helmet with custom model data
+      m_bombTarget = (LivingEntity)m_arena.getWorld().spawnEntity(m_arena.bombTarget().getLocation(), EntityType.ARMOR_STAND);
+    }
+    ArmorStand bombStand = (ArmorStand)m_bombTarget;
+    bombStand.setCustomName("Bomb Target");
+    bombStand.setVisible(true);
+    bombStand.setCustomNameVisible(true);
+    bombStand.setGlowing(true);
     for(Player p : m_players.getPlayers()) {
         if (m_players.requestTransition(p, PlayerManager.State.Playing)) {
-          p.teleport(m_world.getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
+          p.teleport(m_arena.getWorld().getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
         }
     }
-    m_countdownTask.stop();
-    m_fuseTask.start();
-    m_playerRespawnTask.start();
     spawnNextBatch();
+    broadcastTitle("Wave " + m_waves.currentWaveNum());
     return true;
   }
   
   private boolean enterGameOver() {
-    m_gameEndCountdown = 60;
+    broadcastTitle("Game Over!");
-    m_lobbyReturnTask.start();
+    if (m_countdownTask != null) {
-    m_countdownTask.stop();
+      m_countdownTask.cancel();
-    m_fuseTask.stop();
+      m_countdownTask = null;
-    m_playerRespawnTask.stop();
+    }
+    m_mobs.clear();
+    for(Player p : m_players.getPlayers()) {
+      removePlayer(p);
+    }
     return true;
   }
 
-  public Stage getStage() {
+  private void updateMobBars() {
-    return m_stage;
+    m_gameBar.setVisible(true);
+    switch(m_stage) {
+      case Idle:
+        m_gameBar.setProgress(1.0);
+        m_gameBar.setTitle("Waiting for players...");
+        m_gameBar.setColor(BarColor.PURPLE);
+        m_waveBar.setVisible(false);
+        m_bombBar.setVisible(false);
+        break;
+      case Warmup:
+        m_gameBar.setProgress(m_waves.progress());
+        m_gameBar.setTitle("Wave " + m_waves.currentWaveNum() + " / " + m_game.getWaveCount());
+        m_gameBar.setColor(BarColor.PURPLE);
+        m_waveBar.setVisible(true);
+        m_waveBar.setColor(BarColor.BLUE);
+        m_waveBar.setTitle("Warmup - Waiting for players to get ready...");
+        m_waveBar.setProgress(m_players.readyProgress());
+        m_bombBar.setVisible(false);
+        break;
+      case Countdown:
+        m_gameBar.setProgress(m_waves.progress());
+        m_gameBar.setTitle("Wave " + m_waves.currentWaveNum() + " / " + m_game.getWaveCount());
+        m_gameBar.setColor(BarColor.PURPLE);
+        m_waveBar.setVisible(true);
+        m_waveBar.setColor(BarColor.YELLOW);
+        m_waveBar.setTitle("Wave starting!");
+        m_waveBar.setProgress((double)m_warmupCountdown / (double)10);
+        m_bombBar.setVisible(false);
+        break;
+      case Playing:
+        m_gameBar.setProgress(m_waves.progress());
+        m_gameBar.setTitle("Wave " + m_waves.currentWaveNum() + " / " + m_game.getWaveCount());
+        m_gameBar.setColor(BarColor.PURPLE);
+        if (m_mobs.createdMobs() > 0) {
+          m_waveBar.setVisible(true);
+          m_waveBar.setColor(BarColor.GREEN);
+          m_waveBar.setTitle("Mobs remaining: " + m_mobs.remainingMobs());
+          m_waveBar.setProgress(m_mobs.progress());
+        } else {
+          m_waveBar.setVisible(false);
+        }
+        m_bombBar.setVisible(true);
+        m_bombBar.setProgress((double)m_bombHP / (double)100);
+        break;
+      case GameOver:
+        m_gameBar.setColor(BarColor.RED);
+        m_gameBar.setProgress(1.0);
+        m_gameBar.setTitle("Game Over!");
+        m_waveBar.setVisible(false);
+        m_bombBar.setVisible(false);
+        break;
+    }
   }
 
   private void spawnNextBatch() {
-    m_log.info("Spawning batch " + m_waves.currentBatchNum());
+    broadcastMessage("Spawning batch " + m_waves.currentBatchNum());
-    Spawner spawner = new GameSpawner(m_world, m_arena, m_mobs);
+    Spawner spawner = new GameSpawner(m_arena, m_mobs, m_players, m_bombTarget);
     m_waves.currentWave().spawnBatch(spawner, m_waves.currentBatchNum());
-    m_bars.update();
+    updateMobBars();
-    m_sidebars.update();
   }
 
-  private void handlePlayerDeath(Player player) {
+  public void handlePlayerDeath(Player player) {
     if (m_players.requestTransition(player, PlayerManager.State.Dead)) {
-      m_world.strikeLightningEffect(player.getLocation());
+      m_arena.getWorld().strikeLightningEffect(player.getLocation());
-      //if (!m_players.isAnyoneAlive()) {
+      if (!m_players.isAnyoneAlive()) {
-      if (false) {
+        broadcastMessage("Everyone is dead :(");
-        BaseComponent[] message = new ComponentBuilder()
-          .append("Everyone is ").color(ChatColor.LIGHT_PURPLE)
-          .append("DEAD").color(ChatColor.RED).bold(true)
-          .append(" :(").color(ChatColor.LIGHT_PURPLE)
-          .create();
-        broadcastMessage(message);
         requestTransition(Stage.GameOver);
       } else {
-        BaseComponent[] message = new ComponentBuilder()
-          .append(player.getName())
-          .append(" has ").color(ChatColor.LIGHT_PURPLE)
-          .append("DIED!").color(ChatColor.RED).bold(true)
-          .append(" :(").color(ChatColor.LIGHT_PURPLE)
-          .create();
-        broadcastMessage(message);
-        sendDeathTitle(player);
         m_log.info("Remaining players " + m_players.remainingPlayers());
       }
     }
   }
 
   public void handleEntityDeath(Entity entity) {
-    boolean wasCarrier = m_mobs.isBombCarrier(entity);
     if (m_mobs.killMob(entity)) {
-      int COIN_STACK_SIZE = 5;
+      broadcastMessage("Killed game entity " + entity);
-      int coinsToDrop = 60;
+      updateMobBars();
-      while(coinsToDrop > 0) {
-        int droppedCoins = Math.min(coinsToDrop, COIN_STACK_SIZE);
-        ItemStack coins = Items.makeCoins();
-        coins.setAmount(droppedCoins);
-        coinsToDrop -= droppedCoins;
-        m_state.addDroppedCoins(droppedCoins);
-        m_sidebars.update();
-        m_world.dropItem(entity.getLocation(), coins);
-      }
-      m_bars.update();
-      m_sidebars.update();
       if (m_mobs.remainingMobs() <= 3) {
         m_log.info("Starting next batch!");
         if (m_waves.isLastBatch()) {
           if (m_waves.isLastWave()) {
-            BaseComponent[] message = new ComponentBuilder()
-              .append("You Won!").color(ChatColor.LIGHT_PURPLE).bold(true)
-              .create();
-            broadcastMessage(message);
             requestTransition(Stage.GameOver);
           } else if (m_mobs.empty()) {
             requestTransition(Stage.Warmup);
@@ -428,6 +341,7 @@ public class GameRunner implements Instance {
     if (m_stage == stage) {
       return false;
     }
+    m_log.info("Game state: " + stage);
     switch(stage) {
       case Idle:
         return enterIdle();
@@ -446,11 +360,11 @@ public class GameRunner implements Instance {
   private boolean validateTransition(Stage from, Stage to) {
     switch(from) {
       case Idle:
-        return !m_players.isEmpty() && to == Stage.Warmup;
+        return to == Stage.Warmup;
       case Warmup:
-        return to == Stage.Playing || to == Stage.Idle || to == Stage.Countdown || to == Stage.GameOver;
+        return to == Stage.Playing || to == Stage.Idle || to == Stage.Countdown ;
       case Countdown:
-        return to == Stage.Playing || to == Stage.Idle || to == Stage.Warmup || to == Stage.GameOver;
+        return to == Stage.Playing || to == Stage.Idle || to == Stage.Warmup;
       case Playing:
         return to == Stage.Warmup || to == Stage.GameOver || to == Stage.Idle;
       case GameOver:
@@ -467,56 +381,23 @@ public class GameRunner implements Instance {
     if (attemptTransition(stage)) {
       m_log.info("Game transition: " + m_stage + " -> " + stage);
       m_stage = stage;
-      m_bars.update();
+      updateMobBars();
-      m_sidebars.update();
-      for(Player p : m_players.getPlayers()) {
-        sendStageTitle(p);
-      }
       return true;
     }
     m_log.severe("Failed to complete transition: " + m_stage + " -> " + stage);
     return false;
   }
 
-  void sendDeathTitle(Player p) {
-    p.sendTitle(ChatColor.RED.toString() + "You died!", "Wait to respawn...");
-  }
-
-  void sendRespawnTitle(Player p) {
-    p.sendTitle(ChatColor.AQUA.toString() + "Respawn", "");
-  }
-
-  void sendStageTitle(Player p) {
-    switch(m_stage) {
-      case Warmup:
-        p.sendTitle(ChatColor.YELLOW.toString() + "Warmup", ChatColor.LIGHT_PURPLE.toString() + "Prepare yourself for wave " + m_waves.currentWaveNum());
-        break;
-      case Playing:
-        p.sendTitle(ChatColor.AQUA.toString()  + "Wave " + m_waves.currentWaveNum(), "");
-        break;
-      case GameOver:
-        p.sendTitle(ChatColor.RED.toString() + "Game over!", "");
-    }
-  }
-
   public void addPlayer(Player p) {
-    if (m_players.contains(p)) {
-      return;
-    }
-    p.getInventory().clear();
-    m_sidebars.addPlayer(p);
     m_players.addPlayer(p);
-    m_bars.addPlayer(p);
+    m_gameBar.addPlayer(p);
+    m_waveBar.addPlayer(p);
+    m_bombBar.addPlayer(p);
     if (m_stage == Stage.Idle || m_stage == Stage.Warmup) {
       if (m_players.requestTransition(p, PlayerManager.State.Playing)) {
-        p.teleport(m_world.getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
+        p.teleport(m_arena.getWorld().getSpawnLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
       }
-      BaseComponent[] message = new ComponentBuilder()
+      broadcastMessage(p.getName() + " has joined the game");
-        .append(p.getName()).bold(true)
-        .append(" has joined the game").color(ChatColor.AQUA)
-        .create();
-      broadcastMessage(message);
-      sendStageTitle(p);
       if (m_stage == Stage.Idle) {
         requestTransition(Stage.Warmup);
       }
@@ -524,18 +405,11 @@ public class GameRunner implements Instance {
   }
 
   public void removePlayer(Player p) {
-    p.getInventory().clear();
+    m_gameBar.removePlayer(p);
-    m_sidebars.removePlayer(p);
+    m_waveBar.removePlayer(p);
-    m_bars.removePlayer(p);
     m_players.removePlayer(p);
     if (m_players.isEmpty()) {
       requestTransition(Stage.Idle);
-    } else {
-      BaseComponent[] message = new ComponentBuilder()
-        .append(p.getName()).bold(true)
-        .append("Has left the game").color(ChatColor.AQUA)
-        .create();
-      broadcastMessage(message);
     }
   }
 
@@ -545,13 +419,18 @@ public class GameRunner implements Instance {
 
   void broadcastTitle(String title, String subtitle) {
     for(Player p : m_players.getPlayers()) {
-      p.sendTitle(title, subtitle);
+      p.sendTitle(title, subtitle, 10, 70, 20);
     }
   }
 
-  void broadcastMessage(BaseComponent[] component) {
+  void broadcastMessage(String string) {
-    for(Player p : m_world.getPlayers()) {
+    World world = m_arena.getWorld();
-      p.spigot().sendMessage(component);
+    for(Player p : world.getPlayers()) {
+      p.sendMessage(string);
     }
   }
+
+  void registerSpawnedMob(Entity entity) {
+    m_mobs.addEntity(entity);
+  }
 }

src/main/java/gg/malloc/defense/engine/GameSpawner.java

@@ -1,58 +1,39 @@
 package gg.malloc.defense.engine;
 
 import gg.malloc.defense.model.Spawner;
-import gg.malloc.defense.model.Waypoint;
+import gg.malloc.defense.model.Spawnpoint;
 import gg.malloc.defense.model.Arena;
 
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Mob;
-import org.bukkit.World;
-import org.bukkit.Location;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.Material;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.attribute.AttributeModifier;
 
 public class GameSpawner implements Spawner {
   Arena m_arena;
   MobManager m_manager;
+  PlayerManager m_players;
+  LivingEntity m_bombTarget;
   int m_spawnIdx = 0;
-  World m_world;
 
-  public GameSpawner(World world, Arena arena, MobManager manager) {
+  public GameSpawner(Arena arena, MobManager manager, PlayerManager players, LivingEntity bombTarget) {
-    m_world = world;
     m_arena = arena;
     m_manager = manager;
+    m_players = players;
+    m_bombTarget = bombTarget;
   }
 
   @Override
-  public LivingEntity spawnBombCarrier(EntityType type) {
+  public Entity spawnMob(EntityType type) {
-    if (m_manager.bombCount() == 0) {
+    Spawnpoint[] spawnpoints = m_arena.spawnpoints();
-      return m_manager.addBombCarrier(spawnMob(type, MobManager.Goal.BombCarrier));
-    } else {
-      return spawnMob(type, MobManager.Goal.BombCarrier);
-    }
-  }
-
-  @Override
-  public LivingEntity spawnMob(EntityType type) {
-    return spawnMob(type, MobManager.Goal.PlayerHarassment);
-  }
-
-  public Mob spawnMob(EntityType type, MobManager.Goal goal) {
-    Waypoint[] spawnpoints = m_arena.spawnpoints();
     m_spawnIdx %= spawnpoints.length;
     //m_log.fine("Spawning " + type + " at " + spawnpoints[m_spawnIdx]);
-    Waypoint thisSpawner = spawnpoints[m_spawnIdx];
+    Entity newMob = m_arena.getWorld().spawnEntity(spawnpoints[m_spawnIdx].getLocation(), type);
-    Location loc = new Location(m_world, thisSpawner.getX(), thisSpawner.getY(), thisSpawner.getZ());
+    LivingEntity livingMob = (LivingEntity)newMob;
-    Mob newMob = (Mob)m_world.spawnEntity(loc, type);
+    livingMob.setRemoveWhenFarAway(false);
-    newMob.setRemoveWhenFarAway(false);
+    m_manager.addEntity(newMob);
-    m_manager.addEntity(newMob, goal);
     m_spawnIdx += 1;
+    ((Mob)newMob).setTarget(m_bombTarget);
     return newMob;
   }
 }

src/main/java/gg/malloc/defense/engine/GameState.java

@@ -1,89 +0,0 @@
-package gg.malloc.defense.engine;
-
-import gg.malloc.defense.model.Game;
-import gg.malloc.defense.model.Progress;
-import gg.malloc.defense.model.State;
-
-import org.bukkit.entity.Player;
-
-public class GameState implements State {
-  GameRunner m_runner;
-  WaveManager m_waves;
-  Game m_game;
-  MobManager m_mobs;
-  BombFuse m_fuse;
-  PlayerManager m_players;
-
-  int m_coinsDropped;
-  int m_coinsPickedUp;
-
-  public GameState(GameRunner runner, WaveManager waves, Game game, MobManager mobs, BombFuse fuse, PlayerManager players) {
-    m_runner = runner;
-    m_waves = waves;
-    m_game = game;
-    m_mobs = mobs;
-    m_fuse = fuse;
-    m_players = players;
-    m_coinsDropped = 0;
-    m_coinsPickedUp = 0;
-  }
-
-  public int getRemainingCoins() {
-    return coinsDropped() - coinsPickedUp();
-  }
-
-  public int coinsDropped() {
-    return m_coinsDropped;
-  }
-
-  public int coinsPickedUp() {
-    return m_coinsPickedUp;
-  }
-
-  int INITIAL_BALANCE = 1500;
-
-  public int getPlayerBalance(Player p) {
-    return coinsPickedUp() - m_players.getPlayerExpenses(p) + INITIAL_BALANCE;
-  }
-
-  public void addDroppedCoins(int v) {
-    m_coinsDropped += v;
-  }
-
-  public void addPickedUpCoins(int v) {
-    m_coinsPickedUp += v;
-  }
-
-  public void resetBalances() {
-    m_coinsDropped = 0;
-    m_coinsPickedUp = 0;
-  }
-
-  public Progress playerRespawnProgress(Player p) {
-    return m_players.getRespawnProgress(p);
-  }
-
-  public Progress coinProgress() {
-    return new StaticProgress(m_coinsPickedUp, m_coinsDropped);
-  }
-
-  public GameRunner.Stage getStage() {
-    return m_runner.getStage();
-  }
-
-  public Progress fuseProgress() {
-    return m_fuse;
-  }
-
-  public Progress waveProgress() {
-    return m_waves.asProgress();
-  }
-
-  public Progress mobProgress() {
-    return m_mobs;
-  }
-
-  public Progress playerReadyProgress() {
-    return m_players.readyProgress();
-  }
-}

src/main/java/gg/malloc/defense/engine/MobManager.java

@@ -1,85 +1,49 @@
 package gg.malloc.defense.engine;
 
 import java.util.HashSet;
-import java.util.HashMap;
 
-import org.bukkit.Location;
-import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.GameMode;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Mob;
 import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.inventory.EntityEquipment;
 
 import gg.malloc.defense.model.Game;
-import gg.malloc.defense.model.Progress;
-
-import gg.malloc.defense.ui.BombCarrier;
-import gg.malloc.defense.ui.Items;
-
-public class MobManager implements Progress {
-  LivingEntity m_bombTarget;
-  HashSet<Mob> m_livingMobs = new HashSet<>();
-  HashSet<Mob> m_bombCarriers = new HashSet<>();
-  HashSet<LivingEntity> m_droppedBombs = new HashSet<>();
-  HashMap<Mob, Goal> m_mobGoals = new HashMap<>();
-
-  public enum Goal {
-    BombCarrier,
-    PlayerHarassment
-  }
-
-  @Override
-  public int value() {
-    return m_killedMobs;
-  }
-
-  @Override
-  public int maximum() {
-    return m_createdMobs;
-  }
 
+public class MobManager {
+  HashSet<Entity> m_livingMobs = new HashSet<>();
   int m_createdMobs = 0;
   int m_killedMobs = 0;
 
+  Game m_game;
+
+  MobManager(Game game) {
+    m_game = game;
+  }
+
+  public void handleEntityDamage(EntityDamageEvent evt) {
+    Entity entity = evt.getEntity();
+    //m_log.info("Damage " + entity);
+    //m_log.info("Living Mobs " + m_livingMobs);
+    if (m_livingMobs.contains(entity)) {
+      m_game.onMobDamaged(entity);
+    }
+  }
+
   public boolean contains(Entity entity) {
     return m_livingMobs.contains(entity);
   }
 
-  public boolean isBombCarrier(Entity entity) {
-    return m_bombCarriers.contains(entity);
-  }
-
   public boolean killMob(Entity entity) {
     if (m_livingMobs.contains(entity)) {
       m_killedMobs += 1;
-      if (m_bombCarriers.remove(entity)) {
-        dropBomb(entity.getLocation());
-      }
       return m_livingMobs.remove(entity);
     }
     return false;
   }
 
   public void clear() {
-    for(Mob e : m_livingMobs) {
+    for(Entity e : m_livingMobs) {
       e.remove();
     }
-    for(LivingEntity e : m_droppedBombs) {
-      e.remove();
-    }
-    if (m_bombTarget != null) {
-      m_bombTarget.remove();
-    }
-    m_bombTarget = null;
-    m_droppedBombs.clear();
     m_livingMobs.clear();
-    m_bombCarriers.clear();
     m_createdMobs = 0;
     m_killedMobs = 0;
   }
@@ -100,160 +64,13 @@ public class MobManager implements Progress {
     return (double)m_killedMobs / (double)m_createdMobs;
   }
 
-  Player getNearestPlayer(Location location) {
+  public void addEntity(Entity entity) {
-    Player nearestPlayer = null;
+    //m_log.fine("Registered new mob " + entity); 
-    for(Player p : location.getWorld().getPlayers()) {
-      if (p.getGameMode() == GameMode.SPECTATOR) {
-        continue;
-      } else if (nearestPlayer == null) {
-        nearestPlayer = p;
-      } else if (location.distance(p.getLocation()) < location.distance(nearestPlayer.getLocation())) {
-        nearestPlayer = p;
-      }
-    }
-    return nearestPlayer;
-  }
-
-  LivingEntity getNearestBombObjective(Location location) {
-    LivingEntity nearest = null;
-    if (m_droppedBombs.size() > 0) {
-      for(LivingEntity ent : m_droppedBombs) {
-        if (nearest == null) {
-          nearest = ent;
-        } else if (location.distance(ent.getLocation()) < location.distance(nearest.getLocation())) {
-          nearest = ent;
-        }
-      }
-    } else if (m_bombCarriers.size() > 0) {
-      for(LivingEntity ent : m_bombCarriers) {
-        if (nearest == null) {
-          nearest = ent;
-        } else if (location.distance(ent.getLocation()) < location.distance(nearest.getLocation())) {
-          nearest = ent;
-        }
-      }
-    }
-    if (nearest == null) {
-      nearest = m_bombTarget;
-    }
-    return nearest;
-  }
-  
-  Player getBiggestPlayerThreat(Location location) {
-    Entity mostImportantObjective = getNearestBombObjective(location);
-    return getNearestPlayer(mostImportantObjective.getLocation());
-  }
-
-  LivingEntity getMobTarget(Mob mob) {
-    switch(m_mobGoals.get(mob)) {
-      case PlayerHarassment:
-        if (mob.getTarget() instanceof Player) {
-          return mob.getTarget();
-        } else {
-          Player nearestThreat = getBiggestPlayerThreat(mob.getLocation());
-          return nearestThreat;
-        }
-      case BombCarrier:
-        if (m_bombCarriers.contains(mob)) {
-          return m_bombTarget;
-        } else if (m_droppedBombs.size() > 0) {
-          return m_droppedBombs.iterator().next();
-        } else {
-          return getBiggestPlayerThreat(mob.getLocation());
-        }
-      default:
-        return m_bombTarget;
-    }
-  }
-
-  public void addEntity(Mob entity, Goal goal) {
     m_livingMobs.add(entity);
-    m_mobGoals.put(entity, goal);
-    entity.setTarget(getMobTarget(entity));
     m_createdMobs += 1;
   }
 
-  public int bombCount() {
-    return m_bombCarriers.size() + m_droppedBombs.size();
-  }
-
-  public Mob addBombCarrier(Mob entity) {
-    m_bombCarriers.add(entity);
-    entity.setTarget(m_bombTarget);
-    return (Mob)(new BombCarrier(entity).inHand());
-  }
-
-  public void removeBombCarrier(Mob entity) {
-    m_bombCarriers.remove(entity);
-  }
-
   public boolean empty() {
     return m_livingMobs.size() == 0;
   }
-
-  public LivingEntity dropBomb(Location location) {
-    ArmorStand droppedBomb = (ArmorStand)(new BombCarrier((LivingEntity)location.getWorld().spawnEntity(location, EntityType.ARMOR_STAND)).onHead());
-    droppedBomb.setCustomName("The Bomb");
-    droppedBomb.setVisible(false);
-    droppedBomb.setCustomNameVisible(true);
-    droppedBomb.setGlowing(true);
-    m_droppedBombs.add(droppedBomb);
-    for(Mob ent : m_livingMobs) {
-      if (!m_bombCarriers.contains(ent)) {
-        ent.setTarget(getMobTarget(ent));
-      }
-    }
-    return droppedBomb;
-  }
-
-  boolean m_bombWasHit = false;
-
-  public boolean bombWasHit() {
-    return m_bombWasHit;
-  }
-
-  public void handleEntityDamage(EntityDamageEvent evt) {
-    Entity entity = evt.getEntity();
-    m_bombWasHit = false;
-
-    if (entity == m_bombTarget && evt instanceof EntityDamageByEntityEvent) {
-      EntityDamageByEntityEvent entityEvt = (EntityDamageByEntityEvent)evt;
-      evt.setCancelled(true);
-      if (m_bombCarriers.contains(entityEvt.getDamager())) {
-        m_bombWasHit = true;
-      }
-    } if (m_droppedBombs.contains(entity)) {
-      evt.setCancelled(true);
-      EntityDamageByEntityEvent entityEvt = (EntityDamageByEntityEvent)evt;
-      if (m_livingMobs.contains(entityEvt.getDamager())) {
-        evt.getEntity().remove();
-        m_droppedBombs.remove(evt.getEntity());
-        addBombCarrier((Mob)entityEvt.getDamager());
-        for(Mob ent : m_livingMobs) {
-          ent.setTarget(getMobTarget(ent));
-        }
-      }
-    } else if (m_livingMobs.contains(evt.getEntity())) {
-      //m_game.onMobDamaged(evt.getEntity());
-    }
-  }
-
-  public LivingEntity spawnTarget(Location location) {
-    assert(m_bombTarget == null);
-    m_bombTarget = (LivingEntity)location.getWorld().spawnEntity(location, EntityType.ARMOR_STAND);
-    ArmorStand bombStand = (ArmorStand)m_bombTarget;
-    bombStand.setCustomName("Bomb Target");
-    bombStand.setVisible(false);
-    bombStand.setCustomNameVisible(true);
-    bombStand.setGlowing(true);
-    EntityEquipment equipment = bombStand.getEquipment();
-    equipment.setHelmet(Items.makeBombTarget());
-    return m_bombTarget;
-  }
-
-  public void handleEntityRetarget(EntityTargetEvent evt) {
-    if (m_livingMobs.contains(evt.getEntity())) {
-      evt.setTarget(getMobTarget((Mob)evt.getEntity()));
-    }
-  }
 }

src/main/java/gg/malloc/defense/engine/PlayerManager.java

@@ -5,10 +5,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.scoreboard.ScoreboardManager;
-
-import gg.malloc.defense.ui.Sidebar;
-import gg.malloc.defense.model.Progress;
 
 import java.util.HashMap;
 import java.util.Collection;
@@ -16,8 +12,6 @@ import java.util.Collection;
 public class PlayerManager {
   HashMap<Player, State> m_playerStates = new HashMap<>();
   HashMap<Player, Boolean> m_playerReadyStates = new HashMap<>();
-  HashMap<Player, Integer> m_playerExpenses = new HashMap<>();
-  HashMap<Player, Integer> m_respawnCounters = new HashMap<>();
 
   public enum State {
     Idle,
@@ -33,10 +27,6 @@ public class PlayerManager {
     return allSuccess;
   }
 
-  public boolean contains(Player player) {
-    return m_playerStates.containsKey(player);
-  }
-
   public boolean requestTransition(Player player, State toState) {
     State currentState = m_playerStates.get(player);
     if (currentState == toState) {
@@ -63,29 +53,25 @@ public class PlayerManager {
     return true;
   }
 
-  public void healPlayer(Player player) {
-    player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());
-    player.setFoodLevel(40);
-  }
-
   // Respawn player
   public boolean enterPlaying(Player player) {
+    //m_log.fine("Respawning player " + player);
     player.setGameMode(Bukkit.getDefaultGameMode());
-    healPlayer(player);
+    player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());
+    player.setFoodLevel(10);
     return true;
   }
 
   public boolean enterDead(Player player) {
+    //m_log.info("Player has died in game" + player);
     player.setGameMode(GameMode.SPECTATOR);
-    m_respawnCounters.put(player, 15);
     return true;
   }
 
   public void addPlayer(Player player) {
+    //m_log.info("Adding player " + player); 
     m_playerStates.put(player, State.Idle);
     m_playerReadyStates.put(player, false);
-    m_playerExpenses.put(player, 0);
-    m_respawnCounters.put(player, 0);
   }
 
   public boolean isReady(Player player) {
@@ -96,14 +82,14 @@ public class PlayerManager {
     m_playerReadyStates.put(player, ready);
   }
 
-  public Progress readyProgress() {
+  public double readyProgress() {
     int readyNum = 0;
     for(boolean b : m_playerReadyStates.values()) {
       if (b) {
         readyNum += 1;
       }
     }
-    return new StaticProgress(readyNum, m_playerReadyStates.size());
+    return (double)readyNum / (double)m_playerReadyStates.size();
   }
 
   public boolean isEveryoneReady() {
@@ -113,53 +99,12 @@ public class PlayerManager {
       }
     }
     return true;
-  
-  }
-
-  public Progress getRespawnProgress(Player player) {
-    return new StaticProgress(m_respawnCounters.get(player), 15);
-  }
-
-  public int getRespawnCounter(Player player) {
-    if (m_respawnCounters.containsKey(player)) {
-      return m_respawnCounters.get(player);
-    } else {
-      return 0;
-    }
-  }
-
-  public void tickRespawnCounters() {
-    for(Player p : m_respawnCounters.keySet()) {
-      if (m_respawnCounters.get(p) > 0) {
-        m_respawnCounters.put(p, m_respawnCounters.get(p) - 1);
-      }
-    }
-  }
-
-  public boolean readyToRespawn(Player player) {
-    return m_respawnCounters.get(player) == 0 && m_playerStates.get(player) == State.Dead;
-  }
-
-  public void addPlayerExpenses(Player player, int amount) {
-    if (m_playerExpenses.containsKey(player)) {
-      m_playerExpenses.put(player, m_playerExpenses.get(player) + amount);
-    }
-  }
-
-  public int getPlayerExpenses(Player player) {
-    if (m_playerExpenses.containsKey(player)) {
-      return m_playerExpenses.get(player);
-    }
-    return 0;
   }
 
   public boolean removePlayer(Player player) {
-    healPlayer(player);
+    //m_log.info("Removing player " + player); 
     requestTransition(player, State.Idle);
     m_playerStates.remove(player);
-    m_playerReadyStates.remove(player);
-    m_playerExpenses.remove(player);
-    m_respawnCounters.remove(player);
     return true;
   }
 

src/main/java/gg/malloc/defense/engine/StaticProgress.java

@@ -1,21 +0,0 @@
-package gg.malloc.defense.engine;
-
-import gg.malloc.defense.model.Progress;
-
-public class StaticProgress implements Progress {
-  int m_value;
-  int m_maximum;
-
-  public StaticProgress(int value, int maximum) {
-    m_value = value;
-    m_maximum = maximum;
-  }
-
-  public int value() {
-    return m_value;
-  }
-
-  public int maximum() {
-    return m_maximum;
-  }
-}

src/main/java/gg/malloc/defense/engine/TickTask.java

@@ -1,40 +0,0 @@
-package gg.malloc.defense.engine;
-
-import gg.malloc.defense.Plugin;
-import org.bukkit.scheduler.BukkitTask;
-
-public class TickTask {
-  Runnable m_runnable;
-  int m_interval;
-  BukkitTask m_task = null;
-  Plugin m_plugin;
-  boolean m_cancelled = false;
-
-  public TickTask(Plugin plugin, Runnable runnable, int interval) {
-    m_plugin = plugin;
-    m_runnable = runnable;
-    m_interval = interval;
-  }
-
-  public void start() {
-    m_cancelled = false;
-    if (m_task == null) {
-      tick();
-    }
-  }
-
-  private void tick() {
-    m_runnable.run();
-    if (!m_cancelled) {
-      m_task = m_plugin.getServer().getScheduler().runTaskLater(m_plugin, () -> {tick();}, m_interval);
-    }
-  }
-
-  void stop() {
-    m_cancelled = true;
-    if (m_task != null) {
-      m_task.cancel();
-      m_task = null;
-    }
-  }
-}

src/main/java/gg/malloc/defense/engine/WaveManager.java

@@ -1,56 +0,0 @@
-package gg.malloc.defense.engine;
-
-import gg.malloc.defense.model.Wave;
-import gg.malloc.defense.model.Game;
-import gg.malloc.defense.model.Progress;
-
-public class WaveManager {
-  int m_currentWaveNum = 0;
-  int m_currentBatch = 0;
-  Wave m_currentWave = null;
-  Game m_game;
-
-  public Progress asProgress() {
-    return new StaticProgress(m_currentWaveNum, m_game.getWaveCount());
-  }
-
-  public WaveManager(Game game) {
-    m_game = game;
-  }
-
-  public void reset() {
-    m_currentWaveNum = 0;
-    m_currentBatch = 0;
-    m_currentWave = null;
-  }
-
-  public Wave currentWave() {
-    return m_currentWave;
-  }
-
-  public int currentWaveNum() {
-    return m_currentWaveNum;
-  }
-
-  public int currentBatchNum() {
-    return m_currentBatch;
-  }
-
-  public boolean isLastWave() {
-    return m_currentWaveNum >= m_game.getWaveCount();
-  }
-
-  public boolean isLastBatch() {
-    return m_currentBatch >= m_currentWave.batchCount();
-  }
-
-  public void nextBatch() {
-    m_currentBatch += 1;
-  }
-
-  public void next() {
-    m_currentWaveNum += 1;
-    m_currentBatch = 0;
-    m_currentWave = m_game.getWave(m_currentWaveNum);
-  }
-}

src/main/java/gg/malloc/defense/games/ScaledWaves.java

@@ -6,9 +6,6 @@ import gg.malloc.defense.model.Spawner;
 
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Mob;
-import org.bukkit.attribute.AttributeModifier;
-import org.bukkit.attribute.Attribute;
 
 import java.util.HashMap;
 
@@ -46,7 +43,7 @@ public class ScaledWaves implements Game {
 
     MobWave(HashMap<EntityType, Double> weights, int totalCount, int batches, boolean hasRavager) {
       m_batches = batches;
-      m_mobsPerBatch = Math.max(1, totalCount / batches) * 3;
+      m_mobsPerBatch = Math.max(1, totalCount / batches);
       m_spawnWeights = weights;
       m_hasRavager = hasRavager;
     }
@@ -58,8 +55,6 @@ public class ScaledWaves implements Game {
 
     @Override
     public void spawnBatch(Spawner spawner, int batch) {
-      double healthScale = -0.7;
-      AttributeModifier modifier = new AttributeModifier("Scaled Health", healthScale, AttributeModifier.Operation.MULTIPLY_SCALAR_1);
       assert(m_mobsPerBatch > 0);
       for(int i = 0; i < m_mobsPerBatch; i++) {
         EntityType selectedType = null;
@@ -72,13 +67,7 @@ public class ScaledWaves implements Game {
           }
         }
         assert(selectedType != null);
-        Mob newMob;
+        Entity newMob = spawner.spawnMob(selectedType);
-        if (selectedType == EntityType.ZOMBIE) {
-          newMob = (Mob)spawner.spawnBombCarrier(selectedType);
-          newMob.getAttribute(Attribute.GENERIC_MAX_HEALTH).addModifier(modifier);
-        } else {
-          newMob = (Mob)spawner.spawnMob(selectedType);
-        }
         newMob.setCustomName("Mob " + i + "/" + m_mobsPerBatch);
       }
       if (m_hasRavager) {

src/main/java/gg/malloc/defense/model/Arena.java

@@ -3,6 +3,8 @@ package gg.malloc.defense.model;
 import org.bukkit.World;
 
 public interface Arena {
-  Waypoint[] spawnpoints();
+  World getWorld();
-  Waypoint bombTarget();
+  String name();
+  Spawnpoint[] spawnpoints();
+  Spawnpoint bombTarget();
 }

src/main/java/gg/malloc/defense/model/Game.java

@@ -1,6 +1,8 @@
 package gg.malloc.defense.model;
+import org.bukkit.entity.Entity;
 
 public interface Game {
   int getWaveCount();
   Wave getWave(int waveNumber);
+  default void onMobDamaged(Entity entity) {}
 }

src/main/java/gg/malloc/defense/model/Instance.java

@@ -1,26 +0,0 @@
-package gg.malloc.defense.model;
-
-import java.util.Collection;
-import java.util.UUID;
-
-import org.bukkit.entity.Player;
-
-public interface Instance {
-  public enum Stage {
-    Idle,
-    Warmup,
-    Countdown,
-    Playing,
-    GameOver
-  }
-
-  UUID getId();
-  Stage getStage();
-  boolean requestTransition(Stage stage);
-  State getState();
-  void addPlayer(Player p);
-  void removePlayer(Player p);
-  Collection<Player> getPlayers();
-  void togglePlayerReady(Player p);
-  void spendMoney(Player p, int amount);
-}

src/main/java/gg/malloc/defense/model/Progress.java

@@ -1,13 +0,0 @@
-package gg.malloc.defense.model;
-
-public interface Progress {
-
-  int value();
-  int maximum();
-  default int remaining() {
-    return maximum() - value();
-  }
-  default double toDouble() {
-    return Math.min(maximum(), Math.max(0.0, value())) / maximum();
-  }
-}

src/main/java/gg/malloc/defense/model/Spawner.java

@@ -1,9 +1,8 @@
 package gg.malloc.defense.model;
 
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Entity;
 
 public interface Spawner {
-  LivingEntity spawnMob(EntityType type);
+  Entity spawnMob(EntityType type);
-  LivingEntity spawnBombCarrier(EntityType type);
 }

src/main/java/gg/malloc/defense/model/Spawnpoint.java

@@ -0,0 +1,9 @@
+package gg.malloc.defense.model;
+
+import org.bukkit.Location;
+
+public interface Spawnpoint {
+  Location getLocation();
+  String getName();
+  String getID();
+}

src/main/java/gg/malloc/defense/model/State.java

@@ -1,16 +0,0 @@
-package gg.malloc.defense.model;
-
-import org.bukkit.entity.Player;
-
-public interface State {
-  Instance.Stage getStage();
-
-  Progress fuseProgress();
-  Progress waveProgress();
-  Progress mobProgress();
-  Progress playerReadyProgress();
-  Progress coinProgress();
-
-  Progress playerRespawnProgress(Player p);
-  int getPlayerBalance(Player p);
-}

src/main/java/gg/malloc/defense/model/Waypoint.java

@@ -1,18 +0,0 @@
-package gg.malloc.defense.model;
-
-public class Waypoint {
-  double m_x;
-  double m_y;
-  double m_z;
-  String m_name;
-
-  public Waypoint(double x, double y, double z) {
-    m_x = x;
-    m_y = y;
-    m_z = z;
-  }
-
-  public double getX() { return m_x; }
-  public double getY() { return m_y; }
-  public double getZ() { return m_z; }
-}

src/main/java/gg/malloc/defense/ui/BombCarrier.java

@@ -1,27 +0,0 @@
-package gg.malloc.defense.ui;
-
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.Material;
-
-public class BombCarrier {
-  LivingEntity m_entity;
-
-  public BombCarrier(LivingEntity entity) {
-    m_entity = entity;
-  }
-
-  public LivingEntity inHand() {
-    EntityEquipment equipment = m_entity.getEquipment();
-    equipment.setItemInOffHand(Items.makeBombHelmet());
-    return m_entity;
-  }
-
-  public LivingEntity onHead() {
-    EntityEquipment equipment = m_entity.getEquipment();
-    equipment.setHelmet(Items.makeBombHelmet());
-    return m_entity;
-  }
-}

src/main/java/gg/malloc/defense/ui/BossBars.java

@@ -1,126 +0,0 @@
-package gg.malloc.defense.ui;
-
-import gg.malloc.defense.model.Game;
-import gg.malloc.defense.model.State;
-import gg.malloc.defense.model.Progress;
-
-import java.util.HashMap;
-
-import org.bukkit.boss.BossBar;
-import org.bukkit.boss.BarStyle;
-import org.bukkit.boss.BarColor;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class BossBars {
-  BossBar m_gameBar = Bukkit.createBossBar("Malloc Defense", BarColor.PURPLE, BarStyle.SOLID);
-  BossBar m_waveBar = Bukkit.createBossBar("Malloc Defense", BarColor.PURPLE, BarStyle.SOLID);
-  BossBar m_bombBar = Bukkit.createBossBar("Bomb Fuse", BarColor.RED, BarStyle.SOLID);
-  HashMap<Player, BossBar> m_respawnBars = new HashMap<>();
-
-  State m_gameState;
-
-  double m_countdownProgress;
-
-  public void setCountdownProgress(double v) {
-    m_countdownProgress = v;
-  }
-
-  public BossBars(State gameState) {
-    m_gameState = gameState;
-    m_gameBar.setVisible(true);
-    m_waveBar.setVisible(false);
-    m_bombBar.setVisible(false);
-  }
-
-  public void addPlayer(Player p) {
-    m_gameBar.addPlayer(p);
-    m_waveBar.addPlayer(p);
-    m_bombBar.addPlayer(p);
-    BossBar respawnBar = Bukkit.createBossBar("Respawn", BarColor.BLUE, BarStyle.SOLID);
-    respawnBar.addPlayer(p);
-    respawnBar.setVisible(false);
-    m_respawnBars.put(p, respawnBar);
-  }
-
-  public void removePlayer(Player p) {
-    m_gameBar.removePlayer(p);
-    m_waveBar.removePlayer(p);
-    m_bombBar.removePlayer(p);
-    if (m_respawnBars.containsKey(p)) {
-      m_respawnBars.get(p).removePlayer(p);
-      m_respawnBars.remove(p);
-    }
-  }
-
-  public void update() {
-    switch(m_gameState.getStage()) {
-      case Idle:
-        m_gameBar.setProgress(1.0);
-        m_gameBar.setTitle("Waiting for players...");
-        m_gameBar.setColor(BarColor.PURPLE);
-        m_waveBar.setVisible(false);
-        m_bombBar.setVisible(false);
-        break;
-      case Warmup:
-        m_gameBar.setProgress(m_gameState.waveProgress().toDouble());
-        m_gameBar.setTitle("Wave " + m_gameState.waveProgress().value() + " / " + m_gameState.waveProgress().maximum());
-        m_gameBar.setColor(BarColor.PURPLE);
-        m_waveBar.setVisible(true);
-        m_waveBar.setColor(BarColor.BLUE);
-        m_waveBar.setTitle("Warmup - Waiting for players to get ready...");
-        m_waveBar.setProgress(m_gameState.playerReadyProgress().toDouble());
-        m_bombBar.setVisible(false);
-        break;
-      case Countdown:
-        m_gameBar.setProgress(m_gameState.waveProgress().toDouble());
-        m_gameBar.setTitle("Wave " + m_gameState.waveProgress().value() + " / " + m_gameState.waveProgress().maximum());
-        m_gameBar.setColor(BarColor.PURPLE);
-        m_waveBar.setVisible(true);
-        m_waveBar.setColor(BarColor.YELLOW);
-        m_waveBar.setTitle("Wave starting!");
-        m_waveBar.setProgress(m_countdownProgress);
-        m_bombBar.setVisible(false);
-        break;
-      case Playing:
-        m_gameBar.setProgress(m_gameState.waveProgress().toDouble());
-        m_gameBar.setTitle("Wave " + m_gameState.waveProgress().value() + " / " + m_gameState.waveProgress().maximum());
-        m_gameBar.setColor(BarColor.PURPLE);
-        if (m_gameState.mobProgress().maximum() > 0) {
-          m_waveBar.setVisible(true);
-          m_waveBar.setColor(BarColor.GREEN);
-          m_waveBar.setTitle("Mobs remaining: " + (m_gameState.mobProgress().maximum() - m_gameState.mobProgress().value()));
-          m_waveBar.setProgress(m_gameState.mobProgress().toDouble());
-        } else {
-          m_waveBar.setVisible(false);
-        }
-        if (m_gameState.fuseProgress().value() > 0) {
-          m_bombBar.setVisible(true);
-          m_bombBar.setProgress(1.0 - m_gameState.fuseProgress().toDouble());
-        } else {
-          m_bombBar.setVisible(false);
-        }
-        break;
-      case GameOver:
-        m_gameBar.setColor(BarColor.RED);
-        m_gameBar.setProgress(1.0);
-        m_gameBar.setTitle("Game Over!");
-        m_waveBar.setVisible(true);
-        m_waveBar.setColor(BarColor.BLUE);
-        m_waveBar.setTitle("Returning to lobby...");
-        m_waveBar.setProgress(m_countdownProgress);
-        m_bombBar.setVisible(false);
-        break;
-    }
-    for (Player p : m_respawnBars.keySet()) {
-      Progress respawnProgress = m_gameState.playerRespawnProgress(p);
-      if (respawnProgress.value() > 0) {
-        m_respawnBars.get(p).setVisible(true);
-        m_respawnBars.get(p).setProgress(respawnProgress.toDouble());
-        m_respawnBars.get(p).setTitle("Respawning in " + respawnProgress.value());
-      } else {
-        m_respawnBars.get(p).setVisible(false);
-      }
-    }
-  }
-}

src/main/java/gg/malloc/defense/ui/Items.java

@@ -1,38 +0,0 @@
-package gg.malloc.defense.ui;
-
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.Material;
-
-import de.tr7zw.nbtapi.NBTItem;
-import de.tr7zw.nbtapi.NBTCompound;
-
-public class Items {
-  public static ItemStack makeCoins() {
-      ItemStack coinItem = new ItemStack(Material.IRON_NUGGET);
-      ItemMeta meta = coinItem.getItemMeta();
-      meta.setCustomModelData(93197);
-      coinItem.setItemMeta(meta);
-
-      NBTItem nbt = new NBTItem(coinItem);
-      nbt.addCompound("malloc").setInteger("coinValue", 1);
-
-      return nbt.getItem();
-  }
-
-  public static ItemStack makeBombHelmet() {
-      ItemStack bombItem = new ItemStack(Material.CARVED_PUMPKIN);
-      ItemMeta meta = bombItem.getItemMeta();
-      meta.setCustomModelData(33197);
-      bombItem.setItemMeta(meta);
-      return bombItem;
-  }
-
-  public static ItemStack makeBombTarget() {
-      ItemStack bombItem = new ItemStack(Material.CARVED_PUMPKIN);
-      ItemMeta meta = bombItem.getItemMeta();
-      meta.setCustomModelData(35197);
-      bombItem.setItemMeta(meta);
-      return bombItem;
-  }
-}

src/main/java/gg/malloc/defense/ui/Sidebar.java

@@ -1,94 +0,0 @@
-package gg.malloc.defense.ui;
-
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import gg.malloc.defense.model.State;
-
-import org.bukkit.ChatColor;
-import org.bukkit.scoreboard.Scoreboard;
-import org.bukkit.scoreboard.DisplaySlot;
-import org.bukkit.scoreboard.Score;
-import org.bukkit.scoreboard.Team;
-import org.bukkit.scoreboard.Objective;
-import org.bukkit.entity.Player;
-
-public class Sidebar {
-  Scoreboard m_scoreboard;
-  Objective m_objective;
-  ArrayList<String> m_rowKeys;
-  HashMap<Integer, String> m_rows;
-  ArrayList<Team> m_teams;
-  Player m_player;
-  int m_size;
-
-  State m_state;
-
-  public Sidebar(State state, Scoreboard scoreboard, Player player) {
-    m_state = state;
-    m_player = player;
-    m_scoreboard = scoreboard;
-    m_objective = m_scoreboard.registerNewObjective("text", "dummy", ChatColor.LIGHT_PURPLE + "" + ChatColor.BOLD + "Malloc Defense");
-    m_objective.setDisplaySlot(DisplaySlot.SIDEBAR);
-    m_rowKeys = new ArrayList<>();
-    m_rows = new HashMap<>();
-    m_teams = new ArrayList<>();
-    m_rowKeys.add(ChatColor.BLACK + "" + ChatColor.WHITE);
-    m_rowKeys.add(ChatColor.GOLD+ "" + ChatColor.WHITE);
-    m_rowKeys.add(ChatColor.WHITE+ "" + ChatColor.WHITE);
-    m_rowKeys.add(ChatColor.BLACK+ "" + ChatColor.BLACK);
-    for(String key : m_rowKeys) {
-      Team team = m_scoreboard.registerNewTeam(key);
-      team.addEntry(key);
-      m_teams.add(team);
-    }
-  }
-
-  public void update() {
-    switch(m_state.getStage()) {
-      case Idle:
-        m_rows.put(0, ChatColor.LIGHT_PURPLE + "Waiting for players...");
-        m_size = 1;
-        break;
-      case Warmup:
-        m_rows.put(0, ChatColor.LIGHT_PURPLE + "Wave " + m_state.waveProgress().value() + " / " + m_state.waveProgress().maximum());
-        m_rows.put(1, ChatColor.AQUA + "Get ready!");
-        m_rows.put(2, ChatColor.AQUA + "Balance: " + m_state.getPlayerBalance(m_player));
-        m_rows.put(3, ChatColor.AQUA + "Coins remaining: " + m_state.coinProgress().remaining());
-        m_size = 4;
-        break;
-      case Countdown:
-        m_rows.put(0, ChatColor.LIGHT_PURPLE + "Wave " + m_state.waveProgress().value() + " / " + m_state.waveProgress().maximum());
-        m_rows.put(1, ChatColor.GOLD + "Wave incoming!");
-        m_rows.put(2, ChatColor.AQUA + "Balance: " + m_state.getPlayerBalance(m_player));
-        m_rows.put(3, ChatColor.AQUA + "Coins remaining: " + m_state.coinProgress().remaining());
-        m_size = 4;
-        break;
-      case Playing:
-        m_rows.put(0, ChatColor.LIGHT_PURPLE + "Wave " + m_state.waveProgress().value() + " / " + m_state.waveProgress().maximum());
-        m_rows.put(1, ChatColor.GREEN + "Mobs remaining: " + m_state.mobProgress().remaining());
-        m_rows.put(2, ChatColor.AQUA + "Balance: " + m_state.getPlayerBalance(m_player));
-        m_rows.put(3, ChatColor.AQUA + "Coins remaining: " + m_state.coinProgress().remaining());
-        m_size = 4;
-        break;
-      case GameOver:
-        m_rows.put(0, ChatColor.RED + "Game over!");
-        m_size = 1;
-    }
-
-    for(int i = 0; i < Math.min(m_size, m_rowKeys.size()); i++) {
-      Score rowScore = m_objective.getScore(m_rowKeys.get(i));
-      rowScore.setScore(m_rowKeys.size() - i);
-      if (m_rows.containsKey(i)) {
-        m_teams.get(i).setPrefix(m_rows.get(i));
-      } else {
-        m_teams.get(i).setPrefix("");
-      }
-    }
-  }
-
-  public Scoreboard getScoreboard() {
-    return m_scoreboard;
-  }
-}

src/main/java/gg/malloc/defense/ui/Sidebars.java

@@ -1,35 +0,0 @@
-package gg.malloc.defense.ui;
-
-import org.bukkit.entity.Player;
-import org.bukkit.scoreboard.ScoreboardManager;
-
-import java.util.HashMap;
-
-import gg.malloc.defense.model.State;
-
-public class Sidebars {
-  State m_state;
-  ScoreboardManager m_scoreboards;
-  HashMap<Player, Sidebar> m_sidebars = new HashMap<>();
-
-  public Sidebars(State state, ScoreboardManager scoreboards) {
-    m_state = state;
-    m_scoreboards = scoreboards;
-  }
-
-  public void addPlayer(Player player) {
-    m_sidebars.put(player, new Sidebar(m_state, m_scoreboards.getNewScoreboard(), player));
-    player.setScoreboard(m_sidebars.get(player).getScoreboard());
-  }
-
-  public void removePlayer(Player player) {
-    m_sidebars.remove(player);
-    player.setScoreboard(m_scoreboards.getMainScoreboard());
-  }
-
-  public void update() {
-    for(Player p : m_sidebars.keySet()) {
-      m_sidebars.get(p).update();
-    }
-  }
-}

src/main/resources/config.yml

@@ -1,18 +0,0 @@
-lobby:
-  world: world
-maps:
-  quarry:
-    target:
-      x: -20.0
-      y: 80.0
-      z: 31.0
-    spawnpoints:
-      - x: -15.0
-        y: 80.0
-        z: -46.0
-      - x: -1.0
-        y: 80.0
-        z: -45.0
-      - x: 12.0
-        y: 81.0
-        z: -42.0

src/main/resources/plugin.yml

@@ -2,21 +2,13 @@ name: Malloc-Defense
 version: 1.0
 api-version: 1.18
 main: gg.malloc.defense.Plugin
-depend:  [Vault]
+depend:  []
 commands:
-  ready:
-    description: Mark yourself as ready for the next wave
-  list:
-    description: List games
-  join:
-    description: Join a game
-  leave:
-    description: Leave a game
-  reload:
-    description: Reload the configuration
   setstage:
     description: Sets a game stage
   addplayer:
     description: Adds a player to a game
   debuginfo:
     description: Unknowable powers
+  ready:
+    description: Mark yourself as ready for the next wave