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

Add and apply .editorconfig from P2 (#1195)

Browse Source 
* Consistenty use javax annotations.
 - 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

* Add and apply .editorconfig from P2
 - Does not rearrange entries

* Address some comments

* add back some javadoc comments

* Address final comments

Co-authored-by: NotMyFault <mc.cache@web.de>
This commit is contained in:
dordsor21
2021-07-24 16:34:05 +01:00
committed by GitHub
parent 3b4beba7d6
commit 8c0195970b
1143 changed files with 143599 additions and 9952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/RichParser.java
View File

@ -7,8 +7,8 @@ import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.internal.registry.InputParser;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -23,13 +23,14 @@ import java.util.stream.Stream;
* @param <E> the parse result.
*/
public abstract class RichParser<E> extends InputParser<E> {
private final String[] prefixes;
/**
* Create a new rich parser with a defined prefix for the result, e.g. {@code #simplex}.
*
* @param worldEdit the worldedit instance.
* @param aliases the prefix of this parser result.
* @param aliases the prefix of this parser result.
*/
protected RichParser(WorldEdit worldEdit, String... aliases) {
super(worldEdit);
@ -147,4 +148,5 @@ public abstract class RichParser<E> extends InputParser<E> {
}
return arguments.toArray(new String[0]);
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/AdjacentMaskParser.java
View File

@ -1,15 +1,15 @@
package com.fastasyncworldedit.core.extension.factory.parser.mask;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.mask.AdjacentAnyMask;
import com.fastasyncworldedit.core.function.mask.AdjacentMask;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class AdjacentMaskParser extends RichParser<Mask> {
@ -47,4 +47,5 @@ public class AdjacentMaskParser extends RichParser<Mask> {
}
return new AdjacentMask(subMask, min, max);
}
}

11
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/AngleMaskParser.java
View File

@ -1,16 +1,16 @@
package com.fastasyncworldedit.core.extension.factory.parser.mask;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.mask.AngleMask;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class AngleMaskParser extends RichParser<Mask> {
@ -49,8 +49,10 @@ public class AngleMaskParser extends RichParser<Mask> {
if (flag.equals("-o")) {
overlay = true;
} else {
throw new InputParseException(Caption.of("fawe.error.invalid-flag",
TextComponent.of(flag)));
throw new InputParseException(Caption.of(
"fawe.error.invalid-flag",
TextComponent.of(flag)
));
}
}
}
@ -68,4 +70,5 @@ public class AngleMaskParser extends RichParser<Mask> {
return new AngleMask(context.getExtent(), min, max, overlay, 1);
}
}

11
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/ExtremaMaskParser.java
View File

@ -1,16 +1,16 @@
package com.fastasyncworldedit.core.extension.factory.parser.mask;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.mask.ExtremaMask;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class ExtremaMaskParser extends RichParser<Mask> {
@ -51,8 +51,10 @@ public class ExtremaMaskParser extends RichParser<Mask> {
if (flag.equals("-o")) {
overlay = true;
} else {
throw new InputParseException(Caption.of("fawe.error.invalid-flag",
TextComponent.of(flag)));
throw new InputParseException(Caption.of(
"fawe.error.invalid-flag",
TextComponent.of(flag)
));
}
}
}
@ -68,4 +70,5 @@ public class ExtremaMaskParser extends RichParser<Mask> {
return new ExtremaMask(context.getExtent(), min, max, overlay, 4);
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/FalseMaskParser.java
View File

@ -26,4 +26,5 @@ public class FalseMaskParser extends SimpleInputParser<Mask> {
public Mask parseFromSimpleInput(String input, ParserContext context) {
return Masks.alwaysFalse();
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/LiquidMaskParser.java
View File

@ -26,4 +26,5 @@ public class LiquidMaskParser extends SimpleInputParser<Mask> {
public Mask parseFromSimpleInput(String input, ParserContext context) {
return new LiquidMask(context.getExtent());
}
}

11
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/ROCAngleMaskParser.java
View File

@ -1,16 +1,16 @@
package com.fastasyncworldedit.core.extension.factory.parser.mask;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.mask.ROCAngleMask;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class ROCAngleMaskParser extends RichParser<Mask> {
@ -51,8 +51,10 @@ public class ROCAngleMaskParser extends RichParser<Mask> {
if (flag.equals("-o")) {
overlay = true;
} else {
throw new InputParseException(Caption.of("fawe.error.invalid-flag",
TextComponent.of(flag)));
throw new InputParseException(Caption.of(
"fawe.error.invalid-flag",
TextComponent.of(flag)
));
}
}
}
@ -68,4 +70,5 @@ public class ROCAngleMaskParser extends RichParser<Mask> {
return new ROCAngleMask(context.getExtent(), min, max, overlay, 4);
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RadiusMaskParser.java
View File

@ -1,14 +1,14 @@
package com.fastasyncworldedit.core.extension.factory.parser.mask;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.mask.RadiusMask;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class RadiusMaskParser extends RichParser<Mask> {
@ -34,4 +34,5 @@ public class RadiusMaskParser extends RichParser<Mask> {
int max = Integer.parseInt(arguments[1]);
return new RadiusMask(min, max);
}
}

5
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/RichOffsetMaskParser.java
View File

@ -1,8 +1,8 @@
package com.fastasyncworldedit.core.extension.factory.parser.mask;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask;
@ -10,8 +10,8 @@ import com.sk89q.worldedit.function.mask.MaskIntersection;
import com.sk89q.worldedit.function.mask.Masks;
import com.sk89q.worldedit.function.mask.OffsetMask;
import com.sk89q.worldedit.math.BlockVector3;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class RichOffsetMaskParser extends RichParser<Mask> {
@ -48,4 +48,5 @@ public class RichOffsetMaskParser extends RichParser<Mask> {
OffsetMask offsetMask = new OffsetMask(submask, BlockVector3.at(x, y, z));
return new MaskIntersection(offsetMask, Masks.negate(submask));
}
}

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/SimplexMaskParser.java
View File

@ -1,17 +1,18 @@
package com.fastasyncworldedit.core.extension.factory.parser.mask;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.mask.SimplexMask;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class SimplexMaskParser extends RichParser<Mask> {
private static final String SIMPLEX_PREFIX = "#simplex";
public SimplexMaskParser(WorldEdit worldEdit) {
@ -39,4 +40,5 @@ public class SimplexMaskParser extends RichParser<Mask> {
max = (max - 50d) / 50d;
return new SimplexMask(scale, min, max);
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/SurfaceMaskParser.java
View File

@ -27,4 +27,5 @@ public class SurfaceMaskParser extends SimpleInputParser<Mask> {
public Mask parseFromSimpleInput(String input, ParserContext context) throws InputParseException {
return new SurfaceMask(context.getExtent());
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/TrueMaskParser.java
View File

@ -26,4 +26,5 @@ public class TrueMaskParser extends SimpleInputParser<Mask> {
public Mask parseFromSimpleInput(String input, ParserContext context) {
return Masks.alwaysTrue();
}
}

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/WallMaskParser.java
View File

@ -29,6 +29,10 @@ public class WallMaskParser extends SimpleInputParser<Mask> {
@Override
public Mask parseFromSimpleInput(String input, ParserContext context) throws InputParseException {
return new MaskIntersection(new ExistingBlockMask(context.getExtent()), new WallMask(new BlockMask(context.getExtent(), BlockTypes.AIR.getDefaultState().toBaseBlock()), 1, 8));
return new MaskIntersection(
new ExistingBlockMask(context.getExtent()),
new WallMask(new BlockMask(context.getExtent(), BlockTypes.AIR.getDefaultState().toBaseBlock()), 1, 8)
);
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/XAxisMaskParser.java
View File

@ -26,4 +26,5 @@ public class XAxisMaskParser extends SimpleInputParser<Mask> {
public Mask parseFromSimpleInput(String input, ParserContext context) {
return new XAxisMask(context.getExtent());
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/YAxisMaskParser.java
View File

@ -26,4 +26,5 @@ public class YAxisMaskParser extends SimpleInputParser<Mask> {
public Mask parseFromSimpleInput(String input, ParserContext context) {
return new YAxisMask(context.getExtent());
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/mask/ZAxisMaskParser.java
View File

@ -26,4 +26,5 @@ public class ZAxisMaskParser extends SimpleInputParser<Mask> {
public Mask parseFromSimpleInput(String input, ParserContext context) {
return new ZAxisMask();
}
}

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/BiomePatternParser.java
View File

@ -1,9 +1,9 @@
package com.fastasyncworldedit.core.extension.factory.parser.pattern;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.pattern.BiomeApplyingPattern;
import com.sk89q.worldedit.WorldEdit;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.NoMatchException;
import com.sk89q.worldedit.extension.input.ParserContext;
@ -11,11 +11,12 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class BiomePatternParser extends RichParser<Pattern> {
private final static String BIOME_PREFIX = "$";
/**
@ -71,4 +72,5 @@ public class BiomePatternParser extends RichParser<Pattern> {
}
return new BiomeApplyingPattern(context.requireExtent(), biomeType);
}
}

11
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/BufferedPatternParser.java
View File

@ -1,15 +1,15 @@
package com.fastasyncworldedit.core.extension.factory.parser.pattern;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.pattern.BufferedPattern;
import com.sk89q.worldedit.WorldEdit;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.stream.Stream;
public class BufferedPatternParser extends RichParser<Pattern> {
@ -34,10 +34,13 @@ public class BufferedPatternParser extends RichParser<Pattern> {
@Override
protected Pattern parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException {
if (arguments.length != 1) {
throw new InputParseException(Caption.of("fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[pattern] (e.g. " + getPrefix() + "[stone,dirt])")));
throw new InputParseException(Caption.of(
"fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[pattern] (e.g. " + getPrefix() + "[stone,dirt])")
));
}
Pattern inner = this.worldEdit.getPatternFactory().parseFromInput(arguments[0], context);
return new BufferedPattern(context.requireActor(), inner);
}
}

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/ExistingPatternParser.java
View File

@ -11,6 +11,7 @@ import java.util.Collections;
import java.util.List;
public class ExistingPatternParser extends SimpleInputParser<Pattern> {
private final List<String> aliases = Collections.singletonList("#existing");
public ExistingPatternParser(WorldEdit worldEdit) {
@ -26,4 +27,5 @@ public class ExistingPatternParser extends SimpleInputParser<Pattern> {
public Pattern parseFromSimpleInput(String input, ParserContext context) throws InputParseException {
return new ExistingPattern(context.requireExtent());
}
}

11
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/Linear2DPatternParser.java
View File

@ -1,19 +1,19 @@
package com.fastasyncworldedit.core.extension.factory.parser.pattern;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.pattern.Linear2DBlockPattern;
import com.google.common.base.Preconditions;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.Set;
import java.util.stream.Stream;
@ -44,8 +44,10 @@ public class Linear2DPatternParser extends RichParser<Pattern> {
@Override
protected Pattern parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException {
if (arguments.length == 0 || arguments.length > 3) {
throw new InputParseException(Caption.of("fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[pattern] (e.g. " + getPrefix() + "[stone,dirt])")));
throw new InputParseException(Caption.of(
"fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[pattern] (e.g. " + getPrefix() + "[stone,dirt])")
));
}
Pattern inner = this.worldEdit.getPatternFactory().parseFromInput(arguments[0], context);
if (inner instanceof BlockStateHolder) {
@ -68,4 +70,5 @@ public class Linear2DPatternParser extends RichParser<Pattern> {
throw new InputParseException(TextComponent.of("Pattern " + inner.getClass().getSimpleName()
+ " cannot be used with " + getPrefix()));
}
}

13
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/Linear3DPatternParser.java
View File

@ -1,19 +1,19 @@
package com.fastasyncworldedit.core.extension.factory.parser.pattern;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.function.pattern.Linear3DBlockPattern;
import com.google.common.base.Preconditions;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.Set;
import java.util.stream.Stream;
@ -45,8 +45,10 @@ public class Linear3DPatternParser extends RichParser<Pattern> {
@Override
protected Pattern parseFromInput(@Nonnull String[] arguments, ParserContext context) throws InputParseException {
if (arguments.length == 0 || arguments.length > 4) {
throw new InputParseException(Caption.of("fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[pattern] (e.g. " + getPrefix() + "[stone,dirt])")));
throw new InputParseException(Caption.of(
"fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[pattern] (e.g. " + getPrefix() + "[stone,dirt])")
));
}
Pattern inner = this.worldEdit.getPatternFactory().parseFromInput(arguments[0], context);
if (inner instanceof BlockStateHolder) {
@ -69,9 +71,10 @@ public class Linear3DPatternParser extends RichParser<Pattern> {
}
if (inner instanceof RandomPattern) {
Set<Pattern> patterns = ((RandomPattern) inner).getPatterns();
return new Linear3DBlockPattern(patterns.toArray(new Pattern[0]), xScale, yScale,zScale);
return new Linear3DBlockPattern(patterns.toArray(new Pattern[0]), xScale, yScale, zScale);
}
throw new InputParseException(TextComponent.of("Pattern " + inner.getClass().getSimpleName()
+ " cannot be used with " + getPrefix()));
}
}

11
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/NoisePatternParser.java
View File

@ -1,10 +1,10 @@
package com.fastasyncworldedit.core.extension.factory.parser.pattern;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.fastasyncworldedit.core.math.random.NoiseRandom;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.fastasyncworldedit.core.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.Pattern;
@ -12,8 +12,8 @@ import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.math.noise.NoiseGenerator;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
import java.util.function.Supplier;
import java.util.stream.Stream;
@ -49,8 +49,10 @@ public abstract class NoisePatternParser extends RichParser<Pattern> {
@Override
protected Pattern parseFromInput(@Nonnull String[] arguments, ParserContext context) {
if (arguments.length != 2) {
throw new InputParseException(Caption.of("fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[scale][pattern] (e.g. " + getPrefix() + "[5][dirt,stone])")));
throw new InputParseException(Caption.of(
"fawe.error.command.syntax",
TextComponent.of(getPrefix() + "[scale][pattern] (e.g. " + getPrefix() + "[5][dirt,stone])")
));
}
double scale = parseScale(arguments[0]);
Pattern inner = worldEdit.getPatternFactory().parseFromInput(arguments[1], context);
@ -74,4 +76,5 @@ public abstract class NoisePatternParser extends RichParser<Pattern> {
double scale = Double.parseDouble(argument);
return 1d / Math.max(1, scale);
}
}

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/PerlinPatternParser.java
View File

@ -4,6 +4,7 @@ import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.math.noise.PerlinNoise;
public class PerlinPatternParser extends NoisePatternParser {
private static final String PERLIN_NAME = "perlin";
/**
@ -14,4 +15,5 @@ public class PerlinPatternParser extends NoisePatternParser {
public PerlinPatternParser(WorldEdit worldEdit) {
super(worldEdit, PERLIN_NAME, PerlinNoise::new);
}
}

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RandomPatternParser.java
View File

@ -62,7 +62,10 @@ public class RandomPatternParser extends InputParser<Pattern> {
String[] p = token.split("%", 2);
if (p.length < 2) {
throw new InputParseException(Caption.of("worldedit.error.parser.missing-random-type", TextComponent.of(input)));
throw new InputParseException(Caption.of(
"worldedit.error.parser.missing-random-type",
TextComponent.of(input)
));
} else {
chance = Double.parseDouble(p[0]);
innerPattern = worldEdit.getPatternFactory().parseFromInput(p[1], context);
@ -77,4 +80,5 @@ public class RandomPatternParser extends InputParser<Pattern> {
return randomPattern;
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/RidgedMultiFractalPatternParser.java
View File

@ -15,4 +15,5 @@ public class RidgedMultiFractalPatternParser extends NoisePatternParser {
public RidgedMultiFractalPatternParser(WorldEdit worldEdit) {
super(worldEdit, RIDGED_MULTI_FRACTAL_NAME, RidgedMultiFractalNoise::new);
}
}

4
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/SimplexPatternParser.java
View File

@ -1,12 +1,14 @@
package com.fastasyncworldedit.core.extension.factory.parser.pattern;
import com.sk89q.worldedit.WorldEdit;
import com.fastasyncworldedit.core.math.random.SimplexNoiseGenerator;
import com.sk89q.worldedit.WorldEdit;
public class SimplexPatternParser extends NoisePatternParser {
private static final String SIMPLEX_NAME = "simplex";
public SimplexPatternParser(WorldEdit worldEdit) {
super(worldEdit, SIMPLEX_NAME, SimplexNoiseGenerator::new);
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/pattern/VoronoiPatternParser.java
View File

@ -15,4 +15,5 @@ public class VoronoiPatternParser extends NoisePatternParser {
public VoronoiPatternParser(WorldEdit worldEdit) {
super(worldEdit, VORONOI_NAME, VoronoiNoise::new);
}
}

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/Binding.java
View File

@ -5,5 +5,7 @@ import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface Binding {
String value() default "";
}

10
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/Bindings.java
View File

@ -53,7 +53,7 @@ public class Bindings {
// Get the key
Class<?> ret = method.getReturnType();
Key key;
if ( annotations.length == 1) {
if (annotations.length == 1) {
key = Key.of(ret);
} else if (annotations.length == 2) {
Annotation annotation = annotations[0] == binding ? annotations[1] : annotations[0];
@ -112,7 +112,12 @@ public class Bindings {
return true;
}
private Object invoke(String arg, Function<InjectedValueAccess, Object>[] argsFunc, InjectedValueAccess access, Method method) {
private Object invoke(
String arg,
Function<InjectedValueAccess, Object>[] argsFunc,
InjectedValueAccess access,
Method method
) {
try {
Object[] args = new Object[argsFunc.length];
for (int i = 0; i < argsFunc.length; i++) {
@ -132,4 +137,5 @@ public class Bindings {
return null;
}
}
}

1
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/CommandBindings.java
View File

@ -7,4 +7,5 @@ public class CommandBindings extends Bindings {
public CommandBindings(WorldEdit worldEdit) {
super(worldEdit);
}
}

4
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/ConsumeBindings.java
View File

@ -6,6 +6,7 @@ import com.fastasyncworldedit.core.util.MainUtil;
import com.fastasyncworldedit.core.util.image.ImageUtil;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.annotation.Confirm;
import com.sk89q.worldedit.command.util.annotation.Time;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.NoMatchException;
@ -14,7 +15,6 @@ import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.internal.annotation.Selection;
import com.sk89q.worldedit.command.util.annotation.Time;
import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
@ -31,6 +31,7 @@ import org.enginehub.piston.inject.InjectedValueAccess;
import java.util.UUID;
public class ConsumeBindings extends Bindings {
private final PlatformCommandManager manager;
public ConsumeBindings(WorldEdit worldEdit, PlatformCommandManager manager) {
@ -158,4 +159,5 @@ public class ConsumeBindings extends Bindings {
throw new InputParseException(Caption.of(e.getMessage()));
}
}
}

4
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/PrimitiveBindings.java
View File

@ -12,10 +12,11 @@ import com.sk89q.worldedit.math.Vector2;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import java.util.Locale;
import javax.annotation.Nullable;
import java.util.Locale;
public class PrimitiveBindings extends Bindings {
public PrimitiveBindings(WorldEdit worldEdit) {
super(worldEdit);
}
@ -242,4 +243,5 @@ public class PrimitiveBindings extends Bindings {
}
}
}
}

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/ProvideBindings.java
View File

@ -10,11 +10,11 @@ import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.argument.Arguments;
import com.sk89q.worldedit.command.util.annotation.AllowedRegion;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.command.util.annotation.AllowedRegion;
import com.sk89q.worldedit.internal.annotation.Selection;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.session.request.Request;
@ -29,6 +29,7 @@ import java.net.URI;
import java.util.Optional;
public class ProvideBindings extends Bindings {
public ProvideBindings(WorldEdit worldEdit) {
super(worldEdit);
}
@ -96,6 +97,7 @@ public class ProvideBindings extends Bindings {
}
public static class ImageUri {
public final URI uri;
private BufferedImage image;
@ -109,6 +111,7 @@ public class ProvideBindings extends Bindings {
}
return image = ImageUtil.load(uri);
}
}
@Binding
@ -129,4 +132,5 @@ public class ProvideBindings extends Bindings {
}
return editSession;
}
}