Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-13 14:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistenty use javax annotations. (#1197)

Browse Source 
- Unfortunately jetbrains annotations seem to be exposed transitively via core somewhere, but with the correct IDE settings, annotations can be defaulted to javax
 - Cleaning up of import order in #1195
 - Must be merged before #1195

Co-authored-by: NotMyFault <mc.cache@web.de>
This commit is contained in:
dordsor21
2021-07-24 14:52:08 +01:00
committed by GitHub
parent 5e9535db41
commit f2ee2248e0
87 changed files with 304 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -141,8 +141,8 @@ import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.IOException;
import java.util.ArrayList;
@ -247,7 +247,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
private final Region[] allowedRegions;
@Deprecated
public EditSession(@NotNull EventBus bus, World world, @Nullable Player player,
public EditSession(@Nonnull EventBus bus, World world, @Nullable Player player,
@Nullable FaweLimit limit, @Nullable AbstractChangeSet changeSet,
@Nullable RegionWrapper[] allowedRegions, @Nullable Boolean autoQueue,
@Nullable Boolean fastmode, @Nullable Boolean checkMemory, @Nullable Boolean combineStages,
@ -266,7 +266,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
* @param event the event to call with the extent
*/
//FAWE start - EditSessionEvent
public EditSession(@NotNull EventBus eventBus, World world, int maxBlocks, @Nullable BlockBag blockBag, EditSessionEvent event) {
public EditSession(@Nonnull EventBus eventBus, World world, int maxBlocks, @Nullable BlockBag blockBag, EditSessionEvent event) {
this(eventBus, world, null, null, null, null, true, null, null, null, blockBag, event);
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/HistorySubCommands.java
View File

@ -45,7 +45,7 @@ import org.enginehub.piston.annotation.CommandContainer;
import org.enginehub.piston.annotation.param.Arg;
import org.enginehub.piston.annotation.param.ArgFlag;
import org.enginehub.piston.annotation.param.Switch;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import org.jetbrains.annotations.Range;
import java.io.File;
@ -276,7 +276,7 @@ public class HistorySubCommands {
private PaginationBox list(RollbackDatabase database, String pageCommand, List<Supplier<? extends ChangeSet>> histories, BlockVector3 origin) {
return PaginationBox.fromStrings("Edits:", pageCommand, histories, new Function<Supplier<? extends ChangeSet>, Component>() {
@NotNull
@Nonnull
@Override
public Component apply(@Nullable Supplier<? extends ChangeSet> input) {
ChangeSet edit = input.get();

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
View File

@ -36,7 +36,7 @@ import com.sk89q.worldedit.world.block.BlockCategories;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Iterator;
import java.util.Set;

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
View File

@ -38,7 +38,7 @@ import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Set;

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
View File

@ -36,7 +36,7 @@ import com.sk89q.worldedit.util.formatting.text.format.TextColor;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
/**
* Looks up information about a block.

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
View File

@ -35,7 +35,7 @@ import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Set;

4
worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Platform.java
View File

@ -31,7 +31,7 @@ import com.sk89q.worldedit.world.DataFixer;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.registry.Registries;
import org.enginehub.piston.CommandManager;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Locale;
@ -231,7 +231,7 @@ public interface Platform extends Keyed {
*
* @return the relighter factory to be used.
*/
@NotNull
@Nonnull
RelighterFactory getRelighterFactory();
//FAWE end
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
View File

@ -151,7 +151,7 @@ import org.enginehub.piston.part.SubCommandPart;
import org.enginehub.piston.suggestion.Suggestion;
import org.enginehub.piston.util.HelpGenerator;
import org.enginehub.piston.util.ValueProvider;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
@ -380,7 +380,7 @@ public final class PlatformCommandManager {
private <CI> void registerSubCommands(String name, List<String> aliases, String desc,
Consumer<BiConsumer<CommandRegistration, CI>> handlerInstance,
@NotNull Consumer<CommandManager> additionalConfig) {
@Nonnull Consumer<CommandManager> additionalConfig) {
commandManager.register(name, cmd -> {
cmd.aliases(aliases);
cmd.description(TextComponent.of(desc));

4
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java
View File

@ -37,7 +37,7 @@ import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.util.Iterator;
import java.util.List;
@ -280,7 +280,7 @@ public class BlockArrayClipboard implements Clipboard {
return getParent().getBiomeType(x, y, z);
}
@NotNull
@Nonnull
@Override
public Iterator<BlockVector3> iterator() {
OffsetBlockVector3 mutable = new OffsetBlockVector3(origin);

4
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/Clipboard.java
View File

@ -47,7 +47,7 @@ import com.sk89q.worldedit.regions.Regions;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BaseBlock;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.io.Closeable;
import java.io.File;
@ -160,7 +160,7 @@ public interface Clipboard extends Extent, Iterable<BlockVector3>, Closeable {
}
@Override
@NotNull
@Nonnull
default Iterator<BlockVector3> iterator() {
return getRegion().iterator();
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java
View File

@ -46,7 +46,7 @@ import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.block.BlockTypesCache;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Arrays;
@ -529,7 +529,7 @@ public class BlockTransformExtent extends ResettableExtent {
* @param transform the transform
* @return the same block
*/
public static <B extends BlockStateHolder<B>> B transform(@NotNull B block, @NotNull Transform transform) {
public static <B extends BlockStateHolder<B>> B transform(@Nonnull B block, @Nonnull Transform transform) {
//FAWE start - use own logic
// performance critical
BlockState state = block.toImmutableState();

10
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockTypeMask.java
View File

@ -23,7 +23,7 @@ import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.util.Collection;
import java.util.HashSet;
@ -50,7 +50,7 @@ public class BlockTypeMask extends AbstractExtentMask {
* @param extent the extent
* @param blocks a list of blocks to match
*/
public BlockTypeMask(Extent extent, @NotNull Collection<BlockType> blocks) {
public BlockTypeMask(Extent extent, @Nonnull Collection<BlockType> blocks) {
this(extent, blocks.toArray(new BlockType[0]));
}
@ -60,7 +60,7 @@ public class BlockTypeMask extends AbstractExtentMask {
* @param extent the extent
* @param block an array of blocks to match
*/
public BlockTypeMask(Extent extent, @NotNull BlockType... block) {
public BlockTypeMask(Extent extent, @Nonnull BlockType... block) {
super(extent);
this.types = new boolean[BlockTypes.size()];
for (BlockType type : block) {
@ -81,7 +81,7 @@ public class BlockTypeMask extends AbstractExtentMask {
*
* @param blocks a list of blocks
*/
public void add(@NotNull Collection<BlockType> blocks) {
public void add(@Nonnull Collection<BlockType> blocks) {
checkNotNull(blocks);
//FAWE start
for (BlockType type : blocks) {
@ -95,7 +95,7 @@ public class BlockTypeMask extends AbstractExtentMask {
*
* @param block an array of blocks
*/
public void add(@NotNull BlockType... block) {
public void add(@Nonnull BlockType... block) {
//FAWE start - get internal id
for (BlockType type : block) {
if (!hasAir && (type == BlockTypes.AIR || type == BlockTypes.CAVE_AIR || type == BlockTypes.VOID_AIR)) {

2
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/Mask.java
View File

@ -24,7 +24,7 @@ import com.fastasyncworldedit.core.extent.filter.MaskFilter;
import com.fastasyncworldedit.core.extent.filter.block.FilterBlock;
import com.fastasyncworldedit.core.function.mask.InverseMask;
import com.sk89q.worldedit.math.BlockVector3;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.function.Consumer;

2
worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/ChangeSet.java
View File

@ -22,7 +22,7 @@ package com.sk89q.worldedit.history.changeset;
import com.fastasyncworldedit.core.history.changeset.ChangeSetSummary;
import com.sk89q.worldedit.history.change.Change;
import com.sk89q.worldedit.regions.Region;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.io.Closeable;
import java.io.IOException;

4
worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
View File

@ -33,7 +33,7 @@ import com.fastasyncworldedit.core.math.MutableBlockVector2;
import com.fastasyncworldedit.core.math.MutableBlockVector3;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.storage.ChunkStore;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.util.AbstractSet;
import java.util.Iterator;
@ -329,7 +329,7 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
//FAWE start
return new AbstractSet<BlockVector2>() {
@NotNull
@Nonnull
@Override
public Iterator<BlockVector2> iterator() {
return new Iterator<BlockVector2>() {

2
worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java
View File

@ -31,7 +31,7 @@ import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.format.TextColor;
import com.sk89q.worldedit.world.World;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;

2
worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/AbstractProperty.java
View File

@ -22,7 +22,7 @@ package com.sk89q.worldedit.registry.state;
import com.fastasyncworldedit.core.registry.state.PropertyKey;
import com.fastasyncworldedit.core.util.MathMan;
import com.sk89q.worldedit.world.block.BlockTypesCache;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
import java.util.List;

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -45,7 +45,7 @@ import com.fastasyncworldedit.core.registry.state.PropertyKey;
import com.sk89q.worldedit.util.concurrency.LazyReference;
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
@ -79,7 +79,7 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
this.emptyBaseBlock = new BlanketBaseBlock(this);
}
public BlockState(BlockType blockType, int internalId, int ordinal, @NotNull CompoundTag tile) {
public BlockState(BlockType blockType, int internalId, int ordinal, @Nonnull CompoundTag tile) {
this.blockType = blockType;
this.internalId = internalId;
this.ordinal = ordinal;

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockMaterial.java
View File

@ -20,7 +20,7 @@
package com.sk89q.worldedit.world.registry;
import com.sk89q.jnbt.CompoundTag;
import org.jetbrains.annotations.Nullable;
import javax.annotation.Nullable;
/**
* Describes the material for a block.