added resource restructuring

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;

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;
     }
 
     /**

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;
 

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);
 

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);
 

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));

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);
 

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();

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());

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);

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);

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

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());
     }
 
     /**

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));
         }
     }