[1.18.2] Port

The-Fireplace · The-Fireplace · commit a2f5d41f979a · 2025-06-07T21:50:24.000-05:00
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -23,9 +23,7 @@ jobs:
                 uses: actions/setup-java@v4
                 with:
                     distribution: 'temurin'
-                    java-version: |
-                        16
-                        ${{ matrix.java }}
+                    java-version: ${{ matrix.java }}
 
             -   name: Cache Gradle packages
                 uses: actions/cache@v4
diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
@@ -21,9 +21,7 @@ jobs:
               uses: actions/setup-java@v4
               with:
                   distribution: 'temurin'
-                  java-version: |
-                      16
-                      ${{ matrix.java }}
+                  java-version: ${{ matrix.java }}
 
             - name: build
               run: ./gradlew build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -23,9 +23,7 @@ jobs:
                 uses: actions/setup-java@v4
                 with:
                     distribution: 'temurin'
-                    java-version: |
-                        16
-                        ${{ matrix.java }}
+                    java-version: ${{ matrix.java }}
 
             -   name: Cache Gradle packages
                 uses: actions/cache@v4
diff --git a/README.md b/README.md
@@ -7,5 +7,5 @@ A client-side Minecraft mod that allows the system narrator to read books to you
 
 ## Current Target Game Versions
 New releases are not planned to occur outside of these version ranges. Existing versions outside these ranges may still function, but are no longer supported.
-- Fabric: Minecraft 1.17.1 - Current
+- Fabric: Minecraft 1.17 - Current
 - Forge: Minecraft 1.17 - 1.20.6
