From 10428deeddbdef97eaa7cd9b96a7202434d39c64 Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Sun, 24 Nov 2024 19:54:29 +0100 Subject: [PATCH] added resource restructuring --- .../src/main/java/pp/mdga/client/Asset.java | 33 +++++++++--------- .../pp/mdga/client/acoustic/SoundAsset.java | 2 +- .../pp/mdga/client/board/BoardHandler.java | 2 +- .../pp/mdga/client/dialog/HostDialog.java | 2 +- .../pp/mdga/client/dialog/JoinDialog.java | 2 +- .../client/dialog/SettingsButtonDialog.java | 2 +- .../pp/mdga/client/dialog/StartDialog.java | 2 +- .../pp/mdga/client/view/CeremonyView.java | 4 +-- .../java/pp/mdga/client/view/LobbyView.java | 2 +- .../java/pp/mdga/client/view/MainView.java | 2 +- .../java/pp/mdga/client/view/MdgaView.java | 12 +++---- .../resources/{ => Images}/audio_icon.png | Bin .../src/main/resources/{ => Images}/b1.png | Bin .../src/main/resources/{ => Images}/b2.png | Bin .../{ => Images}/background/lautsprecher.png | Bin .../{ => Images}/background/monitors.png | Bin .../{ => Images}/background/zahnräder.png | Bin .../src/main/resources/{ => Images}/lobby.png | Bin .../main/resources/{ => Images}/mdga_logo.png | Bin .../main/resources/{ => Images}/monitor.png | Bin .../resources/{ => Images}/powercards.png | Bin .../main/resources/{ => Images}/zahnrad.png | Bin .../main/resources/{ => Maps}/circle_map.mdga | 0 .../src/main/resources/{ => Maps}/map.mdga | 0 .../{ => Models}/bigTent/bigTent.j3o | Bin .../{ => Models}/bigTent/bigTent_diff.png | Bin .../{ => Models}/cardStack/cardStack.j3o | Bin .../{ => Models}/cardStack/cardStack_diff.png | Bin .../main/resources/{ => Models}/cir/cir.j3o | Bin .../resources/{ => Models}/cir/cir_diff.png | Bin .../main/resources/{ => Models}/heer/heer.j3o | Bin .../resources/{ => Models}/heer/heer_diff.png | Bin .../main/resources/{ => Models}/jet/jet.j3o | Bin .../resources/{ => Models}/jet/jet_diff.png | Bin .../src/main/resources/{ => Models}/lw/lw.j3o | Bin .../resources/{ => Models}/lw/lw_diff.png | Bin .../resources/{ => Models}/marine/marine.j3o | Bin .../{ => Models}/marine/marine_diff.png | Bin .../{ => Models}/node_home/node_home.j3o | Bin .../node_home/node_home_black_diff.png | Bin .../node_home/node_home_blue_diff.png | Bin .../node_home/node_home_green_diff.png | Bin .../node_home/node_home_orange_diff.png | Bin .../node_home/node_home_yellow_diff.png | Bin .../node_normal/node_bonus_diff.png | Bin .../{ => Models}/node_normal/node_normal.j3o | Bin .../node_normal/node_normal_diff.png | Bin .../node_normal/node_start_diff.png | Bin .../resources/{ => Models}/radar/radar.j3o | Bin .../{ => Models}/radar/radar_diff.png | Bin .../{ => Models}/shieldCard/shieldCard.j3o | Bin .../shieldCard/shieldCard_diff.png | Bin .../{ => Models}/shield_ring/shield_ring.obj | 0 .../main/resources/{ => Models}/ship/ship.j3o | Bin .../resources/{ => Models}/ship/ship_diff.png | Bin .../{ => Models}/smallTent/smallTent.j3o | Bin .../{ => Models}/smallTent/smallTent_diff.png | Bin .../{ => Models}/swapCard/swapCard.j3o | Bin .../{ => Models}/swapCard/swapCard_diff.png | Bin .../main/resources/{ => Models}/tank/tank.j3o | Bin .../resources/{ => Models}/tank/tank_diff.png | Bin .../{ => Models}/tree_big/tree_big.obj | 0 .../{ => Models}/tree_big/tree_big_diff.png | Bin .../{ => Models}/tree_small/tree_small.obj | 0 .../tree_small/tree_small_diff.png | Bin .../{ => Models}/turboCard/turboCard.j3o | Bin .../{ => Models}/turboCard/turboCard_diff.png | Bin .../resources/{ => Models}/world/world.j3o | Bin .../{ => Models}/world/world_diff.png | Bin .../world_new/world_export_new.obj | 0 .../{ => Models}/world_new/world_new.obj | 0 .../{ => Models}/world_new/world_new_diff.png | Bin .../resources/{sound => Sounds}/GameOver.wav | Bin .../resources/{sound => Sounds}/LevelUp2.wav | Bin .../pp.mdga/server/DetermineStartPlayer.java | 4 +-- .../src/main/java/pp.mdga/server/Lobby.java | 8 ++--- .../src/main/java/pp.mdga/server/Turn.java | 2 +- 77 files changed, 40 insertions(+), 39 deletions(-) rename Projekte/mdga/client/src/main/resources/{ => Images}/audio_icon.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/b1.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/b2.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/background/lautsprecher.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/background/monitors.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/background/zahnräder.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/lobby.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/mdga_logo.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/monitor.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/powercards.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Images}/zahnrad.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Maps}/circle_map.mdga (100%) rename Projekte/mdga/client/src/main/resources/{ => Maps}/map.mdga (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/bigTent/bigTent.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/bigTent/bigTent_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/cardStack/cardStack.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/cardStack/cardStack_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/cir/cir.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/cir/cir_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/heer/heer.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/heer/heer_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/jet/jet.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/jet/jet_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/lw/lw.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/lw/lw_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/marine/marine.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/marine/marine_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_home/node_home.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_home/node_home_black_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_home/node_home_blue_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_home/node_home_green_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_home/node_home_orange_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_home/node_home_yellow_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_normal/node_bonus_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_normal/node_normal.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_normal/node_normal_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/node_normal/node_start_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/radar/radar.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/radar/radar_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/shieldCard/shieldCard.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/shieldCard/shieldCard_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/shield_ring/shield_ring.obj (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/ship/ship.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/ship/ship_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/smallTent/smallTent.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/smallTent/smallTent_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/swapCard/swapCard.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/swapCard/swapCard_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/tank/tank.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/tank/tank_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/tree_big/tree_big.obj (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/tree_big/tree_big_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/tree_small/tree_small.obj (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/tree_small/tree_small_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/turboCard/turboCard.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/turboCard/turboCard_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/world/world.j3o (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/world/world_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/world_new/world_export_new.obj (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/world_new/world_new.obj (100%) rename Projekte/mdga/client/src/main/resources/{ => Models}/world_new/world_new_diff.png (100%) rename Projekte/mdga/client/src/main/resources/{sound => Sounds}/GameOver.wav (100%) rename Projekte/mdga/client/src/main/resources/{sound => Sounds}/LevelUp2.wav (100%) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java index 7dd38eef..b92246d8 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java @@ -8,26 +8,26 @@ public enum Asset { jet, lw, marine, - node_home_blue("./node_home/node_home.j3o", "./node_home/node_home_blue_diff.png"), - node_wait_blue("./node_home/node_home.j3o", "./node_home/node_home_blue_diff.png"), - node_home_black("./node_home/node_home.j3o", "./node_home/node_home_black_diff.png"), - node_wait_black("./node_home/node_home.j3o", "./node_home/node_home_black_diff.png"), - node_home_green("./node_home/node_home.j3o", "./node_home/node_home_green_diff.png"), - node_wait_green("./node_home/node_home.j3o", "./node_home/node_home_green_diff.png"), - node_home_yellow("./node_home/node_home.j3o", "./node_home/node_home_orange_diff.png"), - node_wait_yellow("./node_home/node_home.j3o", "./node_home/node_home_orange_diff.png"), + node_home_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"), + node_wait_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"), + node_home_black("Models/node_home/node_home.j3o", "Models/node_home/node_home_black_diff.png"), + node_wait_black("Models/node_home/node_home.j3o", "Models/node_home/node_home_black_diff.png"), + node_home_green("Models/node_home/node_home.j3o", "Models/node_home/node_home_green_diff.png"), + node_wait_green("Models/node_home/node_home.j3o", "Models/node_home/node_home_green_diff.png"), + node_home_yellow("Models/node_home/node_home.j3o", "Models/node_home/node_home_orange_diff.png"), + node_wait_yellow("Models/node_home/node_home.j3o", "Models/node_home/node_home_orange_diff.png"), node_normal, - node_start("./node_normal/node_normal.j3o", "./node_normal/node_start_diff.png"), - node_bonus("./node_normal/node_normal.j3o", "./node_normal/node_bonus_diff.png"), + node_start("Models/node_normal/node_normal.j3o", "Models/node_normal/node_start_diff.png"), + node_bonus("Models/node_normal/node_normal.j3o", "Models/node_normal/node_bonus_diff.png"), radar, ship(0.8f), smallTent, tank, // world(1.2f), - world("./world_new/world_export_new.obj", "./world_new/world_new_diff.png", 1.2f), - shield_ring("./shield_ring/shield_ring.obj", null), - tree_small("./tree_small/tree_small.obj", "./tree_small/tree_small_diff.png"), - tree_big("./tree_big/tree_big.obj", "./tree_big/tree_big_diff.png"), + world("Models/world_new/world_export_new.obj", "Models/world_new/world_new_diff.png", 1.2f), + shield_ring("Models/shield_ring/shield_ring.obj", null), + tree_small("Models/tree_small/tree_small.obj", "Models/tree_small/tree_small_diff.png"), + tree_big("Models/tree_big/tree_big.obj", "Models/tree_big/tree_big_diff.png"), turboCard, swapCard, shieldCard @@ -36,9 +36,10 @@ public enum Asset { private final String modelPath; private final String diffPath; private final float size; + private static final String root = "Models/"; Asset() { - String folderFileName = "./" + name() + "/" + name(); + String folderFileName = "./" + root + name() + "/" + name(); this.modelPath = folderFileName + ".j3o"; this.diffPath = folderFileName + "_diff.png"; this.size = 1f; @@ -51,7 +52,7 @@ public enum Asset { } Asset(float size) { - String folderFileName = "./" + name() + "/" + name(); + String folderFileName = "./" + root + name() + "/" + name(); this.modelPath = folderFileName + ".j3o"; this.diffPath = folderFileName + "_diff.png"; this.size = size; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java index a495ea57..ce4e6c23 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java @@ -27,7 +27,7 @@ enum SoundAsset { * @param name The name of the sound file. */ SoundAsset(String name) { - this.path = "sound/" + name; + this.path = "Sounds/" + name; } /** diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index acfd4090..539b4d95 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -16,7 +16,7 @@ public class BoardHandler { private static final float GRID_SIZE = 1.72f; private static final float GRID_ELEVATION = 0.0f; - private static final String MAP_NAME = "map.mdga"; + private static final String MAP_NAME = "Maps/map.mdga"; private final MdgaApp app; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/HostDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/HostDialog.java index 4d7ff73c..84fe9ffe 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/HostDialog.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/HostDialog.java @@ -19,7 +19,7 @@ public HostDialog(MdgaApp app, Node node, Runnable backAction) { quad1.setMargin(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor()); container.setBackground(quad1); - Texture texture = app.getAssetManager().loadTexture("mdga_logo.png"); + Texture texture = app.getAssetManager().loadTexture("Images/mdga_logo.png"); QuadBackgroundComponent b = new QuadBackgroundComponent(texture); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/JoinDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/JoinDialog.java index 1e23cb24..0b8162c6 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/JoinDialog.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/JoinDialog.java @@ -22,7 +22,7 @@ public JoinDialog(MdgaApp app, Node node, Runnable backAction) { quad1.setMargin(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor()); container.setBackground(quad1); - Texture texture = app.getAssetManager().loadTexture("mdga_logo.png"); + Texture texture = app.getAssetManager().loadTexture("Images/mdga_logo.png"); QuadBackgroundComponent b = new QuadBackgroundComponent(texture); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/SettingsButtonDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/SettingsButtonDialog.java index fdca5abe..432d67b2 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/SettingsButtonDialog.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/SettingsButtonDialog.java @@ -18,7 +18,7 @@ public class SettingsButtonDialog extends Dialog { public SettingsButtonDialog(MdgaApp app, Node node, String label, Runnable action) { super(app, node); - icon = new IconComponent("zahnrad.png"); + icon = new IconComponent("Images/zahnrad.png"); icon.setIconScale(0.1f * app.getResolutionFactor()); createButton(label, action, new Vector3f(60 * app.getResolutionFactor(), 60 * app.getResolutionFactor(), 0)); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/StartDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/StartDialog.java index f4760ac9..850586f3 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/StartDialog.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/StartDialog.java @@ -19,7 +19,7 @@ public StartDialog(MdgaApp app, Node node) { quad1.setMargin(100 * app.getResolutionFactor(), 50 * app.getResolutionFactor()); container.setBackground(quad1); - Texture texture = app.getAssetManager().loadTexture("mdga_logo.png"); + Texture texture = app.getAssetManager().loadTexture("Images/mdga_logo.png"); QuadBackgroundComponent b = new QuadBackgroundComponent(texture); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java index 6efaf081..15736706 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java @@ -39,7 +39,7 @@ public void onLeave() { } private void awardCeremony() { - background = createBackground("b1.png"); + background = createBackground("Images/b1.png"); node.attachChild(background); continueButton.show(); @@ -47,7 +47,7 @@ private void awardCeremony() { } private void statistics() { - background = createBackground("b2.png"); + background = createBackground("Images/b2.png"); node.attachChild(background); continueButton.show(); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java index d15c7010..2b9b8a0f 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java @@ -21,7 +21,7 @@ public class LobbyView extends MdgaView { public LobbyView(MdgaApp app) { super(app); - background = createBackground("lobby.png"); + background = createBackground("Images/lobby.png"); node.attachChild(background); readyButton = new SingleButtonRightDialog(app, node, "Fertig", () -> app.getModelSyncronizer().setReady()); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java index d8cb6a44..166ec106 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java @@ -18,7 +18,7 @@ public class MainView extends MdgaView { public MainView(MdgaApp app) { super(app); - background = createBackground("powercards.png"); + background = createBackground("Images/powercards.png"); node.attachChild(background); Vector3f size = new Vector3f(280, 60, 0); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java index b7d9f18b..68d22729 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MdgaView.java @@ -44,29 +44,29 @@ public MdgaView(MdgaApp app) { this.settingsButton = new SettingsButtonDialog(app, node, "", () -> enterSettings(false)); - this.settingsBackground = createBackground("background/zahnräder.png"); + this.settingsBackground = createBackground("Images/background/zahnräder.png"); settingsNode.attachChild(settingsBackground); - this.audioBackground = createBackground("background/lautsprecher.png"); + this.audioBackground = createBackground("Images/background/lautsprecher.png"); audioSettingsNode.attachChild(audioBackground); - this.videoBackground = createBackground("background/monitors.png"); + this.videoBackground = createBackground("Images/background/monitors.png"); videoSettingsNode.attachChild(videoBackground); Vector3f size = new Vector3f(280, 60, 0); - this.settings = new SettingsDialog(app, settingsNode, "zahnrad.png"); + this.settings = new SettingsDialog(app, settingsNode, "Images/zahnrad.png"); this.settings.addButton("Video", () -> enterVideo(), size); this.settings.addButton("Audio", () -> enterAudio(), size); this.settings.addButton("Zurück", () -> leaveSettings(false), size); - this.audio = new SettingsDialog(app, audioSettingsNode, "audio_icon.png"); + this.audio = new SettingsDialog(app, audioSettingsNode, "Images/audio_icon.png"); this.audio.addSlider("Lautstärke", new PercentRunnable(app.getAcousticHandler()::setMainVolume), size, 5); this.audio.addSlider("Musik", new PercentRunnable(app.getAcousticHandler()::setMusicVolume), size, 10); this.audio.addSlider("Sound", new PercentRunnable(app.getAcousticHandler()::setSoundVolume), size, 10); this.audio.addButton("Zurück", () -> leaveAudio(), size); - this.video = new SettingsDialog(app, videoSettingsNode, "monitor.png"); + this.video = new SettingsDialog(app, videoSettingsNode, "Images/monitor.png"); this.video.addButton("A", () -> System.out.println("A"), size); this.video.addButton("B", () -> System.out.println("B"), size); this.video.addButton("Zurück", () -> leaveVideo(), size); diff --git a/Projekte/mdga/client/src/main/resources/audio_icon.png b/Projekte/mdga/client/src/main/resources/Images/audio_icon.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/audio_icon.png rename to Projekte/mdga/client/src/main/resources/Images/audio_icon.png diff --git a/Projekte/mdga/client/src/main/resources/b1.png b/Projekte/mdga/client/src/main/resources/Images/b1.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/b1.png rename to Projekte/mdga/client/src/main/resources/Images/b1.png diff --git a/Projekte/mdga/client/src/main/resources/b2.png b/Projekte/mdga/client/src/main/resources/Images/b2.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/b2.png rename to Projekte/mdga/client/src/main/resources/Images/b2.png diff --git a/Projekte/mdga/client/src/main/resources/background/lautsprecher.png b/Projekte/mdga/client/src/main/resources/Images/background/lautsprecher.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/background/lautsprecher.png rename to Projekte/mdga/client/src/main/resources/Images/background/lautsprecher.png diff --git a/Projekte/mdga/client/src/main/resources/background/monitors.png b/Projekte/mdga/client/src/main/resources/Images/background/monitors.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/background/monitors.png rename to Projekte/mdga/client/src/main/resources/Images/background/monitors.png diff --git a/Projekte/mdga/client/src/main/resources/background/zahnräder.png b/Projekte/mdga/client/src/main/resources/Images/background/zahnräder.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/background/zahnräder.png rename to Projekte/mdga/client/src/main/resources/Images/background/zahnräder.png diff --git a/Projekte/mdga/client/src/main/resources/lobby.png b/Projekte/mdga/client/src/main/resources/Images/lobby.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/lobby.png rename to Projekte/mdga/client/src/main/resources/Images/lobby.png diff --git a/Projekte/mdga/client/src/main/resources/mdga_logo.png b/Projekte/mdga/client/src/main/resources/Images/mdga_logo.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/mdga_logo.png rename to Projekte/mdga/client/src/main/resources/Images/mdga_logo.png diff --git a/Projekte/mdga/client/src/main/resources/monitor.png b/Projekte/mdga/client/src/main/resources/Images/monitor.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/monitor.png rename to Projekte/mdga/client/src/main/resources/Images/monitor.png diff --git a/Projekte/mdga/client/src/main/resources/powercards.png b/Projekte/mdga/client/src/main/resources/Images/powercards.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/powercards.png rename to Projekte/mdga/client/src/main/resources/Images/powercards.png diff --git a/Projekte/mdga/client/src/main/resources/zahnrad.png b/Projekte/mdga/client/src/main/resources/Images/zahnrad.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/zahnrad.png rename to Projekte/mdga/client/src/main/resources/Images/zahnrad.png diff --git a/Projekte/mdga/client/src/main/resources/circle_map.mdga b/Projekte/mdga/client/src/main/resources/Maps/circle_map.mdga similarity index 100% rename from Projekte/mdga/client/src/main/resources/circle_map.mdga rename to Projekte/mdga/client/src/main/resources/Maps/circle_map.mdga diff --git a/Projekte/mdga/client/src/main/resources/map.mdga b/Projekte/mdga/client/src/main/resources/Maps/map.mdga similarity index 100% rename from Projekte/mdga/client/src/main/resources/map.mdga rename to Projekte/mdga/client/src/main/resources/Maps/map.mdga diff --git a/Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o b/Projekte/mdga/client/src/main/resources/Models/bigTent/bigTent.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o rename to Projekte/mdga/client/src/main/resources/Models/bigTent/bigTent.j3o diff --git a/Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png b/Projekte/mdga/client/src/main/resources/Models/bigTent/bigTent_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png rename to Projekte/mdga/client/src/main/resources/Models/bigTent/bigTent_diff.png diff --git a/Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o b/Projekte/mdga/client/src/main/resources/Models/cardStack/cardStack.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o rename to Projekte/mdga/client/src/main/resources/Models/cardStack/cardStack.j3o diff --git a/Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png b/Projekte/mdga/client/src/main/resources/Models/cardStack/cardStack_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png rename to Projekte/mdga/client/src/main/resources/Models/cardStack/cardStack_diff.png diff --git a/Projekte/mdga/client/src/main/resources/cir/cir.j3o b/Projekte/mdga/client/src/main/resources/Models/cir/cir.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/cir/cir.j3o rename to Projekte/mdga/client/src/main/resources/Models/cir/cir.j3o diff --git a/Projekte/mdga/client/src/main/resources/cir/cir_diff.png b/Projekte/mdga/client/src/main/resources/Models/cir/cir_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/cir/cir_diff.png rename to Projekte/mdga/client/src/main/resources/Models/cir/cir_diff.png diff --git a/Projekte/mdga/client/src/main/resources/heer/heer.j3o b/Projekte/mdga/client/src/main/resources/Models/heer/heer.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/heer/heer.j3o rename to Projekte/mdga/client/src/main/resources/Models/heer/heer.j3o diff --git a/Projekte/mdga/client/src/main/resources/heer/heer_diff.png b/Projekte/mdga/client/src/main/resources/Models/heer/heer_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/heer/heer_diff.png rename to Projekte/mdga/client/src/main/resources/Models/heer/heer_diff.png diff --git a/Projekte/mdga/client/src/main/resources/jet/jet.j3o b/Projekte/mdga/client/src/main/resources/Models/jet/jet.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/jet/jet.j3o rename to Projekte/mdga/client/src/main/resources/Models/jet/jet.j3o diff --git a/Projekte/mdga/client/src/main/resources/jet/jet_diff.png b/Projekte/mdga/client/src/main/resources/Models/jet/jet_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/jet/jet_diff.png rename to Projekte/mdga/client/src/main/resources/Models/jet/jet_diff.png diff --git a/Projekte/mdga/client/src/main/resources/lw/lw.j3o b/Projekte/mdga/client/src/main/resources/Models/lw/lw.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/lw/lw.j3o rename to Projekte/mdga/client/src/main/resources/Models/lw/lw.j3o diff --git a/Projekte/mdga/client/src/main/resources/lw/lw_diff.png b/Projekte/mdga/client/src/main/resources/Models/lw/lw_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/lw/lw_diff.png rename to Projekte/mdga/client/src/main/resources/Models/lw/lw_diff.png diff --git a/Projekte/mdga/client/src/main/resources/marine/marine.j3o b/Projekte/mdga/client/src/main/resources/Models/marine/marine.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/marine/marine.j3o rename to Projekte/mdga/client/src/main/resources/Models/marine/marine.j3o diff --git a/Projekte/mdga/client/src/main/resources/marine/marine_diff.png b/Projekte/mdga/client/src/main/resources/Models/marine/marine_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/marine/marine_diff.png rename to Projekte/mdga/client/src/main/resources/Models/marine/marine_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home.j3o b/Projekte/mdga/client/src/main/resources/Models/node_home/node_home.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_home/node_home.j3o rename to Projekte/mdga/client/src/main/resources/Models/node_home/node_home.j3o diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_home/node_home_black_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_home/node_home_black_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_blue_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_home/node_home_blue_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_home/node_home_blue_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_home/node_home_blue_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_home/node_home_green_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_home/node_home_green_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_orange_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_home/node_home_orange_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_home/node_home_orange_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_home/node_home_orange_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_home/node_home_yellow_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_home/node_home_yellow_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_normal/node_bonus_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_normal/node_bonus_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o b/Projekte/mdga/client/src/main/resources/Models/node_normal/node_normal.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o rename to Projekte/mdga/client/src/main/resources/Models/node_normal/node_normal.j3o diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_normal/node_normal_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_normal/node_normal_diff.png diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png b/Projekte/mdga/client/src/main/resources/Models/node_normal/node_start_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png rename to Projekte/mdga/client/src/main/resources/Models/node_normal/node_start_diff.png diff --git a/Projekte/mdga/client/src/main/resources/radar/radar.j3o b/Projekte/mdga/client/src/main/resources/Models/radar/radar.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/radar/radar.j3o rename to Projekte/mdga/client/src/main/resources/Models/radar/radar.j3o diff --git a/Projekte/mdga/client/src/main/resources/radar/radar_diff.png b/Projekte/mdga/client/src/main/resources/Models/radar/radar_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/radar/radar_diff.png rename to Projekte/mdga/client/src/main/resources/Models/radar/radar_diff.png diff --git a/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o b/Projekte/mdga/client/src/main/resources/Models/shieldCard/shieldCard.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o rename to Projekte/mdga/client/src/main/resources/Models/shieldCard/shieldCard.j3o diff --git a/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png b/Projekte/mdga/client/src/main/resources/Models/shieldCard/shieldCard_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png rename to Projekte/mdga/client/src/main/resources/Models/shieldCard/shieldCard_diff.png diff --git a/Projekte/mdga/client/src/main/resources/shield_ring/shield_ring.obj b/Projekte/mdga/client/src/main/resources/Models/shield_ring/shield_ring.obj similarity index 100% rename from Projekte/mdga/client/src/main/resources/shield_ring/shield_ring.obj rename to Projekte/mdga/client/src/main/resources/Models/shield_ring/shield_ring.obj diff --git a/Projekte/mdga/client/src/main/resources/ship/ship.j3o b/Projekte/mdga/client/src/main/resources/Models/ship/ship.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/ship/ship.j3o rename to Projekte/mdga/client/src/main/resources/Models/ship/ship.j3o diff --git a/Projekte/mdga/client/src/main/resources/ship/ship_diff.png b/Projekte/mdga/client/src/main/resources/Models/ship/ship_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/ship/ship_diff.png rename to Projekte/mdga/client/src/main/resources/Models/ship/ship_diff.png diff --git a/Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o b/Projekte/mdga/client/src/main/resources/Models/smallTent/smallTent.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o rename to Projekte/mdga/client/src/main/resources/Models/smallTent/smallTent.j3o diff --git a/Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png b/Projekte/mdga/client/src/main/resources/Models/smallTent/smallTent_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png rename to Projekte/mdga/client/src/main/resources/Models/smallTent/smallTent_diff.png diff --git a/Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o b/Projekte/mdga/client/src/main/resources/Models/swapCard/swapCard.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o rename to Projekte/mdga/client/src/main/resources/Models/swapCard/swapCard.j3o diff --git a/Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png b/Projekte/mdga/client/src/main/resources/Models/swapCard/swapCard_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png rename to Projekte/mdga/client/src/main/resources/Models/swapCard/swapCard_diff.png diff --git a/Projekte/mdga/client/src/main/resources/tank/tank.j3o b/Projekte/mdga/client/src/main/resources/Models/tank/tank.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/tank/tank.j3o rename to Projekte/mdga/client/src/main/resources/Models/tank/tank.j3o diff --git a/Projekte/mdga/client/src/main/resources/tank/tank_diff.png b/Projekte/mdga/client/src/main/resources/Models/tank/tank_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/tank/tank_diff.png rename to Projekte/mdga/client/src/main/resources/Models/tank/tank_diff.png diff --git a/Projekte/mdga/client/src/main/resources/tree_big/tree_big.obj b/Projekte/mdga/client/src/main/resources/Models/tree_big/tree_big.obj similarity index 100% rename from Projekte/mdga/client/src/main/resources/tree_big/tree_big.obj rename to Projekte/mdga/client/src/main/resources/Models/tree_big/tree_big.obj diff --git a/Projekte/mdga/client/src/main/resources/tree_big/tree_big_diff.png b/Projekte/mdga/client/src/main/resources/Models/tree_big/tree_big_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/tree_big/tree_big_diff.png rename to Projekte/mdga/client/src/main/resources/Models/tree_big/tree_big_diff.png diff --git a/Projekte/mdga/client/src/main/resources/tree_small/tree_small.obj b/Projekte/mdga/client/src/main/resources/Models/tree_small/tree_small.obj similarity index 100% rename from Projekte/mdga/client/src/main/resources/tree_small/tree_small.obj rename to Projekte/mdga/client/src/main/resources/Models/tree_small/tree_small.obj diff --git a/Projekte/mdga/client/src/main/resources/tree_small/tree_small_diff.png b/Projekte/mdga/client/src/main/resources/Models/tree_small/tree_small_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/tree_small/tree_small_diff.png rename to Projekte/mdga/client/src/main/resources/Models/tree_small/tree_small_diff.png diff --git a/Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o b/Projekte/mdga/client/src/main/resources/Models/turboCard/turboCard.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o rename to Projekte/mdga/client/src/main/resources/Models/turboCard/turboCard.j3o diff --git a/Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png b/Projekte/mdga/client/src/main/resources/Models/turboCard/turboCard_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png rename to Projekte/mdga/client/src/main/resources/Models/turboCard/turboCard_diff.png diff --git a/Projekte/mdga/client/src/main/resources/world/world.j3o b/Projekte/mdga/client/src/main/resources/Models/world/world.j3o similarity index 100% rename from Projekte/mdga/client/src/main/resources/world/world.j3o rename to Projekte/mdga/client/src/main/resources/Models/world/world.j3o diff --git a/Projekte/mdga/client/src/main/resources/world/world_diff.png b/Projekte/mdga/client/src/main/resources/Models/world/world_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/world/world_diff.png rename to Projekte/mdga/client/src/main/resources/Models/world/world_diff.png diff --git a/Projekte/mdga/client/src/main/resources/world_new/world_export_new.obj b/Projekte/mdga/client/src/main/resources/Models/world_new/world_export_new.obj similarity index 100% rename from Projekte/mdga/client/src/main/resources/world_new/world_export_new.obj rename to Projekte/mdga/client/src/main/resources/Models/world_new/world_export_new.obj diff --git a/Projekte/mdga/client/src/main/resources/world_new/world_new.obj b/Projekte/mdga/client/src/main/resources/Models/world_new/world_new.obj similarity index 100% rename from Projekte/mdga/client/src/main/resources/world_new/world_new.obj rename to Projekte/mdga/client/src/main/resources/Models/world_new/world_new.obj diff --git a/Projekte/mdga/client/src/main/resources/world_new/world_new_diff.png b/Projekte/mdga/client/src/main/resources/Models/world_new/world_new_diff.png similarity index 100% rename from Projekte/mdga/client/src/main/resources/world_new/world_new_diff.png rename to Projekte/mdga/client/src/main/resources/Models/world_new/world_new_diff.png diff --git a/Projekte/mdga/client/src/main/resources/sound/GameOver.wav b/Projekte/mdga/client/src/main/resources/Sounds/GameOver.wav similarity index 100% rename from Projekte/mdga/client/src/main/resources/sound/GameOver.wav rename to Projekte/mdga/client/src/main/resources/Sounds/GameOver.wav diff --git a/Projekte/mdga/client/src/main/resources/sound/LevelUp2.wav b/Projekte/mdga/client/src/main/resources/Sounds/LevelUp2.wav similarity index 100% rename from Projekte/mdga/client/src/main/resources/sound/LevelUp2.wav rename to Projekte/mdga/client/src/main/resources/Sounds/LevelUp2.wav diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java index 0ff4b48e..b9910dbc 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java @@ -17,9 +17,9 @@ public DetermineStartPlayer(ServerState parent, ServerGameLogic logic) { @Override public void receivedRequestDice(RequestDice msg, int from) { - logic.send(); +// logic.send(); - broadcastUpdate(new Dice()); +// broadcastUpdate(new Dice()); } @Override diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java index a612f0f2..5da89e84 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java @@ -26,7 +26,7 @@ public Lobby(ServerState parent, ServerGameLogic logic) { */ @Override public void receivedDeselectTSK(DeselectTSK msg, int from) { - broadcastUpdate(new UpdateTSK()); +// broadcastUpdate(new UpdateTSK()); } /** @@ -36,7 +36,7 @@ public void receivedDeselectTSK(DeselectTSK msg, int from) { */ @Override public void receivedNotReady(LobbyNotReady msg, int from) { - broadcastUpdate(new UpdateReady()); +// broadcastUpdate(new UpdateReady()); } /** @@ -46,7 +46,7 @@ public void receivedNotReady(LobbyNotReady msg, int from) { */ @Override public void receivedReady(LobbyReady msg, int from) { - broadcastUpdate(new UpdateReady()); +// broadcastUpdate(new UpdateReady()); } /** @@ -56,7 +56,7 @@ public void receivedReady(LobbyReady msg, int from) { */ @Override public void receivedSelectTSK(SelectTSK msg, int from) { - broadcastUpdate(new UpdateTSK()); +// broadcastUpdate(new UpdateTSK()); } /** diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java index d2eacc7b..aeb05091 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java @@ -29,7 +29,7 @@ public void exit() { this.getParent().getParent().exit(); } else { // todo: next player - broadcastUpdate(new ActivePlayer()); +// broadcastUpdate(new ActivePlayer()); parent.gotoState(new Animation(parent, logic)); } }