From 041163123494876ac6b2539441c3bba55fd4c6aa Mon Sep 17 00:00:00 2001
From: Azurlors <florianrichard2001@gmail.com>
Date: Fri, 16 Dec 2022 15:35:26 +0100
Subject: [PATCH] formatage variable
---
.../src/main/java/engine/DrawingPanel.java | 12 +----------
.../src/main/java/entity/Character.java | 2 +-
.../src/main/java/entity/Monster.java | 2 +-
.../main/java/entity/ShootingCharacter.java | 2 +-
.../main/java/environnement/Coordonnees.java | 10 ++-------
.../src/main/java/environnement/HitBox.java | 21 ++++---------------
.../src/main/java/jeu/Controller.java | 2 +-
MAVENProject/src/main/java/jeu/Jeu.java | 1 -
MAVENProject/src/main/java/jeu/Painter.java | 4 +---
.../main/java/loaders/CharacterLoader.java | 4 ++--
.../src/main/java/loaders/ObstacleLoader.java | 4 ++--
MAVENProject/src/main/java/map/Coffre.java | 2 +-
MAVENProject/src/main/java/map/Obstacle.java | 2 +-
MAVENProject/src/main/java/spotify/MP3.java | 3 +--
14 files changed, 19 insertions(+), 52 deletions(-)
diff --git a/MAVENProject/src/main/java/engine/DrawingPanel.java b/MAVENProject/src/main/java/engine/DrawingPanel.java
index b253f6c..04e5b49 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 5c4b1e6..311acb1 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 57c8bbd..32802a1 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 cd7da03..dbf6a10 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 35f8e8e..471fbe5 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 c10728e..a20f346 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 625d882..52e12a1 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 775e5a2..37b2d01 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 6c3ac58..3da3403 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 d325200..02c104e 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 f8cbba0..669ea96 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 36d0838..92c26e7 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 f64afc2..0075bc3 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 71dc27c..9941ea3 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(){
--
GitLab