Update to 1.18

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
       - name: Build
         uses: eskatos/[email protected]
         with:

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
       - name: Build
         uses: eskatos/[email protected]
         with:

build.gradle

@@ -28,7 +28,7 @@ version = "${mod_version}"
 group = maven_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "${archives_base_name}"
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(16))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 minecraft {
@@ -95,8 +95,8 @@ repositories {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    library 'org.spongepowered:mixin:0.8.4-SNAPSHOT'
-    annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'
+    library 'org.spongepowered:mixin:0.8.5-SNAPSHOT'
+    annotationProcessor 'org.spongepowered:mixin:0.8.5-SNAPSHOT:processor'
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..

gradle.properties

@@ -1,9 +1,9 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx3G
 # Forge Properties
-minecraft_version=1.17.1
-forge_version=37.0.53
-parchment_version=2021.09.05
+minecraft_version=1.18.1
+forge_version=39.0.0
+parchment_version=BLEEDING-SNAPSHOT
 # Mod Properties
 modid=nowplaying
 mod_version=1.2.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.2-20210702220150+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[33,)"
+loaderVersion="[39,)"
 issueTrackerURL="https://github.com/Scotsguy/now-playing/issues"
 license="MIT"
 
@@ -16,6 +16,6 @@ description="Shows a 'now playing' popup whenever a song starts to play."
 [[dependencies.nowplaying]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.17.1,)"
+    versionRange="[1.18,)"
     ordering="NONE"
     side="CLIENT"

src/main/resources/assets/nowplaying/lang/en_us.json

@@ -1,6 +1,18 @@
 {
   "now_playing.toast.now_playing": "Now Playing:",
 
+  "text.autoconfig.now-playing.title": "Now Playing Config",
+
+  "text.autoconfig.now-playing.option.musicStyle": "Notification Style (Music)",
+  "text.autoconfig.now-playing.option.musicStyle.@Tooltip": "How the 'Now Playing' notification should be displayed when music plays normally.",
+
+  "text.autoconfig.now-playing.option.jukeboxStyle": "Notification Style (Jukebox)",
+  "text.autoconfig.now-playing.option.jukeboxStyle.@Tooltip": "How the 'Now Playing' notification should be displayed when music plays from a jukebox.",
+
+  "now_playing.config.style.hotbar": "Hotbar",
+  "now_playing.config.style.toast": "Toast",
+  "now_playing.config.style.disabled": "Disabled",
+
   "now_playing.sound.minecraft:music/game/calm1": "C418 - Minecraft",
   "now_playing.sound.minecraft:music/game/calm2": "C418 - Clark",
   "now_playing.sound.minecraft:music/game/calm3": "C418 - Sweden",
@@ -28,6 +40,15 @@
   "now_playing.sound.minecraft:music/game/water/axolotl": "C418 - Axolotl",
   "now_playing.sound.minecraft:music/game/water/dragon_fish": "C418 - Dragon Fish",
 
+  "now_playing.sound.minecraft:music/game/an_ordinary_day": "Kumi Tanioka - An Ordinary Day",
+  "now_playing.sound.minecraft:music/game/comforting_memories": "Kumi Tanioka - Comforting Memories",
+  "now_playing.sound.minecraft:music/game/floating_dream": "Kumi Tanioka - Floating Dream",
+  "now_playing.sound.minecraft:music/game/infinite_amethyst": "Lena Raine - Infinite Amethyst",
+  "now_playing.sound.minecraft:music/game/left_to_bloom": "Lena Raine - Left to Bloom",
+  "now_playing.sound.minecraft:music/game/one_more_day": "Lena Raine - One More Day",
+  "now_playing.sound.minecraft:music/game/stand_tall": "Lena Raine - Stand Tall",
+  "now_playing.sound.minecraft:music/game/wending": "Lena Raine - Wending",
+
   "now_playing.sound.minecraft:music/game/nether/nether1": "C418 - Concrete Halls",
   "now_playing.sound.minecraft:music/game/nether/nether2": "C418 - Dead Voxel",
   "now_playing.sound.minecraft:music/game/nether/nether3": "C418 - Warmth",

src/main/resources/nowplaying.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "com.github.scotsguy.nowplaying.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "refmap": "main.nowplaying.refmap.json",
   "mixins": [
     "MinecraftMixin",