Move from findbugs null annotations to JetBrains

Forge and Fabric are finally aligned on this so let's do it

Author: williewillus

Fabric/build.gradle

@@ -46,7 +46,6 @@ loom {
 }
 
 dependencies {
-	implementation "com.google.code.findbugs:jsr305:3.0.2"
 	modImplementation "me.zeroeightsix:fiber:0.23.0-2"
 	include "me.zeroeightsix:fiber:0.23.0-2"
 

Fabric/src/main/java/vazkii/patchouli/fabric/network/FabricMessageOpenBookGui.java

@@ -11,7 +11,7 @@
 import vazkii.patchouli.api.PatchouliAPI;
 import vazkii.patchouli.client.book.ClientBookRegistry;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 
 import io.netty.buffer.Unpooled;

Fabric/src/main/java/vazkii/patchouli/fabric/xplat/FabricXplatImpl.java

@@ -18,7 +18,7 @@
 import vazkii.patchouli.xplat.IXplatAbstractions;
 import vazkii.patchouli.xplat.XplatModContainer;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;

Forge/src/main/java/vazkii/patchouli/forge/network/ForgeMessageOpenBookGui.java

@@ -8,7 +8,7 @@
 
 import vazkii.patchouli.client.book.ClientBookRegistry;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Supplier;
 

Forge/src/main/java/vazkii/patchouli/forge/xplat/ForgeXplatImpl.java

@@ -12,8 +12,6 @@
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 
-import org.jetbrains.annotations.Nullable;
-
 import vazkii.patchouli.api.BookContentsReloadEvent;
 import vazkii.patchouli.api.BookDrawScreenEvent;
 import vazkii.patchouli.forge.client.ForgeClientInitializer;
@@ -22,6 +20,8 @@
 import vazkii.patchouli.xplat.IXplatAbstractions;
 import vazkii.patchouli.xplat.XplatModContainer;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

Xplat/build.gradle

@@ -22,7 +22,6 @@ repositories {
 
 dependencies {
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
-    implementation "com.google.code.findbugs:jsr305:3.0.2"
     compileOnly "mezz.jei:jei-1.19-common-api:11.0.0.206"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.1'

Xplat/src/main/java/vazkii/patchouli/api/IMultiblock.java

@@ -8,7 +8,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Rotation;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 

Xplat/src/main/java/vazkii/patchouli/api/IVariable.java

@@ -7,7 +7,7 @@
 import com.google.gson.JsonNull;
 import com.google.gson.JsonPrimitive;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Type;
 import java.util.List;

Xplat/src/main/java/vazkii/patchouli/api/PatchouliAPI.java

@@ -18,7 +18,7 @@
 
 import vazkii.patchouli.api.stub.StubPatchouliAPI;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.InputStream;
 import java.util.Map;

Xplat/src/main/java/vazkii/patchouli/api/VariableHelper.java

@@ -3,7 +3,7 @@
 import com.google.common.base.Suppliers;
 import com.google.gson.JsonElement;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Supplier;
 

Xplat/src/main/java/vazkii/patchouli/api/stub/StubPatchouliAPI.java

@@ -16,7 +16,7 @@
 import vazkii.patchouli.api.IStyleStack;
 import vazkii.patchouli.api.PatchouliAPI.IPatchouliAPI;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.InputStream;
 import java.util.Map;
@@ -180,7 +180,8 @@ public IStateMatcher anyMatcher() {
 		return StubMatcher.INSTANCE;
 	}
 
-	@Override public IStateMatcher tagMatcher(TagKey<Block> block) {
+	@Override
+	public IStateMatcher tagMatcher(TagKey<Block> block) {
 		return StubMatcher.INSTANCE;
 	}
 }

Xplat/src/main/java/vazkii/patchouli/client/base/BookModel.java

@@ -19,8 +19,8 @@
 import vazkii.patchouli.common.book.Book;
 import vazkii.patchouli.common.item.ItemModBook;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.List;
@@ -35,7 +35,7 @@ public BookModel(BakedModel original, ModelBakery loader) {
 
 		this.itemHandler = new ItemOverrides(loader, missing, id -> missing, Collections.emptyList()) {
 			@Override
-			public BakedModel resolve(@Nonnull BakedModel original, @Nonnull ItemStack stack,
+			public BakedModel resolve(@NotNull BakedModel original, @NotNull ItemStack stack,
 					@Nullable ClientLevel world, @Nullable LivingEntity entity, int seed) {
 				Book book = ItemModBook.getBook(stack);
 				if (book != null) {
@@ -47,15 +47,15 @@ public BakedModel resolve(@Nonnull BakedModel original, @Nonnull ItemStack stack
 		};
 	}
 
-	@Nonnull
+	@NotNull
 	@Override
 	public ItemOverrides getOverrides() {
 		return itemHandler;
 	}
 
-	@Nonnull
+	@NotNull
 	@Override
-	public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull RandomSource rand) {
+	public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @NotNull RandomSource rand) {
 		return original.getQuads(state, side, rand);
 	}
 
@@ -79,7 +79,7 @@ public boolean isCustomRenderer() {
 		return original.isCustomRenderer();
 	}
 
-	@Nonnull
+	@NotNull
 	@Override
 	public TextureAtlasSprite getParticleIcon() {
 		return original.getParticleIcon();

Xplat/src/main/java/vazkii/patchouli/client/base/ClientAdvancements.java

@@ -17,7 +17,7 @@
 import vazkii.patchouli.common.book.Book;
 import vazkii.patchouli.mixin.client.AccessorClientAdvancements;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
 
@@ -73,13 +73,13 @@ public LexiconToast(Book book) {
 			this.book = book;
 		}
 
-		@Nonnull
+		@NotNull
 		@Override
 		public Book getToken() {
 			return book;
 		}
 
-		@Nonnull
+		@NotNull
 		@Override
 		public Visibility render(PoseStack ms, ToastComponent toastGui, long delta) {
 			RenderSystem.setShaderTexture(0, TEXTURE);

Xplat/src/main/java/vazkii/patchouli/client/book/BookCategory.java

@@ -11,7 +11,7 @@
 import vazkii.patchouli.common.base.PatchouliConfig;
 import vazkii.patchouli.common.book.Book;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

Xplat/src/main/java/vazkii/patchouli/client/book/BookContentClasspathLoader.java

@@ -11,7 +11,7 @@
 import vazkii.patchouli.common.book.BookRegistry;
 import vazkii.patchouli.xplat.XplatModContainer;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Files;

Xplat/src/main/java/vazkii/patchouli/client/book/BookContentLoader.java

@@ -8,7 +8,7 @@
 import vazkii.patchouli.common.book.Book;
 import vazkii.patchouli.common.book.BookRegistry;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Xplat/src/main/java/vazkii/patchouli/client/book/BookContentResourceDirectLoader.java

@@ -11,7 +11,7 @@
 import vazkii.patchouli.common.book.Book;
 import vazkii.patchouli.common.book.BookRegistry;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

Xplat/src/main/java/vazkii/patchouli/client/book/BookContentResourceListenerLoader.java

@@ -12,7 +12,7 @@
 import vazkii.patchouli.common.book.Book;
 import vazkii.patchouli.common.book.BookRegistry;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.List;

Xplat/src/main/java/vazkii/patchouli/client/book/BookContents.java

@@ -15,7 +15,7 @@
 import vazkii.patchouli.common.util.ItemStackUtil;
 import vazkii.patchouli.common.util.ItemStackUtil.StackWrapper;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

Xplat/src/main/java/vazkii/patchouli/client/book/BookContentsBuilder.java

@@ -11,7 +11,7 @@
 import vazkii.patchouli.common.book.BookRegistry;
 import vazkii.patchouli.common.util.ItemStackUtil;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
 import java.util.ArrayList;

Xplat/src/main/java/vazkii/patchouli/client/book/BookEntry.java

@@ -22,7 +22,7 @@
 import vazkii.patchouli.common.util.ItemStackUtil.StackWrapper;
 import vazkii.patchouli.common.util.SerializationUtil;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 import java.util.Map.Entry;

Xplat/src/main/java/vazkii/patchouli/client/book/ClientBookRegistry.java

@@ -15,7 +15,7 @@
 import vazkii.patchouli.common.book.BookRegistry;
 import vazkii.patchouli.common.util.SerializationUtil;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;

Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBook.java

@@ -35,7 +35,7 @@
 import vazkii.patchouli.mixin.client.AccessorScreen;
 import vazkii.patchouli.xplat.IXplatAbstractions;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 import java.util.*;

Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBookEntry.java

@@ -21,8 +21,8 @@
 import vazkii.patchouli.client.book.BookPage;
 import vazkii.patchouli.common.book.Book;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Objects;
@@ -264,7 +264,7 @@ public void setHoverTooltip(List<String> tooltip) {
 	}
 
 	@Override
-	public void setHoverTooltipComponents(@Nonnull List<Component> tooltip) {
+	public void setHoverTooltipComponents(@NotNull List<Component> tooltip) {
 		setTooltip(tooltip);
 	}
 

Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBookLanding.java

@@ -16,7 +16,7 @@
 import vazkii.patchouli.client.gui.GuiAdvancementsExt;
 import vazkii.patchouli.common.book.Book;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;

Xplat/src/main/java/vazkii/patchouli/client/book/gui/button/GuiButtonCategory.java

@@ -13,7 +13,7 @@
 import vazkii.patchouli.client.book.BookIcon;
 import vazkii.patchouli.client.book.gui.GuiBook;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class GuiButtonCategory extends Button {
 

Xplat/src/main/java/vazkii/patchouli/client/book/page/PageMultiblock.java

@@ -37,7 +37,7 @@
 import vazkii.patchouli.common.multiblock.SerializedMultiblock;
 import vazkii.patchouli.xplat.IClientXplatAbstractions;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.Set;
@@ -188,7 +188,7 @@ private void renderElements(PoseStack ms, AbstractMultiblock mb, Iterable<? exte
 		ms.popPose();
 	}
 
-	private void doWorldRenderPass(PoseStack ms, AbstractMultiblock mb, Iterable<? extends BlockPos> blocks, final @Nonnull MultiBufferSource.BufferSource buffers, Vector4f eye) {
+	private void doWorldRenderPass(PoseStack ms, AbstractMultiblock mb, Iterable<? extends BlockPos> blocks, final @NotNull MultiBufferSource.BufferSource buffers, Vector4f eye) {
 		for (BlockPos pos : blocks) {
 			BlockState bs = mb.getBlockState(pos);
 			ms.pushPose();

Xplat/src/main/java/vazkii/patchouli/client/book/page/abstr/PageDoubleRecipeRegistry.java

@@ -11,7 +11,7 @@
 import vazkii.patchouli.client.book.BookContentsBuilder;
 import vazkii.patchouli.client.book.BookEntry;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class PageDoubleRecipeRegistry<T extends Recipe<?>> extends PageDoubleRecipe<T> {
 	private final RecipeType<? extends T> recipeType;

Xplat/src/main/java/vazkii/patchouli/client/book/template/BookTemplate.java

@@ -15,7 +15,7 @@
 import vazkii.patchouli.client.book.template.component.*;
 import vazkii.patchouli.common.book.Book;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Xplat/src/main/java/vazkii/patchouli/client/book/template/TemplateComponent.java

@@ -15,7 +15,7 @@
 import vazkii.patchouli.client.book.gui.GuiBookEntry;
 import vazkii.patchouli.common.base.PatchouliConfig;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.UnaryOperator;
 

Xplat/src/main/java/vazkii/patchouli/client/book/template/TemplateInclusion.java

@@ -8,7 +8,7 @@
 import vazkii.patchouli.api.IVariable;
 import vazkii.patchouli.api.IVariableProvider;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 

Xplat/src/main/java/vazkii/patchouli/client/book/template/VariableAssigner.java

@@ -12,7 +12,7 @@
 import vazkii.patchouli.api.IVariablesAvailableCallback;
 import vazkii.patchouli.common.util.EntityUtil;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;

Xplat/src/main/java/vazkii/patchouli/client/book/template/variable/Variable.java

@@ -6,7 +6,7 @@
 import vazkii.patchouli.api.IVariableSerializer;
 import vazkii.patchouli.api.VariableHelper;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 

Xplat/src/main/java/vazkii/patchouli/client/book/text/BookTextParser.java

@@ -15,7 +15,7 @@
 import vazkii.patchouli.client.book.gui.GuiBookEntry;
 import vazkii.patchouli.common.book.Book;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;