new custom music, mars and glacio

Author: ethanicusss

src/main/java/com/github/ethanicuss/astraladditions/musicplayer/MusicPlayer.java

@@ -63,15 +63,18 @@ public static MusicSound findMusic(MusicTracker musicTracker){
             if (Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:moon") && player.getY() < 95) {
                 val = ModMusic.MOON;
             }
+            if (Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:mars")) {
+                val = ModMusic.MARS;
+            }
+            if (Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:glacio")) {
+                val = ModMusic.GLACIO;
+            }
             if (Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:mercury")) {
                 val = ModMusic.MERCURY;
             }
             if (Objects.equals(player.world.getRegistryKey().getValue().toString(), "minecraft:the_nether") || Objects.equals(player.world.getRegistryKey().getValue().toString(), "createastral:moon_debris") || Objects.equals(player.world.getRegistryKey().getValue().toString(), "minecraft:the_end")) {
                 val = ModMusic.END;
             }
-            if (Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:mars") && player.getY() < 80) {
-                val = ModMusic.MARS;
-            }
             if (Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:moon_orbit") || Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:mars_orbit") || Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:mercury_orbit") || Objects.equals(player.world.getRegistryKey().getValue().toString(), "ad_astra:earth_orbit")) {
                 val = ModMusic.ORBIT;
             }

src/main/java/com/github/ethanicuss/astraladditions/registry/ModMusic.java

@@ -25,6 +25,7 @@ public class ModMusic {
     public static final MusicSound ORBIT              = new MusicSound(ModSounds.MUSIC_ORBIT, GAME_MIN_DELAY, GAME_MAX_DELAY, false);
     public static final MusicSound MERCURY            = new MusicSound(ModSounds.MUSIC_MERCURY, GAME_MIN_DELAY, GAME_MAX_DELAY, false);
     public static final MusicSound MARS               = new MusicSound(ModSounds.MUSIC_MARS, GAME_MIN_DELAY, GAME_MAX_DELAY, false);
+    public static final MusicSound GLACIO               = new MusicSound(ModSounds.MUSIC_GLACIO, GAME_MIN_DELAY, GAME_MAX_DELAY, false);
     public static final MusicSound END                = new MusicSound(ModSounds.MUSIC_END, GAME_MIN_DELAY, GAME_MAX_DELAY, false);
     public static final MusicSound END_BOSS           = new MusicSound(ModSounds.MUSIC_END_BOSS, 0, 0, true);
     public static final MusicSound WITHER             = new MusicSound(ModSounds.MUSIC_WITHER, 0, 0, true);

src/main/java/com/github/ethanicuss/astraladditions/registry/ModSounds.java

@@ -30,6 +30,8 @@ public class ModSounds {
     public static final SoundEvent MUSIC_MERCURY               = new SoundEvent(MUSIC_MERCURY_ID);
     public static final Identifier MUSIC_MARS_ID               = new Identifier(AstralAdditions.MOD_ID, "music_mars");
     public static final SoundEvent MUSIC_MARS                  = new SoundEvent(MUSIC_MARS_ID);
+    public static final Identifier MUSIC_GLACIO_ID               = new Identifier(AstralAdditions.MOD_ID, "music_glacio");
+    public static final SoundEvent MUSIC_GLACIO                  = new SoundEvent(MUSIC_GLACIO_ID);
     public static final Identifier MUSIC_END_ID                = new Identifier(AstralAdditions.MOD_ID, "music_end");
     public static final SoundEvent MUSIC_END                   = new SoundEvent(MUSIC_END_ID);
     public static final Identifier MUSIC_END_BOSS_ID           = new Identifier(AstralAdditions.MOD_ID, "music_end_boss");

src/main/resources/assets/astraladditions/sounds.json

@@ -30,8 +30,38 @@
   "music_mars": {
     "sounds": [
       {
-        "name": "astraladditions:uneasy",
-        "stream": true
+        "name": "astraladditions:maybe_just_maybe",
+        "stream": true,
+        "weight": 2
+      },
+      {
+        "name": "astraladditions:project_501",
+        "stream": true,
+        "weight": 2
+      },
+      {
+        "name": "music/game/nether/nether3",
+        "stream": true,
+        "weight": 1
+      },
+      {
+        "name": "music/game/nether/nether4",
+        "stream": true,
+        "weight": 1
+      }
+    ]
+  },
+  "music_glacio": {
+    "sounds": [
+      {
+        "name": "astraladditions:frosted_glass",
+        "stream": true,
+        "weight": 2
+      },
+      {
+        "name": "astraladditions:so_cold",
+        "stream": true,
+        "weight": 2
       }
     ]
   },
@@ -96,17 +126,17 @@
       {
         "name": "astraladditions:day",
         "stream": true,
-        "weight": 3
+        "weight": 2
       },
       {
         "name": "astraladditions:sunlight",
         "stream": true,
-        "weight": 3
+        "weight": 2
       },
       {
         "name": "astraladditions:they_will_listen",
         "stream": true,
-        "weight": 3
+        "weight": 2
       },
       {
         "name": "music/game/calm1",
@@ -204,11 +234,6 @@
         "name": "music/game/nether/nether3",
         "stream": true,
         "weight": 1
-      },
-      {
-        "name": "music/game/nether/nether4",
-        "stream": true,
-        "weight": 1
       }
     ]
   },