From acab58d0a3b0ce3bf8a1f045de461e82bf0b9445 Mon Sep 17 00:00:00 2001 From: Samy Avrillon Date: Sat, 2 Nov 2024 00:43:35 +0100 Subject: [PATCH] Removing runtime old classes --- .../model/{runtime => game}/Timestamp.java | 2 +- .../model/game/queues/BuildingQueueItem.java | 2 +- .../game/queues/RecruitmentQueueItem.java | 2 +- .../model/game/queues/ResearchQueueItem.java | 2 +- .../greposimu/model/runtime/Alliance.java | 5 ----- .../greposimu/model/runtime/Joueureuse.java | 9 --------- .../model/runtime/PositionVille.java | 8 -------- .../greposimu/model/runtime/Ville.java | 20 ------------------- .../greposimu/model/simulator/Joueureuse.java | 2 +- .../greposimu/model/simulator/Movements.java | 2 +- .../greposimu/model/simulator/Ville.java | 2 +- .../bernard/greposimu/source/JSONSourcer.java | 2 +- 12 files changed, 8 insertions(+), 50 deletions(-) rename src/main/java/com/bernard/greposimu/model/{runtime => game}/Timestamp.java (72%) delete mode 100644 src/main/java/com/bernard/greposimu/model/runtime/Alliance.java delete mode 100644 src/main/java/com/bernard/greposimu/model/runtime/Joueureuse.java delete mode 100644 src/main/java/com/bernard/greposimu/model/runtime/PositionVille.java delete mode 100644 src/main/java/com/bernard/greposimu/model/runtime/Ville.java diff --git a/src/main/java/com/bernard/greposimu/model/runtime/Timestamp.java b/src/main/java/com/bernard/greposimu/model/game/Timestamp.java similarity index 72% rename from src/main/java/com/bernard/greposimu/model/runtime/Timestamp.java rename to src/main/java/com/bernard/greposimu/model/game/Timestamp.java index db17abc..11d6593 100644 --- a/src/main/java/com/bernard/greposimu/model/runtime/Timestamp.java +++ b/src/main/java/com/bernard/greposimu/model/game/Timestamp.java @@ -1,4 +1,4 @@ -package com.bernard.greposimu.model.runtime; +package com.bernard.greposimu.model.game; public class Timestamp { diff --git a/src/main/java/com/bernard/greposimu/model/game/queues/BuildingQueueItem.java b/src/main/java/com/bernard/greposimu/model/game/queues/BuildingQueueItem.java index ba530fe..2fa85c4 100644 --- a/src/main/java/com/bernard/greposimu/model/game/queues/BuildingQueueItem.java +++ b/src/main/java/com/bernard/greposimu/model/game/queues/BuildingQueueItem.java @@ -2,7 +2,7 @@ package com.bernard.greposimu.model.game.queues; import com.bernard.greposimu.model.game.Building; import com.bernard.greposimu.model.game.Resources; -import com.bernard.greposimu.model.runtime.Timestamp; +import com.bernard.greposimu.model.game.Timestamp; public class BuildingQueueItem extends QueueItem { diff --git a/src/main/java/com/bernard/greposimu/model/game/queues/RecruitmentQueueItem.java b/src/main/java/com/bernard/greposimu/model/game/queues/RecruitmentQueueItem.java index 85080b1..41eee94 100644 --- a/src/main/java/com/bernard/greposimu/model/game/queues/RecruitmentQueueItem.java +++ b/src/main/java/com/bernard/greposimu/model/game/queues/RecruitmentQueueItem.java @@ -1,8 +1,8 @@ package com.bernard.greposimu.model.game.queues; +import com.bernard.greposimu.model.game.Timestamp; import com.bernard.greposimu.model.game.UnitResources; import com.bernard.greposimu.model.game.units.Unit; -import com.bernard.greposimu.model.runtime.Timestamp; public class RecruitmentQueueItem extends QueueItem { diff --git a/src/main/java/com/bernard/greposimu/model/game/queues/ResearchQueueItem.java b/src/main/java/com/bernard/greposimu/model/game/queues/ResearchQueueItem.java index 550ef93..ba56af1 100644 --- a/src/main/java/com/bernard/greposimu/model/game/queues/ResearchQueueItem.java +++ b/src/main/java/com/bernard/greposimu/model/game/queues/ResearchQueueItem.java @@ -1,8 +1,8 @@ package com.bernard.greposimu.model.game.queues; import com.bernard.greposimu.model.game.Resources; +import com.bernard.greposimu.model.game.Timestamp; import com.bernard.greposimu.model.game.researches.Research; -import com.bernard.greposimu.model.runtime.Timestamp; public class ResearchQueueItem extends QueueItem { diff --git a/src/main/java/com/bernard/greposimu/model/runtime/Alliance.java b/src/main/java/com/bernard/greposimu/model/runtime/Alliance.java deleted file mode 100644 index fdda318..0000000 --- a/src/main/java/com/bernard/greposimu/model/runtime/Alliance.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.bernard.greposimu.model.runtime; - -public class Alliance { - -} diff --git a/src/main/java/com/bernard/greposimu/model/runtime/Joueureuse.java b/src/main/java/com/bernard/greposimu/model/runtime/Joueureuse.java deleted file mode 100644 index 0931cae..0000000 --- a/src/main/java/com/bernard/greposimu/model/runtime/Joueureuse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bernard.greposimu.model.runtime; - -public class Joueureuse { - - String nom; - Alliance alliance; - int points; - -} diff --git a/src/main/java/com/bernard/greposimu/model/runtime/PositionVille.java b/src/main/java/com/bernard/greposimu/model/runtime/PositionVille.java deleted file mode 100644 index c274fc5..0000000 --- a/src/main/java/com/bernard/greposimu/model/runtime/PositionVille.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bernard.greposimu.model.runtime; - -public class PositionVille { - - int ileId; - int x,y,nr,ex,ey,fx,fy; - -} diff --git a/src/main/java/com/bernard/greposimu/model/runtime/Ville.java b/src/main/java/com/bernard/greposimu/model/runtime/Ville.java deleted file mode 100644 index 221cc98..0000000 --- a/src/main/java/com/bernard/greposimu/model/runtime/Ville.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.bernard.greposimu.model.runtime; - -import java.util.Map; - -import com.bernard.greposimu.model.game.Resources; - -public class Ville { - - int id; - - // null -> Ville fantôme - Joueureuse proprietaire; - - PositionVille ville; - - Resources resources; - - Map batiments; - -} diff --git a/src/main/java/com/bernard/greposimu/model/simulator/Joueureuse.java b/src/main/java/com/bernard/greposimu/model/simulator/Joueureuse.java index 686303a..3516e43 100644 --- a/src/main/java/com/bernard/greposimu/model/simulator/Joueureuse.java +++ b/src/main/java/com/bernard/greposimu/model/simulator/Joueureuse.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; import com.bernard.greposimu.model.game.God; -import com.bernard.greposimu.model.runtime.Timestamp; +import com.bernard.greposimu.model.game.Timestamp; public class Joueureuse { diff --git a/src/main/java/com/bernard/greposimu/model/simulator/Movements.java b/src/main/java/com/bernard/greposimu/model/simulator/Movements.java index 715874f..98621ba 100644 --- a/src/main/java/com/bernard/greposimu/model/simulator/Movements.java +++ b/src/main/java/com/bernard/greposimu/model/simulator/Movements.java @@ -1,6 +1,6 @@ package com.bernard.greposimu.model.simulator; -import com.bernard.greposimu.model.runtime.Timestamp; +import com.bernard.greposimu.model.game.Timestamp; public class Movements { diff --git a/src/main/java/com/bernard/greposimu/model/simulator/Ville.java b/src/main/java/com/bernard/greposimu/model/simulator/Ville.java index d53af37..42ff180 100644 --- a/src/main/java/com/bernard/greposimu/model/simulator/Ville.java +++ b/src/main/java/com/bernard/greposimu/model/simulator/Ville.java @@ -7,12 +7,12 @@ import java.util.Set; import com.bernard.greposimu.model.game.Building; import com.bernard.greposimu.model.game.God; import com.bernard.greposimu.model.game.Resources; +import com.bernard.greposimu.model.game.Timestamp; import com.bernard.greposimu.model.game.powers.Power; import com.bernard.greposimu.model.game.queues.BuildingQueueItem; import com.bernard.greposimu.model.game.queues.RecruitmentQueueItem; import com.bernard.greposimu.model.game.queues.ResearchQueueItem; import com.bernard.greposimu.model.game.researches.Research; -import com.bernard.greposimu.model.runtime.Timestamp; public class Ville { diff --git a/src/main/java/com/bernard/greposimu/source/JSONSourcer.java b/src/main/java/com/bernard/greposimu/source/JSONSourcer.java index 436eca1..1b41a09 100644 --- a/src/main/java/com/bernard/greposimu/source/JSONSourcer.java +++ b/src/main/java/com/bernard/greposimu/source/JSONSourcer.java @@ -14,6 +14,7 @@ import com.bernard.greposimu.model.game.Building; import com.bernard.greposimu.model.game.GameConfig; import com.bernard.greposimu.model.game.God; import com.bernard.greposimu.model.game.Resources; +import com.bernard.greposimu.model.game.Timestamp; import com.bernard.greposimu.model.game.UnitResources; import com.bernard.greposimu.model.game.powers.Power; import com.bernard.greposimu.model.game.queues.BuildingQueueItem; @@ -22,7 +23,6 @@ import com.bernard.greposimu.model.game.queues.RecruitmentQueueItem.RecruitmentK import com.bernard.greposimu.model.game.queues.ResearchQueueItem; import com.bernard.greposimu.model.game.researches.Research; import com.bernard.greposimu.model.game.units.Unit; -import com.bernard.greposimu.model.runtime.Timestamp; import com.bernard.greposimu.model.simulator.Joueureuse; import com.bernard.greposimu.model.simulator.SimulatorData; import com.bernard.greposimu.model.simulator.Troupes;