diff --git a/build.gradle b/build.gradle index 3db5c988..f31ed9b6 100644 --- a/build.gradle +++ b/build.gradle @@ -24,8 +24,6 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. //modImplementation "net.fabricmc:fabric:${project.fabric_version}" //modCompileOnly fabricApi.module("fabric-rendering-v1", project.fabric_version) - - compileOnly "com.google.code.findbugs:jsr305:${project.jsr305_version}" } processResources { diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java index 41327dbe..49b6e6ce 100644 --- a/src/main/java/carpet/CarpetServer.java +++ b/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 { diff --git a/src/main/java/carpet/mixins/RedstoneWireBlock_fastMixin.java b/src/main/java/carpet/mixins/RedstoneWireBlock_fastMixin.java index 5cdceb9a..101ef513 100644 --- a/src/main/java/carpet/mixins/RedstoneWireBlock_fastMixin.java +++ b/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; diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 9ca41018..f68407e4 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/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 diff --git a/src/main/java/carpet/script/CarpetScriptHost.java b/src/main/java/carpet/script/CarpetScriptHost.java index 073db7e8..fecd5767 100644 --- a/src/main/java/carpet/script/CarpetScriptHost.java +++ b/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; diff --git a/src/main/java/carpet/script/CarpetScriptServer.java b/src/main/java/carpet/script/CarpetScriptServer.java index d3382518..c3b08b35 100644 --- a/src/main/java/carpet/script/CarpetScriptServer.java +++ b/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; diff --git a/src/main/java/carpet/script/Expression.java b/src/main/java/carpet/script/Expression.java index 3105d295..342a0e69 100644 --- a/src/main/java/carpet/script/Expression.java +++ b/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; diff --git a/src/main/java/carpet/script/ScriptCommand.java b/src/main/java/carpet/script/ScriptCommand.java index 02373ab6..d56a1725 100644 --- a/src/main/java/carpet/script/ScriptCommand.java +++ b/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; diff --git a/src/main/java/carpet/script/ScriptHost.java b/src/main/java/carpet/script/ScriptHost.java index 4dd06d5f..298b877d 100644 --- a/src/main/java/carpet/script/ScriptHost.java +++ b/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 deprecations = new HashSet<>(); diff --git a/src/main/java/carpet/script/Token.java b/src/main/java/carpet/script/Token.java index c0fa53e8..3138da62 100644 --- a/src/main/java/carpet/script/Token.java +++ b/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 { @@ -36,8 +36,7 @@ public class Token implements Comparable { 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(); diff --git a/src/main/java/carpet/script/annotation/ListConverter.java b/src/main/java/carpet/script/annotation/ListConverter.java index b02d501f..6889457f 100644 --- a/src/main/java/carpet/script/annotation/ListConverter.java +++ b/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; /** *

Converts a given {@link ListValue} into a {@link List} of values converted to {@code }.

