Refactored to use states

Various other refactoring, no functional differences

core/src/com/me/brickbuster/BrickBuster.java

@@ -1,207 +1,38 @@
 package com.me.brickbuster;
 
-import com.badlogic.gdx.ApplicationAdapter;
+import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import com.badlogic.gdx.math.MathUtils;
+import com.me.brickbuster.state.PlayState;
-import com.badlogic.gdx.math.Vector2;
-import com.me.brickbuster.entity.*;
-import com.me.brickbuster.entity.powerup.*;
 
-import java.util.*;
+public class BrickBuster extends Game {
-
-public class BrickBuster extends ApplicationAdapter {
 
 	public static final int WIDTH = 800;
 	public static final int HEIGHT = 600;
 	public static final String TITLE = "Brick Buster";
 
-	public static final Vector2 HORIZONTAL_EDGE = new Vector2(1, 0);
+	public BitmapFont font;
-	public static final Vector2 VERTICAL_EDGE = new Vector2(0, 1);
+	public SpriteBatch sb;
-
+	public ShapeRenderer sr;
-	public static final int SHIELD_HEIGHT = 5;
-	public static final float POWERUP_CHANCE = 0.15f;
-
-	private static final Map<Class<? extends PowerUp>, Integer> powerUpWeights;
-	private static final int weightSum;
-
-	private BitmapFont font;
-	private SpriteBatch batch;
-	private ShapeRenderer sr;
-
-	private Paddle paddle;
-	private ArrayList<Ball> balls;
-	private ArrayList<Brick> bricks;
-	private ArrayList<PowerUp> powerUps;
-
-	private int shieldCount = 0;
 
 	@Override
 	public void create () {
 		font = new BitmapFont();
-		batch = new SpriteBatch();
+		sb = new SpriteBatch();
 		sr = new ShapeRenderer();
 
-		paddle = new Paddle(this);
+		setScreen(new PlayState(this));
-
-		powerUps = new ArrayList<PowerUp>();
-
-		bricks = new ArrayList<Brick>();
-		for (int col = 0; col < 13; col++) {
-			for (int row = 0; row < 7; row++) {
-				int x = 15 + (col * (Brick.BLOCK_WIDTH + 10));
-				int y = 15 + Brick.BLOCK_HEIGHT + (row * (Brick.BLOCK_HEIGHT + 10));
-				Class<? extends PowerUp> powerUpType = null;
-				if (MathUtils.randomBoolean(POWERUP_CHANCE)) {
-					powerUpType = getWeightedPowerUp();
-				}
-				bricks.add(new Brick(this, powerUpType, x, HEIGHT - y));
-			}
-		}
-
-		balls = new ArrayList<Ball>();
-		balls.add(new Ball(this));
 	}
 
 	@Override
 	public void render () {
 		Gdx.gl.glClearColor(0.5f,1,1,1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-
+		// Render the current Screen (State)
-
+		super.render();
-		long start_update = System.nanoTime();
-		update(Gdx.graphics.getDeltaTime());
-		long finish_update = System.nanoTime() - start_update;
-
-		long start_render = System.nanoTime();
-		for (Brick block : bricks) {
-			block.render(sr);
-		}
-		for (PowerUp powerUp : powerUps) {
-			powerUp.render(sr);
-		}
-		for (Ball ball : balls) {
-			ball.render(sr);
-		}
-		paddle.render(sr);
-
-		if (getShieldCount() > 0) {
-			sr.begin(ShapeRenderer.ShapeType.Filled);
-			sr.setColor(Color.SALMON);
-			sr.rect(0, 0, WIDTH, getShieldCount() * SHIELD_HEIGHT);
-			sr.end();
-		}
-
-		long finish_render = System.nanoTime() - start_render;
-
-		batch.begin();
-		//batch.setColor(Color.BLACK);
-		font.draw(batch, String.format("FPS: %d Update: %.2f ms Render: %.2f ms",
-				Gdx.graphics.getFramesPerSecond(), finish_update/1000000f, finish_render/1000000f), 0, 13);
-		batch.end();
 	}
 
-	public void update(float dt) {
+}
-		for (Iterator<Ball> it = balls.iterator(); it.hasNext();) {
-			Ball ball = it.next();
-			ball.update(dt);
-			if (ball.isDead()) {
-				it.remove();
-			}
-		}
-
-		if (balls.isEmpty()) {
-			reset();
-		}
-
-		paddle.update(dt);
-
-		for (Iterator<PowerUp> it = powerUps.iterator(); it.hasNext();) {
-			PowerUp powerUp = it.next();
-			powerUp.update(dt);
-			if(powerUp.isCaught()) {
-				it.remove();
-			}
-		}
-
-		if (getBricks().isEmpty()) {
-			create();
-		}
-	}
-
-	public void reset() {
-		Paddle paddle = getPaddle();
-		Ball ball = new Ball(this);
-		ball.setX(paddle.getX());
-		ball.setY(Paddle.PADDLE_Y + Paddle.PADDLE_HEIGHT + Ball.RADIUS);
-		balls.add(ball);
-		paddle.setSticky(false);
-		paddle.setWidth(Paddle.DEFAULT_WIDTH);
-	}
-
-	@Override
-	public void dispose () {
-	}
-
-	private static final Class<? extends PowerUp> getWeightedPowerUp() {
-		int remaining = MathUtils.random(weightSum);
-		for (Map.Entry<Class<? extends PowerUp>, Integer> entry : powerUpWeights.entrySet()) {
-			remaining -= entry.getValue();
-			if (remaining < 0) {
-				return entry.getKey();
-			}
-		}
-		return null;
-	}
-
-	public int getShieldCount() {
-		return shieldCount;
-	}
-
-	public void addShield() {
-		shieldCount++;
-		paddle.setY(paddle.getY() + SHIELD_HEIGHT);
-	}
-
-	public void removeShield() {
-		shieldCount--;
-		paddle.setY(paddle.getY() - SHIELD_HEIGHT);
-	}
-
-	public ArrayList<Ball> getBalls() {
-		return balls;
-	}
-
-	public Paddle getPaddle() {
-		return paddle;
-	}
-
-	public ArrayList<Brick> getBricks() {
-		return bricks;
-	}
-
-	public void addPowerUp(PowerUp powerUp) {
-		this.powerUps.add(powerUp);
-	}
-
-	static {
-		Map<Class<? extends PowerUp>, Integer> tmp = new HashMap<Class<? extends PowerUp>, Integer>();
-
-		// Assign PowerUp weights here
-		tmp.put(GluePowerUp.class, 30);
-		tmp.put(LongerPaddlePowerUp.class, 40);
-		tmp.put(MultiBallPowerUp.class, 20);
-		tmp.put(ShieldPowerUp.class, 40);
-		powerUpWeights = Collections.unmodifiableMap(tmp);
-
-		int sum = 0;
-		for (int x : powerUpWeights.values()) {
-			sum += x;
-		}
-		weightSum = sum;
-	}
-}

core/src/com/me/brickbuster/Utils.java

@@ -5,6 +5,9 @@ import com.badlogic.gdx.math.Vector2;
 
 public class Utils {
 
+	public static final Vector2 HORIZONTAL_EDGE = new Vector2(1, 0);
+	public static final Vector2 VERTICAL_EDGE = new Vector2(0, 1);
+
 	public static Vector2 reflect(Vector2 incoming, Vector2 surface) {
 		Vector2 normal = new Vector2(-surface.y, surface.x);
 		return incoming.sub(normal.scl(normal.dot(incoming) * 2));

core/src/com/me/brickbuster/entity/Ball.java

@@ -8,6 +8,7 @@ import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.me.brickbuster.BrickBuster;
 import com.me.brickbuster.Utils;
+import com.me.brickbuster.state.PlayState;
 import net.dermetfan.utils.Pair;
 
 import java.util.Iterator;
@@ -25,16 +26,16 @@ public class Ball extends Entity {
 	private boolean isStuck = true;
 	private boolean isDead = false;
 
-	public Ball(BrickBuster brickBuster) {
+	public Ball(PlayState state) {
-		super(brickBuster,BrickBuster.WIDTH/2, brickBuster.getPaddle().getY() + Paddle.PADDLE_HEIGHT + RADIUS);
+		super(state,BrickBuster.WIDTH/2, state.paddle.getY() + Paddle.PADDLE_HEIGHT + RADIUS);
-		this.speed = getBrickBuster().getBricks().size() > BLOCKS_FOR_BOOST? DEFAULT_SPEED : BOOST_SPEED;
+		this.speed = state.bricks.size() > BLOCKS_FOR_BOOST? DEFAULT_SPEED : BOOST_SPEED;
 	}
 
 	@Override
 	public void render(ShapeRenderer sr) {
 		sr.begin(ShapeType.Filled);
 		sr.setColor(BALL_COLOR);
-		sr.circle(getPos().x, getPos().y, RADIUS);
+		sr.circle(pos.x, pos.y, RADIUS);
 		sr.end();
 	}
 
@@ -48,12 +49,10 @@ public class Ball extends Entity {
 			}
 		}
 
-		BrickBuster game = getBrickBuster();
+		Vector2 new_pos = pos.cpy().add(direction.cpy().scl(speed * dt));
-
-		Vector2 new_pos = getPos().cpy().add(direction.cpy().scl(speed * dt));
 
 		boolean brickCollision = false;
-		Iterator<Brick> brickIterator = game.getBricks().iterator();
+		Iterator<Brick> brickIterator = state.bricks.iterator();
 		while (!brickCollision && brickIterator.hasNext()) {
 			Brick brick = brickIterator.next();
 			Vector2[] vertices = brick.getVertices();
@@ -75,41 +74,40 @@ public class Ball extends Entity {
 		}
 
 		if (new_pos.x + RADIUS > BrickBuster.WIDTH || new_pos.x - RADIUS < 0) {
-			Utils.reflect(direction, BrickBuster.VERTICAL_EDGE);
+			Utils.reflect(direction, Utils.VERTICAL_EDGE);
 		} else if (new_pos.y + RADIUS > BrickBuster.HEIGHT) {
-			Utils.reflect(direction, BrickBuster.HORIZONTAL_EDGE);
+			Utils.reflect(direction, Utils.HORIZONTAL_EDGE);
-		} else if (game.getShieldCount() > 0
+		} else if (state.getShieldCount() > 0
-					&& new_pos.y - RADIUS < BrickBuster.SHIELD_HEIGHT * game.getShieldCount()) {
+					&& new_pos.y - RADIUS < PlayState.SHIELD_HEIGHT * state.getShieldCount()) {
-			Utils.reflect(direction, BrickBuster.HORIZONTAL_EDGE);
+			Utils.reflect(direction, Utils.HORIZONTAL_EDGE);
-			game.removeShield();
+			state.removeShield();
 		} else if (new_pos.y + RADIUS < 0) {
 			isDead = true;
 			return;
-		} else if (direction.y < 0 && new_pos.y <= game.getPaddle().getY() + Paddle.PADDLE_HEIGHT + RADIUS) {
+		} else if (direction.y < 0 && new_pos.y <= state.paddle.getY() + Paddle.PADDLE_HEIGHT + RADIUS) {
-			Pair<Vector2, Vector2> paddle = game.getPaddle().getTopEdge();
+			Pair<Vector2, Vector2> paddle = state.paddle.getTopEdge();
 			Vector2 lineDir = paddle.getValue().sub(paddle.getKey());
 			Vector2 nearest = Utils.nearestPoint(paddle.getKey().cpy(), lineDir, new_pos.cpy());
 
 			if (nearest.dst(new_pos.x, new_pos.y) <= RADIUS) {
 				paddleCollision();
-				if (game.getPaddle().isSticky()) {
+				if (state.paddle.isSticky()) {
 					return;
 				}
 			}
 		}
 
-		getPos().add(direction.cpy().scl(speed * dt));
+		pos.add(direction.cpy().scl(speed * dt));
 	}
 
 	public Vector2 paddleReflectAngle() {
-		Paddle paddle = getBrickBuster().getPaddle();
+		float rel = MathUtils.clamp((pos.x - state.paddle.getX()) + (state.paddle.getWidth()/2), 5, state.paddle.getWidth()-5);
-		float rel = MathUtils.clamp((getX() - paddle.getX()) + (paddle.getWidth()/2), 5, paddle.getWidth()-5);
+		float newAngle = MathUtils.PI - (MathUtils.PI * (rel / state.paddle.getWidth()));
-		float newAngle = MathUtils.PI - (MathUtils.PI * (rel / paddle.getWidth()));
 		return new Vector2(MathUtils.cos(newAngle), MathUtils.sin(newAngle));
 	}
 
 	public void launch() {
-		if (getBrickBuster().getPaddle().isSticky()) {
+		if (state.paddle.isSticky()) {
 			direction = paddleReflectAngle();
 		} else {
 			// launch at random angle between 135 and 45 degrees
@@ -120,10 +118,9 @@ public class Ball extends Entity {
 	}
 
 	public void paddleCollision() {
-		Paddle paddle = getBrickBuster().getPaddle();
+		if (state.paddle.isSticky()) {
-		if (paddle.isSticky()) {
 			isStuck = true;
-			setY(paddle.getY() + Paddle.PADDLE_HEIGHT + RADIUS);
+			pos.y = state.paddle.getY() + Paddle.PADDLE_HEIGHT + RADIUS;
 			return;
 		}
 		direction = paddleReflectAngle();

core/src/com/me/brickbuster/entity/Brick.java

@@ -4,10 +4,11 @@ import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
 import com.badlogic.gdx.math.Vector2;
-import com.me.brickbuster.BrickBuster;
 import com.me.brickbuster.entity.powerup.PowerUp;
+import com.me.brickbuster.state.PlayState;
 
 public class Brick extends Entity {
+
 	public static final Color BLOCK_COLOR = Color.FOREST;
 	public static final int BLOCK_WIDTH = 50;
 	public static final int BLOCK_HEIGHT = 20;
@@ -16,8 +17,8 @@ public class Brick extends Entity {
 
 	private Vector2[] vertices;
 
-	public Brick(BrickBuster brickBuster, Class<? extends PowerUp> powerUpType, int x, int y) {
+	public Brick(PlayState state, Class<? extends PowerUp> powerUpType, int x, int y) {
-		super(brickBuster, x, y);
+		super(state, x, y);
 		this.powerUpType = powerUpType;
 
 		this.vertices = new Vector2[] {
@@ -41,18 +42,18 @@ public class Brick extends Entity {
 	}
 
 	public boolean hit() {
-		if (getBrickBuster().getBricks().size()-1 <= Ball.BLOCKS_FOR_BOOST) {
+		if (state.bricks.size()-1 <= Ball.BLOCKS_FOR_BOOST) {
-			for (Ball ball : getBrickBuster().getBalls()) {
+			for (Ball ball : state.balls) {
 				ball.setSpeed(Ball.BOOST_SPEED);
 			}
 		}
 
 		if (powerUpType != null) {
 			try {
-				PowerUp powerUp = powerUpType.getConstructor(BrickBuster.class, Brick.class).newInstance(getBrickBuster(), this);
+				PowerUp powerUp = powerUpType.getConstructor(PlayState.class, Brick.class).newInstance(state, this);
-				getBrickBuster().addPowerUp(powerUp);
+				state.powerUps.add(powerUp);
 			} catch(Exception e) {
-
+				System.out.println("Error spawning powerup: " + e.getMessage());
 			}
 		}
 		return true;

core/src/com/me/brickbuster/entity/Entity.java

@@ -2,15 +2,15 @@ package com.me.brickbuster.entity;
 
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.math.Vector2;
-import com.me.brickbuster.BrickBuster;
+import com.me.brickbuster.state.PlayState;
 
 public abstract class Entity {
 
-	private BrickBuster brickBuster;
+	protected PlayState state;
-	private Vector2 pos;
+	protected Vector2 pos;
 
-	public Entity(BrickBuster brickBuster, float x, float y) {
+	public Entity(PlayState state, float x, float y) {
-		this.brickBuster = brickBuster;
+		this.state = state;
 		this.pos = new Vector2(x, y);
 	}
 
@@ -18,10 +18,6 @@ public abstract class Entity {
 
 	public abstract void update(float dt);
 
-	public BrickBuster getBrickBuster() {
-		return brickBuster;
-	}
-
 	public Vector2 getPos() {
 		return pos;
 	}

core/src/com/me/brickbuster/entity/Paddle.java

@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
 import com.badlogic.gdx.math.Vector2;
 import com.me.brickbuster.BrickBuster;
+import com.me.brickbuster.state.PlayState;
 import net.dermetfan.utils.Pair;
 
 public class Paddle extends Entity {
@@ -20,7 +21,7 @@ public class Paddle extends Entity {
 	private int width = DEFAULT_WIDTH;
 	private boolean sticky = false;
 
-	public Paddle(BrickBuster brickBuster) {
+	public Paddle(PlayState brickBuster) {
 		super(brickBuster, BrickBuster.WIDTH / 2, PADDLE_Y);
 	}
 
@@ -35,26 +36,26 @@ public class Paddle extends Entity {
 	@Override
 	public void update(float dt) {
 		if (Gdx.input.isKeyPressed(Input.Keys.LEFT)) {
-			if (getX() - width/2 - PADDLE_SPEED * dt < 0) {
+			if (pos.x - width/2 - PADDLE_SPEED * dt < 0) {
 				setX(width/2);
 				return;
 			}
-			setX(getX() - PADDLE_SPEED * dt);
+			pos.x = pos.x - PADDLE_SPEED * dt;
 
-			for (Ball ball : getBrickBuster().getBalls()) {
+			for (Ball ball : state.balls) {
 				if (ball.isStuck()) {
 					ball.setX(ball.getX() - PADDLE_SPEED * dt);
 				}
 			}
 		}
 		if (Gdx.input.isKeyPressed(Input.Keys.RIGHT)) {
-			if (getX() + width/2 + PADDLE_SPEED * dt > BrickBuster.WIDTH) {
+			if (pos.x + width/2 + PADDLE_SPEED * dt > BrickBuster.WIDTH) {
 				setX(BrickBuster.WIDTH - width/2);
 				return;
 			}
-			setX(getX() + PADDLE_SPEED * dt);
+			pos.x = pos.x + PADDLE_SPEED * dt;
 
-			for (Ball ball : getBrickBuster().getBalls()) {
+			for (Ball ball : state.balls) {
 				if (ball.isStuck()) {
 					ball.setX(ball.getX() + PADDLE_SPEED * dt);
 				}
@@ -64,8 +65,8 @@ public class Paddle extends Entity {
 
 	public Pair<Vector2, Vector2> getTopEdge() {
 		return new Pair<Vector2, Vector2>(
-				new Vector2(getX() - width/2, getY() + PADDLE_HEIGHT),
+				new Vector2(pos.x - width/2, pos.y + PADDLE_HEIGHT),
-				new Vector2(getX() + width/2, getY() + PADDLE_HEIGHT)
+				new Vector2(pos.x + width/2, pos.y + PADDLE_HEIGHT)
 		);
 	}
 

core/src/com/me/brickbuster/entity/powerup/GluePowerUp.java

@@ -1,18 +1,18 @@
 package com.me.brickbuster.entity.powerup;
 
 import com.badlogic.gdx.graphics.Color;
-import com.me.brickbuster.BrickBuster;
 import com.me.brickbuster.entity.Brick;
+import com.me.brickbuster.state.PlayState;
 
 public class GluePowerUp extends PowerUp {
 
-	public GluePowerUp(BrickBuster brickBuster, Brick brick) {
+	public GluePowerUp(PlayState state, Brick brick) {
-		super(brickBuster, brick, Color.WHITE);
+		super(state, brick, Color.WHITE);
 	}
 
 	@Override
 	public void activate() {
-		getBrickBuster().getPaddle().setSticky(true);
+		state.paddle.setSticky(true);
 	}
 
 }

core/src/com/me/brickbuster/entity/powerup/LongerPaddlePowerUp.java

@@ -1,20 +1,20 @@
 package com.me.brickbuster.entity.powerup;
 
 import com.badlogic.gdx.graphics.Color;
-import com.me.brickbuster.BrickBuster;
 import com.me.brickbuster.entity.Brick;
 import com.me.brickbuster.entity.Paddle;
+import com.me.brickbuster.state.PlayState;
 
 public class LongerPaddlePowerUp extends PowerUp {
-	public LongerPaddlePowerUp(BrickBuster brickBuster, Brick brick) {
+
-		super(brickBuster, brick, Color.OLIVE);
+	public LongerPaddlePowerUp(PlayState state, Brick brick) {
+		super(state, brick, Color.OLIVE);
 	}
 
 	@Override
 	public void activate() {
-		Paddle paddle = getBrickBuster().getPaddle();
+		if (state.paddle.getWidth() < 250) {
-		if (paddle.getWidth() < 250) {
+			state.paddle.setWidth(state.paddle.getWidth() + 50);
-			paddle.setWidth(paddle.getWidth() + 50);
 		}
 	}
 }

core/src/com/me/brickbuster/entity/powerup/MultiBallPowerUp.java

@@ -3,28 +3,28 @@ package com.me.brickbuster.entity.powerup;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
-import com.me.brickbuster.BrickBuster;
 import com.me.brickbuster.entity.Ball;
 import com.me.brickbuster.entity.Brick;
+import com.me.brickbuster.state.PlayState;
 
 public class MultiBallPowerUp extends PowerUp {
 
 	private Vector2 pos;
 
-	public MultiBallPowerUp(BrickBuster brickBuster, Brick brick) {
+	public MultiBallPowerUp(PlayState state, Brick brick) {
-		super(brickBuster, brick, Color.ROYAL);
+		super(state, brick, Color.ROYAL);
 		this.pos = getPos().cpy();
 	}
 
 	@Override
 	public void activate() {
 		for (int x = 0; x < 2; x++) {
-			Ball ball = new Ball(getBrickBuster());
+			Ball ball = new Ball(state);
 			ball.setPos(pos.cpy());
 			float angle = MathUtils.random(MathUtils.PI*2);
 			ball.setDirection(new Vector2(MathUtils.cos(angle), MathUtils.sin(angle)));
 			ball.setStuck(false);
-			getBrickBuster().getBalls().add(ball);
+			state.balls.add(ball);
 		}
 	}
 }

core/src/com/me/brickbuster/entity/powerup/PowerUp.java

@@ -4,10 +4,10 @@ import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
 import com.badlogic.gdx.math.Vector2;
-import com.me.brickbuster.BrickBuster;
 import com.me.brickbuster.Utils;
 import com.me.brickbuster.entity.Brick;
 import com.me.brickbuster.entity.Entity;
+import com.me.brickbuster.state.PlayState;
 import net.dermetfan.utils.Pair;
 
 public abstract class PowerUp extends Entity {
@@ -18,8 +18,8 @@ public abstract class PowerUp extends Entity {
 	private Color color;
 	private boolean isCaught;
 
-	public PowerUp(BrickBuster brickBuster, Brick brick, Color color) {
+	public PowerUp(PlayState state, Brick brick, Color color) {
-		super(brickBuster, brick.getX() + Brick.BLOCK_WIDTH/2, brick.getY() + Brick.BLOCK_HEIGHT/2);
+		super(state, brick.getX() + Brick.BLOCK_WIDTH/2, brick.getY() + Brick.BLOCK_HEIGHT/2);
 		this.color = color;
 	}
 
@@ -35,7 +35,7 @@ public abstract class PowerUp extends Entity {
 	public void update(float dt) {
 		setY(getY() - FALL_SPEED * dt);
 
-		Pair<Vector2, Vector2> paddle = getBrickBuster().getPaddle().getTopEdge();
+		Pair<Vector2, Vector2> paddle = state.paddle.getTopEdge();
 		Vector2 lineDir = paddle.getValue().sub(paddle.getKey());
 		Vector2 nearest = Utils.nearestPoint(paddle.getKey().cpy(), lineDir, getPos().cpy());
 

core/src/com/me/brickbuster/entity/powerup/ShieldPowerUp.java

@@ -1,18 +1,18 @@
 package com.me.brickbuster.entity.powerup;
 
 import com.badlogic.gdx.graphics.Color;
-import com.me.brickbuster.BrickBuster;
 import com.me.brickbuster.entity.Brick;
+import com.me.brickbuster.state.PlayState;
 
 public class ShieldPowerUp extends PowerUp {
 
-	public ShieldPowerUp(BrickBuster brickBuster, Brick brick) {
+	public ShieldPowerUp(PlayState state, Brick brick) {
-		super(brickBuster, brick, Color.SALMON);
+		super(state, brick, Color.SALMON);
 	}
 
 	@Override
 	public void activate() {
-		getBrickBuster().addShield();
+		state.addShield();
 	}
 
 }

core/src/com/me/brickbuster/state/PlayState.java

@@ -0,0 +1,169 @@
+package com.me.brickbuster.state;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
+import com.badlogic.gdx.math.MathUtils;
+import com.me.brickbuster.BrickBuster;
+import com.me.brickbuster.entity.Ball;
+import com.me.brickbuster.entity.Brick;
+import com.me.brickbuster.entity.Paddle;
+import com.me.brickbuster.entity.powerup.*;
+
+import java.util.*;
+
+public class PlayState extends State {
+
+	public static final int SHIELD_HEIGHT = 5;
+	public static final float POWERUP_CHANCE = 0.15f;
+
+	public static final Map<Class<? extends PowerUp>, Integer> powerUpWeights;
+	private static final int weightSum;
+
+	public List<PowerUp> powerUps;
+	public Paddle paddle;
+	public List<Ball> balls;
+	public List<Brick> bricks;
+
+	private int shieldCount = 0;
+
+	private float updateTime = 0f;
+
+	public PlayState(BrickBuster game) {
+		super(game);
+	}
+
+	@Override
+	public void setup() {
+		powerUps = new ArrayList<PowerUp>();
+		paddle = new Paddle(this);
+
+		bricks = new ArrayList<Brick>();
+		for (int col = 0; col < 13; col++) {
+			for (int row = 0; row < 7; row++) {
+				int x = 15 + (col * (Brick.BLOCK_WIDTH + 10));
+				int y = 15 + Brick.BLOCK_HEIGHT + (row * (Brick.BLOCK_HEIGHT + 10));
+				Class<? extends PowerUp> powerUpType = null;
+				if (MathUtils.randomBoolean(POWERUP_CHANCE)) {
+					powerUpType = getWeightedPowerUp();
+				}
+				bricks.add(new Brick(this, powerUpType, x, BrickBuster.HEIGHT - y));
+			}
+		}
+
+		balls = new ArrayList<Ball>();
+		balls.add(new Ball(this));
+	}
+
+	@Override
+	public void render() {
+		long start = System.nanoTime();
+		for (Brick block : bricks) {
+			block.render(game.sr);
+		}
+		for (PowerUp powerUp : powerUps) {
+			powerUp.render(game.sr);
+		}
+		for (Ball ball : balls) {
+			ball.render(game.sr);
+		}
+		paddle.render(game.sr);
+
+		if (getShieldCount() > 0) {
+			game.sr.begin(ShapeType.Filled);
+			game.sr.setColor(Color.SALMON);
+			game.sr.rect(0, 0, BrickBuster.WIDTH, getShieldCount() * SHIELD_HEIGHT);
+			game.sr.end();
+		}
+		long renderTime = System.nanoTime() - start;
+
+		game.sb.begin();
+		game.font.setColor(Color.GRAY);
+		game.font.draw(game.sb, String.format("FPS: %d Update: %.2f ms Render: %.2f ms",
+				Gdx.graphics.getFramesPerSecond(), updateTime/1000000f, renderTime/1000000f), 0, 13);
+		game.sb.end();
+	}
+
+	@Override
+	public void update(float dt) {
+		long start = System.nanoTime();
+		paddle.update(dt);
+
+		for (Iterator<Ball> it = balls.iterator(); it.hasNext();) {
+			Ball ball = it.next();
+			ball.update(dt);
+			if (ball.isDead()) {
+				it.remove();
+			}
+		}
+		if (balls.isEmpty()) {
+			ballReset();
+		}
+
+		for (Iterator<PowerUp> it = powerUps.iterator(); it.hasNext();) {
+			PowerUp powerUp = it.next();
+			powerUp.update(dt);
+			if(powerUp.isCaught()) {
+				it.remove();
+			}
+		}
+
+		if (bricks.isEmpty()) {
+			// TODO: Fix this - go to an after-game menu
+			//create();
+		}
+		updateTime = System.nanoTime() - start;
+	}
+
+	public int getShieldCount() {
+		return shieldCount;
+	}
+
+	public void addShield() {
+		shieldCount++;
+		paddle.setY(paddle.getY() + SHIELD_HEIGHT);
+	}
+
+	public void removeShield() {
+		shieldCount--;
+		paddle.setY(paddle.getY() - SHIELD_HEIGHT);
+	}
+
+	public void ballReset() {
+		Ball ball = new Ball(this);
+		ball.setX(paddle.getX());
+		ball.setY(Paddle.PADDLE_Y + Paddle.PADDLE_HEIGHT + Ball.RADIUS);
+		balls.add(ball);
+		paddle.setSticky(false);
+		paddle.setWidth(Paddle.DEFAULT_WIDTH);
+	}
+
+	private static final Class<? extends PowerUp> getWeightedPowerUp() {
+		int remaining = MathUtils.random(weightSum);
+		for (Map.Entry<Class<? extends PowerUp>, Integer> entry : PlayState.powerUpWeights.entrySet()) {
+			remaining -= entry.getValue();
+			if (remaining < 0) {
+				return entry.getKey();
+			}
+		}
+		return null;
+	}
+
+	static {
+		Map<Class<? extends PowerUp>, Integer> tmp = new HashMap<Class<? extends PowerUp>, Integer>();
+
+		// Assign PowerUp weights here
+		tmp.put(GluePowerUp.class, 30);
+		tmp.put(LongerPaddlePowerUp.class, 40);
+		tmp.put(MultiBallPowerUp.class, 20);
+		tmp.put(ShieldPowerUp.class, 40);
+		powerUpWeights = Collections.unmodifiableMap(tmp);
+
+		int sum = 0;
+		for (int x : PlayState.powerUpWeights.values()) {
+			sum += x;
+		}
+		weightSum = sum;
+	}
+
+}

core/src/com/me/brickbuster/state/State.java

@@ -0,0 +1,27 @@
+package com.me.brickbuster.state;
+
+import com.badlogic.gdx.ScreenAdapter;
+import com.me.brickbuster.BrickBuster;
+
+public abstract class State extends ScreenAdapter {
+
+	protected final BrickBuster game;
+
+	public State(BrickBuster game) {
+		this.game = game;
+		this.setup();
+	}
+
+	@Override
+	public final void render(float delta) {
+		update(delta);
+		render();
+	}
+
+	public abstract void setup();
+
+	public abstract void render();
+
+	public abstract void update(float dt);
+
+}