From e82ffc4abd56d0ef8debb76cd622b05deb7a672f Mon Sep 17 00:00:00 2001
From: Technici4n <13494793+Technici4n@users.noreply.github.com>
Date: Sat, 22 Nov 2025 00:58:14 +0100
Subject: [PATCH] NullAway setup

---
 gradle.properties              |  2 ++
 projects/neoforge/build.gradle | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index e825b72a38..5f94a3f911 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -51,5 +51,7 @@ assertj_core=3.25.1
 
 # renovate: org.eclipse.jdt:org.eclipse.jdt.core
 jdt_core_version=3.42.0
+error_prone_version=2.44.0
+nullaway_version=0.12.12
 
 neogradle.runtime.platform.installer.debug=true
diff --git a/projects/neoforge/build.gradle b/projects/neoforge/build.gradle
index 1f612e7f25..0901a3b4a3 100644
--- a/projects/neoforge/build.gradle
+++ b/projects/neoforge/build.gradle
@@ -11,6 +11,7 @@ plugins {
     id 'net.neoforged.jarcompatibilitychecker' version '0.1.12'
     id 'net.neoforged.gradleutils'
     id 'neoforge.versioning'
+    id 'net.ltgt.errorprone' version '4.3.0'
 }
 
 apply plugin : net.neoforged.neodev.NeoDevPlugin
@@ -165,6 +166,9 @@ dependencies {
             requireCapability 'net.neoforged:neoforge'
         }
     }
+
+    errorprone "com.google.errorprone:error_prone_core:${project.error_prone_version}"
+    errorprone "com.uber.nullaway:nullaway:${project.nullaway_version}"
 }
 
 // Select runtimeElements rather than universalJar from the main source set
@@ -292,6 +296,13 @@ tasks.register('generateFinalizeSpawnTargets', GenerateFinalizeSpawnTargets.clas
 tasks.withType(JavaCompile.class).configureEach {
     // Increase memory used during compilation, to avoid OutOfMemoryErrors
     options.forkOptions.memoryMaximumSize = '2g'
+
+    // Configure NullAway
+    options.errorprone {
+        disableAllChecks = true // Disable default errorprone checks
+        check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
+        option("NullAway:AnnotatedPackages", "net.neoforged.neoforge")
+    }
 }
 
 tasks.withType(Javadoc.class).configureEach {