Skip to content

Commit

Permalink
Fork Review
Browse files Browse the repository at this point in the history
  • Loading branch information
crimsonFuckr committed Mar 16, 2014
1 parent 21e26cf commit 4ff5f7c
Show file tree
Hide file tree
Showing 23 changed files with 76 additions and 76 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game;
package com.andrewh.game;

import java.awt.Canvas;
import java.awt.Dimension;
Expand All @@ -10,14 +10,14 @@
import javax.swing.JFrame;
import javax.swing.JOptionPane;

import ca.vanzeben.game.entities.Player;
import ca.vanzeben.game.entities.PlayerMP;
import ca.vanzeben.game.gfx.Screen;
import ca.vanzeben.game.gfx.SpriteSheet;
import ca.vanzeben.game.level.Level;
import ca.vanzeben.game.net.GameClient;
import ca.vanzeben.game.net.GameServer;
import ca.vanzeben.game.net.packets.Packet00Login;
import com.andrewh.game.entities.Player;
import com.andrewh.game.entities.PlayerMP;
import com.andrewh.game.gfx.Screen;
import com.andrewh.game.gfx.SpriteSheet;
import com.andrewh.game.level.Level;
import com.andrewh.game.net.GameClient;
import com.andrewh.game.net.GameServer;
import com.andrewh.game.net.packets.Packet00Login;

