diff --git a/server/game-logic/Manager/AttackInformations/AttackInformations.java b/server/game-logic/Manager/AttackInformations/AttackInformations.java index 77b1374..4f4af64 100644 --- a/server/game-logic/Manager/AttackInformations/AttackInformations.java +++ b/server/game-logic/Manager/AttackInformations/AttackInformations.java @@ -1,4 +1,4 @@ -package AttackInformations; +package Manager.AttackInformations; public class AttackInformations{ private int attack_field_dice; diff --git a/server/game-logic/Manager/Field/Field.java b/server/game-logic/Manager/Field/Field.java index 8bfa7ce..a025032 100644 --- a/server/game-logic/Manager/Field/Field.java +++ b/server/game-logic/Manager/Field/Field.java @@ -1,7 +1,6 @@ -package Field; +package Manager.Field; import java.util.ArrayList; -import Field.Player; public class Field { private int dice_number; diff --git a/server/game-logic/Manager/Field/Player.java b/server/game-logic/Manager/Field/Player.java index ccbcedd..1bc7f84 100644 --- a/server/game-logic/Manager/Field/Player.java +++ b/server/game-logic/Manager/Field/Player.java @@ -1,4 +1,4 @@ -package Field; +package Manager.Field; public class Player{ private String name; diff --git a/server/game-logic/Manager/GameManager.java b/server/game-logic/Manager/GameManager.java index 70d7206..b3f7593 100644 --- a/server/game-logic/Manager/GameManager.java +++ b/server/game-logic/Manager/GameManager.java @@ -1,9 +1,8 @@ package Manager; -import Field.Field; -import Field.Player; -import AttackInformations.AttackInformations; - +import Manager.AttackInformations.AttackInformations; +import Manager.Field.Field; +import Manager.Field.Player; import java.util.ArrayList; import java.util.Random; diff --git a/server/game-logic/Manager/Test.java b/server/game-logic/Manager/Test.java index e544a3c..7e67f1c 100644 --- a/server/game-logic/Manager/Test.java +++ b/server/game-logic/Manager/Test.java @@ -1,5 +1,7 @@ +package Manager; + import Manager.GameManager; -import Field.Player; +import Manager.Field.Player; public class Test { public static void main(String[] args){ @@ -9,7 +11,7 @@ public class Test { gm.add_player("Nils"); gm.add_player("Felix"); for(Player current:gm.get_players()){ - System.out.println(current); + System.out.println(current.get_name()); } } } \ No newline at end of file diff --git a/server/game-logic/Test.java b/server/game-logic/Test.java deleted file mode 100644 index dde3c23..0000000 --- a/server/game-logic/Test.java +++ /dev/null @@ -1,16 +0,0 @@ -import Manager.GameManager; -import Field.Player; - -public class Test { - public static void main(String[] args){ - GameManager gm = new GameManager(); - gm.add_player("Sebastian"); - gm.add_player("Lars"); - gm.add_player("Nils"); - gm.add_player("Felix"); - - for(Player current:gm.get_players()){ - System.out.println(current); - } - } -} \ No newline at end of file