diff --git a/src/main/java/carpet/script/annotation/Locator.java b/src/main/java/carpet/script/annotation/Locator.java index af592743..d38e7435 100644 --- a/src/main/java/carpet/script/annotation/Locator.java +++ b/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 java.util.function.Function getReturnFunction(Class type) + private static java.util.function.@Nullable Function getReturnFunction(Class type) { if (type == BlockArgument.class) { diff --git a/src/main/java/carpet/script/annotation/MapConverter.java b/src/main/java/carpet/script/annotation/MapConverter.java index dc818a24..ce14394a 100644 --- a/src/main/java/carpet/script/annotation/MapConverter.java +++ b/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; /** *

Converts a {@link MapValue} to a {@link Map}, converting all of its contents to their respective types.

diff --git a/src/main/java/carpet/script/annotation/OptionalConverter.java b/src/main/java/carpet/script/annotation/OptionalConverter.java index 462bf83e..506cfdc2 100644 --- a/src/main/java/carpet/script/annotation/OptionalConverter.java +++ b/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; /** *

{@link ValueConverter} that accepts a parameter to not be present on function call.

diff --git a/src/main/java/carpet/script/annotation/OutputConverter.java b/src/main/java/carpet/script/annotation/OutputConverter.java index b0219d21..88731023 100644 --- a/src/main/java/carpet/script/annotation/OutputConverter.java +++ b/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; /** *

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 diff --git a/src/main/java/carpet/script/annotation/Param.java b/src/main/java/carpet/script/annotation/Param.java index 703bece6..91beffa9 100644 --- a/src/main/java/carpet/script/annotation/Param.java +++ b/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; diff --git a/src/main/java/carpet/script/annotation/SimpleTypeConverter.java b/src/main/java/carpet/script/annotation/SimpleTypeConverter.java index 87c4f25e..6fde9156 100644 --- a/src/main/java/carpet/script/annotation/SimpleTypeConverter.java +++ b/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; /** *

A simple {@link ValueConverter} implementation that converts from a specified subclass of {@link Value} into {@code } by using a given diff --git a/src/main/java/carpet/script/annotation/ValueCaster.java b/src/main/java/carpet/script/annotation/ValueCaster.java index 6cd2624e..1320f97e 100644 --- a/src/main/java/carpet/script/annotation/ValueCaster.java +++ b/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; /** *

Simple {@link ValueConverter} implementation that casts a {@link Value} into one of its subclasses, either for use directly in parameters or diff --git a/src/main/java/carpet/script/annotation/ValueConverter.java b/src/main/java/carpet/script/annotation/ValueConverter.java index 8c916ef4..f2893e40 100644 --- a/src/main/java/carpet/script/annotation/ValueConverter.java +++ b/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; /** *

Classes implementing this interface are able to convert {@link Value} instances into {@code }, in order to easily use them in parameters for diff --git a/src/main/java/carpet/script/api/Auxiliary.java b/src/main/java/carpet/script/api/Auxiliary.java index b1541734..94969b00 100644 --- a/src/main/java/carpet/script/api/Auxiliary.java +++ b/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; diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index b651aafa..403641b5 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/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; diff --git a/src/main/java/carpet/script/argument/BlockArgument.java b/src/main/java/carpet/script/argument/BlockArgument.java index b9f1040d..7219c85a 100644 --- a/src/main/java/carpet/script/argument/BlockArgument.java +++ b/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 { diff --git a/src/main/java/carpet/script/argument/FileArgument.java b/src/main/java/carpet/script/argument/FileArgument.java index f4853a5a..12d0ea2c 100644 --- a/src/main/java/carpet/script/argument/FileArgument.java +++ b/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; diff --git a/src/main/java/carpet/script/argument/FunctionArgument.java b/src/main/java/carpet/script/argument/FunctionArgument.java index b30f2f56..9667dd40 100644 --- a/src/main/java/carpet/script/argument/FunctionArgument.java +++ b/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; diff --git a/src/main/java/carpet/script/argument/Vector3Argument.java b/src/main/java/carpet/script/argument/Vector3Argument.java index 6f475f44..7ca3356c 100644 --- a/src/main/java/carpet/script/argument/Vector3Argument.java +++ b/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 { diff --git a/src/main/java/carpet/script/command/CommandArgument.java b/src/main/java/carpet/script/command/CommandArgument.java index cb5fcc41..394e1d4e 100644 --- a/src/main/java/carpet/script/command/CommandArgument.java +++ b/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; diff --git a/src/main/java/carpet/script/command/CommandToken.java b/src/main/java/carpet/script/command/CommandToken.java index 22c06f4f..120816e5 100644 --- a/src/main/java/carpet/script/command/CommandToken.java +++ b/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; diff --git a/src/main/java/carpet/script/exception/BreakStatement.java b/src/main/java/carpet/script/exception/BreakStatement.java index 40b76a19..4265987c 100644 --- a/src/main/java/carpet/script/exception/BreakStatement.java +++ b/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 { diff --git a/src/main/java/carpet/script/exception/ContinueStatement.java b/src/main/java/carpet/script/exception/ContinueStatement.java index 449b15ef..9f2ee9d6 100644 --- a/src/main/java/carpet/script/exception/ContinueStatement.java +++ b/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 { diff --git a/src/main/java/carpet/script/exception/ExitStatement.java b/src/main/java/carpet/script/exception/ExitStatement.java index b1982332..b6abe8bc 100644 --- a/src/main/java/carpet/script/exception/ExitStatement.java +++ b/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 diff --git a/src/main/java/carpet/script/exception/ExpressionException.java b/src/main/java/carpet/script/exception/ExpressionException.java index a2cdd1f0..98435a12 100644 --- a/src/main/java/carpet/script/exception/ExpressionException.java +++ b/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; diff --git a/src/main/java/carpet/script/exception/Throwables.java b/src/main/java/carpet/script/exception/Throwables.java index ab345946..e3a4bfd7 100644 --- a/src/main/java/carpet/script/exception/Throwables.java +++ b/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; diff --git a/src/main/java/carpet/script/external/Carpet.java b/src/main/java/carpet/script/external/Carpet.java index ef7503f8..9caa5e29 100644 --- a/src/main/java/carpet/script/external/Carpet.java +++ b/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; diff --git a/src/main/java/carpet/script/utils/AppStoreManager.java b/src/main/java/carpet/script/utils/AppStoreManager.java index f7536faa..dbcebb1f 100644 --- a/src/main/java/carpet/script/utils/AppStoreManager.java +++ b/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 diff --git a/src/main/java/carpet/script/utils/FeatureGenerator.java b/src/main/java/carpet/script/utils/FeatureGenerator.java index f81e0274..bb11c01c 100644 --- a/src/main/java/carpet/script/utils/FeatureGenerator.java +++ b/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 { diff --git a/src/main/java/carpet/script/utils/GlocalFlag.java b/src/main/java/carpet/script/utils/GlocalFlag.java index 05cced39..01dd8ffc 100644 --- a/src/main/java/carpet/script/utils/GlocalFlag.java +++ b/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 diff --git a/src/main/java/carpet/script/utils/ParticleParser.java b/src/main/java/carpet/script/utils/ParticleParser.java index b386f52e..47624b8a 100644 --- a/src/main/java/carpet/script/utils/ParticleParser.java +++ b/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; diff --git a/src/main/java/carpet/script/utils/ShapeDispatcher.java b/src/main/java/carpet/script/utils/ShapeDispatcher.java index 91edfc35..ac2d5a7e 100644 --- a/src/main/java/carpet/script/utils/ShapeDispatcher.java +++ b/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; diff --git a/src/main/java/carpet/script/utils/WorldTools.java b/src/main/java/carpet/script/utils/WorldTools.java index c2274ec3..c3c4064f 100644 --- a/src/main/java/carpet/script/utils/WorldTools.java +++ b/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; diff --git a/src/main/java/carpet/script/utils/shapes/ShapeDirection.java b/src/main/java/carpet/script/utils/shapes/ShapeDirection.java index 29bc08a6..1923007c 100644 --- a/src/main/java/carpet/script/utils/shapes/ShapeDirection.java +++ b/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 diff --git a/src/main/java/carpet/script/value/BlockValue.java b/src/main/java/carpet/script/value/BlockValue.java index 13a8c101..f478a658 100644 --- a/src/main/java/carpet/script/value/BlockValue.java +++ b/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; diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index e84425ad..7065edc3 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/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; diff --git a/src/main/java/carpet/script/value/FunctionValue.java b/src/main/java/carpet/script/value/FunctionValue.java index db54f1aa..ae51c07c 100644 --- a/src/main/java/carpet/script/value/FunctionValue.java +++ b/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 { diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java index 1244a417..279a40a9 100644 --- a/src/main/java/carpet/script/value/NBTSerializableValue.java +++ b/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 { diff --git a/src/main/java/carpet/script/value/ScreenValue.java b/src/main/java/carpet/script/value/ScreenValue.java index dd398770..3f82f3be 100644 --- a/src/main/java/carpet/script/value/ScreenValue.java +++ b/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.*; diff --git a/src/main/java/carpet/script/value/StringValue.java b/src/main/java/carpet/script/value/StringValue.java index df3df1d5..53475678 100644 --- a/src/main/java/carpet/script/value/StringValue.java +++ b/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 { diff --git a/src/main/java/carpet/script/value/Value.java b/src/main/java/carpet/script/value/Value.java index 3276b7fc..e53315c5 100644 --- a/src/main/java/carpet/script/value/Value.java +++ b/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, Cloneable { diff --git a/src/main/java/carpet/script/value/ValueConversions.java b/src/main/java/carpet/script/value/ValueConversions.java index 9777cea4..79111265 100644 --- a/src/main/java/carpet/script/value/ValueConversions.java +++ b/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 { diff --git a/src/main/java/carpet/utils/WoolTool.java b/src/main/java/carpet/utils/WoolTool.java index 53387bd2..761de09c 100644 --- a/src/main/java/carpet/utils/WoolTool.java +++ b/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;