Skip to content

Commit

Permalink
Rename CUSTOM to FALLBACK
Browse files Browse the repository at this point in the history
Signed-off-by: BT (calcastor/mame) <[email protected]>
  • Loading branch information
calcastor committed Sep 18, 2024
1 parent 273a86f commit f3bde9a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/tc/oc/pgm/action/SoundType.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import tc.oc.pgm.util.bukkit.Sounds;

public enum SoundType {
CUSTOM(Sounds.CUSTOM),
CUSTOM(Sounds.FALLBACK),
TIP(Sounds.TIP),
ALERT(Sounds.ALERT),
PORTAL(Sounds.PORTAL),
Expand Down
2 changes: 1 addition & 1 deletion util/src/main/java/tc/oc/pgm/util/bukkit/Sounds.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ public interface Sounds {
Sound ALERT = sound("NOTE_PLING", "BLOCK_NOTE_BLOCK_PLING", 1f, 2f);
Sound CONTROL_POINT_GOOD = sound("PORTAL_TRAVEL", "BLOCK_PORTAL_TRAVEL", 0.35f, 2f);
Sound CONTROL_POINT_BAD = sound("BLAZE_DEATH", "ENTITY_BLAZE_DEATH", 0.4f, 0.8f);
Sound CUSTOM = sound("NOTE_PLING", "BLOCK_NOTE_BLOCK_PLING");
Sound DEATH_OWN =
sound("IRONGOLEM_DEATH", "ENTITY_IRON_GOLEM_DEATH"); // Own death is normal pitch, full volume
Sound DEATH_KILLED = sound(
Expand All @@ -23,6 +22,7 @@ public interface Sounds {
sound("IRONGOLEM_HIT", "ENTITY_IRON_GOLEM_HURT", 1f, 4f / 3f); // Enemy death is higher pitch
Sound DEFUSE = sound("FIZZ", "ENTITY_GENERIC_EXTINGUISH_FIRE");
Sound DIRECT_MESSAGE = sound("ORB_PICKUP", "ENTITY_EXPERIENCE_ORB_PICKUP", 1f, 1.2f);
Sound FALLBACK = sound("NOTE_PLING", "BLOCK_NOTE_BLOCK_PLING");
Sound FLAG_DROP = sound("FIREWORK_TWINKLE2", "ENTITY_FIREWORK_ROCKET_TWINKLE_FAR");
Sound FLAG_DROP_OWN = sound("WITHER_HURT", "ENTITY_WITHER_HURT", 0.7f, 1f);
Sound FLAG_PICKUP = sound("FIREWORK_BLAST2", "ENTITY_FIREWORK_ROCKET_BLAST_FAR", 1f, 0.7f);
Expand Down

0 comments on commit f3bde9a

Please sign in to comment.