diff --git a/build.gradle b/build.gradle
index d55aede..f6d0f0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     repositories {
-        mavenCentral()
         maven { url = 'https://maven.minecraftforge.net' }
+        mavenCentral()
     }
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
@@ -13,16 +13,17 @@ version = '2.0.0'
 group = 'me.xfl03'
 archivesBaseName = 'MoreCrashInfo'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = 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 {
-    mappings channel: 'official', version: '1.17.1'
+    mappings channel: 'official', version: '1.18.2'
     runs {
         client {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', 'morecrashinfo'
 
             mods {
                 morecrashinfo {
@@ -35,6 +36,20 @@ minecraft {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', 'morecrashinfo'
+
+            mods {
+                morecrashinfo {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        gameTestServer {
+            workingDirectory project.file('run')
+            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', 'morecrashinfo'
 
             mods {
                 morecrashinfo {
@@ -47,6 +62,7 @@ minecraft {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
+            property 'forge.enabledGameTestNamespaces', 'morecrashinfo'
             args '--mod', 'morecrashinfo', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
             mods {
@@ -61,7 +77,7 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.17.1-37.1.1'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.2.0'
 }
 
 jar {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8ad73a7..c50b3c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
diff --git a/src/main/resources/crashtransformers.js b/src/main/resources/crashtransformers.js
index a96f4f5..b1a99ca 100644
--- a/src/main/resources/crashtransformers.js
+++ b/src/main/resources/crashtransformers.js
@@ -43,6 +43,13 @@ function initializeCoreMod() {
                 'name': 'net/minecraftforge/fmllegacy/CrashReportExtender'
             },
             'transformer': transformCrashReportExtenderTransformer
+        },
+        'CrashReportExtenderTransformer 18': {
+            'target': {
+                'type': 'CLASS',
+                'name': 'net/minecraftforge/logging/CrashReportExtender'
+            },
+            'transformer': transformCrashReportExtenderTransformer
         }
     }
 }
\ No newline at end of file