Migrate to jetbrains annotations

Sollace · Jun 10, 2021 · 767a9ee · 767a9ee
1 parent c105467
commit 767a9ee
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,11 @@ plugins {
     id 'maven-publish'
 }
 
-targetCompatibility = JavaVersion.VERSION_16
-sourceCompatibility = JavaVersion.VERSION_16
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(16)
+    }
+}
 
 def createVersion() {
     def parts = []
@@ -57,7 +60,6 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}"
     modApi "net.fabricmc:fabric-loader:${project.loader_version}"
-    compileOnly "com.google.code.findbugs:jsr305:3.0.2"
 
     modApi fabricApi.module("fabric-api-base", project.fabric_version)
     modApi fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)

diff --git a/src/main/java/eu/ha3/mc/quick/update/UpdateNotifier.java b/src/main/java/eu/ha3/mc/quick/update/UpdateNotifier.java
@@ -7,8 +7,8 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
 
+import org.jetbrains.annotations.Nullable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/src/main/java/eu/ha3/presencefootsteps/PFOptionsScreen.java b/src/main/java/eu/ha3/presencefootsteps/PFOptionsScreen.java
@@ -1,6 +1,6 @@
 package eu.ha3.presencefootsteps;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.minelittlepony.common.client.gui.GameGui;
 import com.minelittlepony.common.client.gui.element.AbstractSlider;

diff --git a/src/main/java/eu/ha3/presencefootsteps/sound/State.java b/src/main/java/eu/ha3/presencefootsteps/sound/State.java
@@ -1,6 +1,6 @@
 package eu.ha3.presencefootsteps.sound;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public enum State {
     /**

diff --git a/src/main/java/eu/ha3/presencefootsteps/sound/generator/TerrestrialStepSoundGenerator.java b/src/main/java/eu/ha3/presencefootsteps/sound/generator/TerrestrialStepSoundGenerator.java
@@ -5,7 +5,7 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.BlockPos;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import eu.ha3.presencefootsteps.config.Variator;
 import eu.ha3.presencefootsteps.mixins.ILivingEntity;

diff --git a/src/main/java/eu/ha3/presencefootsteps/util/BlockReport.java b/src/main/java/eu/ha3/presencefootsteps/util/BlockReport.java
@@ -5,7 +5,7 @@
 import java.nio.file.Path;
 import java.util.function.Predicate;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.google.gson.stream.JsonWriter;
 import com.minelittlepony.common.util.GamePaths;

diff --git a/src/main/java/eu/ha3/presencefootsteps/world/Association.java b/src/main/java/eu/ha3/presencefootsteps/world/Association.java
@@ -1,6 +1,6 @@
 package eu.ha3.presencefootsteps.world;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;