public class Game extends Canvas implements Runnable {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game;
package com.andrewh.game;

import java.applet.Applet;
import java.awt.BorderLayout;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game;
package com.andrewh.game;

import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ca.vanzeben.game;
package com.andrewh.game;

import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;

import ca.vanzeben.game.net.packets.Packet01Disconnect;
import com.andrewh.game.net.packets.Packet01Disconnect;

public class WindowHandler implements WindowListener {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ca.vanzeben.game.entities;
package com.andrewh.game.entities;

import ca.vanzeben.game.gfx.Screen;
import ca.vanzeben.game.level.Level;
import com.andrewh.game.gfx.Screen;
import com.andrewh.game.level.Level;

public abstract class Entity {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ca.vanzeben.game.entities;
package com.andrewh.game.entities;

import ca.vanzeben.game.level.Level;
import ca.vanzeben.game.level.tiles.Tile;
import com.andrewh.game.level.Level;
import com.andrewh.game.level.tiles.Tile;

public abstract class Mob extends Entity {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package ca.vanzeben.game.entities;
package com.andrewh.game.entities;

import ca.vanzeben.game.Game;
import ca.vanzeben.game.InputHandler;
import ca.vanzeben.game.gfx.Colours;
import ca.vanzeben.game.gfx.Font;
import ca.vanzeben.game.gfx.Screen;
import ca.vanzeben.game.level.Level;
import ca.vanzeben.game.net.packets.Packet02Move;
import com.andrewh.game.Game;
import com.andrewh.game.InputHandler;
import com.andrewh.game.gfx.Colours;
import com.andrewh.game.gfx.Font;
import com.andrewh.game.gfx.Screen;
import com.andrewh.game.level.Level;
import com.andrewh.game.net.packets.Packet02Move;

public class Player extends Mob {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ca.vanzeben.game.entities;
package com.andrewh.game.entities;

import java.net.InetAddress;

import ca.vanzeben.game.InputHandler;
import ca.vanzeben.game.level.Level;
import com.andrewh.game.InputHandler;
import com.andrewh.game.level.Level;

public class PlayerMP extends Player {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.gfx;
package com.andrewh.game.gfx;

public class Colours {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.gfx;
package com.andrewh.game.gfx;

public class Font {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.gfx;
package com.andrewh.game.gfx;

public class Screen {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.gfx;
package com.andrewh.game.gfx;

import java.awt.image.BufferedImage;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.level;
package com.andrewh.game.level;

import java.awt.image.BufferedImage;
import java.io.File;
Expand All @@ -8,10 +8,10 @@

import javax.imageio.ImageIO;

import ca.vanzeben.game.entities.Entity;
import ca.vanzeben.game.entities.PlayerMP;
import ca.vanzeben.game.gfx.Screen;
import ca.vanzeben.game.level.tiles.Tile;
import com.andrewh.game.entities.Entity;
import com.andrewh.game.entities.PlayerMP;
import com.andrewh.game.gfx.Screen;
import com.andrewh.game.level.tiles.Tile;

public class Level {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.level.tiles;
package com.andrewh.game.level.tiles;

public class AnimatedTile extends BasicTile {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.level.tiles;
package com.andrewh.game.level.tiles;

public class BasicSolidTile extends BasicTile {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ca.vanzeben.game.level.tiles;
package com.andrewh.game.level.tiles;

import ca.vanzeben.game.gfx.Screen;
import ca.vanzeben.game.level.Level;
import com.andrewh.game.gfx.Screen;
import com.andrewh.game.level.Level;

public class BasicTile extends Tile {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ca.vanzeben.game.level.tiles;
package com.andrewh.game.level.tiles;

import ca.vanzeben.game.gfx.Colours;
import ca.vanzeben.game.gfx.Screen;
import ca.vanzeben.game.level.Level;
import com.andrewh.game.gfx.Colours;
import com.andrewh.game.gfx.Screen;
import com.andrewh.game.level.Level;

public abstract class Tile {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.net;
package com.andrewh.game.net;

import java.io.IOException;
import java.net.DatagramPacket;
Expand All @@ -7,13 +7,13 @@
import java.net.SocketException;
import java.net.UnknownHostException;

import ca.vanzeben.game.Game;
import ca.vanzeben.game.entities.PlayerMP;
import ca.vanzeben.game.net.packets.Packet;
import ca.vanzeben.game.net.packets.Packet.PacketTypes;
import ca.vanzeben.game.net.packets.Packet00Login;
import ca.vanzeben.game.net.packets.Packet01Disconnect;
import ca.vanzeben.game.net.packets.Packet02Move;
import com.andrewh.game.Game;
import com.andrewh.game.entities.PlayerMP;
import com.andrewh.game.net.packets.Packet;
import com.andrewh.game.net.packets.Packet.PacketTypes;
import com.andrewh.game.net.packets.Packet00Login;
import com.andrewh.game.net.packets.Packet01Disconnect;
import com.andrewh.game.net.packets.Packet02Move;

public class GameClient extends Thread {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ca.vanzeben.game.net;
package com.andrewh.game.net;

import java.io.IOException;
import java.net.DatagramPacket;
Expand All @@ -8,13 +8,13 @@
import java.util.ArrayList;
import java.util.List;

import ca.vanzeben.game.Game;
import ca.vanzeben.game.entities.PlayerMP;
import ca.vanzeben.game.net.packets.Packet;
import ca.vanzeben.game.net.packets.Packet.PacketTypes;
import ca.vanzeben.game.net.packets.Packet00Login;
import ca.vanzeben.game.net.packets.Packet01Disconnect;
import ca.vanzeben.game.net.packets.Packet02Move;
import com.andrewh.game.Game;
import com.andrewh.game.entities.PlayerMP;
import com.andrewh.game.net.packets.Packet;
import com.andrewh.game.net.packets.Packet.PacketTypes;
import com.andrewh.game.net.packets.Packet00Login;
import com.andrewh.game.net.packets.Packet01Disconnect;
import com.andrewh.game.net.packets.Packet02Move;

public class GameServer extends Thread {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ca.vanzeben.game.net.packets;
package com.andrewh.game.net.packets;

import ca.vanzeben.game.net.GameClient;
import ca.vanzeben.game.net.GameServer;
import com.andrewh.game.net.GameClient;
import com.andrewh.game.net.GameServer;

public abstract class Packet {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ca.vanzeben.game.net.packets;
package com.andrewh.game.net.packets;

import ca.vanzeben.game.net.GameClient;
import ca.vanzeben.game.net.GameServer;
import com.andrewh.game.net.GameClient;
import com.andrewh.game.net.GameServer;

public class Packet00Login extends Packet {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ca.vanzeben.game.net.packets;
package com.andrewh.game.net.packets;

import ca.vanzeben.game.net.GameClient;
import ca.vanzeben.game.net.GameServer;
import com.andrewh.game.net.GameClient;
import com.andrewh.game.net.GameServer;

public class Packet01Disconnect extends Packet {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ca.vanzeben.game.net.packets;
package com.andrewh.game.net.packets;

import ca.vanzeben.game.net.GameClient;
import ca.vanzeben.game.net.GameServer;
import com.andrewh.game.net.GameClient;
import com.andrewh.game.net.GameServer;

public class Packet02Move extends Packet {

Expand Down

0 comments on commit 4ff5f7c

Please sign in to comment.