From 49a8b39f9e9e031cd0cf2f7d3078f05c454f1ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Sat, 15 May 2021 22:14:27 +0200 Subject: [PATCH] fix: broken paths --- core/src/sagittarius/model/Arrow.java | 4 ++-- core/src/sagittarius/model/Bow.java | 2 +- core/src/sagittarius/model/Player.java | 3 --- core/src/sagittarius/view/BaseScreen.java | 2 +- .../sagittarius/view/ButtonSounded/ButtonTextSounded.java | 2 +- .../src/sagittarius/view/ButtonSounded/CheckBoxSounded.java | 2 +- core/src/sagittarius/view/ButtonSounded/SpinnerSounded.java | 2 +- core/src/sagittarius/view/CreditScreen.java | 3 +-- core/src/sagittarius/view/GameScreen.java | 2 +- core/src/sagittarius/view/ResumeScreen.java | 6 ++---- core/src/sagittarius/view/SettingsScreen.java | 5 ++--- core/src/sagittarius/view/StartScreen.java | 5 ++--- 12 files changed, 15 insertions(+), 23 deletions(-) diff --git a/core/src/sagittarius/model/Arrow.java b/core/src/sagittarius/model/Arrow.java index b70c501..04d1049 100644 --- a/core/src/sagittarius/model/Arrow.java +++ b/core/src/sagittarius/model/Arrow.java @@ -56,8 +56,8 @@ public class Arrow extends EntityQuad { if (!preview) { - arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/arrow_landed.mp3")); - arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/player_death.wav")); + arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/arrow_landed.mp3")); + arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/player_death.wav")); texture = new ArrayList<>(); String path = "core/assets/arrow" + MathUtils.random(2); diff --git a/core/src/sagittarius/model/Bow.java b/core/src/sagittarius/model/Bow.java index ed1e347..deefcb4 100644 --- a/core/src/sagittarius/model/Bow.java +++ b/core/src/sagittarius/model/Bow.java @@ -19,7 +19,7 @@ public class Bow extends Actor { private boolean aimAssist = false; private boolean pressed = false; private float angle; - private Sound shotSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/arrow_shot.mp3")); + private Sound shotSound = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/arrow_shot.mp3")); private Vector2 anchor = new Vector2(); private Vector2 aim = new Vector2(); diff --git a/core/src/sagittarius/model/Player.java b/core/src/sagittarius/model/Player.java index 17417f6..40501cd 100644 --- a/core/src/sagittarius/model/Player.java +++ b/core/src/sagittarius/model/Player.java @@ -11,9 +11,6 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.MathUtils; -import com.badlogic.gdx.audio.Sound; - -import sagittarius.SagittariusGame; public class Player extends EntityQuad { diff --git a/core/src/sagittarius/view/BaseScreen.java b/core/src/sagittarius/view/BaseScreen.java index d62e97a..1516e8a 100644 --- a/core/src/sagittarius/view/BaseScreen.java +++ b/core/src/sagittarius/view/BaseScreen.java @@ -45,7 +45,7 @@ public abstract class BaseScreen implements Screen { @Override public void dispose() { - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/Ghostrifter-Deflector.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/Ghostrifter-Deflector.mp3")); uiStage.dispose(); mainStage.dispose(); } diff --git a/core/src/sagittarius/view/ButtonSounded/ButtonTextSounded.java b/core/src/sagittarius/view/ButtonSounded/ButtonTextSounded.java index 752aa65..12571dd 100644 --- a/core/src/sagittarius/view/ButtonSounded/ButtonTextSounded.java +++ b/core/src/sagittarius/view/ButtonSounded/ButtonTextSounded.java @@ -9,7 +9,7 @@ import sagittarius.SagittariusGame; public class ButtonTextSounded extends com.kotcrab.vis.ui.widget.VisTextButton{ - private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/clickbutton.mp3")); + private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3")); public ButtonTextSounded(String name){ super(name); diff --git a/core/src/sagittarius/view/ButtonSounded/CheckBoxSounded.java b/core/src/sagittarius/view/ButtonSounded/CheckBoxSounded.java index fd2154c..0bfd878 100644 --- a/core/src/sagittarius/view/ButtonSounded/CheckBoxSounded.java +++ b/core/src/sagittarius/view/ButtonSounded/CheckBoxSounded.java @@ -9,7 +9,7 @@ import sagittarius.SagittariusGame; public class CheckBoxSounded extends com.kotcrab.vis.ui.widget.VisCheckBox{ - private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/clickbutton.mp3")); + private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3")); public CheckBoxSounded(String name){ super(name); diff --git a/core/src/sagittarius/view/ButtonSounded/SpinnerSounded.java b/core/src/sagittarius/view/ButtonSounded/SpinnerSounded.java index f932b0f..46edf33 100644 --- a/core/src/sagittarius/view/ButtonSounded/SpinnerSounded.java +++ b/core/src/sagittarius/view/ButtonSounded/SpinnerSounded.java @@ -10,7 +10,7 @@ import sagittarius.SagittariusGame; public class SpinnerSounded extends com.kotcrab.vis.ui.widget.spinner.Spinner{ - private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/clickbutton.mp3")); + private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3")); public SpinnerSounded(String name,SimpleFloatSpinnerModel SpinnerModel){ super(name,SpinnerModel); diff --git a/core/src/sagittarius/view/CreditScreen.java b/core/src/sagittarius/view/CreditScreen.java index b7de2f6..a6167b0 100644 --- a/core/src/sagittarius/view/CreditScreen.java +++ b/core/src/sagittarius/view/CreditScreen.java @@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.widget.VisTable; -import com.badlogic.gdx.audio.Sound; import sagittarius.view.ButtonSounded.*; import sagittarius.SagittariusGame; @@ -19,7 +18,7 @@ public class CreditScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/credit_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/credit_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play(); diff --git a/core/src/sagittarius/view/GameScreen.java b/core/src/sagittarius/view/GameScreen.java index 21e654e..6e107bd 100644 --- a/core/src/sagittarius/view/GameScreen.java +++ b/core/src/sagittarius/view/GameScreen.java @@ -51,7 +51,7 @@ public class GameScreen extends BaseScreen implements InputProcessor { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/game_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/game_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play(); diff --git a/core/src/sagittarius/view/ResumeScreen.java b/core/src/sagittarius/view/ResumeScreen.java index 218e1a6..d86612a 100644 --- a/core/src/sagittarius/view/ResumeScreen.java +++ b/core/src/sagittarius/view/ResumeScreen.java @@ -1,13 +1,11 @@ package sagittarius.view; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.audio.Music; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel; -import com.badlogic.gdx.audio.Sound; import sagittarius.view.ButtonSounded.*; @@ -26,7 +24,7 @@ public class ResumeScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/resumeMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play(); @@ -95,7 +93,7 @@ public class ResumeScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/game_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/game_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play(); diff --git a/core/src/sagittarius/view/SettingsScreen.java b/core/src/sagittarius/view/SettingsScreen.java index d214642..ec81843 100644 --- a/core/src/sagittarius/view/SettingsScreen.java +++ b/core/src/sagittarius/view/SettingsScreen.java @@ -7,7 +7,6 @@ import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel; -import com.badlogic.gdx.audio.Sound; import sagittarius.view.ButtonSounded.*; import sagittarius.SagittariusGame; @@ -19,7 +18,7 @@ public class SettingsScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/resumeMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play(); @@ -74,7 +73,7 @@ public class SettingsScreen extends BaseScreen { } else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){ - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/resumeMenu_music.mp3")); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play(); SagittariusGame.disableMusic = false; diff --git a/core/src/sagittarius/view/StartScreen.java b/core/src/sagittarius/view/StartScreen.java index f3bc572..31d11d8 100644 --- a/core/src/sagittarius/view/StartScreen.java +++ b/core/src/sagittarius/view/StartScreen.java @@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.widget.VisTable; -import com.badlogic.gdx.audio.Sound; import sagittarius.view.ButtonSounded.ButtonTextSounded; import sagittarius.SagittariusGame; @@ -19,7 +18,7 @@ public class StartScreen extends BaseScreen { if (!SagittariusGame.disableMusic){ if ( SagittariusGame.music != null ){ SagittariusGame.music.stop(); - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/mainMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play(); @@ -27,7 +26,7 @@ public class StartScreen extends BaseScreen { } else { - SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3")); + SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/mainMenu_music.mp3")); SagittariusGame.music.setLooping(true); SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.play();