Fix build, remove JSR 305, optimize imports

build.gradle

@@ -70,8 +70,8 @@ allprojects {
 		modImplementation "net.fabricmc.fabric-api:fabric-api:0.30.0+1.16"
 
 		implementation 'net.patchworkmc:event-racecar:1.0.1:with-typetools'
-		implementation 'com.google.code.findbugs:jsr305:3.0.2'
 		implementation 'com.electronwill.night-config:toml:3.6.2'
+		implementation 'org.cadixdev:lorenz:0.5.7'
 	}
 
 	configurations {
@@ -84,7 +84,7 @@ allprojects {
 
 	afterEvaluate {
 		remapJar {
-			input = file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar")
+			input.set(file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar"))
 			archiveName = "${archivesBaseName}-${version}.jar"
 		}
 
@@ -183,36 +183,6 @@ subprojects {
 	javadoc.enabled = false
 }
 
-subprojects.each { bintrayUpload.dependsOn("${it.path}:bintrayUpload") }
-
-bintray {
-	user = project.hasProperty('bintrayUser') ? project.getProperty('bintrayUser') : System.getenv('bintray_user')
-	key = project.hasProperty('bintrayKey') ? project.getProperty('bintrayKey') : System.getenv('bintray_key')
-	publish = true
-	override = true
-	publications = ['mavenJava']
-	pkg {
-		repo = project.bintrayRepo
-		name = project.name
-		user = bintray.user
-		userOrg = project.repoOwner
-		licenses = [project.codeLicense]
-		desc = project.description
-		websiteUrl = "https://github.com/${project.repoOwner}/${project.repoName}"
-		issueTrackerUrl = "https://github.com/${project.repoOwner}/${project.repoName}/issues"
-		vcsUrl = "https://github.com/${project.repoOwner}/${project.repoName}.git"
-		publicDownloadNumbers = true
-
-		githubRepo = "${project.repoOwner}/${project.repoName}"
-		version {
-			name = project.version
-			released = new Date()
-		}
-	}
-
-	javadoc.enabled = false
-}
-
 task remapMavenJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: jar) {
 	afterEvaluate {
 		input = file("${project.buildDir}/libs/${archivesBaseName}-${version}-dev.jar")
@@ -267,7 +237,8 @@ dependencies {
 	include 'com.electronwill.night-config:core:3.6.2'
 	include 'com.electronwill.night-config:toml:3.6.2'
 	include 'net.patchworkmc:event-racecar:1.0.1:with-typetools'
-	include 'org.cadixdev:lorenz:0.5.4'
+	include 'org.cadixdev:lorenz:0.5.7'
+	include 'org.cadixdev:bombe:0.3.4'
 }
 
 loom {

patchwork-api-base/src/main/java/net/minecraftforge/common/util/LazyOptional.java

@@ -25,13 +25,11 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * This object encapsulates a lazy value, with typical transformation operations
@@ -49,14 +47,13 @@
  *
  * @param <T> The type of the optional value.
  */
-@ParametersAreNonnullByDefault
 public class LazyOptional<T> {
 	private final NonNullSupplier<T> supplier;
 	private AtomicReference<T> resolved;
 	private Set<NonNullConsumer<LazyOptional<T>>> listeners = new HashSet<>();
 	private boolean isValid = true;
 
-	private static final @Nonnull LazyOptional<Void> EMPTY = new LazyOptional<>(null);
+	private static final @NotNull LazyOptional<Void> EMPTY = new LazyOptional<>(null);
 	private static final Logger LOGGER = LogManager.getLogger();
 
 	/**

patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullConsumer.java

@@ -21,14 +21,14 @@
 
 import java.util.function.Consumer;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Equivalent to {@link Consumer}, except with nonnull contract.
+ * Equivalent to {@link Consumer}, except with NotNull contract.
  *
  * @see Consumer
  */
 @FunctionalInterface
 public interface NonNullConsumer<T> {
-	void accept(@Nonnull T t);
+	void accept(@NotNull T t);
 }

patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullFunction.java

@@ -21,7 +21,7 @@
 
 import java.util.function.Function;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Equivalent to {@link Function}, except with nonnull contract.
@@ -30,6 +30,6 @@
  */
 @FunctionalInterface
 public interface NonNullFunction<T, R> {
-	@Nonnull
-	R apply(@Nonnull T t);
+	@NotNull
+	R apply(@NotNull T t);
 }

patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullPredicate.java

@@ -21,7 +21,7 @@
 
 import java.util.function.Predicate;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Equivalent to {@link Predicate}, except with nonnull contract.
@@ -30,5 +30,5 @@
  */
 @FunctionalInterface
 public interface NonNullPredicate<T> {
-	boolean test(@Nonnull T t);
+	boolean test(@NotNull T t);
 }

patchwork-api-base/src/main/java/net/minecraftforge/common/util/NonNullSupplier.java

@@ -21,7 +21,7 @@
 
 import java.util.function.Supplier;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Equivalent to {@link Supplier}, except with nonnull contract.
@@ -30,6 +30,6 @@
  */
 @FunctionalInterface
 public interface NonNullSupplier<T> {
-	@Nonnull
+	@NotNull
 	T get();
 }

patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java

@@ -21,11 +21,10 @@
 
 import java.util.concurrent.Callable;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.base.Throwables;
 import net.minecraftforge.common.util.LazyOptional;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.nbt.Tag;
 import net.minecraft.util.math.Direction;
@@ -147,7 +146,7 @@ public T getDefaultInstance() {
 		}
 	}
 
-	public @Nonnull <R> LazyOptional<R> orEmpty(Capability<R> toCheck, LazyOptional<T> inst) {
+	public @NotNull <R> LazyOptional<R> orEmpty(Capability<R> toCheck, LazyOptional<T> inst) {
 		return this == toCheck ? inst.cast() : LazyOptional.empty();
 	}
 

patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java

@@ -22,12 +22,10 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-
 import com.google.common.collect.Lists;
 import net.minecraftforge.common.util.INBTSerializable;
 import net.minecraftforge.common.util.LazyOptional;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
@@ -44,7 +42,6 @@
  * Internally the handlers are baked into arrays for fast iteration.
  * The ResourceLocations will be used for the NBT Key when serializing.
  */
-@ParametersAreNonnullByDefault
 public final class CapabilityDispatcher implements INBTSerializable<CompoundTag>, ICapabilityProvider {
 	private final ICapabilityProvider[] caps;
 	private final INBTSerializable<Tag>[] writers;

patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityProvider.java

@@ -19,20 +19,16 @@
 
 package net.minecraftforge.common.capabilities;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-
 import net.minecraftforge.common.util.LazyOptional;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.Direction;
 
 import net.patchworkmc.api.capability.CapabilityProviderConvertible;
 import net.patchworkmc.impl.capability.CapabilityEvents;
 
-@ParametersAreNonnullByDefault
 public abstract class CapabilityProvider<B> implements ICapabilityProvider, CapabilityProviderConvertible {
 	protected final Class<B> baseClass;
 	protected CapabilityDispatcher capabilities;
@@ -104,8 +100,8 @@ public void reviveCaps() {
 	}
 
 	@Override
-	@Nonnull
-	public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+	@NotNull
+	public <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) {
 		final CapabilityDispatcher disp = getCapabilities();
 		return !valid || disp == null ? LazyOptional.empty() : disp.getCapability(cap, side);
 	}

patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/ICapabilityProvider.java

@@ -19,10 +19,9 @@
 
 package net.minecraftforge.common.capabilities;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import net.minecraftforge.common.util.LazyOptional;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.util.math.Direction;
 
@@ -39,15 +38,15 @@ public interface ICapabilityProvider {
 	 *                   <strong>CAN BE NULL</strong>. Null is defined to represent 'internal' or 'self'
 	 * @return The requested a {@link LazyOptional optional} holding the requested capability.
 	 */
-	@Nonnull
-	<T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable Direction direction);
+	@NotNull
+	<T> LazyOptional<T> getCapability(@NotNull Capability<T> capability, @Nullable Direction direction);
 
 	/*
 	 * Purely added as a bouncer to sided version, to make modders stop complaining about calling with a null value.
 	 * This should never be OVERRIDDEN, modders should only ever implement the sided version.
 	 */
-	@Nonnull
-	default <T> LazyOptional<T> getCapability(@Nonnull final Capability<T> cap) {
+	@NotNull
+	default <T> LazyOptional<T> getCapability(@NotNull final Capability<T> cap) {
 		return getCapability(cap, null);
 	}
 }

patchwork-capabilities/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java

@@ -19,7 +19,7 @@
 
 package net.minecraftforge.common.util;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.PersistentState;

patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityProviderConvertible.java

@@ -19,11 +19,10 @@
 
 package net.patchworkmc.api.capability;
 
-import javax.annotation.Nonnull;
-
 import net.minecraftforge.common.capabilities.CapabilityProvider;
+import org.jetbrains.annotations.NotNull;
 
 public interface CapabilityProviderConvertible {
-	@Nonnull
+	@NotNull
 	CapabilityProvider<?> patchwork$getCapabilityProvider();
 }

patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java

@@ -19,10 +19,9 @@
 
 package net.patchworkmc.impl.capability;
 
-import javax.annotation.Nullable;
-
 import net.minecraftforge.common.capabilities.CapabilityProvider;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
+import org.jetbrains.annotations.Nullable;
 
 public class BaseCapabilityProvider<T> extends CapabilityProvider<T> {
 	private final T provider;

patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityEvents.java

@@ -19,12 +19,11 @@
 
 package net.patchworkmc.impl.capability;
 
-import javax.annotation.Nullable;
-
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.CapabilityDispatcher;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
+import org.jetbrains.annotations.Nullable;
 
 public class CapabilityEvents {
 	// This is less restrictive than Forge's implementation, since patchwork can't make vanilla extend stuff at random.

patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java

@@ -19,14 +19,13 @@
 
 package net.patchworkmc.impl.capability;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityDispatcher;
 import net.minecraftforge.common.capabilities.CapabilityProvider;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.common.util.LazyOptional;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.Direction;
@@ -74,13 +73,13 @@ default void reviveCaps() {
 		patchwork$getCapabilityProvider().reviveCaps();
 	}
 
-	@Nonnull
-	default <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+	@NotNull
+	default <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) {
 		return patchwork$getCapabilityProvider().getCapability(cap, side);
 	}
 
-	@Nonnull
-	default <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap) {
+	@NotNull
+	default <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap) {
 		return patchwork$getCapabilityProvider().getCapability(cap);
 	}
 }

patchwork-dispatcher/src/main/java/net/patchworkmc/impl/PatchworkClientModLoader.java

@@ -24,18 +24,18 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.resource.ResourceReloadListener;
-import net.minecraft.util.profiler.Profiler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.resource.ClientBuiltinResourcePackProvider;
 import net.minecraft.resource.ReloadableResourceManager;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceReloadListener;
+import net.minecraft.util.profiler.Profiler;
 
 public class PatchworkClientModLoader {
 	private static final Logger LOGGER = LogManager.getLogger(PatchworkClientModLoader.class);