SteamWar/FightSystem
SteamWar/FightSystem
12
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Adding SWSound for better Sound handling

Quellcode durchsuchen 
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Lixfel 2019-12-27 10:09:03 +01:00
Ursprung 9901c4edb8
Commit 6582b9a5c4
12 geänderte Dateien mit 40 neuen und 21 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

13
FightSystem_12/src/de/steamwar/fightsystem/countdown/Countdown_12.java
Datei anzeigen

@ -5,7 +5,16 @@ import org.bukkit.Sound;
class Countdown_12 {
private Countdown_12(){}
static Sound getSound(String sound){
return Sound.valueOf(sound);
static Sound getSound(SWSound sound){
switch(sound){
case ENTITY_WITHER_DEATH:
return Sound.ENTITY_WITHER_DEATH;
case BLOCK_NOTE_BASS:
return Sound.BLOCK_NOTE_BASS;
case BLOCK_NOTE_PLING:
return Sound.BLOCK_NOTE_PLING;
default:
return null;
}
}
}

12
FightSystem_14/src/de/steamwar/fightsystem/countdown/Countdown_14.java
Datei anzeigen

@ -5,14 +5,16 @@ import org.bukkit.Sound;
class Countdown_14 {
private Countdown_14(){}
static Sound getSound(String sound){
static Sound getSound(SWSound sound){
switch(sound){
case "BLOCK_NOTE_BASS":
return Sound.BLOCK_NOTE_BLOCK_PLING;
case "BLOCK_NOTE_PLING":
case ENTITY_WITHER_DEATH:
return Sound.ENTITY_WITHER_DEATH;
case BLOCK_NOTE_BASS:
return Sound.BLOCK_NOTE_BLOCK_BASS;
case BLOCK_NOTE_PLING:
return Sound.BLOCK_NOTE_BLOCK_PLING;
default:
return Sound.valueOf(sound);
return null;
}
}
}

10
FightSystem_8/src/de/steamwar/fightsystem/countdown/Countdown_8.java
Datei anzeigen

@ -5,16 +5,16 @@ import org.bukkit.Sound;
class Countdown_8 {
private Countdown_8(){}
static Sound getSound(String sound){
static Sound getSound(SWSound sound){
switch(sound){
case "ENTITY_WITHER_DEATH":
case ENTITY_WITHER_DEATH:
return Sound.WITHER_DEATH;
case "BLOCK_NOTE_BASS":
case BLOCK_NOTE_BASS:
return Sound.NOTE_BASS;
case "BLOCK_NOTE_PLING":
case BLOCK_NOTE_PLING:
return Sound.NOTE_PLING;
default:
return Sound.valueOf(sound);
return null;
}
}
}

7
FightSystem_API/src/de/steamwar/fightsystem/countdown/SWSound.java Normale Datei
Datei anzeigen

@ -0,0 +1,7 @@
package de.steamwar.fightsystem.countdown;
public enum SWSound {
ENTITY_WITHER_DEATH,
BLOCK_NOTE_PLING,
BLOCK_NOTE_BASS
}

4
FightSystem_Main/src/de/steamwar/fightsystem/countdown/Countdown.java
Datei anzeigen

@ -26,7 +26,7 @@ public abstract class Countdown {
abstract String countdownCounting();
abstract void countdownFinished();
Countdown(int time, String sound, boolean level) {
Countdown(int time, SWSound sound, boolean level) {
this.time = time;
this.sound = getSound(sound);
this.level = level;
@ -36,7 +36,7 @@ public abstract class Countdown {
this.taskID = bukkitScheduler.scheduleSyncRepeatingTask(FightSystem.getPlugin(), this::count, 0, 20);
}
public static Sound getSound(String sound){
public static Sound getSound(SWSound sound){
if(sound == null)
return null;

2
FightSystem_Main/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
Datei anzeigen

@ -7,7 +7,7 @@ import org.bukkit.Bukkit;
public class EnternCountdown extends Countdown {
public EnternCountdown() {
super(Config.EnterPhaseBegin, "BLOCK_NOTE_PLING", false);
super(Config.EnterPhaseBegin, SWSound.BLOCK_NOTE_PLING, false);
}
@Override

2
FightSystem_Main/src/de/steamwar/fightsystem/countdown/EventStartCountdown.java
Datei anzeigen

@ -6,7 +6,7 @@ import de.steamwar.fightsystem.Config;
public class EventStartCountdown extends Countdown {
public EventStartCountdown() {
super(Config.SetupDuration, "BLOCK_NOTE_PLING", false);
super(Config.SetupDuration, SWSound.BLOCK_NOTE_PLING, false);
}
@Override

2
FightSystem_Main/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
Datei anzeigen

@ -6,7 +6,7 @@ import de.steamwar.fightsystem.Config;
public class PreRunningCountdown extends Countdown {
public PreRunningCountdown() {
super(Config.PreFightDuration, "BLOCK_NOTE_PLING", true);
super(Config.PreFightDuration, SWSound.BLOCK_NOTE_PLING, true);
}
@Override

2
FightSystem_Main/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
Datei anzeigen

@ -6,7 +6,7 @@ import de.steamwar.fightsystem.Config;
public class SpectateOverCountdown extends Countdown {
public SpectateOverCountdown() {
super(Config.SpectatorDuration, "BLOCK_NOTE_PLING", false);
super(Config.SpectatorDuration, SWSound.BLOCK_NOTE_PLING, false);
}
@Override

2
FightSystem_Main/src/de/steamwar/fightsystem/countdown/TechKOCountdown.java
Datei anzeigen

@ -11,7 +11,7 @@ public class TechKOCountdown extends Countdown {
private final FightTeam team;
public TechKOCountdown(FightTeam team) {
super(WinconditionTechKO.TECH_KO_COUNTDOWN_TIME, "BLOCK_NOTE_PLING", false);
super(WinconditionTechKO.TECH_KO_COUNTDOWN_TIME, SWSound.BLOCK_NOTE_PLING, false);
this.team = team;
}

2
FightSystem_Main/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java
Datei anzeigen

@ -9,7 +9,7 @@ public class TimeOverCountdown extends Countdown {
private final Runnable timeOver;
public TimeOverCountdown(Runnable timeOver) {
super(Config.TimeoutTime, "BLOCK_NOTE_BASS", false);
super(Config.TimeoutTime, SWSound.BLOCK_NOTE_BASS, false);
this.timeOver = timeOver;
}

3
FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerDeathListener.java
Datei anzeigen

@ -2,6 +2,7 @@ package de.steamwar.fightsystem.listener;
import de.steamwar.fightsystem.FightSystem;
import de.steamwar.fightsystem.countdown.Countdown;
import de.steamwar.fightsystem.countdown.SWSound;
import de.steamwar.fightsystem.fight.Fight;
import de.steamwar.fightsystem.fight.FightTeam;
import org.bukkit.Bukkit;
@ -26,6 +27,6 @@ public class PlayerDeathListener extends BasicListener {
fightTeam.getFightPlayer(player).setOut();
player.setGameMode(GameMode.SPECTATOR);
player.teleport(fightTeam.getSpawn());
Fight.playSound(Countdown.getSound("ENTITY_WITHER_DEATH"), 100.0F, 1.0F);
Fight.playSound(Countdown.getSound(SWSound.ENTITY_WITHER_DEATH), 100.0F, 1.0F);
}
}