From 507437298ba2eead222bd5f3b0700b5d139ce523 Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Thu, 4 May 2023 22:12:13 +0200
Subject: [PATCH] DownDate to java 11

---
 .../java/school_project/MapGenerator.java     | 20 ++++++++++++-------
 app/src/main/java/school_project/Piece.java   |  3 ++-
 .../school_project/Utils/MatrixShape.java     |  7 ++++---
 app/src/main/java/school_project/Vec2.java    |  3 ++-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/school_project/MapGenerator.java b/app/src/main/java/school_project/MapGenerator.java
index f6a44b8..e782f97 100644
--- a/app/src/main/java/school_project/MapGenerator.java
+++ b/app/src/main/java/school_project/MapGenerator.java
@@ -20,13 +20,19 @@ public class MapGenerator {
 
         // define map size depending on the difficulty
         switch (difficulty){
-            case Easy -> map_size = new Vec2(rand.nextInt(3, 5), rand.nextInt(3, 5));
-            case Medium -> map_size = new Vec2(rand.nextInt(5, 8), rand.nextInt(5, 8));
-            case Difficult -> {
-                map_size = new Vec2(rand.nextInt(8, 10), rand.nextInt(8, 10));
+            case Easy:
+                map_size = new Vec2(rand.nextInt(2) + 3, rand.nextInt(2) + 3);
+                break;
+            case Medium:
+                map_size = new Vec2(rand.nextInt(3)+5, rand.nextInt(3)+5);
+                break;
+            case Difficult:
+                map_size = new Vec2(rand.nextInt(2)+8, rand.nextInt(2)+8);
                 depth = 2;
-            }
-            default -> map_size = new Vec2();
+                break;
+            default:
+                map_size = new Vec2();
+                break;
         }
 
         // Cut edges
@@ -57,7 +63,7 @@ public class MapGenerator {
         while (EmptySlots.size() > 0){
             Collections.shuffle(EmptySlots);
             Vec2 selected = EmptySlots.get(0);
-            int size = rand.nextInt(1, 4);
+            int size = rand.nextInt(3)+1;
             boolean[][] shape = new boolean[size][size];
             for(int i = 0; i < size; i++){
                 for (int j = 0; j < size; j++) {
diff --git a/app/src/main/java/school_project/Piece.java b/app/src/main/java/school_project/Piece.java
index ac01953..7ce450e 100644
--- a/app/src/main/java/school_project/Piece.java
+++ b/app/src/main/java/school_project/Piece.java
@@ -68,7 +68,8 @@ public class Piece extends Shape{
 
     @Override
     public boolean equals(Object obj) {
-        if(obj instanceof Piece pieceObj){
+        if(obj instanceof Piece){
+            Piece pieceObj = (Piece) obj;
             if( pieceObj.getPosition().equals(this.getPosition()) && pieceObj.getShape().equals(getShape())) {
                 return true;
             }
diff --git a/app/src/main/java/school_project/Utils/MatrixShape.java b/app/src/main/java/school_project/Utils/MatrixShape.java
index c2f9c94..fed4045 100644
--- a/app/src/main/java/school_project/Utils/MatrixShape.java
+++ b/app/src/main/java/school_project/Utils/MatrixShape.java
@@ -1,6 +1,5 @@
 package school_project.Utils;
 
-import javafx.geometry.Rectangle2D;
 import javafx.scene.Node;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -19,7 +18,8 @@ public class MatrixShape extends GridPane {
     public MatrixShape(Shape shape) {
         super();
         this.shape = shape;
-        if(shape instanceof Piece p){
+        if(shape instanceof Piece){
+            Piece p = (Piece) shape;
             color = p.getColor();
         }
 
@@ -36,7 +36,8 @@ public class MatrixShape extends GridPane {
             for (int j = 0; j < shape_matrix[i].length; j++) {
                 if(shape_matrix[i][j]){
                     Node _cell;
-                    if(shape instanceof Piece p){
+                    if(shape instanceof Piece){
+                        Piece p = (Piece) shape;
                         _cell = new Rectangle(GameUI.SEGMENT_SIZE, GameUI.SEGMENT_SIZE);
                         ((Rectangle) _cell).setFill(color);
                     }else{
diff --git a/app/src/main/java/school_project/Vec2.java b/app/src/main/java/school_project/Vec2.java
index 6529e15..05d2576 100644
--- a/app/src/main/java/school_project/Vec2.java
+++ b/app/src/main/java/school_project/Vec2.java
@@ -21,7 +21,8 @@ public class Vec2 implements Serializable {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof Vec2 vec) {
+        if (obj instanceof Vec2) {
+            Vec2 vec = (Vec2) obj;
             return this.x == vec.x && this.y == vec.y;
         }
         return false;