diff --git a/build.gradle b/build.gradle
@@ -17,9 +17,9 @@ subprojects { Project subProject ->
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
 
-    sourceCompatibility = JavaVersion.VERSION_16
-    targetCompatibility = JavaVersion.VERSION_16
-    java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
     group = project.maven_group
     version = "${project.mod_version}+${project.minecraft_version}"
@@ -29,7 +29,7 @@ subprojects { Project subProject ->
 
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = 'UTF-8'
-        it.options.release.set(16)
+        it.options.release.set(17)
     }
 
     javadoc.options.addStringOption('Xdoclint:none', '-quiet')
diff --git a/common/src/main/resources/audiobook.mixins.json b/common/src/main/resources/audiobook.mixins.json
@@ -2,7 +2,7 @@
     "required": true,
     "minVersion": "0.8",
     "package": "dev.the_fireplace.audiobook.mixin",
-    "compatibilityLevel": "JAVA_16",
+    "compatibilityLevel": "JAVA_17",
     "client": [
         "BookViewScreenMixin",
         "MinecraftMixin",
diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${readable_name}",
-    "pack_format": 7
+    "pack_format": 8
   }
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -9,7 +9,7 @@ plugins {
 archivesBaseName = "${archives_base_name}-Fabric"
 final def mainArtifactFile = layout.buildDirectory.file("libs/${archivesBaseName}-${version}.jar").get().asFile
 final def changelogFile = file('../changelog.txt')
-final def supportedMinecraftVersions = [project.minecraft_version, '1.17']
+final def supportedMinecraftVersions = [project.minecraft_version, '1.18.1', '1.18', '1.17.1', '1.17']
 
 dependencies {
 	minecraft "com.mojang:minecraft:${minecraft_version}"
@@ -84,7 +84,7 @@ if (hasProperty('curseForgeApiKey') || System.getenv("CURSEFORGE_API_KEY") != nu
 			supportedMinecraftVersions.each { value ->
 				addGameVersion value
 			}
-			addGameVersion 'Java 16'
+			addGameVersion 'Java 17'
 			addGameVersion 'Fabric'
 			addGameVersion 'Quilt'
 			mainArtifact(mainArtifactFile) {
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 plugins {
     id 'java'
     id 'java-library'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
     // Mod Hosting Publish
     id 'com.matthewprenger.cursegradle' version '1.4.0'
     id 'com.modrinth.minotaur' version '2.+'
@@ -22,13 +22,9 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 
 archivesBaseName = "${archives_base_name}-Forge"
-def mainArtifactFile = layout.buildDirectory.file("libs/${archivesBaseName}-${version}.jar").get().asFile
-def changelogFile = file('../changelog.txt')
-def supportedMinecraftVersions = [project.minecraft_version, '1.17']
-
-repositories {
-    maven { url 'https://maven.shedaniel.me/' }
-}
+final def mainArtifactFile = layout.buildDirectory.file("libs/${archivesBaseName}-${version}.jar").get().asFile
+final def changelogFile = file('../changelog.txt')
+final def supportedMinecraftVersions = [project.minecraft_version, '1.18.1', '1.18']
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
@@ -49,6 +45,8 @@ mixin {
 minecraft {
     mappings channel: 'official', version: minecraft_version
 
+    copyIdeResources = true
+
     runs {
         client {
             workingDirectory project.file('run')
@@ -145,7 +143,7 @@ if (hasProperty('curseForgeApiKey') || System.getenv("CURSEFORGE_API_KEY") != nu
             supportedMinecraftVersions.each { value ->
                 addGameVersion value
             }
-            addGameVersion 'Java 16'
+            addGameVersion 'Java 17'
             addGameVersion 'Forge'
             mainArtifact(mainArtifactFile) {
                 displayName = "$archivesBaseName-$version"
diff --git a/forge/settings.gradle b/forge/settings.gradle
@@ -0,0 +1,3 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}
diff --git a/forge/src/main/java/dev/the_fireplace/audiobook/entrypoints/Forge.java b/forge/src/main/java/dev/the_fireplace/audiobook/entrypoints/Forge.java
@@ -3,13 +3,13 @@
 import net.minecraftforge.fml.IExtensionPoint;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
+import net.minecraftforge.network.NetworkConstants;
 
 @Mod("audiobook")
 public class Forge
 {
     public Forge() {
         // Register as optional on both sides
-        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
     }
 }
diff --git a/forge/src/main/java/dev/the_fireplace/audiobook/entrypoints/RegistryHandler.java b/forge/src/main/java/dev/the_fireplace/audiobook/entrypoints/RegistryHandler.java
@@ -3,10 +3,10 @@
 import dev.the_fireplace.audiobook.AudiobookConstants;
 import dev.the_fireplace.audiobook.AudiobookKeys;
 import net.minecraft.client.KeyMapping;
+import net.minecraftforge.client.ClientRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fmlclient.registry.ClientRegistry;
 
 import java.awt.event.KeyEvent;
 
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[37,)"
+loaderVersion = "[38,)"
 license = "${license_name}"
 issueTrackerURL = "${github_url}/issues"
 showAsResourcePack = false
@@ -18,13 +18,13 @@ description = "${mod_description}"
 [[dependencies.audiobook]]
 modId = "forge"
 mandatory = true
-versionRange = "[37,)"
+versionRange = "[38,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.audiobook]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.17,)"
+versionRange = "[1.18,)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -3,13 +3,13 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 # Common
-minecraft_version=1.17.1
+minecraft_version=1.18.2
 # Fabric
 fabric_loader_version=0.15.11
 # Fabric Dependencies
-fabric_api_version=0.46.1+1.17
+fabric_api_version=0.47.8+1.18.2
 # Forge
-forge_version=37.1.1
+forge_version=40.0.34
 forge_mixin_version=0.8.5
 forge_update_json_url=https://api.modrinth.com/updates/audiobook/forge_updates.json
 # Mod Properties
diff --git a/settings.gradle b/settings.gradle
@@ -5,6 +5,10 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
         maven {
             name = 'Sponge Snapshots'
             url = 'https://repo.spongepowered.org/repository/maven-public/'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"pack": {`
`3`	`3`	`"description": "${readable_name}",`
`4`		`- "pack_format": 7`
	`4`	`+ "pack_format": 8`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+plugins {`
	`2`	`+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'`
	`3`	`+}`