diff --git a/SchiffeVersenken/.idea/workspace.xml b/SchiffeVersenken/.idea/workspace.xml deleted file mode 100644 index dae9c6a..0000000 --- a/SchiffeVersenken/.idea/workspace.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - { - "customColor": "", - "associatedIndex": -1 -} - - - - - - - - - - - - - - - - - - 1730115126753 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libs/jlayer-1.0.3.jar b/libs/jlayer-1.0.3.jar new file mode 100644 index 0000000..db89b9f Binary files /dev/null and b/libs/jlayer-1.0.3.jar differ diff --git a/makefile b/makefile new file mode 100644 index 0000000..cc59d0d --- /dev/null +++ b/makefile @@ -0,0 +1,36 @@ +MAIN_CLASS := HalloSchiffeVersenken +JAR_NAME := schiffeVersenken.jar + +SRC_DIR := src +OUT_DIR := bin +LIB_DIR := libs + +JC := javac +JCFLAGS := -d $(OUT_DIR)/ -cp "$(LIB_DIR)/*" + +JR := java + +SEPERATOR := : +ifeq ($(OS),Windows_NT) + SEPERATOR := ; +endif + +.SUFFIXES: .java +.PHONY: classfiles clean + + +classfiles: $(SRC_DIR)/* + $(JC) $(JCFLAGS) $(SRC_DIR)/* + +jar: classfiles + jar --create --file=$(OUT_DIR)/$(JAR_NAME) --main-class=$(MAIN_CLASS) -C $(OUT_DIR)/ . + +test-jar: jar +# $(JR) -cp "$(OUT_DIR)/:$(LIB_DIR)/*" $(MAIN_CLASS) + $(JR) -jar $(OUT_DIR)/$(JAR_NAME) + +test: classfiles + $(JR) -cp "$(OUT_DIR)$(SEPERATOR)$(LIB_DIR)/*" $(MAIN_CLASS) + +clean: + rm $(OUT_DIR)/*.class \ No newline at end of file diff --git a/src/HalloSchiffeVersenken.java b/src/HalloSchiffeVersenken.java index 8ed4024..eaa1be8 100644 --- a/src/HalloSchiffeVersenken.java +++ b/src/HalloSchiffeVersenken.java @@ -11,9 +11,9 @@ public class HalloSchiffeVersenken { /* System.out.println("sound"); SoundHandler.playSound("hit"); - Thread.sleep(3000); - System.out.println("sound"); - SoundHandler.playSound("hit"); + + Thread.sleep(10000); + SoundHandler.setSoundOn(false); System.out.println("sound off"); SoundHandler.playSound("hit"); diff --git a/src/SoundHandler.java b/src/SoundHandler.java index 028eda1..d7b385b 100644 --- a/src/SoundHandler.java +++ b/src/SoundHandler.java @@ -10,22 +10,30 @@ import java.util.Map; public class SoundHandler { private static boolean soundOn = true; + + // Wenn fehler beim erstellen von .jar mit sound hier gucken private static HashMap sounds = new HashMap(Map.of( - "hit", "~/../Sound/water-drip.mp3" + "hit", "./Sound/water-drip.mp3" )); public static void playSound(String soundName) { if (soundOn) { - try { - Player player = new Player(new FileInputStream(sounds.get(soundName))); - player.play(); - } catch (JavaLayerException | FileNotFoundException e) { - System.out.println("dslkfsfnsldfnlsnfsdnölscls"); - e.printStackTrace(); - } + new Thread(new Runnable() { + @Override + public void run() { + try { + Player player = new Player(new FileInputStream(sounds.get(soundName))); + player.play(); + } catch (JavaLayerException | FileNotFoundException e) { + e.printStackTrace(); + } + } + }).start(); + } } + static void add(String soundName, String path){ sounds.put(soundName, path); }