Revert "Revert "Organization + Backend""

This reverts commit 989b591.

build.gradle

@@ -61,3 +61,27 @@ project(":core") {
 
     }
 }
+
+project(":test") {
+    apply plugin: "java-library"
+
+    sourceSets.test.java.srcDirs = ["src/"]
+
+
+    dependencies {
+        compile project(":desktop")
+        compile project(":core")
+
+        api "com.badlogicgames.gdx:gdx:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+
+        testCompile 'junit:junit:4.+'
+        testCompile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+        testCompile "com.badlogicgames.gdx:gdx:$gdxVersion"
+        testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+        testCompile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+        testCompile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
+
+        testImplementation "org.mockito:mockito-core:3.+"
+    }
+}

core/src/com/mygdx/pirategame/HealthBar.java → core/src/main/java/com/mygdx/pirategame/HealthBar.java

@@ -1,10 +1,10 @@
-package com.mygdx.pirategame;
+package main.java.com.mygdx.pirategame;
 
 
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.Sprite;
-import com.mygdx.pirategame.gameobjects.enemy.Enemy;
+import main.java.com.mygdx.pirategame.gameobjects.enemy.Enemy;
 
 /**
  * Health Bar

core/src/com/mygdx/pirategame/Hud.java → core/src/main/java/com/mygdx/pirategame/Hud.java

@@ -1,4 +1,4 @@
-package com.mygdx.pirategame;
+package main.java.com.mygdx.pirategame;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Texture;
@@ -9,7 +9,7 @@
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import com.mygdx.pirategame.screen.SkillTreeScreen;
+import main.java.com.mygdx.pirategame.screen.SkillTreeScreen;
 
 /**
  * Hud

core/src/com/mygdx/pirategame/PirateGame.java → core/src/main/java/com/mygdx/pirategame/PirateGame.java

@@ -1,12 +1,12 @@
-package com.mygdx.pirategame;
+package main.java.com.mygdx.pirategame;
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import com.mygdx.pirategame.screen.*;
+import main.java.com.mygdx.pirategame.screen.*;
 
 
 /**

core/src/com/mygdx/pirategame/audioControls.java → core/src/main/java/com/mygdx/pirategame/audioControls.java

@@ -1,4 +1,4 @@
-package com.mygdx.pirategame;
+package main.java.com.mygdx.pirategame;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Preferences;
 

core/src/com/mygdx/pirategame/gameobjects/CannonFire.java → core/src/main/java/com/mygdx/pirategame/gameobjects/CannonFire.java

@@ -1,4 +1,4 @@
-package com.mygdx.pirategame.gameobjects;
+package main.java.com.mygdx.pirategame.gameobjects;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Sound;
@@ -7,8 +7,8 @@
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.physics.box2d.*;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Cannon Fire

core/src/com/mygdx/pirategame/gameobjects/CollegeFire.java → core/src/main/java/com/mygdx/pirategame/gameobjects/CollegeFire.java

@@ -1,11 +1,11 @@
-package com.mygdx.pirategame.gameobjects;
+package main.java.com.mygdx.pirategame.gameobjects;
 
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.physics.box2d.*;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 import java.util.Random;
 

core/src/com/mygdx/pirategame/gameobjects/Player.java → core/src/main/java/com/mygdx/pirategame/gameobjects/Player.java

@@ -1,4 +1,4 @@
-package com.mygdx.pirategame.gameobjects;
+package main.java.com.mygdx.pirategame.gameobjects;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Sound;
@@ -8,8 +8,8 @@
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.physics.box2d.*;
 import com.badlogic.gdx.utils.Array;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Creates the class of the player. Everything that involves actions coming from the player boat
@@ -21,7 +21,7 @@ public class Player extends Sprite {
     private Texture ship;
     public World world;
     public Body b2body;
-    private Sound breakSound;
+    private Sound breakSound, cannonballHitSound;
     private Array<CannonFire> cannonBalls;
 
     /**
@@ -41,8 +41,11 @@ public Player(GameScreen screen) {
         setRegion(ship);
         setOrigin(32 / PirateGame.PPM,55 / PirateGame.PPM);
 
-        // Sound effect for damage
+        // Sound effect for terrain collision
         breakSound = Gdx.audio.newSound(Gdx.files.internal("sfx_and_music/wood-bump.mp3"));
+        // Sound effect for cannonball hit
+        cannonballHitSound = Gdx.audio.newSound(Gdx.files.internal("sfx_and_music/ship-hit.wav"));
+
 
         // Sets cannonball array
         cannonBalls = new Array<CannonFire>();
@@ -72,12 +75,22 @@ public void update(float dt) {
      * Plays the break sound when a boat takes damage
      */
     public void playBreakSound() {
-        // Plays damage sound effect
+        // Plays terrain collision sound effect
         if (screen.game.getPreferences().isEffectsEnabled()) {
             breakSound.play(screen.game.getPreferences().getEffectsVolume());
         }
     }
 
