From 5d18e151288861adf756fa8405918973e77ee46f Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 10 Mar 2022 14:24:44 +0100 Subject: [PATCH] Replace JB occurrences with JSR 305 (for now) (#1651) * refactor: Replace JB occurrences with JSR 305 (for now) * chore: Update adapter jar --- .../adapter/ext/fawe/PaperweightAdapter.java | 2 +- .../fawe/v1_17_R1_2/PaperweightGetBlocks.java | 5 ++--- .../ext/fawe/v1_18_R1/PaperweightAdapter.java | 2 +- .../fawe/v1_18_R1/PaperweightGetBlocks.java | 4 ++-- .../v1_18_R1/PaperweightPlatformAdapter.java | 8 ++++---- .../ext/fawe/v1_18_R2/PaperweightAdapter.java | 2 +- .../fawe/v1_18_R2/PaperweightGetBlocks.java | 4 ++-- .../v1_18_R2/PaperweightPlatformAdapter.java | 8 ++++---- .../src/main/resources/worldedit-adapters.jar | Bin 621889 -> 621808 bytes .../transform/Linear3DTransformParser.java | 4 ++-- .../transform/LinearTransformParser.java | 4 ++-- .../transform/PatternTransformParser.java | 4 ++-- .../transform/RotateTransformParser.java | 4 ++-- .../transform/ScaleTransformParser.java | 4 ++-- .../transform/SpreadTransformParser.java | 4 ++-- .../fastasyncworldedit/util/StubPlatform.java | 2 +- 16 files changed, 30 insertions(+), 31 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java index 5301f152a..6ad1e4817 100644 --- a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java @@ -997,7 +997,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter iterator() { Iterable result = StreamSupport.stream(Iterables.concat(slices).spliterator(), false).map(input -> { diff --git a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java index cbe86f946..e0affcb54 100644 --- a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java @@ -990,7 +990,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter iterator() { Iterable result = StreamSupport.stream(Iterables.concat(slices).spliterator(), false).map(input -> { diff --git a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightPlatformAdapter.java index 1685e0425..2e44f4caa 100644 --- a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightPlatformAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R1/PaperweightPlatformAdapter.java @@ -51,10 +51,10 @@ import net.minecraft.world.level.chunk.SingleValuePalette; import net.minecraft.world.level.gameevent.GameEventDispatcher; import net.minecraft.world.level.gameevent.GameEventListener; import org.bukkit.craftbukkit.v1_18_R1.CraftChunk; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import sun.misc.Unsafe; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; @@ -608,7 +608,7 @@ public final class PaperweightPlatformAdapter extends NMSAdapter { return null; } - @NotNull + @Nonnull @Override public Iterator iterator() { return Collections.emptyIterator(); @@ -629,7 +629,7 @@ public final class PaperweightPlatformAdapter extends NMSAdapter { return null; } - @NotNull + @Nonnull @Override public Iterator iterator() { return Collections.emptyIterator(); diff --git a/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R2/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R2/PaperweightAdapter.java index 13641aa25..bc5d07de6 100644 --- a/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R2/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R2/PaperweightAdapter.java @@ -960,7 +960,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter iterator() { Iterable result = StreamSupport.stream(Iterables.concat(slices).spliterator(), false).map(input -> { diff --git a/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightPlatformAdapter.java index f535014ba..209e867f7 100644 --- a/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightPlatformAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1_18_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightPlatformAdapter.java @@ -52,10 +52,10 @@ import net.minecraft.world.level.chunk.SingleValuePalette; import net.minecraft.world.level.gameevent.GameEventDispatcher; import net.minecraft.world.level.gameevent.GameEventListener; import org.bukkit.craftbukkit.v1_18_R2.CraftChunk; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import sun.misc.Unsafe; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; @@ -621,7 +621,7 @@ public final class PaperweightPlatformAdapter extends NMSAdapter { return null; } - @NotNull + @Nonnull @Override public Iterator iterator() { return Collections.emptyIterator(); @@ -642,7 +642,7 @@ public final class PaperweightPlatformAdapter extends NMSAdapter { return null; } - @NotNull + @Nonnull @Override public Iterator iterator() { return Collections.emptyIterator(); diff --git a/worldedit-bukkit/adapters/adapter-legacy/src/main/resources/worldedit-adapters.jar b/worldedit-bukkit/adapters/adapter-legacy/src/main/resources/worldedit-adapters.jar index 245e02e6aab713c75b2ef0844287b2f0d1e29548..6ed8e0e9797fd0b25ca313365028ffb16653b2a5 100644 GIT binary patch delta 16073 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 delta 16278 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 H6Dj`(-D{DX diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/Linear3DTransformParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/Linear3DTransformParser.java index bfd68c7cf..01d4868d3 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/Linear3DTransformParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/Linear3DTransformParser.java @@ -7,8 +7,8 @@ import com.fastasyncworldedit.core.extent.transform.RandomTransform; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.util.stream.Stream; public class Linear3DTransformParser extends RichParser { @@ -31,7 +31,7 @@ public class Linear3DTransformParser extends RichParser { } @Override - protected ResettableExtent parseFromInput(@NotNull String[] arguments, ParserContext context) throws InputParseException { + protected ResettableExtent parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException { if (arguments.length != 1) { return null; } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/LinearTransformParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/LinearTransformParser.java index 3a09669b2..026f38338 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/LinearTransformParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/LinearTransformParser.java @@ -7,8 +7,8 @@ import com.fastasyncworldedit.core.extent.transform.RandomTransform; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.util.stream.Stream; public class LinearTransformParser extends RichParser { @@ -31,7 +31,7 @@ public class LinearTransformParser extends RichParser { } @Override - protected ResettableExtent parseFromInput(@NotNull String[] arguments, ParserContext context) throws InputParseException { + protected ResettableExtent parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException { if (arguments.length != 1) { return null; } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/PatternTransformParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/PatternTransformParser.java index c1ecd7a50..cf81db4ce 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/PatternTransformParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/PatternTransformParser.java @@ -8,8 +8,8 @@ import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.function.pattern.Pattern; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.util.stream.Stream; public class PatternTransformParser extends RichParser { @@ -34,7 +34,7 @@ public class PatternTransformParser extends RichParser { } @Override - protected ResettableExtent parseFromInput(@NotNull String[] arguments, ParserContext context) throws InputParseException { + protected ResettableExtent parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException { if (arguments.length > 2) { return null; } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RotateTransformParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RotateTransformParser.java index f82328e14..19ae8a599 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RotateTransformParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/RotateTransformParser.java @@ -9,8 +9,8 @@ import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.transform.BlockTransformExtent; import com.sk89q.worldedit.math.transform.AffineTransform; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.util.stream.Stream; public class RotateTransformParser extends RichParser { @@ -36,7 +36,7 @@ public class RotateTransformParser extends RichParser { } @Override - protected ResettableExtent parseFromInput(@NotNull String[] arguments, ParserContext context) throws InputParseException { + protected ResettableExtent parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException { AffineTransform transform = new AffineTransform(); Extent extent; if (arguments.length == 1) { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/ScaleTransformParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/ScaleTransformParser.java index 856be56ff..4bab68d0f 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/ScaleTransformParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/ScaleTransformParser.java @@ -8,8 +8,8 @@ import com.sk89q.worldedit.command.util.SuggestionHelper; import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extent.Extent; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.util.stream.Stream; public class ScaleTransformParser extends RichParser { @@ -34,7 +34,7 @@ public class ScaleTransformParser extends RichParser { } @Override - protected ResettableExtent parseFromInput(@NotNull String[] arguments, ParserContext context) throws InputParseException { + protected ResettableExtent parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException { double xScale; double yScale; double zScale; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/SpreadTransformParser.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/SpreadTransformParser.java index baaab896e..2f71407b2 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/SpreadTransformParser.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/transform/SpreadTransformParser.java @@ -8,8 +8,8 @@ import com.sk89q.worldedit.command.util.SuggestionHelper; import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extent.Extent; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.util.stream.Stream; public class SpreadTransformParser extends RichParser { @@ -34,7 +34,7 @@ public class SpreadTransformParser extends RichParser { } @Override - protected ResettableExtent parseFromInput(@NotNull String[] arguments, ParserContext context) throws InputParseException { + protected ResettableExtent parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException { if (arguments.length != 3 && arguments.length != 4) { return null; } diff --git a/worldedit-core/src/test/java/com/fastasyncworldedit/util/StubPlatform.java b/worldedit-core/src/test/java/com/fastasyncworldedit/util/StubPlatform.java index 6e9f81de8..dcf1fc9d4 100644 --- a/worldedit-core/src/test/java/com/fastasyncworldedit/util/StubPlatform.java +++ b/worldedit-core/src/test/java/com/fastasyncworldedit/util/StubPlatform.java @@ -11,8 +11,8 @@ import com.sk89q.worldedit.util.SideEffect; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.registry.Registries; import org.enginehub.piston.CommandManager; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; import java.util.EnumMap; import java.util.Map; import java.util.Set;