Switch to jspecify for nullability annotations

Author: Pyrofab

build.gradle.kts

@@ -75,7 +75,6 @@ allprojects {
         compileOnly(fabricApi.module("fabric-gametest-api-v1", fabricApiVersion))
         localImplementation("org.ladysnake:elmendorf:${props["elmendorf_version"]}")
 
-        compileOnly("com.google.code.findbugs:jsr305:3.0.2")
         compileOnly("org.jetbrains:annotations:24.0.1")
     }
 

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentContainer.java

@@ -29,8 +29,8 @@
 import net.minecraft.world.level.storage.ValueOutput;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
+import org.jspecify.annotations.Nullable;
 import org.ladysnake.cca.api.v3.component.load.ClientLoadAwareComponent;
 import org.ladysnake.cca.api.v3.component.load.ClientUnloadAwareComponent;
 import org.ladysnake.cca.api.v3.component.load.ServerLoadAwareComponent;

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentKey.java

@@ -32,7 +32,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.ladysnake.cca.api.v3.component.sync.AutoSyncedComponent;
 import org.ladysnake.cca.api.v3.component.sync.ComponentPacketWriter;
 import org.ladysnake.cca.api.v3.component.sync.PlayerSyncPredicate;

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentProvider.java

@@ -26,7 +26,7 @@
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.ladysnake.cca.api.v3.component.sync.AutoSyncedComponent;
 import org.ladysnake.cca.api.v3.component.sync.PlayerSyncPredicate;
 import org.ladysnake.cca.internal.base.ComponentUpdatePayload;

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentRegistry.java

@@ -23,12 +23,11 @@
 package org.ladysnake.cca.api.v3.component;
 
 import net.minecraft.resources.Identifier;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.Nullable;
 import org.ladysnake.cca.api.v8.component.CardinalComponent;
 import org.ladysnake.cca.internal.base.ComponentRegistryImpl;
 
-import javax.annotation.Nullable;
 import java.util.stream.Stream;
 
 /**
@@ -41,7 +40,6 @@
  * @see ComponentKey
  * @since 2.7.0
  */
-@ApiStatus.NonExtendable
 public final class ComponentRegistry {
     /**
      * Get a component key for the given identifier and class, or create one if it does not exist.

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentRegistryV3.java

@@ -25,10 +25,10 @@
 import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.Nullable;
 import org.ladysnake.cca.api.v8.component.CardinalComponent;
 import org.ladysnake.cca.internal.base.ComponentRegistryImpl;
 
-import javax.annotation.Nullable;
 import java.util.stream.Stream;
 
 /**

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/TransientComponent.java

@@ -24,7 +24,7 @@
 
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.ladysnake.cca.api.v8.component.CardinalComponent;
 
 /**

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/load/package-info.java

@@ -21,11 +21,8 @@
  * OR OTHER DEALINGS IN THE SOFTWARE.
  */
 @ApiStatus.Experimental
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
+@NullMarked
 package org.ladysnake.cca.api.v3.component.load;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.ladysnake.cca.api.v3.util.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/package-info.java

@@ -20,10 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
  * OR OTHER DEALINGS IN THE SOFTWARE.
  */
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
+@NullMarked
 package org.ladysnake.cca.api.v3.component;
 
-import org.ladysnake.cca.api.v3.util.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;

…/util/MethodsReturnNonnullByDefault.java …/api/v3/component/sync/package-info.javacardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/util/MethodsReturnNonnullByDefault.java renamed to cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/sync/package-info.java cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/util/MethodsReturnNonnullByDefault.java renamed to cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/sync/package-info.java

@@ -20,29 +20,9 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
  * OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package org.ladysnake.cca.api.v3.util;
+@ApiStatus.Experimental
+@NullMarked
+package org.ladysnake.cca.api.v3.component.sync;
 
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierDefault;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * This annotation can be applied to a package, class or method to indicate that
- * the method in that element are nonnull by default unless there is:
- * <ul>
- * <li>An explicit nullness annotation
- * <li>The method overrides a method in a superclass (in which case the
- * annotation of the corresponding method in the superclass applies)
- * <li> there is a default parameter annotation applied to a more tightly nested
- * element.
- * </ul>
- *
- */
-@Documented
-@Nonnull
-@TypeQualifierDefault(ElementType.METHOD) // Note: This is a copy of javax.annotation.ParametersAreNonnullByDefault with target changed to METHOD
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MethodsReturnNonnullByDefault {}
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;