Migrate nullability annotations to jSpecify

Mojang has done that, we don't need 3 different sets of annotations

src/main/java/carpet/CarpetServer.java

@@ -40,7 +40,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.commands.PerfCommand;
 import net.minecraft.server.level.ServerPlayer;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class CarpetServer // static for now - easier to handle all around the code, its one anyways
 {

src/main/java/carpet/mixins/RedstoneWireBlock_fastMixin.java

@@ -25,7 +25,7 @@ import net.minecraft.world.level.block.RedStoneWireBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.minecraft.world.level.block.RedStoneWireBlock.POWER;
 

src/main/java/carpet/script/CarpetExpression.java

@@ -22,7 +22,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import org.apache.commons.lang3.tuple.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.List;
 
 public class CarpetExpression

src/main/java/carpet/script/CarpetScriptHost.java

@@ -41,7 +41,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import org.apache.commons.lang3.tuple.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.math.BigInteger;
 import java.nio.file.Path;
 import java.util.ArrayList;

src/main/java/carpet/script/CarpetScriptServer.java

@@ -31,7 +31,7 @@ import net.minecraft.world.level.storage.LevelResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.io.IOException;
 import java.nio.file.FileVisitOption;
 import java.nio.file.Files;

src/main/java/carpet/script/Expression.java

@@ -38,7 +38,7 @@ import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/carpet/script/ScriptCommand.java

@@ -48,7 +48,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.pattern.BlockInWorld;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.minecraft.commands.Commands.argument;
 import static net.minecraft.commands.Commands.literal;

src/main/java/carpet/script/ScriptHost.java

@@ -10,7 +10,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -38,8 +38,7 @@ public abstract class ScriptHost
     protected boolean inTermination = false;
     public boolean strict;
     public Expression.LoadOverride loadOverrides;
-    @Nullable
-    public Expression.ExpressionNode root;
+    public Expression.@Nullable ExpressionNode root;
 
     private final Set<String> deprecations = new HashSet<>();
 

src/main/java/carpet/script/Token.java

@@ -1,6 +1,6 @@
 package carpet.script;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class Token implements Comparable<Token> {
 
@@ -36,8 +36,7 @@ public class Token implements Comparable<Token> {
     public int linepos;
     public int lineno;
 
-    @Nullable
-    public Expression.ExpressionNode node = null;
+    public Expression.@Nullable ExpressionNode node = null;
 
     public static final Token NONE = new Token();
 

src/main/java/carpet/script/annotation/ListConverter.java

@@ -10,7 +10,7 @@ import carpet.script.Context;
 import carpet.script.value.ListValue;
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * <p>Converts a given {@link ListValue} into a {@link List} of values converted to {@code <T>}.</p>

src/main/java/carpet/script/annotation/Locator.java

@@ -20,7 +20,7 @@ import carpet.script.value.BlockValue;
 import carpet.script.value.FunctionValue;
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;
@@ -165,9 +165,8 @@ public interface Locator
                 }
             }
 
-            @Nullable
             @SuppressWarnings("unchecked")
-            private static <R> java.util.function.Function<BlockArgument, R> getReturnFunction(Class<R> type)
+            private static <R> java.util.function.@Nullable Function<BlockArgument, R> getReturnFunction(Class<R> type)
             {
                 if (type == BlockArgument.class)
                 {

src/main/java/carpet/script/annotation/MapConverter.java

@@ -13,7 +13,7 @@ import carpet.script.value.ListValue;
 import carpet.script.value.MapValue;
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * <p>Converts a {@link MapValue} to a {@link Map}, converting all of its contents to their respective types.</p>

src/main/java/carpet/script/annotation/OptionalConverter.java

@@ -9,7 +9,7 @@ import java.util.Optional;
 import carpet.script.Context;
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * <p>{@link ValueConverter} that accepts a parameter to not be present on function call.</p>

src/main/java/carpet/script/annotation/OutputConverter.java

@@ -25,7 +25,7 @@ import carpet.script.value.StringValue;
 import carpet.script.value.Value;
 import carpet.script.value.ValueConversions;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * <p>A converter from a given {@link Object} of type T into a {@link Value}, used in order to convert the outputs of methods into usable Scarpet

src/main/java/carpet/script/annotation/Param.java

@@ -23,7 +23,7 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE_USE;

src/main/java/carpet/script/annotation/SimpleTypeConverter.java

@@ -18,7 +18,7 @@ import carpet.script.value.NumericValue;
 import carpet.script.value.Value;
 import carpet.script.value.ValueConversions;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * <p>A simple {@link ValueConverter} implementation that converts from a specified subclass of {@link Value} into {@code <R>} by using a given

src/main/java/carpet/script/annotation/ValueCaster.java

@@ -18,7 +18,7 @@ import carpet.script.value.StringValue;
 import carpet.script.value.ThreadValue;
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * <p>Simple {@link ValueConverter} implementation that casts a {@link Value} into one of its subclasses, either for use directly in parameters or

src/main/java/carpet/script/annotation/ValueConverter.java

@@ -14,7 +14,7 @@ import carpet.script.Context;
 import carpet.script.annotation.Param.Params;
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * <p>Classes implementing this interface are able to convert {@link Value} instances into {@code <R>}, in order to easily use them in parameters for

src/main/java/carpet/script/api/Auxiliary.java

@@ -81,7 +81,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.net.URI;

src/main/java/carpet/script/api/WorldAccess.java

@@ -132,7 +132,7 @@ import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraft.world.phys.Vec3;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static carpet.script.utils.WorldTools.canHasChunk;
 

src/main/java/carpet/script/argument/BlockArgument.java

@@ -14,7 +14,7 @@ import java.util.NoSuchElementException;
 
 import net.minecraft.core.BlockPos;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class BlockArgument extends Argument
 {

src/main/java/carpet/script/argument/FileArgument.java

@@ -22,7 +22,7 @@ import net.minecraft.nbt.TagTypes;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

src/main/java/carpet/script/argument/FunctionArgument.java

@@ -10,7 +10,7 @@ import carpet.script.value.ListValue;
 import carpet.script.value.Value;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

src/main/java/carpet/script/argument/Vector3Argument.java

@@ -14,7 +14,7 @@ import java.util.NoSuchElementException;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec3;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class Vector3Argument extends Argument
 {

src/main/java/carpet/script/command/CommandArgument.java

@@ -108,7 +108,7 @@ import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.scores.ScoreHolder;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.minecraft.commands.Commands.argument;
 

src/main/java/carpet/script/command/CommandToken.java

@@ -14,7 +14,7 @@ import java.util.Objects;
 
 import net.minecraft.commands.CommandSourceStack;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.minecraft.commands.Commands.literal;
 

src/main/java/carpet/script/exception/BreakStatement.java

@@ -2,7 +2,7 @@ package carpet.script.exception;
 
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class BreakStatement extends ExitStatement
 {

src/main/java/carpet/script/exception/ContinueStatement.java

@@ -2,7 +2,7 @@ package carpet.script.exception;
 
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ContinueStatement extends ExitStatement
 {

src/main/java/carpet/script/exception/ExitStatement.java

@@ -2,7 +2,7 @@ package carpet.script.exception;
 
 import carpet.script.value.Value;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /* Exception thrown to terminate execution mid expression (aka return statement) */
 public class ExitStatement extends StacklessRuntimeException

src/main/java/carpet/script/exception/ExpressionException.java

@@ -6,7 +6,7 @@ import carpet.script.Token;
 import carpet.script.external.Carpet;
 import carpet.script.value.FunctionValue;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

src/main/java/carpet/script/exception/Throwables.java

@@ -1,6 +1,6 @@
 package carpet.script.exception;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/carpet/script/external/Carpet.java

@@ -33,7 +33,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.io.IOException;
 import java.nio.file.FileVisitOption;
 import java.nio.file.Files;

src/main/java/carpet/script/utils/AppStoreManager.java

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.io.IOUtils;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A class used to save scarpet app store scripts to disk

src/main/java/carpet/script/utils/FeatureGenerator.java

@@ -63,7 +63,7 @@ import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement
 import net.minecraft.world.level.levelgen.structure.structures.JigsawStructure;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class FeatureGenerator
 {

src/main/java/carpet/script/utils/GlocalFlag.java

@@ -1,6 +1,6 @@
 package carpet.script.utils;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.function.Supplier;
 
 public class GlocalFlag extends ThreadLocal<Boolean>

src/main/java/carpet/script/utils/ParticleParser.java

@@ -6,7 +6,7 @@ import net.minecraft.commands.arguments.ParticleArgument;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.particles.ParticleOptions;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/carpet/script/utils/ShapeDispatcher.java

@@ -57,7 +57,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;

src/main/java/carpet/script/utils/WorldTools.java

@@ -34,7 +34,7 @@ import net.minecraft.world.level.levelgen.WorldGenSettings;
 import net.minecraft.world.level.storage.DerivedLevelData;
 import net.minecraft.world.level.storage.ServerLevelData;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;

src/main/java/carpet/script/utils/shapes/ShapeDirection.java

@@ -1,6 +1,6 @@
 package carpet.script.utils.shapes;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Locale;
 
 public enum ShapeDirection

src/main/java/carpet/script/value/BlockValue.java

@@ -40,7 +40,7 @@ import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static carpet.script.value.NBTSerializableValue.nameFromResource;
 

src/main/java/carpet/script/value/EntityValue.java

@@ -80,7 +80,7 @@ import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;

src/main/java/carpet/script/value/FunctionValue.java

@@ -23,7 +23,7 @@ import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class FunctionValue extends Value implements Fluff.ILazyFunction
 {

src/main/java/carpet/script/value/NBTSerializableValue.java

@@ -56,7 +56,7 @@ import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class NBTSerializableValue extends Value implements ContainerValueInterface
 {

src/main/java/carpet/script/value/ScreenValue.java

@@ -59,7 +59,7 @@ import net.minecraft.world.inventory.StonecutterMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeHolder;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static net.minecraft.world.inventory.MenuType.*;
 

src/main/java/carpet/script/value/StringValue.java

@@ -4,7 +4,7 @@ import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class StringValue extends Value
 {

src/main/java/carpet/script/value/Value.java

@@ -15,7 +15,7 @@ import java.util.regex.PatternSyntaxException;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.Tag;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class Value implements Comparable<Value>, Cloneable
 {

src/main/java/carpet/script/value/ValueConversions.java

@@ -60,7 +60,7 @@ import java.util.UUID;
 import java.util.function.Predicate;
 import java.util.stream.StreamSupport;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ValueConversions
 {

src/main/java/carpet/utils/WoolTool.java

@@ -21,7 +21,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.phys.Vec3;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Map.entry;