diff --git a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts index aff4db0fc2..cbd66a4965 100644 --- a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts @@ -14,9 +14,8 @@ tasks .withType() .matching { it.name == "compileJava" || it.name == "compileTestJava" } .configureEach { - // TODO: re-enable this-escape when ANTLR suppresses it properly val disabledLint = listOf( - "processing", "path", "fallthrough", "serial", "overloads", "this-escape", + "processing", "path", "fallthrough", "serial", "overloads", ) options.release.set(25) options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" }) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java index 9d0a44b62f..6f6f523175 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java @@ -100,6 +100,7 @@ public static PermissionsResolverManager getInstance() { FlatFilePermissionsResolver.class, }; + @SuppressWarnings("this-escape") protected PermissionsResolverManager(Plugin plugin) { this.server = plugin.getServer(); new ServerListener().register(plugin); // Register the events diff --git a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlatform.java b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlatform.java index ca5edb90b1..fc645341fa 100644 --- a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlatform.java +++ b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlatform.java @@ -79,6 +79,7 @@ public abstract class CoreMcPlatform extends AbstractPlatform implements MultiUs private boolean hookingEvents = false; private CoreMcPermissionsProvider permissionsProvider; + @SuppressWarnings("this-escape") protected CoreMcPlatform(CoreMcMod mod, Lifecycled server) { this.mod = mod; this.dataFixer = new CoreMcDataFixer(this, getDataVersion()); diff --git a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlayer.java b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlayer.java index 96b9b58cfb..ec7d333e48 100644 --- a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlayer.java +++ b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlayer.java @@ -66,11 +66,7 @@ public CoreMcPlayer(CoreMcPlatform platform, ServerPlayer player) { this.platform = platform; this.player = player; - if (getUniqueId() == null) { - throw new AssertionError("Player UUID cannot be null"); - } - - ThreadSafeCache.getInstance().getOnlineIds().add(getUniqueId()); + ThreadSafeCache.getInstance().getOnlineIds().add(player.getUUID()); } @Override diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java index 3535ae16a1..8f06e5edb6 100644 --- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java +++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java @@ -54,6 +54,7 @@ public SkullBlock(BlockState state) { * @param blockState BlockState to set * @param owner name of player */ + @SuppressWarnings("this-escape") public SkullBlock(BlockState blockState, String owner) { super(blockState); this.setOwner(owner); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java index 20fe0f7b40..022863982b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java @@ -56,13 +56,13 @@ public ParserContext() { * @param other the other instance */ public ParserContext(ParserContext other) { - setExtent(other.getExtent()); - setSession(other.getSession()); - setWorld(other.getWorld()); - setActor(other.getActor()); - setRestricted(other.isRestricted()); - setPreferringWildcard(other.isPreferringWildcard()); - setTryLegacy(other.isTryingLegacy()); + this.extent = other.extent; + this.session = other.session; + this.world = other.world; + this.actor = other.actor; + this.restricted = other.restricted; + this.tryLegacy = other.tryLegacy; + this.preferringWildcard = other.preferringWildcard; } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlatform.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlatform.java index 3bf41a1efb..c36e85c643 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlatform.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlatform.java @@ -39,6 +39,7 @@ public abstract class AbstractPlatform implements Platform { private final ResourceLoader resourceLoader = new WorldEditResourceLoader(WorldEdit.getInstance()); + @SuppressWarnings("this-escape") private final LazyReference archiveUnpacker = LazyReference.from(() -> { try { return new ArchiveUnpacker(getConfiguration().getWorkingDirectoryPath().resolve(".archive-unpack")); @@ -46,6 +47,7 @@ public abstract class AbstractPlatform implements Platform { throw new UncheckedIOException(e); } }); + @SuppressWarnings("this-escape") private final LazyReference translationManager = LazyReference.from(() -> { try { return new TranslationManager(archiveUnpacker.getValue(), getResourceLoader()); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java index a61eb098d3..1ef6a34ab3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java @@ -94,6 +94,7 @@ public class PlatformManager { * * @param worldEdit the WorldEdit instance */ + @SuppressWarnings("this-escape") public PlatformManager(WorldEdit worldEdit) { checkNotNull(worldEdit); this.worldEdit = worldEdit; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java index 2e6881304a..59ccf217f9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java @@ -45,6 +45,10 @@ */ public class BlockArrayClipboard implements Clipboard { + private static BlockVector3 getDimensions(Region region) { + return region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1); + } + private final Region region; private BlockVector3 origin; /** @@ -73,7 +77,7 @@ public BlockArrayClipboard(Region region) { this.region = region.clone(); this.origin = region.getMinimumPoint(); - BlockVector3 dimensions = getDimensions(); + BlockVector3 dimensions = getDimensions(region); blocks = new BaseBlock[dimensions.x() * dimensions.y() * dimensions.z()]; yStride = dimensions.x(); zStride = yStride * dimensions.y(); @@ -100,7 +104,7 @@ public void setOrigin(BlockVector3 origin) { @Override public BlockVector3 getDimensions() { - return region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1); + return getDimensions(region); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java index b688daa9d3..c4dcc05815 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java @@ -36,7 +36,7 @@ public abstract class AbstractExtentMask extends AbstractMask { * @param extent the extent */ protected AbstractExtentMask(Extent extent) { - setExtent(extent); + this.extent = extent; } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter.java index 5c0089ff64..2cd8d13f64 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter.java @@ -33,6 +33,11 @@ */ public class NoiseFilter extends AbstractMask { + private static void checkDensity(double density) { + checkArgument(density >= 0, "density must be >= 0"); + checkArgument(density <= 1, "density must be <= 1"); + } + private NoiseGenerator noiseGenerator; private double density; @@ -43,8 +48,9 @@ public class NoiseFilter extends AbstractMask { * @param density the density */ public NoiseFilter(NoiseGenerator noiseGenerator, double density) { - setNoiseGenerator(noiseGenerator); - setDensity(density); + checkDensity(density); + this.noiseGenerator = noiseGenerator; + this.density = density; } /** @@ -79,8 +85,7 @@ public double getDensity() { * Set the probability of passing as a number between 0 and 1 (inclusive). */ public void setDensity(double density) { - checkArgument(density >= 0, "density must be >= 0"); - checkArgument(density <= 1, "density must be <= 1"); + checkDensity(density); this.density = density; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter2D.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter2D.java index ac59d3ef15..4c1e079f3f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter2D.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter2D.java @@ -31,6 +31,11 @@ */ public class NoiseFilter2D extends AbstractMask2D { + private static void checkDensity(double density) { + checkArgument(density >= 0, "density must be >= 0"); + checkArgument(density <= 1, "density must be <= 1"); + } + private NoiseGenerator noiseGenerator; private double density; @@ -41,8 +46,9 @@ public class NoiseFilter2D extends AbstractMask2D { * @param density the density */ public NoiseFilter2D(NoiseGenerator noiseGenerator, double density) { - setNoiseGenerator(noiseGenerator); - setDensity(density); + checkDensity(density); + this.noiseGenerator = noiseGenerator; + this.density = density; } /** @@ -77,8 +83,7 @@ public double getDensity() { * Set the probability of passing as a number between 0 and 1 (inclusive). */ public void setDensity(double density) { - checkArgument(density >= 0, "density must be >= 0"); - checkArgument(density <= 1, "density must be <= 1"); + checkDensity(density); this.density = density; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/RegionMask.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/RegionMask.java index 95d5e5b1d3..c1295407da 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/RegionMask.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/RegionMask.java @@ -37,7 +37,7 @@ public class RegionMask extends AbstractMask { * @param region the region */ public RegionMask(Region region) { - setRegion(region); + this.region = region; } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java index f9a494c840..da02bc7012 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java @@ -20,11 +20,12 @@ package com.sk89q.worldedit.function.operation; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.util.formatting.text.Component; import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Deque; import java.util.List; @@ -36,7 +37,7 @@ */ public class OperationQueue implements Operation { - private final List operations = Lists.newArrayList(); + private final List operations; private final Deque queue = new ArrayDeque<>(); private Operation current; @@ -44,6 +45,7 @@ public class OperationQueue implements Operation { * Create a new queue containing no operations. */ public OperationQueue() { + this.operations = new ArrayList<>(); } /** @@ -53,22 +55,17 @@ public OperationQueue() { */ public OperationQueue(Collection operations) { checkNotNull(operations); - for (Operation operation : operations) { - offer(operation); - } - this.operations.addAll(operations); + this.queue.addAll(operations); + this.operations = new ArrayList<>(operations); } /** * Create a new queue with operations from the given array. * - * @param operation an array of operations + * @param operations an array of operations */ - public OperationQueue(Operation... operation) { - checkNotNull(operation); - for (Operation o : operation) { - offer(o); - } + public OperationQueue(Operation... operations) { + this(Arrays.asList(operations)); } /** @@ -79,6 +76,7 @@ public OperationQueue(Operation... operation) { public void offer(Operation operation) { checkNotNull(operation); queue.offer(operation); + operations.add(operation); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java index 560fd0b90b..ac8a1e5caf 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/BlockPattern.java @@ -41,7 +41,7 @@ public class BlockPattern extends AbstractPattern { * @param block the block */ public BlockPattern(BlockStateHolder block) { - setBlock(block); + this.block = block.toBaseBlock(); } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RepeatingExtentPattern.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RepeatingExtentPattern.java index aa2fd4d2f5..7dc445ba26 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RepeatingExtentPattern.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RepeatingExtentPattern.java @@ -42,8 +42,8 @@ public class RepeatingExtentPattern extends AbstractExtentPattern { */ public RepeatingExtentPattern(Extent extent, BlockVector3 origin, BlockVector3 offset) { super(extent); - setOrigin(origin); - setOffset(offset); + this.origin = origin; + this.offset = offset; size = extent.getMaximumPoint().subtract(extent.getMinimumPoint()).add(1, 1, 1); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/FlatRegionOffset.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/FlatRegionOffset.java index 7b256556f4..6e7e15ccb3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/FlatRegionOffset.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/FlatRegionOffset.java @@ -41,7 +41,7 @@ public class FlatRegionOffset implements FlatRegionFunction { */ public FlatRegionOffset(BlockVector2 offset, FlatRegionFunction function) { checkNotNull(function); - setOffset(offset); + this.offset = offset; this.function = function; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/RegionOffset.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/RegionOffset.java index ec2834421d..c50056f5b7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/RegionOffset.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/util/RegionOffset.java @@ -41,7 +41,7 @@ public class RegionOffset implements RegionFunction { */ public RegionOffset(BlockVector3 offset, RegionFunction function) { checkNotNull(function); - setOffset(offset); + this.offset = offset; this.function = function; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java index 59e57b0c73..78b71959b1 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java @@ -65,6 +65,7 @@ public abstract class BreadthFirstSearch implements Operation { * * @param function the function to apply to visited blocks */ + @SuppressWarnings("this-escape") protected BreadthFirstSearch(RegionFunction function) { checkNotNull(function); this.function = function; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java index 29d77df845..2562bf4d11 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/DownwardVisitor.java @@ -45,6 +45,7 @@ public class DownwardVisitor extends RecursiveVisitor { * @param function the function * @param baseY the base Y */ + @SuppressWarnings("this-escape") public DownwardVisitor(Mask mask, RegionFunction function, int baseY) { super(mask, function); checkNotNull(mask); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/NonRisingVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/NonRisingVisitor.java index ad64b530c3..4e75488825 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/NonRisingVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/NonRisingVisitor.java @@ -36,6 +36,7 @@ public class NonRisingVisitor extends RecursiveVisitor { * @param mask the mask * @param function the function */ + @SuppressWarnings("this-escape") public NonRisingVisitor(Mask mask, RegionFunction function) { super(mask, function); Collection directions = getDirections(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java b/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java index 408316d405..4fe98e7e56 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java @@ -43,6 +43,7 @@ public class KochanekBartelsInterpolation implements Interpolation { private Vector3[] coeffD; private double scaling; + @SuppressWarnings("this-escape") public KochanekBartelsInterpolation() { setNodes(Collections.emptyList()); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java index 4b56a0f22f..ded23e5f40 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java @@ -57,6 +57,7 @@ public CuboidRegion(BlockVector3 pos1, BlockVector3 pos2) { * @param pos1 the first position * @param pos2 the second position */ + @SuppressWarnings("this-escape") public CuboidRegion(World world, BlockVector3 pos1, BlockVector3 pos2) { super(world); checkNotNull(pos1); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java index 90373a3e93..1ac08e1186 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java @@ -74,6 +74,7 @@ public CylinderRegion(World world) { * @param minY the minimum Y, inclusive * @param maxY the maximum Y, inclusive */ + @SuppressWarnings("this-escape") public CylinderRegion(World world, BlockVector3 center, Vector2 radius, int minY, int maxY) { super(world); setCenter(center.toBlockVector2()); @@ -91,6 +92,7 @@ public CylinderRegion(World world, BlockVector3 center, Vector2 radius, int minY * @param minY the minimum Y, inclusive * @param maxY the maximum Y, inclusive */ + @SuppressWarnings("this-escape") public CylinderRegion(BlockVector3 center, Vector2 radius, int minY, int maxY) { super(null); setCenter(center.toBlockVector2()); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java index 2d6505fe40..533a6d3fd6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java @@ -63,6 +63,7 @@ public EllipsoidRegion(BlockVector3 pos1, Vector3 pos2) { * @param center the center * @param radius the radius */ + @SuppressWarnings("this-escape") public EllipsoidRegion(World world, BlockVector3 center, Vector3 radius) { super(world); this.center = center; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java index 7449a67c0c..d51417d6eb 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java @@ -69,6 +69,7 @@ public Polygonal2DRegion(World world) { * @param minY minimum Y * @param maxY maximum Y */ + @SuppressWarnings("this-escape") public Polygonal2DRegion(World world, List points, int minY, int maxY) { super(world); this.points = new ArrayList<>(points); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java index bbef54c1f7..4e606b4f38 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java @@ -38,6 +38,7 @@ public class FlatRegionIterator implements Iterator { private int nextX; private int nextZ; + @SuppressWarnings("this-escape") public FlatRegionIterator(Region region) { checkNotNull(region); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java index 54f67b4de1..a0227c5d40 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java @@ -37,6 +37,7 @@ public class RegionIterator implements Iterator { private int nextY; private int nextZ; + @SuppressWarnings("this-escape") public RegionIterator(Region region) { checkNotNull(region); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java index af0dd9c344..eb33fd7e51 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java @@ -77,6 +77,7 @@ public ConvexPolyhedralRegionSelector(@Nullable World world) { * * @param oldSelector the old selector */ + @SuppressWarnings("this-escape") public ConvexPolyhedralRegionSelector(RegionSelector oldSelector) { checkNotNull(oldSelector); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java index 07549dbc36..0a682d272f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java @@ -87,6 +87,7 @@ public class SessionManager { * * @param worldEdit a WorldEdit instance */ + @SuppressWarnings("this-escape") public SessionManager(WorldEdit worldEdit) { checkNotNull(worldEdit); this.worldEdit = worldEdit; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/LocatedBlockList.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/LocatedBlockList.java index 8169f31c23..8d3da7d354 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/LocatedBlockList.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/LocatedBlockList.java @@ -45,6 +45,7 @@ public class LocatedBlockList implements Iterable { public LocatedBlockList() { } + @SuppressWarnings("this-escape") public LocatedBlockList(Collection collection) { for (LocatedBlock locatedBlock : collection) { add(locatedBlock.location(), locatedBlock.block()); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandUsageBox.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandUsageBox.java index 96c9ec2e60..754064b193 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandUsageBox.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandUsageBox.java @@ -59,6 +59,7 @@ public CommandUsageBox(List commands, String commandString, String help * @param helpRootCommand the command used to get subcommand help * @param parameters list of parameters to use */ + @SuppressWarnings("this-escape") public CommandUsageBox(List commands, String commandString, String helpRootCommand, @Nullable CommandParameters parameters) throws InvalidComponentException { checkNotNull(commands); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java index 1e1acb9c67..a38267d789 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java @@ -47,6 +47,7 @@ public MessageBox(String title, TextComponentProducer contents) { /** * Create a new box. */ + @SuppressWarnings("this-escape") public MessageBox(String title, TextComponentProducer contents, TextColor borderColor) { checkNotNull(title); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ConfigReport.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ConfigReport.java index 1393d38c97..96f565d22a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ConfigReport.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ConfigReport.java @@ -23,6 +23,7 @@ public class ConfigReport extends DataReport { + @SuppressWarnings("this-escape") public ConfigReport() { super("WorldEdit Configuration"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/HierarchyObjectReport.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/HierarchyObjectReport.java index b2fff9e8d7..47e43878bc 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/HierarchyObjectReport.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/HierarchyObjectReport.java @@ -21,6 +21,7 @@ public class HierarchyObjectReport extends ShallowObjectReport { + @SuppressWarnings("this-escape") public HierarchyObjectReport(String title, Object object) { super(title, object); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ShallowObjectReport.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ShallowObjectReport.java index 7f6bc27151..2f61873572 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ShallowObjectReport.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ShallowObjectReport.java @@ -31,6 +31,7 @@ public class ShallowObjectReport extends DataReport { private static final Logger LOGGER = LogManagerCompat.getLogger(); + @SuppressWarnings("this-escape") public ShallowObjectReport(String title, Object object) { super(title); checkNotNull(object, "object"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/SystemInfoReport.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/SystemInfoReport.java index ccb5d8435f..720d96132d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/SystemInfoReport.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/report/SystemInfoReport.java @@ -31,6 +31,7 @@ public class SystemInfoReport extends DataReport { + @SuppressWarnings("this-escape") public SystemInfoReport() { super("System Information"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java index f33d5d03cd..66fa710d4c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java @@ -86,6 +86,7 @@ public BlockType(String id) { this(id, null); } + @SuppressWarnings("this-escape") public BlockType(String id, Function applyDefaultValues) { // If it has no namespace, assume minecraft. if (!id.contains(":")) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java index 8c40291986..ae9536d3b9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java @@ -70,6 +70,7 @@ public AnvilChunk13(CompoundTag tag) throws DataException { * @param tag the tag to read * @throws DataException on a data error */ + @SuppressWarnings("this-escape") public AnvilChunk13(LinCompoundTag tag) throws DataException { rootTag = tag; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java index bf87f81572..894733431f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java @@ -68,6 +68,7 @@ public AnvilChunk18(CompoundTag tag) throws DataException { * @param tag the tag to read * @throws DataException on a data error */ + @SuppressWarnings("this-escape") public AnvilChunk18(LinCompoundTag tag) throws DataException { rootTag = tag; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java index 495dd6777e..148e17e672 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java @@ -51,7 +51,7 @@ public class ItemType implements Keyed { WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS) .getRegistries().getItemRegistry().getRichName(this) ); - @SuppressWarnings("removal") + @SuppressWarnings({"this-escape", "removal"}) private final LazyReference itemMaterial = LazyReference.from(() -> WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS) .getRegistries().getItemRegistry().getMaterial(this) diff --git a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeWorldEdit.java b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeWorldEdit.java index 5050da61a4..268831606e 100644 --- a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeWorldEdit.java +++ b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeWorldEdit.java @@ -65,6 +65,7 @@ public static CoreMcPlatform getPlatform() { private ModContainer container; + @SuppressWarnings("this-escape") public NeoForgeWorldEdit(IEventBus modBus) { modBus.addListener(this::onFMLCommonSetup);