Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-06-25 10:15:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Release 6.11.1

Browse Source
This commit is contained in:
Alexander Brandes 2023-03-06 10:40:17 +01:00
parent 4210a3a555
commit 447e4c7d58
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
11 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/plotsquared/core/configuration/Config.java
View File

@ -52,7 +52,7 @@ public class Config {
* @return value
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
@SuppressWarnings("unchecked")
public static <T> T get(String key, Class<?> root) {
String[] split = key.split("\\.");
@ -450,7 +450,7 @@ public class Config {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public Collection<String> getSections() {
return INSTANCES.keySet();
}

2
Core/src/main/java/com/plotsquared/core/events/EntityEvent.java
View File

@ -22,7 +22,7 @@ import com.sk89q.worldedit.entity.Entity;
import org.checkerframework.checker.nullness.qual.NonNull;
/**
* @since TODO
* @since 6.11.1
*/
public abstract class EntityEvent {

2
Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
View File

@ -383,7 +383,7 @@ public class HybridUtils {
/**
* @deprecated Unused internally and poor implementation. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public int checkModified(QueueCoordinator queue, int x1, int x2, int y1, int y2, int z1, int z2, BlockState[] blocks) {
int count = 0;
for (int y = y1; y <= y2; y++) {

2
Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java
View File

@ -82,7 +82,7 @@ public class PlotSettings {
/**
* @deprecated Unused internally. Scheduled for removal in next major release. Use {@link PlotSettings#setMerged(Direction, boolean)}
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public boolean setMerged(int direction, boolean merged) {
if (this.merged[direction] != merged) {
this.merged[direction] = merged;

4
Core/src/main/java/com/plotsquared/core/util/BlockUtil.java
View File

@ -116,7 +116,7 @@ public final class BlockUtil {
* @return Parsed block states
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static @NonNull BlockState[] parse(final @NonNull String commaDelimited) {
final String[] split = commaDelimited.split(",(?![^\\(\\[]*[\\]\\)])");
final BlockState[] result = new BlockState[split.length];
@ -134,7 +134,7 @@ public final class BlockUtil {
* not a properly serialized block state
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static @Nullable BlockState deserialize(final @NonNull Map<String, Object> map) {
if (map.containsKey("material")) {
final Object object = map.get("material");

2
Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
View File

@ -116,7 +116,7 @@ public class ChunkUtil {
* @return {@code true} if the region pos1-pos2 contains the chunk
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isWholeChunk(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockVector2 chunk) {
int x1 = pos1.getX();
int z1 = pos1.getZ();

44
Core/src/main/java/com/plotsquared/core/util/MathMan.java
View File

@ -73,7 +73,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static long pairInt(int x, int y) {
return (((long) x) << 32) | (y & 0xffffffffL);
}
@ -81,7 +81,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static int unpairIntX(long pair) {
return (int) (pair >> 32);
}
@ -89,7 +89,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static int unpairIntY(long pair) {
return (int) pair;
}
@ -97,7 +97,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static byte pair16(byte x, byte y) {
return (byte) (x + (y << 4));
}
@ -105,7 +105,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static byte unpair16x(byte value) {
return (byte) (value & 0xF);
}
@ -113,7 +113,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static byte unpair16y(byte value) {
return (byte) ((value >> 4) & 0xF);
}
@ -121,7 +121,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static long inverseRound(double val) {
long round = Math.round(val);
return (long) (round + Math.signum(val - round));
@ -130,7 +130,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static int sqrt(int x) {
int xn;
@ -210,7 +210,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static double getMean(double[] array) {
double count = 0;
for (double i : array) {
@ -231,7 +231,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static short unpairX(int hash) {
return (short) (hash >> 16);
}
@ -239,7 +239,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static short unpairY(int hash) {
return (short) (hash & 0xFFFF);
}
@ -252,7 +252,7 @@ public class MathMan {
* @return x, y, z unit vector
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static float[] getDirection(float yaw, float pitch) {
double pitch_sin = Math.sin(pitch);
return new float[]{(float) (pitch_sin * Math.cos(yaw)),
@ -262,7 +262,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static int floorMod(int x, int y) {
int i = x % y;
if (i < 0) {
@ -284,7 +284,7 @@ public class MathMan {
* @return pitch and yaw of x,y,z from 0,0,0
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static float[] getPitchAndYaw(float x, float y, float z) {
float distance = sqrtApprox((z * z) + (x * x));
return new float[]{atan2(y, distance), atan2(x, z)};
@ -293,7 +293,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static final float atan2(float y, float x) {
float add;
float mul;
@ -332,7 +332,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static float sqrtApprox(float f) {
return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
}
@ -341,7 +341,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static double sqrtApprox(double d) {
return Double
.longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
@ -350,7 +350,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static float invSqrt(float x) {
float xhalf = 0.5f * x;
int i = Float.floatToIntBits(x);
@ -394,7 +394,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static double getSD(double[] array, double av) {
double sd = 0;
for (double element : array) {
@ -414,7 +414,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static int mod(int x, int y) {
if (isPowerOfTwo(y)) {
return x & (y - 1);
@ -425,7 +425,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static int unsignedmod(int x, int y) {
if (isPowerOfTwo(y)) {
return x & (y - 1);
@ -436,7 +436,7 @@ public class MathMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isPowerOfTwo(int number) {
return (number & (number - 1)) == 0;
}

2
Core/src/main/java/com/plotsquared/core/util/RegionUtil.java
View File

@ -98,7 +98,7 @@ public class RegionUtil {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static @NonNull Rectangle2D toRectangle(final @NonNull CuboidRegion region) {
final BlockVector2 min = region.getMinimumPoint().toBlockVector2();
final BlockVector2 max = region.getMaximumPoint().toBlockVector2();

28
Core/src/main/java/com/plotsquared/core/util/StringMan.java
View File

@ -42,7 +42,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static String replaceFromMap(String string, Map<String, String> replacements) {
StringBuilder sb = new StringBuilder(string);
int size = string.length();
@ -77,7 +77,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static String getString(Object obj) {
if (obj == null) {
return "null";
@ -113,7 +113,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static String replaceFirst(char c, String s) {
if (s == null) {
return "";
@ -143,7 +143,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static String replaceAll(String string, Object... pairs) {
StringBuilder sb = new StringBuilder(string);
for (int i = 0; i < pairs.length; i += 2) {
@ -163,7 +163,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isAlphanumeric(String str) {
for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
@ -188,7 +188,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isAlpha(String str) {
for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
@ -212,7 +212,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static String join(Collection<?> collection, char delimiter) {
return join(collection.toArray(), delimiter + "");
}
@ -220,7 +220,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isAsciiPrintable(char c) {
return (c >= ' ') && (c < '');
}
@ -228,7 +228,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isAsciiPrintable(String s) {
for (char c : s.toCharArray()) {
if (!isAsciiPrintable(c)) {
@ -288,7 +288,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static String join(int[] array, String delimiter) {
Integer[] wrapped = new Integer[array.length];
for (int i = 0; i < array.length; i++) {
@ -300,7 +300,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isEqualToAny(String a, String... args) {
for (String arg : args) {
if (StringMan.isEqual(a, arg)) {
@ -331,7 +331,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean isEqualIgnoreCase(String a, String b) {
return a.equals(b) || ((a != null) && (b != null) && (a.length() == b.length()) && a
.equalsIgnoreCase(b));
@ -346,7 +346,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean contains(String name, char c) {
for (char current : name.toCharArray()) {
if (c == current) {
@ -359,7 +359,7 @@ public class StringMan {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public <T> Collection<T> match(Collection<T> col, String startsWith) {
if (col == null) {
return null;

8
Core/src/main/java/com/plotsquared/core/util/WEManager.java
View File

@ -61,7 +61,7 @@ public class WEManager {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dy, double dz) {
int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
int y = Math.toIntExact(Math.round(dy - 0.5));
@ -77,7 +77,7 @@ public class WEManager {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dz) {
int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
@ -127,7 +127,7 @@ public class WEManager {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean intersects(CuboidRegion region1, CuboidRegion region2) {
return RegionUtil.intersects(region1, region2);
}
@ -135,7 +135,7 @@ public class WEManager {
/**
* @deprecated Unused internally. Scheduled for removal in next major release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.1")
public static boolean regionContains(CuboidRegion selection, HashSet<CuboidRegion> mask) {
for (CuboidRegion region : mask) {
if (intersects(region, selection)) {

2
build.gradle.kts
View File

@ -18,7 +18,7 @@ plugins {
}
group = "com.plotsquared"
version = "6.11.1-SNAPSHOT"
version = "6.11.1"
if (!File("$rootDir/.git").exists()) {
logger.lifecycle("""