+    /**
+     * Plays the explosion sound when a boat is hit by a cannonball
+     */
+    public void playCannonballHitSound() {
+        // Plays cannonball hit sound effect
+        if (screen.game.getPreferences().isEffectsEnabled()) {
+            cannonballHitSound.play(screen.game.getPreferences().getEffectsVolume());
+        }
+    }
+
     /**
      * Defines all the parts of the player's physical model. Sets it up for collisons
      */

core/src/com/mygdx/pirategame/gameobjects/enemy/College.java → core/src/main/java/com/mygdx/pirategame/gameobjects/enemy/College.java

@@ -1,15 +1,16 @@
-package com.mygdx.pirategame.gameobjects.enemy;
+package main.java.com.mygdx.pirategame.gameobjects.enemy;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Sound;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.physics.box2d.*;
 import com.badlogic.gdx.utils.Array;
-import com.mygdx.pirategame.world.AvailableSpawn;
-import com.mygdx.pirategame.gameobjects.CollegeFire;
-import com.mygdx.pirategame.Hud;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.Hud;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.gameobjects.CollegeFire;
+import main.java.com.mygdx.pirategame.world.AvailableSpawn;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -31,6 +32,7 @@ public class College extends Enemy {
     private Array<CollegeFire> cannonBalls;
     private AvailableSpawn noSpawn;
     public ArrayList<EnemyShip> fleet = new ArrayList<>();
+    private Sound cannonballHitSound;
 
     /**
      *
@@ -71,6 +73,9 @@ public College(GameScreen screen, String college, float x, float y, String flag,
             }
             fleet.add(new EnemyShip(screen, ranX, ranY, ship, college));
         }
+
+        // explosion sound effect
+        cannonballHitSound = Gdx.audio.newSound(Gdx.files.internal("sfx_and_music/explode.mp3"));
     }
 
     /**
@@ -181,6 +186,11 @@ public void onContact() {
         Gdx.app.log("enemy", "collision");
         health -= damage;
         bar.changeHealth(damage);
+
+        // Plays explosion sound effect
+        if (screen.game.getPreferences().isEffectsEnabled()) {
+            cannonballHitSound.play(screen.game.getPreferences().getEffectsVolume());
+        }
     }
 
     /**

core/src/com/mygdx/pirategame/gameobjects/enemy/Enemy.java → core/src/main/java/com/mygdx/pirategame/gameobjects/enemy/Enemy.java

@@ -1,10 +1,10 @@
-package com.mygdx.pirategame.gameobjects.enemy;
+package main.java.com.mygdx.pirategame.gameobjects.enemy;
 
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.physics.box2d.Body;
 import com.badlogic.gdx.physics.box2d.World;
-import com.mygdx.pirategame.screen.GameScreen;
-import com.mygdx.pirategame.HealthBar;
+import main.java.com.mygdx.pirategame.HealthBar;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Enemy

core/src/com/mygdx/pirategame/gameobjects/enemy/EnemyShip.java → core/src/main/java/com/mygdx/pirategame/gameobjects/enemy/EnemyShip.java

@@ -1,4 +1,4 @@
-package com.mygdx.pirategame.gameobjects.enemy;
+package main.java.com.mygdx.pirategame.gameobjects.enemy;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Sound;
@@ -7,10 +7,9 @@
 import com.badlogic.gdx.physics.box2d.BodyDef;
 import com.badlogic.gdx.physics.box2d.CircleShape;
 import com.badlogic.gdx.physics.box2d.FixtureDef;
-import com.mygdx.pirategame.gameobjects.enemy.Enemy;
-import com.mygdx.pirategame.screen.GameScreen;
-import com.mygdx.pirategame.Hud;
-import com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.Hud;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Enemy Ship

core/src/com/mygdx/pirategame/gameobjects/entity/Coin.java → core/src/main/java/com/mygdx/pirategame/gameobjects/entity/Coin.java

@@ -1,4 +1,4 @@
-package com.mygdx.pirategame.gameobjects.entity;
+package main.java.com.mygdx.pirategame.gameobjects.entity;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Sound;
@@ -7,9 +7,9 @@
 import com.badlogic.gdx.physics.box2d.BodyDef;
 import com.badlogic.gdx.physics.box2d.CircleShape;
 import com.badlogic.gdx.physics.box2d.FixtureDef;
-import com.mygdx.pirategame.Hud;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.Hud;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Coin

core/src/com/mygdx/pirategame/gameobjects/entity/Entity.java → core/src/main/java/com/mygdx/pirategame/gameobjects/entity/Entity.java

@@ -1,9 +1,9 @@
-package com.mygdx.pirategame.gameobjects.entity;
+package main.java.com.mygdx.pirategame.gameobjects.entity;
 
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.physics.box2d.Body;
 import com.badlogic.gdx.physics.box2d.World;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Entity

core/src/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls.java → core/src/main/java/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls.java

@@ -1,9 +1,8 @@
-package com.mygdx.pirategame.gameobjects.tileobject;
+package main.java.com.mygdx.pirategame.gameobjects.tileobject;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Rectangle;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.gameobjects.tileobject.InteractiveTileObject;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * College Walls (Alcuin)

core/src/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls2.java → core/src/main/java/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls2.java

@@ -1,9 +1,8 @@
-package com.mygdx.pirategame.gameobjects.tileobject;
+package main.java.com.mygdx.pirategame.gameobjects.tileobject;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Rectangle;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.gameobjects.tileobject.InteractiveTileObject;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * College Walls (Goodricke)

core/src/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls3.java → core/src/main/java/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls3.java

@@ -1,9 +1,8 @@
-package com.mygdx.pirategame.gameobjects.tileobject;
+package main.java.com.mygdx.pirategame.gameobjects.tileobject;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Rectangle;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.gameobjects.tileobject.InteractiveTileObject;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * College Walls (Constantine)

core/src/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls4.java → core/src/main/java/com/mygdx/pirategame/gameobjects/tileobject/CollegeWalls4.java

@@ -1,9 +1,8 @@
-package com.mygdx.pirategame.gameobjects.tileobject;
+package main.java.com.mygdx.pirategame.gameobjects.tileobject;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Rectangle;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.gameobjects.tileobject.InteractiveTileObject;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * College Walls (Anne Lister)

core/src/com/mygdx/pirategame/gameobjects/tileobject/InteractiveTileObject.java → core/src/main/java/com/mygdx/pirategame/gameobjects/tileobject/InteractiveTileObject.java

@@ -1,10 +1,10 @@
-package com.mygdx.pirategame.gameobjects.tileobject;
+package main.java.com.mygdx.pirategame.gameobjects.tileobject;
 
 import com.badlogic.gdx.maps.tiled.TiledMapTile;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.physics.box2d.*;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Interactive Tile Object

core/src/com/mygdx/pirategame/gameobjects/tileobject/Islands.java → core/src/main/java/com/mygdx/pirategame/gameobjects/tileobject/Islands.java

@@ -1,10 +1,9 @@
-package com.mygdx.pirategame.gameobjects.tileobject;
+package main.java.com.mygdx.pirategame.gameobjects.tileobject;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Rectangle;
-import com.mygdx.pirategame.Hud;
-import com.mygdx.pirategame.PirateGame;
-import com.mygdx.pirategame.gameobjects.tileobject.InteractiveTileObject;
-import com.mygdx.pirategame.screen.GameScreen;
+import main.java.com.mygdx.pirategame.Hud;
+import main.java.com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.screen.GameScreen;
 
 /**
  * Sets up the class for all the Islands. Deals with what happens on collision and its properties

core/src/com/mygdx/pirategame/screen/DeathScreen.java → core/src/main/java/com/mygdx/pirategame/screen/DeathScreen.java

@@ -1,4 +1,4 @@
-package com.mygdx.pirategame.screen;
+package main.java.com.mygdx.pirategame.screen;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Screen;
@@ -13,7 +13,7 @@
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
-import com.mygdx.pirategame.PirateGame;
+import main.java.com.mygdx.pirategame.PirateGame;
 
 /**
  * Death Screen