SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Update FaWe #7

Zusammengeführt
Lixfel hat 467 Commits von update nach main 2024-11-28 22:27:32 +01:00 zusammengeführt
Diskussion 0 Commits 467 Geänderte Dateien 816 +60 -60
19 geänderte Dateien mit 60 neuen und 60 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit c82ab99a22 werden angezeigt - Alle Commits anzeigen

4
build.gradle.kts
Datei anzeigen

@ -34,7 +34,7 @@ logger.lifecycle("""
*******************************************
""")
var rootVersion by extra("2.10.1")
var rootVersion by extra("2.11.0")
var snapshot by extra("SNAPSHOT")
var revision: String by extra("")
var buildNumber by extra("")
@ -52,7 +52,7 @@ ext {
}
}
version = String.format("%s-%s", rootVersion, buildNumber)
version = String.format("%s", rootVersion)
if (!project.hasProperty("gitCommitHash")) {
apply(plugin = "org.ajoberstar.grgit")

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Config.java
Datei anzeigen

@ -224,7 +224,7 @@ public class Config {
/**
* Indicates that a field's default value should match another input if the config is otherwise already generated
*
* @since TODO
* @since 2.11.0
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})

4
worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/BlockMaskBuilder.java
Datei anzeigen

@ -65,7 +65,7 @@ public class BlockMaskBuilder {
/**
* Create a new instance with a given {@link ParserContext} to use if parsing regex
*
* @since TODO
* @since 2.11.0
*/
public BlockMaskBuilder(ParserContext context) {
this(new long[BlockTypes.size()][], context);
@ -79,7 +79,7 @@ public class BlockMaskBuilder {
/**
* Create a new instance with a given {@link ParserContext} to use if parsing regex
*
* @since TODO
* @since 2.11.0
*/
protected BlockMaskBuilder(long[][] bitSets, ParserContext context) {
this.bitSets = bitSets;

6
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
Datei anzeigen

@ -1352,7 +1352,7 @@ public class LocalSession implements TextureHolder {
* @param item the item type
* @param tool the tool to set, which can be {@code null}
* @throws InvalidToolBindException if the item can't be bound to that item
* @since TODO
* @since 2.11.0
*/
public void setTool(BaseItem item, @Nullable Tool tool) throws InvalidToolBindException {
if (item.getType().hasBlockType()) {
@ -1919,7 +1919,7 @@ public class LocalSession implements TextureHolder {
* Get the preferred wand item for this user, or {@code null} to use the default
*
* @return item id of wand item, or {@code null}
* @since TODO
* @since 2.11.0
*/
public BaseItem getWandBaseItem() {
return wandItem == null ? null : new BaseItem(wandItem.getType(), wandItem.getNbtReference());
@ -1929,7 +1929,7 @@ public class LocalSession implements TextureHolder {
* Get the preferred navigation wand item for this user, or {@code null} to use the default
*
* @return item id of nav wand item, or {@code null}
* @since TODO
* @since 2.11.0
*/
public BaseItem getNavWandBaseItem() {
return navWandItem == null ? null : new BaseItem(navWandItem.getType(), navWandItem.getNbtReference());

10
worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java
Datei anzeigen

@ -468,7 +468,7 @@ public final class WorldEdit {
/**
* @deprecated Use {@link WorldEdit#checkMaxBrushRadius(Expression, Actor)}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public void checkMaxBrushRadius(Expression radius) throws MaxBrushRadiusException {
double val = radius.evaluate();
checkArgument(val >= 0, "Radius must be a positive number.");
@ -485,7 +485,7 @@ public final class WorldEdit {
* @param radius Radius to check
* @param actor Actor to check for
* @throws MaxRadiusException If given radius larger than allowed
* @since TODO
* @since 2.11.0
*/
public void checkMaxRadius(double radius, Actor actor) {
int max = actor.getLimit().MAX_RADIUS;
@ -500,7 +500,7 @@ public final class WorldEdit {
* @param radius Radius to check
* @param actor Actor to check for
* @throws MaxRadiusException If given radius larger than allowed
* @since TODO
* @since 2.11.0
*/
public void checkMaxBrushRadius(double radius, Actor actor) {
int max = actor.getLimit().MAX_BRUSH_RADIUS;
@ -515,7 +515,7 @@ public final class WorldEdit {
* @param expression Radius to check
* @param actor Actor to check for
* @throws BrushRadiusLimitException If given radius larger than allowed
* @since TODO
* @since 2.11.0
*/
public void checkMaxBrushRadius(Expression expression, Actor actor) {
double radius = expression.evaluate();
@ -532,7 +532,7 @@ public final class WorldEdit {
* @param position Position to check
* @param extent Extent to check in
* @throws OutsideWorldBoundsException If the position is outside the world height limits
* @since TODO
* @since 2.11.0
*/
public void checkExtentHeightBounds(BlockVector3 position, Extent extent) {
if (position.y() < extent.getMinY() || position.y() > extent.getMaxY()) {

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
Datei anzeigen

@ -340,7 +340,7 @@ public class ClipboardCommands {
aliases = {"/download"},
desc = "Downloads your clipboard through the configured web interface"
)
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
@CommandPermissions({"worldedit.clipboard.download"})
public void download(
final Actor actor,

6
worldedit-core/src/main/java/com/sk89q/worldedit/history/change/BiomeChange3D.java
Datei anzeigen

@ -56,7 +56,7 @@ public record BiomeChange3D(BlockVector3 position, BiomeType previous, BiomeType
* @return the position
* @deprecated Use {@link #position()}.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BlockVector3 getPosition() {
return position;
}
@ -67,7 +67,7 @@ public record BiomeChange3D(BlockVector3 position, BiomeType previous, BiomeType
* @return the previous biome
* @deprecated Use {@link #previous()}.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BiomeType getPrevious() {
return previous;
}
@ -78,7 +78,7 @@ public record BiomeChange3D(BlockVector3 position, BiomeType previous, BiomeType
* @return the current biome
* @deprecated Use {@link #current()}.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BiomeType getCurrent() {
return current;
}

6
worldedit-core/src/main/java/com/sk89q/worldedit/history/change/BlockChange.java
Datei anzeigen

@ -71,7 +71,7 @@ public record BlockChange(BlockVector3 position, BaseBlock previous, BaseBlock c
* @return the position
* @deprecated use {@link #position()}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BlockVector3 getPosition() {
return position;
}
@ -82,7 +82,7 @@ public record BlockChange(BlockVector3 position, BaseBlock previous, BaseBlock c
* @return the previous block
* @deprecated use {@link #previous()}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BaseBlock getPrevious() {
return previous;
}
@ -93,7 +93,7 @@ public record BlockChange(BlockVector3 position, BaseBlock previous, BaseBlock c
* @return the current block
* @deprecated use {@link #current()}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BaseBlock getCurrent() {
return current;
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/AbstractFactory.java
Datei anzeigen

@ -68,7 +68,7 @@ public abstract class AbstractFactory<E> {
* @param worldEdit the WorldEdit instance
* @param defaultParser the parser to fall back to
* @param richParser the rich parser
* @since TODO
* @since 2.11.0
*/
protected AbstractFactory(WorldEdit worldEdit, InputParser<E> defaultParser, FaweParser<E> richParser) {
checkNotNull(worldEdit);

12
worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector2.java
Datei anzeigen

@ -122,7 +122,7 @@ public class BlockVector2 {
* Get the X coordinate.
*
* @return the x coordinate
* @since TODO
* @since 2.11.0
*/
public int x() {
return x;
@ -134,7 +134,7 @@ public class BlockVector2 {
* @return the x coordinate
* @deprecated use {@link #x()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getX() {
return x;
}
@ -145,7 +145,7 @@ public class BlockVector2 {
* @return the x coordinate
* @deprecated use {@link #x()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getBlockX() {
return x;
}
@ -164,7 +164,7 @@ public class BlockVector2 {
* Get the Z coordinate.
*
* @return the z coordinate
* @since TODO
* @since 2.11.0
*/
public int z() {
return z;
@ -176,7 +176,7 @@ public class BlockVector2 {
* @return the z coordinate
* @deprecated use {@link #z()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getZ() {
return z;
}
@ -187,7 +187,7 @@ public class BlockVector2 {
* @return the z coordinate
* @deprecated use {@link #z()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getBlockZ() {
return z;
}

18
worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java
Datei anzeigen

@ -174,7 +174,7 @@ public abstract class BlockVector3 {
* Get the X coordinate.
*
* @return the x coordinate
* @since TODO
* @since 2.11.0
*/
public abstract int x();
//FAWE end
@ -185,7 +185,7 @@ public abstract class BlockVector3 {
* @return the x coordinate
* @deprecated use {@link #x()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getX() {
return this.x(); //FAWE - access abstract getter instead of local field
}
@ -196,7 +196,7 @@ public abstract class BlockVector3 {
* @return the x coordinate
* @deprecated use {@link #x()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getBlockX() {
return this.x(); //FAWE - access abstract getter instead of local field
}
@ -219,7 +219,7 @@ public abstract class BlockVector3 {
* Get the Y coordinate.
*
* @return the y coordinate
* @since TODO
* @since 2.11.0
*/
public abstract int y();
//FAWE end
@ -230,7 +230,7 @@ public abstract class BlockVector3 {
* @return the y coordinate
* @deprecated use {@link #y()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getY() {
return this.y(); //FAWE - access abstract getter instead of local field
}
@ -241,7 +241,7 @@ public abstract class BlockVector3 {
* @return the y coordinate
* @deprecated use {@link #y()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getBlockY() {
return this.y(); //FAWE - access abstract getter instead of local field
}
@ -263,7 +263,7 @@ public abstract class BlockVector3 {
* Get the Z coordinate.
*
* @return the Z coordinate
* @since TODO
* @since 2.11.0
*/
public abstract int z();
//FAWE end
@ -274,7 +274,7 @@ public abstract class BlockVector3 {
* @return the z coordinate
* @deprecated use {@link #z()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getZ() {
return this.z(); //FAWE - access abstract getter instead of local field
}
@ -285,7 +285,7 @@ public abstract class BlockVector3 {
* @return the z coordinate
* @deprecated use {@link #z()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public int getBlockZ() {
return this.z(); //FAWE - access abstract getter instead of local field
}

8
worldedit-core/src/main/java/com/sk89q/worldedit/math/Vector2.java
Datei anzeigen

@ -57,7 +57,7 @@ public record Vector2(double x, double z) {
* @return the x coordinate
* @deprecated use {@link #x()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public double getX() {
return x;
}
@ -66,7 +66,7 @@ public record Vector2(double x, double z) {
* Get the X coordinate, aligned to the block grid.
*
* @return the block-aligned x coordinate
* @since TODO
* @since 2.11.0
*/
public int blockX() {
return MathMan.roundInt(x);
@ -86,7 +86,7 @@ public record Vector2(double x, double z) {
* Get the Z coordinate, aligned to the block grid.
*
* @return the block-aligned z coordinate
* @since TODO
* @since 2.11.0
*/
public int blockZ() {
return MathMan.roundInt(z);
@ -98,7 +98,7 @@ public record Vector2(double x, double z) {
* @return the z coordinate
* @deprecated use {@link #z()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public double getZ() {
return z;
}

12
worldedit-core/src/main/java/com/sk89q/worldedit/math/Vector3.java
Datei anzeigen

@ -160,7 +160,7 @@ public abstract class Vector3 {
* Get the X coordinate.
*
* @return the x coordinate
* @since TODO
* @since 2.11.0
*/
public abstract double x();
@ -179,7 +179,7 @@ public abstract class Vector3 {
* @return the x coordinate
* @deprecated use {@link #x()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public double getX() {
return this.x();
}
@ -201,7 +201,7 @@ public abstract class Vector3 {
* Get the Y coordinate.
*
* @return the y coordinate
* @since TODO
* @since 2.11.0
*/
public abstract double y();
@ -220,7 +220,7 @@ public abstract class Vector3 {
* @return the y coordinate
* @deprecated use {@link #y()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public double getY() {
return this.y();
}
@ -241,7 +241,7 @@ public abstract class Vector3 {
* Get the Z coordinate.
*
* @return the z coordinate
* @since TODO
* @since 2.11.0
*/
public abstract double z();
@ -260,7 +260,7 @@ public abstract class Vector3 {
* @return the z coordinate
* @deprecated use {@link #z()} instead
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public double getZ() {
return this.z();
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/registry/Keyed.java
Datei anzeigen

@ -33,7 +33,7 @@ public interface Keyed {
* @return an id
* @deprecated Use {@link #id()} instead.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
default String getId() {
return id();
}
@ -43,7 +43,7 @@ public interface Keyed {
* may have additional restrictions.
*
* @return an id
* @since TODO
* @since 2.11.0
*/
@NonAbstractForCompatibility(delegateName = "getId", delegateParams = {})
default String id() {

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/LocatedBlock.java
Datei anzeigen

@ -40,7 +40,7 @@ public record LocatedBlock(BlockVector3 location, BaseBlock block) {
* @return The location
* @deprecated This class is now a record. Use {@link #location()} instead.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BlockVector3 getLocation() {
return this.location;
}
@ -51,7 +51,7 @@ public record LocatedBlock(BlockVector3 location, BaseBlock block) {
* @return The block
* @deprecated This class is now a record. Use {@link #block()} instead.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
public BaseBlock getBlock() {
return this.block;
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeType.java
Datei anzeigen

@ -47,7 +47,7 @@ public class BiomeType implements RegistryItem, Keyed, BiomePattern {
* Gets the ID of this biome.
*
* @return The id
* @since TODO
* @since 2.11.0
*/
@Override
public String id() {
@ -78,7 +78,7 @@ public class BiomeType implements RegistryItem, Keyed, BiomePattern {
* @return The id
* @deprecated use {@link #id()}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
@Override
public String getId() {
return this.id;

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java
Datei anzeigen

@ -45,7 +45,7 @@ public class EntityType implements RegistryItem, Keyed {
* Gets the id of this entity type.
*
* @return the id
* @since TODO
* @since 2.11.0
*/
public String id() {
return this.id;
@ -57,7 +57,7 @@ public class EntityType implements RegistryItem, Keyed {
* @return the id
* @deprecated use {@link #id()}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
@Override
public String getId() {
return this.id;

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidType.java
Datei anzeigen

@ -43,7 +43,7 @@ public class FluidType implements RegistryItem, Keyed {
* Gets the ID of this block.
*
* @return The id
* @since TODO
* @since 2.11.0
*/
public String id() {
return this.id;
@ -55,7 +55,7 @@ public class FluidType implements RegistryItem, Keyed {
* @return The id
* @deprecated use {@link #id()}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
@Override
public String getId() {
return this.id;

8
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/ItemMaterial.java
Datei anzeigen

@ -29,7 +29,7 @@ public interface ItemMaterial {
* @return the maximum quantity
* @deprecated Use {@link #maxStackSize()} instead.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
default int getMaxStackSize() {
return maxStackSize();
}
@ -38,7 +38,7 @@ public interface ItemMaterial {
* Gets the the maximum quantity of this item that can be in a single stack.
*
* @return the maximum quantity
* @since TODO
* @since 2.11.0
*/
@NonAbstractForCompatibility(delegateName = "getMaxStackSize", delegateParams = {})
default int maxStackSize() {
@ -52,7 +52,7 @@ public interface ItemMaterial {
* @return the maximum damage, or 0 if not applicable
* @deprecated Use {@link #maxDamage()} instead.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.0")
default int getMaxDamage() {
return maxDamage();
}
@ -61,7 +61,7 @@ public interface ItemMaterial {
* Gets the the maximum damage this item can take before being broken.
*
* @return the maximum damage, or 0 if not applicable
* @since TODO
* @since 2.11.0
*/
@NonAbstractForCompatibility(delegateName = "getMaxDamage", delegateParams = {})
default int maxDamage() {