Corrected classpath, new (and clearer) package arrangement.
This commit is contained in:
parent
b98d1908f6
commit
de721b59ab
15
.classpath
15
.classpath
@ -1,7 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="GamePlay"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
@ -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();
|
@ -1,5 +1,6 @@
|
||||
package Actions;
|
||||
import input.*;
|
||||
package gameplay.actions;
|
||||
|
||||
import gameplay.input.*;
|
||||
|
||||
public class Attack {
|
||||
/**
|
@ -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
|
@ -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
|
@ -1,4 +1,4 @@
|
||||
package Entities;
|
||||
package gameplay.entities;
|
||||
|
||||
public class Projectile extends Entity{
|
||||
}
|
@ -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
|
@ -1,4 +1,4 @@
|
||||
package Frames;
|
||||
package gameplay.frames;
|
||||
|
||||
/**
|
||||
* This will handle the next frames to be played by each entity.
|
@ -1,4 +1,4 @@
|
||||
package Hitboxes;
|
||||
package gameplay.hitboxes;
|
||||
|
||||
public class Active_HitBox extends HitBox {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package Hitboxes;
|
||||
package gameplay.hitboxes;
|
||||
|
||||
public class Active_throw_Hitbox extends HitBox {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package Hitboxes;
|
||||
package gameplay.hitboxes;
|
||||
|
||||
public class HitBox {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package Hitboxes;
|
||||
package gameplay.hitboxes;
|
||||
|
||||
public class Passive_HitBox extends HitBox {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package Hitboxes;
|
||||
package gameplay.hitboxes;
|
||||
|
||||
public class Passive_throw_HitBox extends HitBox {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package Hitboxes;
|
||||
package gameplay.hitboxes;
|
||||
|
||||
public class Push_HitBox extends HitBox {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package input;
|
||||
package gameplay.input;
|
||||
|
||||
public enum Button {
|
||||
UP, DOWN, LEFT, RIGHT, A, B, C, D;
|
@ -1,4 +1,4 @@
|
||||
package input;
|
||||
package gameplay.input;
|
||||
|
||||
public class InputBuffer {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package input;
|
||||
package gameplay.input;
|
||||
|
||||
/**
|
||||
* The class handling the parsing of one input.
|
Loading…
x
Reference in New Issue
Block a user