diff --git a/.classpath b/.classpath index 90f172f..675385c 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,16 @@ - - - + + + + + + + + + + + + diff --git a/GamePlay/Match/match.java b/src/gameplay/Match/match.java similarity index 68% rename from GamePlay/Match/match.java rename to src/gameplay/Match/match.java index 34705ee..a9c13fb 100644 --- a/GamePlay/Match/match.java +++ b/src/gameplay/Match/match.java @@ -1,7 +1,8 @@ -package Match; +package gameplay.Match; -import input.InputBuffer; -import Entities.*; +import gameplay.input.InputBuffer; +import gameplay.entities.*; +import gameplay.entities.Character; /** * Main class that describes the base structure of the match, with characters, timer and such @@ -19,16 +20,16 @@ public class match { private InputBuffer inputsP1, inputsP2; private int hpP1, hpP2; private int roundsWonP1, roundsWonP2; - private Entities.Character p1, p2; //characters of player 1 and 2 + private Character p1, p2; //characters of player 1 and 2 /** * base constructor of the match class. * Initiates a new match with with two given characters */ - public match(Entities.Character p1, Entities.Character p2) { + public match(Character p1, Character p2) { this.timer = 99; - this.inputsP1 = new input.InputBuffer(inputBufferSize); - this.inputsP2 = new input.InputBuffer(inputBufferSize); + this.inputsP1 = new InputBuffer(inputBufferSize); + this.inputsP2 = new InputBuffer(inputBufferSize); this.p1 = p1; this.p2 = p2; this.hpP1 = p1.getMaxHP(); diff --git a/GamePlay/Actions/Attack.java b/src/gameplay/actions/Attack.java similarity index 87% rename from GamePlay/Actions/Attack.java rename to src/gameplay/actions/Attack.java index 4e769c4..48e9fe5 100644 --- a/GamePlay/Actions/Attack.java +++ b/src/gameplay/actions/Attack.java @@ -1,5 +1,6 @@ -package Actions; -import input.*; +package gameplay.actions; + +import gameplay.input.*; public class Attack { /** diff --git a/GamePlay/Entities/Character.java b/src/gameplay/entities/Character.java similarity index 90% rename from GamePlay/Entities/Character.java rename to src/gameplay/entities/Character.java index f4d2366..8a6d52e 100644 --- a/GamePlay/Entities/Character.java +++ b/src/gameplay/entities/Character.java @@ -1,6 +1,6 @@ -package Entities; +package gameplay.entities; -import Frames.Frame; +import gameplay.frames.Frame; /** * Character class, which is a sub-class of an entity diff --git a/GamePlay/Entities/Entity.java b/src/gameplay/entities/Entity.java similarity index 94% rename from GamePlay/Entities/Entity.java rename to src/gameplay/entities/Entity.java index 0ddf6c6..5d7bd38 100644 --- a/GamePlay/Entities/Entity.java +++ b/src/gameplay/entities/Entity.java @@ -1,6 +1,6 @@ -package Entities; +package gameplay.entities; -import Frames.Frame; +import gameplay.frames.Frame; /** * Entity class, which is the main class regrouping characters and projectiles diff --git a/GamePlay/Entities/Projectile.java b/src/gameplay/entities/Projectile.java similarity index 61% rename from GamePlay/Entities/Projectile.java rename to src/gameplay/entities/Projectile.java index 2feb351..d08cb4b 100644 --- a/GamePlay/Entities/Projectile.java +++ b/src/gameplay/entities/Projectile.java @@ -1,4 +1,4 @@ -package Entities; +package gameplay.entities; public class Projectile extends Entity{ } diff --git a/GamePlay/Frames/Frame.java b/src/gameplay/frames/Frame.java similarity index 96% rename from GamePlay/Frames/Frame.java rename to src/gameplay/frames/Frame.java index 177603d..14cf3cd 100644 --- a/GamePlay/Frames/Frame.java +++ b/src/gameplay/frames/Frame.java @@ -1,7 +1,9 @@ -package Frames; +package gameplay.frames; import java.util.ArrayList; -import Hitboxes.*; + +import gameplay.hitboxes.*; + /** * Main class for frames * @author Victor Azra diff --git a/GamePlay/Frames/nextFrameBuffer.java b/src/gameplay/frames/nextFrameBuffer.java similarity index 98% rename from GamePlay/Frames/nextFrameBuffer.java rename to src/gameplay/frames/nextFrameBuffer.java index 87d7f43..2360a77 100644 --- a/GamePlay/Frames/nextFrameBuffer.java +++ b/src/gameplay/frames/nextFrameBuffer.java @@ -1,4 +1,4 @@ -package Frames; +package gameplay.frames; /** * This will handle the next frames to be played by each entity. diff --git a/GamePlay/Hitboxes/Active_HitBox.java b/src/gameplay/hitboxes/Active_HitBox.java similarity index 64% rename from GamePlay/Hitboxes/Active_HitBox.java rename to src/gameplay/hitboxes/Active_HitBox.java index af4b970..05c6a76 100644 --- a/GamePlay/Hitboxes/Active_HitBox.java +++ b/src/gameplay/hitboxes/Active_HitBox.java @@ -1,4 +1,4 @@ -package Hitboxes; +package gameplay.hitboxes; public class Active_HitBox extends HitBox { diff --git a/GamePlay/Hitboxes/Active_throw_Hitbox.java b/src/gameplay/hitboxes/Active_throw_Hitbox.java similarity index 66% rename from GamePlay/Hitboxes/Active_throw_Hitbox.java rename to src/gameplay/hitboxes/Active_throw_Hitbox.java index 2bcd36b..79f1828 100644 --- a/GamePlay/Hitboxes/Active_throw_Hitbox.java +++ b/src/gameplay/hitboxes/Active_throw_Hitbox.java @@ -1,4 +1,4 @@ -package Hitboxes; +package gameplay.hitboxes; public class Active_throw_Hitbox extends HitBox { diff --git a/GamePlay/Hitboxes/HitBox.java b/src/gameplay/hitboxes/HitBox.java similarity index 98% rename from GamePlay/Hitboxes/HitBox.java rename to src/gameplay/hitboxes/HitBox.java index ae2e01f..1fa984c 100644 --- a/GamePlay/Hitboxes/HitBox.java +++ b/src/gameplay/hitboxes/HitBox.java @@ -1,4 +1,4 @@ -package Hitboxes; +package gameplay.hitboxes; public class HitBox { diff --git a/GamePlay/Hitboxes/Passive_HitBox.java b/src/gameplay/hitboxes/Passive_HitBox.java similarity index 64% rename from GamePlay/Hitboxes/Passive_HitBox.java rename to src/gameplay/hitboxes/Passive_HitBox.java index 2a2582b..51e3674 100644 --- a/GamePlay/Hitboxes/Passive_HitBox.java +++ b/src/gameplay/hitboxes/Passive_HitBox.java @@ -1,4 +1,4 @@ -package Hitboxes; +package gameplay.hitboxes; public class Passive_HitBox extends HitBox { diff --git a/GamePlay/Hitboxes/Passive_throw_HitBox.java b/src/gameplay/hitboxes/Passive_throw_HitBox.java similarity index 67% rename from GamePlay/Hitboxes/Passive_throw_HitBox.java rename to src/gameplay/hitboxes/Passive_throw_HitBox.java index 8ffe132..88a677c 100644 --- a/GamePlay/Hitboxes/Passive_throw_HitBox.java +++ b/src/gameplay/hitboxes/Passive_throw_HitBox.java @@ -1,4 +1,4 @@ -package Hitboxes; +package gameplay.hitboxes; public class Passive_throw_HitBox extends HitBox { diff --git a/GamePlay/Hitboxes/Push_HitBox.java b/src/gameplay/hitboxes/Push_HitBox.java similarity index 89% rename from GamePlay/Hitboxes/Push_HitBox.java rename to src/gameplay/hitboxes/Push_HitBox.java index 28d05b8..e7f44f4 100644 --- a/GamePlay/Hitboxes/Push_HitBox.java +++ b/src/gameplay/hitboxes/Push_HitBox.java @@ -1,4 +1,4 @@ -package Hitboxes; +package gameplay.hitboxes; public class Push_HitBox extends HitBox { diff --git a/GamePlay/input/Button.java b/src/gameplay/input/Button.java similarity index 93% rename from GamePlay/input/Button.java rename to src/gameplay/input/Button.java index 85a90c7..6ef406f 100644 --- a/GamePlay/input/Button.java +++ b/src/gameplay/input/Button.java @@ -1,4 +1,4 @@ -package input; +package gameplay.input; public enum Button { UP, DOWN, LEFT, RIGHT, A, B, C, D; diff --git a/GamePlay/input/InputBuffer.java b/src/gameplay/input/InputBuffer.java similarity index 98% rename from GamePlay/input/InputBuffer.java rename to src/gameplay/input/InputBuffer.java index 058e4b0..778e6bf 100644 --- a/GamePlay/input/InputBuffer.java +++ b/src/gameplay/input/InputBuffer.java @@ -1,4 +1,4 @@ -package input; +package gameplay.input; public class InputBuffer { diff --git a/GamePlay/input/Inputs.java b/src/gameplay/input/Inputs.java similarity index 98% rename from GamePlay/input/Inputs.java rename to src/gameplay/input/Inputs.java index 769a029..2248c21 100644 --- a/GamePlay/input/Inputs.java +++ b/src/gameplay/input/Inputs.java @@ -1,4 +1,4 @@ -package input; +package gameplay.input; /** * The class handling the parsing of one input.