refactor jbwapi to look more like bwmirror

Author: JasperGeurtz

pom.xml

@@ -23,7 +23,6 @@
                     <target>8</target>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>

src/main/java/bwapi/BWClient.java

@@ -1,10 +1,7 @@
 package bwapi;
 
-import JavaBWAPIBackend.Client;
 import java.util.Objects;
 
-
-
 public class BWClient {
     private BWListener eventListener;
 

src/main/java/bwapi/BWListener.java

@@ -1,8 +1,6 @@
 package bwapi;
 
 
-import bwapi.point.Position;
-
 public interface BWListener {
 
     void onStart();

src/main/java/bwapi/BuildingPlacer.java

@@ -1,10 +1,5 @@
 package bwapi;
 
-import bwapi.point.TilePosition;
-import bwapi.types.UnitType;
-
-import java.util.Set;
-
 class BuildingPlacer {
     private static int MAX_RANGE = 64;
 

src/main/java/bwapi/Bullet.java

@@ -1,14 +1,10 @@
 package bwapi;
 
-import JavaBWAPIBackend.Client.GameData.BulletData;
-import bwapi.point.Position;
-import bwapi.types.BulletType;
-
 public class Bullet {
-    private final BulletData bulletData;
+    private final Client.GameData.BulletData bulletData;
     private final Game game;
 
-    Bullet(final BulletData bulletData, final Game game) {
+    Bullet(final Client.GameData.BulletData bulletData, final Game game) {
         this.bulletData = bulletData;
         this.game = game;
     }

src/main/java/bwapi/types/BulletType.java src/main/java/bwapi/BulletType.javasrc/main/java/bwapi/types/BulletType.java renamed to src/main/java/bwapi/BulletType.java

@@ -1,9 +1,6 @@
-package bwapi.types;
+package bwapi;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 public enum BulletType {
     Melee(0),

…c/main/java/JavaBWAPIBackend/Client.java src/main/java/bwapi/Client.javasrc/main/java/JavaBWAPIBackend/Client.java renamed to src/main/java/bwapi/Client.java src/main/java/JavaBWAPIBackend/Client.java renamed to src/main/java/bwapi/Client.java

@@ -1,4 +1,4 @@
-package JavaBWAPIBackend;
+package bwapi;
 
 import com.sun.jna.platform.win32.Kernel32;
 
@@ -9,7 +9,7 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.StandardCharsets;
 
-public class Client {
+class Client {
     public static final int READ_WRITE = 0x1 | 0x2 | 0x4;
     private static final int GAME_SIZE = 4 // ServerProcID
                                        + 4 // IsConnected

src/main/java/bwapi/values/Color.java src/main/java/bwapi/Color.javasrc/main/java/bwapi/values/Color.java renamed to src/main/java/bwapi/Color.java

@@ -1,4 +1,4 @@
-package bwapi.values;
+package bwapi;
 
 
 import java.util.Objects;

…c/main/java/bwapi/types/CommandType.java src/main/java/bwapi/CommandType.javasrc/main/java/bwapi/types/CommandType.java renamed to src/main/java/bwapi/CommandType.java src/main/java/bwapi/types/CommandType.java renamed to src/main/java/bwapi/CommandType.java

@@ -1,4 +1,4 @@
-package bwapi.types;
+package bwapi;
 
 public enum CommandType {
 	None(0),

…c/main/java/bwapi/values/Coordinate.java src/main/java/bwapi/Coordinate.javasrc/main/java/bwapi/values/Coordinate.java renamed to src/main/java/bwapi/Coordinate.java src/main/java/bwapi/values/Coordinate.java renamed to src/main/java/bwapi/Coordinate.java

@@ -1,4 +1,4 @@
-package bwapi.values;
+package bwapi;
 
 public enum Coordinate {
     None(0),