Refactor: Gatherers->Gatherer

src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java

@@ -4,16 +4,16 @@ import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Character;
 import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType;
 import it.polimi.ingsw.gc14.Model.Player;
 
-public class Gatherers extends Character {
+public class Gatherer extends Character {
 
     /**
      *
      * @param Era gatherers era
      */
-    public Gatherers(int Era) {
+    public Gatherer(int Era) {
         super(Era, CharacterType.GATHERERS);
     }
-    public Gatherers(int Era,int nMin) {
+    public Gatherer(int Era, int nMin) {
         super(Era, CharacterType.GATHERERS,nMin);
     }
     @Override
@@ -23,7 +23,7 @@ public class Gatherers extends Character {
 
     @Override
     public Character clone() {
-        return new Gatherers(getEra());
+        return new Gatherer(getEra());
     }
     public void insert(Player player) {
         player.gatherers.add(this);

src/main/java/it/polimi/ingsw/gc14/Model/DecksCreator.java

@@ -1,10 +1,8 @@
 package it.polimi.ingsw.gc14.Model;
 
 import com.google.gson.*;
-import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType;
 import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*;
 import it.polimi.ingsw.gc14.Model.Cards.TribeCard;
-import it.polimi.ingsw.gc14.Model.Cards.TribeCards.EventType;
 import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events.CavePaintings;
 import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events.Hunt;
 import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events.ShamanicRitual;
@@ -61,10 +59,10 @@ public class DecksCreator {
                 case 3 -> new Builder(era, p[0], p[1], p[2]);
                 default -> throw new IllegalArgumentException("Builder: parametri non validi");
             };
-            case "Gatherers" -> switch (p.length) {
-                case 0 -> new Gatherers(era);
-                case 1 -> new Gatherers(era, p[0]);
-                default -> throw new IllegalArgumentException("Gatherers: parametri non validi");
+            case "Gatherer" -> switch (p.length) {
+                case 0 -> new Gatherer(era);
+                case 1 -> new Gatherer(era, p[0]);
+                default -> throw new IllegalArgumentException("Gatherer: parametri non validi");
             };
             case "Artist" -> switch (p.length) {
                 case 0 -> new Artist(era);

src/main/java/it/polimi/ingsw/gc14/Model/Player.java

@@ -37,7 +37,7 @@ public class Player {
     public ArrayList <Artist> artists;
     public ArrayList <Builder> builders;
     public ArrayList <Inventor> inventors;
-    public ArrayList <Gatherers>  gatherers;
+    public ArrayList <Gatherer>  gatherers;
     public ArrayList <Shaman> shamans;
     public ArrayList <Hunter> hunters;
 

src/main/resources/Cards/cards_era1.json

@@ -81,21 +81,21 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 1,
     "armed": false,
     "params": []
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 1,
     "armed": false,
     "params": []
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 1,
     "armed": false,
     "params": [
@@ -104,7 +104,7 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 1,
     "armed": false,
     "params": [

src/main/resources/Cards/cards_era2.json

@@ -88,14 +88,14 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 2,
     "armed": false,
     "params": []
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 2,
     "armed": false,
     "params": [
@@ -104,7 +104,7 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 2,
     "armed": false,
     "params": [
@@ -113,7 +113,7 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 2,
     "armed": false,
     "params": [

src/main/resources/Cards/cards_era3.json

@@ -72,7 +72,7 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 3,
     "armed": false,
     "params": [
@@ -81,7 +81,7 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 3,
     "armed": false,
     "params": [
@@ -90,7 +90,7 @@
   },
   {
     "isEvent": false,
-    "type": "Gatherers",
+    "type": "Gatherer",
     "era": 3,
     "armed": false,
     "params": []