feat: Opaque Windows & Grammar

Author: worldwidepixel

LICENSE-MUSIC

@@ -3,8 +3,8 @@ The soundtracks for Joy are created by WorldWidePixel.
 Pridecraft Studios has full rights to use and profit off this music for any work created that may use this music.
 
 You are authorised to use Joy, with a few restrictions. In short:
-- You must provide credit to WorldWidePixel
-- You can not reupload this soundtrack verbatim 
+- You must provide attribution to WorldWidePixel
+- You can not reupload this soundtrack verbatim
 - You may use this soundtrack under the fair use doctrine including but not limited to the following:
   - Using this soundtrack in videos or streams
 

LICENSE.md

@@ -13,7 +13,7 @@ You may use code from Joy under the terms of the MPL-2.0.
 
 The core code was taken from [DaFuqs] and [hibiii] under the [Unlicense][BLAHAJ-BASE].
 
-Pride Blahajs were taken from [musicalskele] under the [MIT License][BLAHAJ-PRIDE].
+Pride Blahajar were taken from [musicalskele] under the [MIT License][BLAHAJ-PRIDE].
 
 *Note: This is operating under assumptions from known and disclosed sources.*
 

README.md

@@ -4,7 +4,7 @@
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/pridecraft-studios/joy/total?style=for-the-badge&logo=github&label=Github%20Downloads)
 ![GitHub commit activity](https://img.shields.io/github/commit-activity/t/pridecraft-studios/joy?style=for-the-badge&logo=github)
 
-This is Joy, a Content Mod made by [Pridecraft Studios], and a sister to [Pride Pack].
+This is Joy, a content mod made by [Pridecraft Studios], and a sister to [Pride Pack].
 It comes with lots of LGBTQ+ Pride additions, including paintings, beds, mobs, candles, and more!
 
 There are also added variants as well, including trans bees and backporting of pride bundle variants.

xplat/src/main/resources/assets/joy/lang/en_us.json

@@ -219,5 +219,18 @@
   "tag.item.c.gliders": "Gliders",
   "tag.item.c.elytra": "Elytra",
   "tag.item.c.totem_of_undying": "Totems of Undying",
-  "tag.item.joy.pride_dyeable": "Pride Dyeable Items"
+  "tag.item.joy.pride_dyeable": "Pride Dyeable Items",
+
+  "joy.music.game.creative.reminiscence": "WorldWidePixel - Reminiscence",
+  "joy.music.game.douglas": "WorldWidePixel - Douglas",
+  "joy.music.game.melancolie": "WorldWidePixel - Mélancolie",
+  "joy.music.game.regina": "WorldWidePixel - Regina",
+  "joy.music.game.opaque_window": "WorldWidePixel - Opaque Window",
+  "joy.music.menu.joy": "WorldWidePixel - Joy",
+  "now-playing.joy:music/game/creative": "WorldWidePixel - Reminiscence",
+  "now-playing.joy:music/game/douglas": "WorldWidePixel - Douglas",
+  "now-playing.joy:music/game/melancolie": "WorldWidePixel - Mélancolie",
+  "now-playing.joy:music/game/regina": "WorldWidePixel - Regina",
+  "now-playing.joy:music/game/opaque_window": "WorldWidePixel - Opaque Window",
+  "now-playing.joy:music/menu/joy": "WorldWidePixel - Joy"
 }

xplat/src/main/resources/assets/joy/sounds/music/game/opaque_window.ogg

@@ -20,6 +20,10 @@
       {
         "name": "joy:music/game/regina",
         "stream": true
+      },
+      {
+        "name": "joy:music/game/opaque_window",
+        "stream": true
       }
     ]
   },
@@ -31,4 +35,4 @@
       }
     ]
   }
-}
+}