diff --git a/MAVENProject/src/main/java/engine/DrawingPanel.java b/MAVENProject/src/main/java/engine/DrawingPanel.java
index b253f6cb2023bed8f8711fd09292cddfe39f647f..04e5b49b4fc19d248dbb24e18c25907034417525 100644
--- a/MAVENProject/src/main/java/engine/DrawingPanel.java
+++ b/MAVENProject/src/main/java/engine/DrawingPanel.java
@@ -9,7 +9,6 @@ import java.awt.Graphics;
import java.awt.image.BufferedImage;
import javax.swing.JPanel;
-import static jeu.Jeu.getGameCharacter;
public class DrawingPanel extends JPanel {
@@ -90,16 +89,7 @@ public class DrawingPanel extends JPanel {
*/
public void paint(Graphics g) {
super.paint(g);
- if (getGameCharacter().getCoord() != null){
- //int x = (int) getGameCharacter().getCoord().getX();
- //int z = (int) getGameCharacter().getCoord().getZ();
- g.drawImage(this.currentImage, 0,0, getWidth(), getHeight(),0, 0, getWidth(), getHeight(), null);
- }
- else {
- g.drawImage(this.currentImage, 0,0, getWidth(), getHeight()+100, 0, 0,
+ g.drawImage(this.currentImage, 0,0, getWidth(), getHeight(), 0, 0,
getWidth(), getHeight(), null);
- System.out.println("test");
- }
}
-
}
diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java
index 5c4b1e69bab10381f79ce877802ee338aeb40c33..311acb18f8d485a9ed74358e326863cd1f14591c 100644
--- a/MAVENProject/src/main/java/entity/Character.java
+++ b/MAVENProject/src/main/java/entity/Character.java
@@ -147,7 +147,7 @@ public class Character extends Entity{
private void keyGestion() {
for (Coffre cof : Jeu.getCoffreTable()){
if (HitBox.collision(this.getHitBox(), cof.getHitbox())){
- if (cof.key ==true) {
+ if (cof.key) {
this.key += 1;
cof.key = false;
System.out.print("Tu as trouvé une clée!");
diff --git a/MAVENProject/src/main/java/entity/Monster.java b/MAVENProject/src/main/java/entity/Monster.java
index 57c8bbdfe250a222c283f2fa66579a528a4caf33..32802a187fe5537ed10dc195fe478a0cc825f9f2 100644
--- a/MAVENProject/src/main/java/entity/Monster.java
+++ b/MAVENProject/src/main/java/entity/Monster.java
@@ -54,7 +54,7 @@ public class Monster extends Entity{
//recupere la liste des obstacles dans le voisinage
List<Obstacle> listeObstaclesInVoisinage = getObstacleTable();
//stocke l'obstacle avec lequel il y a eu collision
- HashMap<Obstacle,PositionCollision> collisionsPresentes = new HashMap<Obstacle,PositionCollision>();
+ HashMap<Obstacle,PositionCollision> collisionsPresentes = new HashMap<>();
//recupere les collisions
for (int i=0;i<listeObstaclesInVoisinage.size();i++) {
diff --git a/MAVENProject/src/main/java/entity/ShootingCharacter.java b/MAVENProject/src/main/java/entity/ShootingCharacter.java
index cd7da036dd3547b115599741af657b4adcc2912f..dbf6a1057e980a2044d32fddd7d9c4ca9539827e 100644
--- a/MAVENProject/src/main/java/entity/ShootingCharacter.java
+++ b/MAVENProject/src/main/java/entity/ShootingCharacter.java
@@ -15,7 +15,7 @@ public class ShootingCharacter extends Character{
public void attaque(){
if (this.getTableCommande().get("CommandAttack") != 0 && hasAttacked == 0){ //on ajoute un kunai dans la liste
List<Kunai> temp = Jeu.getKunaiList();
- Coordonnees coordKunai = new Coordonnees(coord.getX()+direction*Kunai.getWidth()/2+direction*this.getEntityWIDTH()/2, coord.getZ());
+ Coordonnees coordKunai = new Coordonnees(coord.getX() + (direction * (double) Kunai.getWidth() / 2) + ((direction * this.getEntityWIDTH()) / 2), coord.getZ());
temp.add(new Kunai(direction, attackStat, coordKunai));
Jeu.setKunaiList(temp);
hasAttacked++;
diff --git a/MAVENProject/src/main/java/environnement/Coordonnees.java b/MAVENProject/src/main/java/environnement/Coordonnees.java
index 35f8e8efd0f47d6f2b47ff6ebc84a81dc2ea4420..471fbe575320eba3344f819480048c0eb2824051 100644
--- a/MAVENProject/src/main/java/environnement/Coordonnees.java
+++ b/MAVENProject/src/main/java/environnement/Coordonnees.java
@@ -2,20 +2,14 @@ package environnement;
public class Coordonnees {
- private double x;
- private double z;
+ private final double x;
+ private final double z;
public Coordonnees(double newX,double newZ){
this.x = newX;
this.z = newZ;
}
- public static int distance(Object o1,Object o2){
- //if (((o1 instanceof Entity) || (o1 instanceof Bloc)) && ((o2 instanceof Entity) || (o2 instanceof Bloc)))return Math.sqrt(Math.pow(o1.coord.x - o2.coord.x, 2) + Math.pow(o1.coord.y - o2.coord.y,2));
- //a retoucher selon le reste du programme
- return 0;
- }
-
public double getX() {
return x;
}
diff --git a/MAVENProject/src/main/java/environnement/HitBox.java b/MAVENProject/src/main/java/environnement/HitBox.java
index c10728ee19263ef99058a30de068b84247bdf9b8..a20f346994987a21ebed88eec04b1eac5911cb9e 100644
--- a/MAVENProject/src/main/java/environnement/HitBox.java
+++ b/MAVENProject/src/main/java/environnement/HitBox.java
@@ -9,11 +9,10 @@ import static environnement.PositionCollision.*;
public class HitBox {
//private final Coordonnees centre;
- private HashMap<String, Coordonnees> extremites = new HashMap<>();
- private static double defaultUnit = 10;
- private double width;
- private double height;
- private Coordonnees centre;
+ private final HashMap<String, Coordonnees> extremites = new HashMap<>();
+ private final double width;
+ private final double height;
+ private final Coordonnees centre;
public double getWidth() {
return width;
@@ -27,14 +26,6 @@ public class HitBox {
return centre;
}
- public HitBox(Coordonnees c){
- extremites.put("HautDroite",new Coordonnees(c.getX()+defaultUnit/2,c.getZ()-defaultUnit/2));
- extremites.put("BasDroite",new Coordonnees(c.getX()+defaultUnit/2,c.getZ()+defaultUnit/2));
- extremites.put("HautGauche",new Coordonnees(c.getX()-defaultUnit/2,c.getZ()-defaultUnit/2));
- extremites.put("BasGauche",new Coordonnees(c.getX()-defaultUnit/2,c.getZ()+defaultUnit/2));
- centre = c;
- }
-
public HitBox(Coordonnees c , double Height , double Width){
extremites.put("HautDroite",new Coordonnees(c.getX()+Width/2,c.getZ()-Height/2));
extremites.put("BasDroite",new Coordonnees(c.getX()+Width/2,c.getZ()+Height/2));
@@ -45,10 +36,6 @@ public class HitBox {
centre = c;
}
- public static int getDefaultUnit() {
- return (int)defaultUnit;
- }
-
public static Boolean collision(HitBox A, HitBox B){
Boolean a = !(A.extremites.get("HautGauche").getX() > B.extremites.get("HautDroite").getX()); // A est à droite de B
Boolean b = !(A.extremites.get("HautDroite").getX() <= B.extremites.get("HautGauche").getX()); // A est à gauche de B
diff --git a/MAVENProject/src/main/java/jeu/Controller.java b/MAVENProject/src/main/java/jeu/Controller.java
index 625d8824ac734024b632ab623e0c417b2326822a..52e12a14d17008c163397a282bdc09c50796a451 100644
--- a/MAVENProject/src/main/java/jeu/Controller.java
+++ b/MAVENProject/src/main/java/jeu/Controller.java
@@ -9,7 +9,7 @@ public class Controller implements GameController{
private boolean isRightPressed, isLeftPressed, isSpacePressed;
private boolean isLeftCLickPressed;
- private HashMap<String,Boolean> cmd = new HashMap<String,Boolean>();
+ private final HashMap<String,Boolean> cmd = new HashMap<>();
/*
* commande en cours
*/
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 775e5a2dc368f809fc1e90728b74c8f982d151e8..37b2d016e8bdf6da3fc5d94b0b8c34ed4381358c 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -130,7 +130,6 @@ public class Jeu implements Game{
monsterList.add(new Monster(new Coordonnees(320, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Bat(new Coordonnees(1500, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1, 3));
monsterList.add(new Boss(new Coordonnees(3000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 500, 90, 180, 3, 50));*/
- System.out.println(monsterList);
//on charge le perso (a la fin du constructeur, cest important par rapport a obstacleTable, sinon y'a des pbs de "causalite")
gameCharacterLoader = new CharacterLoader(characterSkinPath,new ShootingCharacter(new Coordonnees(xdebut, zdebut), 1500, 1,600000));
gameCharacter = new ShootingCharacter(new Coordonnees(xdebut, zdebut), 1500, 1,600000);
diff --git a/MAVENProject/src/main/java/jeu/Painter.java b/MAVENProject/src/main/java/jeu/Painter.java
index 6c3ac58eee93c02b42a56d1a41aabb19f81c1aaf..3da3403a6330603b2210bbcdb4407664be17a7f6 100644
--- a/MAVENProject/src/main/java/jeu/Painter.java
+++ b/MAVENProject/src/main/java/jeu/Painter.java
@@ -28,12 +28,10 @@ public class Painter implements GamePainter{
//protected static final int HEIGHT = TILES_SIZE*TILES_IN_HEIGHT;
protected static final int WIDTH =1500;
protected static final int HEIGHT=750;
- public static Obstacle test = new Obstacle(new HitBox(new Coordonnees(300,550),32,128));
-
private static Coordonnees coordonneesCam;
public int xCam;
public int zCam;
- private int decalage = 255; // decalage Cam bas pour perso
+ private final int decalage = 255; // decalage Cam bas pour perso
public Painter() {
}
diff --git a/MAVENProject/src/main/java/loaders/CharacterLoader.java b/MAVENProject/src/main/java/loaders/CharacterLoader.java
index d3252001c48145bdd8b931f96a2eb557852d5561..02c104e072ebadc444b3a0c81fa3e2b542e911c5 100644
--- a/MAVENProject/src/main/java/loaders/CharacterLoader.java
+++ b/MAVENProject/src/main/java/loaders/CharacterLoader.java
@@ -8,7 +8,7 @@ import java.util.HashMap;
import javax.swing.ImageIcon;
public class CharacterLoader { // classe qui cree le perso
- private Character gameCharacter; // perso a creer
+ private final Character gameCharacter; // perso a creer
private String skinPath; // chemin du skin a l'instant t du jeu
private Image imageCharacter;
private Map<String,Integer> pathTable; // objet utilise a revoir
@@ -17,7 +17,7 @@ public class CharacterLoader { // classe qui cree le perso
gameCharacter = charac;
skinPath = path;
imageCharacter = new ImageIcon(path).getImage();
- pathTable = new HashMap<String,Integer>();
+ pathTable = new HashMap<>();
}
diff --git a/MAVENProject/src/main/java/loaders/ObstacleLoader.java b/MAVENProject/src/main/java/loaders/ObstacleLoader.java
index f8cbba0f64421c97cfd7dc6e8e8dbb225e8b6469..669ea96cd80250f4eb960c065782e1a7e8d085d2 100644
--- a/MAVENProject/src/main/java/loaders/ObstacleLoader.java
+++ b/MAVENProject/src/main/java/loaders/ObstacleLoader.java
@@ -7,8 +7,8 @@ import java.net.URL;
public class ObstacleLoader {
- private Image imageObstacle;
- private Obstacle obstacle;
+ private final Image imageObstacle;
+ private final Obstacle obstacle;
public Image getImageObstacle() {
return imageObstacle;
diff --git a/MAVENProject/src/main/java/map/Coffre.java b/MAVENProject/src/main/java/map/Coffre.java
index 36d0838d29405fb06c2157a86bf530777aade16a..92c26e79a22bd8fd56036014b0eb75b1707b995c 100644
--- a/MAVENProject/src/main/java/map/Coffre.java
+++ b/MAVENProject/src/main/java/map/Coffre.java
@@ -6,7 +6,7 @@ import environnement.HitBox;
public class Coffre {
- private HitBox hitbox;
+ private final HitBox hitbox;
public boolean key = true;
public Coffre(HitBox h){
diff --git a/MAVENProject/src/main/java/map/Obstacle.java b/MAVENProject/src/main/java/map/Obstacle.java
index f64afc24ec0cf9994f16d40ceeaff401ab6c783c..0075bc3866c69dcaff87969a9525a25b8b3f45ff 100644
--- a/MAVENProject/src/main/java/map/Obstacle.java
+++ b/MAVENProject/src/main/java/map/Obstacle.java
@@ -23,7 +23,7 @@ public final class Obstacle {
@Override
public String toString() {
- return "Obstacle coordonnees" + Double.toString(hitbox.getCentre().getX()) + " " + Double.toString(hitbox.getCentre().getZ());
+ return "Obstacle coordonnees" + hitbox.getCentre().getX() + " " + hitbox.getCentre().getZ();
}
}
diff --git a/MAVENProject/src/main/java/spotify/MP3.java b/MAVENProject/src/main/java/spotify/MP3.java
index 71dc27ce4567572375eb8fa94cca9a68530ee64a..9941ea34d8c7145309b8d2ddcf649aba7127d6ac 100644
--- a/MAVENProject/src/main/java/spotify/MP3.java
+++ b/MAVENProject/src/main/java/spotify/MP3.java
@@ -13,8 +13,7 @@ public class MP3 {
String fn = "Music/";
URL url = getClass().getClassLoader().getResource(fn);
assert url != null;
- String path = url.toString().substring(6)+"/"+musicPath;
- filePath = path;
+ filePath = url.toString().substring(6)+"/"+musicPath;
}
public void displayMusic(){