mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-05 15:14:43 +02:00
Compare commits
18 Commits
Author | SHA1 | Date | |
---|---|---|---|
447e4c7d58 | |||
4210a3a555 | |||
52823f5024 | |||
1326c257a0 | |||
fc3137cd96 | |||
c46cc73f52 | |||
f11acacedd | |||
d1bac90745 | |||
e98f628d34 | |||
b2ab61559c | |||
dd6eb8e74f | |||
97cdd03ea4 | |||
f5118e6802 | |||
94ca5cf679 | |||
5a55a1f602 | |||
ed33635a15 | |||
888682e5d0 | |||
72bb5f00b0 |
@ -2,7 +2,6 @@ name: Announce release on discord
|
|||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
types: [published]
|
types: [published]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
send_announcement:
|
send_announcement:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -12,7 +11,7 @@ jobs:
|
|||||||
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
|
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
DISCORD_USERNAME: PlotSquared Release
|
DISCORD_USERNAME: PlotSquared Release
|
||||||
DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
|
DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
|
||||||
uses: Ilshidur/action-discord@0.3.2
|
uses: Ilshidur/action-discord@08d9328877d6954120eef2b07abbc79249bb6210 # ratchet:Ilshidur/action-discord@0.3.2
|
||||||
with:
|
with:
|
||||||
args: |
|
args: |
|
||||||
"<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"
|
"<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"
|
||||||
|
8
.github/workflows/build-pr.yml
vendored
8
.github/workflows/build-pr.yml
vendored
@ -1,19 +1,17 @@
|
|||||||
name: Build PR
|
name: Build PR
|
||||||
|
on: [pull_request]
|
||||||
on: [ pull_request ]
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_pr:
|
build_pr:
|
||||||
if: github.repository_owner == 'IntellectualSites'
|
if: github.repository_owner == 'IntellectualSites'
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/wrapper-validation-action@v1
|
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
|
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@ -1,10 +1,8 @@
|
|||||||
name: build
|
name: build
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- v6
|
- v6
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
if: github.repository_owner == 'IntellectualSites'
|
if: github.repository_owner == 'IntellectualSites'
|
||||||
@ -13,7 +11,7 @@ jobs:
|
|||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/wrapper-validation-action@v1
|
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
@ -45,7 +43,7 @@ jobs:
|
|||||||
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
|
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
|
||||||
- name: Publish core javadoc
|
- name: Publish core javadoc
|
||||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
|
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
|
||||||
uses: cpina/github-action-push-to-another-repository@main
|
uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
|
||||||
env:
|
env:
|
||||||
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
|
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
|
||||||
with:
|
with:
|
||||||
@ -57,7 +55,7 @@ jobs:
|
|||||||
target-directory: core
|
target-directory: core
|
||||||
- name: Publish bukkit javadoc
|
- name: Publish bukkit javadoc
|
||||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
|
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
|
||||||
uses: cpina/github-action-push-to-another-repository@main
|
uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
|
||||||
env:
|
env:
|
||||||
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
|
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
|
||||||
with:
|
with:
|
||||||
|
17
.github/workflows/codeql.yml
vendored
17
.github/workflows/codeql.yml
vendored
@ -1,10 +1,8 @@
|
|||||||
name: "CodeQL"
|
name: "CodeQL"
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ v6 ]
|
branches: [v6]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
analyze:
|
analyze:
|
||||||
name: Analyze
|
name: Analyze
|
||||||
@ -13,23 +11,18 @@ jobs:
|
|||||||
actions: read
|
actions: read
|
||||||
contents: read
|
contents: read
|
||||||
security-events: write
|
security-events: write
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
language: [ 'java' ]
|
language: ['java']
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
uses: github/codeql-action/init@v2
|
uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
||||||
with:
|
with:
|
||||||
languages: ${{ matrix.language }}
|
languages: ${{ matrix.language }}
|
||||||
|
|
||||||
- name: Autobuild
|
- name: Autobuild
|
||||||
uses: github/codeql-action/autobuild@v2
|
uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
||||||
|
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@v2
|
uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
||||||
|
6
.github/workflows/release-drafter.yml
vendored
6
.github/workflows/release-drafter.yml
vendored
@ -1,14 +1,12 @@
|
|||||||
name: draft release
|
name: draft release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- v6
|
- v6
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [ opened, reopened, synchronize ]
|
types: [opened, reopened, synchronize]
|
||||||
pull_request_target:
|
pull_request_target:
|
||||||
types: [ opened, reopened, synchronize ]
|
types: [opened, reopened, synchronize]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update_release_draft:
|
update_release_draft:
|
||||||
if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
|
if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
|
||||||
|
@ -71,6 +71,7 @@ import org.bukkit.block.BlockFace;
|
|||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.block.data.type.Dispenser;
|
import org.bukkit.block.data.type.Dispenser;
|
||||||
|
import org.bukkit.block.data.type.Farmland;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.Fireball;
|
import org.bukkit.entity.Fireball;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -709,20 +710,33 @@ public class BlockEventListener implements Listener {
|
|||||||
Block block = event.getBlock();
|
Block block = event.getBlock();
|
||||||
Location location = BukkitUtil.adapt(block.getLocation());
|
Location location = BukkitUtil.adapt(block.getLocation());
|
||||||
PlotArea area = location.getPlotArea();
|
PlotArea area = location.getPlotArea();
|
||||||
|
|
||||||
if (area == null) {
|
if (area == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Plot plot = area.getOwnedPlot(location);
|
Plot plot = area.getOwnedPlot(location);
|
||||||
|
|
||||||
if (plot == null) {
|
if (plot == null) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Material blockType = block.getType();
|
|
||||||
if (blockType == Material.FARMLAND) {
|
if (block.getBlockData() instanceof Farmland farmland && event.getNewState().getBlockData() instanceof Farmland newFarmland) {
|
||||||
if (!plot.getFlag(SoilDryFlag.class)) {
|
int currentMoisture = farmland.getMoisture();
|
||||||
plot.debug("Soil could not dry because soil-dry = false");
|
int newMoisture = newFarmland.getMoisture();
|
||||||
event.setCancelled(true);
|
|
||||||
|
// farmland gets moisturizes
|
||||||
|
if (newMoisture > currentMoisture) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (plot.getFlag(SoilDryFlag.class)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
plot.debug("Soil could not dry because soil-dry = false");
|
||||||
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
|
|||||||
## Enforcement
|
## Enforcement
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||||
reported by contacting the project team at contact@intellectualsites.com. All
|
reported by contacting the project team at contact<at>intellectualsites.com. All
|
||||||
complaints will be reviewed and investigated and will result in a response that
|
complaints will be reviewed and investigated and will result in a response that
|
||||||
is deemed necessary and appropriate to the circumstances. The project team is
|
is deemed necessary and appropriate to the circumstances. The project team is
|
||||||
obligated to maintain confidentiality with regard to the reporter of an incident.
|
obligated to maintain confidentiality with regard to the reporter of an incident.
|
||||||
|
@ -106,7 +106,6 @@ public class Clear extends Command {
|
|||||||
BackupManager.backup(player, plot, () -> {
|
BackupManager.backup(player, plot, () -> {
|
||||||
final long start = System.currentTimeMillis();
|
final long start = System.currentTimeMillis();
|
||||||
boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
|
boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
|
||||||
plot.getPlotModificationManager().unlink();
|
|
||||||
TaskManager.runTask(() -> {
|
TaskManager.runTask(() -> {
|
||||||
plot.removeRunning();
|
plot.removeRunning();
|
||||||
// If the state changes, then mark it as no longer done
|
// If the state changes, then mark it as no longer done
|
||||||
|
@ -50,7 +50,9 @@ public class Config {
|
|||||||
* @param root configuration class
|
* @param root configuration class
|
||||||
* @param <T> value type
|
* @param <T> value type
|
||||||
* @return value
|
* @return value
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public static <T> T get(String key, Class<?> root) {
|
public static <T> T get(String key, Class<?> root) {
|
||||||
String[] split = key.split("\\.");
|
String[] split = key.split("\\.");
|
||||||
@ -445,6 +447,10 @@ public class Config {
|
|||||||
return INSTANCES.values();
|
return INSTANCES.values();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public Collection<String> getSections() {
|
public Collection<String> getSections() {
|
||||||
return INSTANCES.keySet();
|
return INSTANCES.keySet();
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ import com.sk89q.worldedit.entity.Entity;
|
|||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since TODO
|
* @since 6.11.1
|
||||||
*/
|
*/
|
||||||
public abstract class EntityEvent {
|
public abstract class EntityEvent {
|
||||||
|
|
||||||
|
@ -380,6 +380,10 @@ public class HybridUtils {
|
|||||||
run.run();
|
run.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally and poor implementation. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@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) {
|
public int checkModified(QueueCoordinator queue, int x1, int x2, int y1, int y2, int z1, int z2, BlockState[] blocks) {
|
||||||
int count = 0;
|
int count = 0;
|
||||||
for (int y = y1; y <= y2; y++) {
|
for (int y = y1; y <= y2; y++) {
|
||||||
|
@ -79,6 +79,10 @@ public class PlotSettings {
|
|||||||
this.ratings = ratings;
|
this.ratings = ratings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release. Use {@link PlotSettings#setMerged(Direction, boolean)}
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public boolean setMerged(int direction, boolean merged) {
|
public boolean setMerged(int direction, boolean merged) {
|
||||||
if (this.merged[direction] != merged) {
|
if (this.merged[direction] != merged) {
|
||||||
this.merged[direction] = merged;
|
this.merged[direction] = merged;
|
||||||
|
@ -114,7 +114,9 @@ public final class BlockUtil {
|
|||||||
*
|
*
|
||||||
* @param commaDelimited List of block states
|
* @param commaDelimited List of block states
|
||||||
* @return Parsed block states
|
* @return Parsed block states
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static @NonNull BlockState[] parse(final @NonNull String commaDelimited) {
|
public static @NonNull BlockState[] parse(final @NonNull String commaDelimited) {
|
||||||
final String[] split = commaDelimited.split(",(?![^\\(\\[]*[\\]\\)])");
|
final String[] split = commaDelimited.split(",(?![^\\(\\[]*[\\]\\)])");
|
||||||
final BlockState[] result = new BlockState[split.length];
|
final BlockState[] result = new BlockState[split.length];
|
||||||
@ -130,7 +132,9 @@ public final class BlockUtil {
|
|||||||
* @param map Serialized block state
|
* @param map Serialized block state
|
||||||
* @return Deserialized block state, or {@code null} if the map is
|
* @return Deserialized block state, or {@code null} if the map is
|
||||||
* not a properly serialized block state
|
* not a properly serialized block state
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static @Nullable BlockState deserialize(final @NonNull Map<String, Object> map) {
|
public static @Nullable BlockState deserialize(final @NonNull Map<String, Object> map) {
|
||||||
if (map.containsKey("material")) {
|
if (map.containsKey("material")) {
|
||||||
final Object object = map.get("material");
|
final Object object = map.get("material");
|
||||||
|
@ -114,7 +114,9 @@ public class ChunkUtil {
|
|||||||
* @param pos2 Region maximum point
|
* @param pos2 Region maximum point
|
||||||
* @param chunk BlockVector2 of chunk coordinates
|
* @param chunk BlockVector2 of chunk coordinates
|
||||||
* @return {@code true} if the region pos1-pos2 contains the chunk
|
* @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 = "6.11.1")
|
||||||
public static boolean isWholeChunk(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockVector2 chunk) {
|
public static boolean isWholeChunk(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockVector2 chunk) {
|
||||||
int x1 = pos1.getX();
|
int x1 = pos1.getX();
|
||||||
int z1 = pos1.getZ();
|
int z1 = pos1.getZ();
|
||||||
|
@ -70,35 +70,67 @@ public class MathMan {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static long pairInt(int x, int y) {
|
public static long pairInt(int x, int y) {
|
||||||
return (((long) x) << 32) | (y & 0xffffffffL);
|
return (((long) x) << 32) | (y & 0xffffffffL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static int unpairIntX(long pair) {
|
public static int unpairIntX(long pair) {
|
||||||
return (int) (pair >> 32);
|
return (int) (pair >> 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static int unpairIntY(long pair) {
|
public static int unpairIntY(long pair) {
|
||||||
return (int) pair;
|
return (int) pair;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static byte pair16(byte x, byte y) {
|
public static byte pair16(byte x, byte y) {
|
||||||
return (byte) (x + (y << 4));
|
return (byte) (x + (y << 4));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static byte unpair16x(byte value) {
|
public static byte unpair16x(byte value) {
|
||||||
return (byte) (value & 0xF);
|
return (byte) (value & 0xF);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static byte unpair16y(byte value) {
|
public static byte unpair16y(byte value) {
|
||||||
return (byte) ((value >> 4) & 0xF);
|
return (byte) ((value >> 4) & 0xF);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static long inverseRound(double val) {
|
public static long inverseRound(double val) {
|
||||||
long round = Math.round(val);
|
long round = Math.round(val);
|
||||||
return (long) (round + Math.signum(val - round));
|
return (long) (round + Math.signum(val - round));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static int sqrt(int x) {
|
public static int sqrt(int x) {
|
||||||
int xn;
|
int xn;
|
||||||
|
|
||||||
@ -175,6 +207,10 @@ public class MathMan {
|
|||||||
return count / array.length;
|
return count / array.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static double getMean(double[] array) {
|
public static double getMean(double[] array) {
|
||||||
double count = 0;
|
double count = 0;
|
||||||
for (double i : array) {
|
for (double i : array) {
|
||||||
@ -191,10 +227,19 @@ public class MathMan {
|
|||||||
return (a & b) + (a ^ b) / 2;
|
return (a & b) + (a ^ b) / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static short unpairX(int hash) {
|
public static short unpairX(int hash) {
|
||||||
return (short) (hash >> 16);
|
return (short) (hash >> 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static short unpairY(int hash) {
|
public static short unpairY(int hash) {
|
||||||
return (short) (hash & 0xFFFF);
|
return (short) (hash & 0xFFFF);
|
||||||
}
|
}
|
||||||
@ -205,13 +250,19 @@ public class MathMan {
|
|||||||
* @param yaw yaw
|
* @param yaw yaw
|
||||||
* @param pitch pitch
|
* @param pitch pitch
|
||||||
* @return x, y, z unit vector
|
* @return x, y, z unit vector
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static float[] getDirection(float yaw, float pitch) {
|
public static float[] getDirection(float yaw, float pitch) {
|
||||||
double pitch_sin = Math.sin(pitch);
|
double pitch_sin = Math.sin(pitch);
|
||||||
return new float[]{(float) (pitch_sin * Math.cos(yaw)),
|
return new float[]{(float) (pitch_sin * Math.cos(yaw)),
|
||||||
(float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch)};
|
(float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch)};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static int floorMod(int x, int y) {
|
public static int floorMod(int x, int y) {
|
||||||
int i = x % y;
|
int i = x % y;
|
||||||
if (i < 0) {
|
if (i < 0) {
|
||||||
@ -231,12 +282,18 @@ public class MathMan {
|
|||||||
* @param y y
|
* @param y y
|
||||||
* @param z z
|
* @param z z
|
||||||
* @return pitch and yaw of x,y,z from 0,0,0
|
* @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 = "6.11.1")
|
||||||
public static float[] getPitchAndYaw(float x, float y, float z) {
|
public static float[] getPitchAndYaw(float x, float y, float z) {
|
||||||
float distance = sqrtApprox((z * z) + (x * x));
|
float distance = sqrtApprox((z * z) + (x * x));
|
||||||
return new float[]{atan2(y, distance), atan2(x, z)};
|
return new float[]{atan2(y, distance), atan2(x, z)};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static final float atan2(float y, float x) {
|
public static final float atan2(float y, float x) {
|
||||||
float add;
|
float add;
|
||||||
float mul;
|
float mul;
|
||||||
@ -272,15 +329,28 @@ public class MathMan {
|
|||||||
return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
|
return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static float sqrtApprox(float f) {
|
public static float sqrtApprox(float f) {
|
||||||
return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
|
return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static double sqrtApprox(double d) {
|
public static double sqrtApprox(double d) {
|
||||||
return Double
|
return Double
|
||||||
.longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
|
.longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static float invSqrt(float x) {
|
public static float invSqrt(float x) {
|
||||||
float xhalf = 0.5f * x;
|
float xhalf = 0.5f * x;
|
||||||
int i = Float.floatToIntBits(x);
|
int i = Float.floatToIntBits(x);
|
||||||
@ -321,6 +391,10 @@ public class MathMan {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static double getSD(double[] array, double av) {
|
public static double getSD(double[] array, double av) {
|
||||||
double sd = 0;
|
double sd = 0;
|
||||||
for (double element : array) {
|
for (double element : array) {
|
||||||
@ -337,6 +411,10 @@ public class MathMan {
|
|||||||
return Math.sqrt(sd / array.length);
|
return Math.sqrt(sd / array.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static int mod(int x, int y) {
|
public static int mod(int x, int y) {
|
||||||
if (isPowerOfTwo(y)) {
|
if (isPowerOfTwo(y)) {
|
||||||
return x & (y - 1);
|
return x & (y - 1);
|
||||||
@ -344,6 +422,10 @@ public class MathMan {
|
|||||||
return x % y;
|
return x % y;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static int unsignedmod(int x, int y) {
|
public static int unsignedmod(int x, int y) {
|
||||||
if (isPowerOfTwo(y)) {
|
if (isPowerOfTwo(y)) {
|
||||||
return x & (y - 1);
|
return x & (y - 1);
|
||||||
@ -351,6 +433,10 @@ public class MathMan {
|
|||||||
return x % y;
|
return x % y;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean isPowerOfTwo(int number) {
|
public static boolean isPowerOfTwo(int number) {
|
||||||
return (number & (number - 1)) == 0;
|
return (number & (number - 1)) == 0;
|
||||||
}
|
}
|
||||||
|
@ -95,6 +95,10 @@ public class RegionUtil {
|
|||||||
.getY() && y <= max.getY();
|
.getY() && y <= max.getY();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static @NonNull Rectangle2D toRectangle(final @NonNull CuboidRegion region) {
|
public static @NonNull Rectangle2D toRectangle(final @NonNull CuboidRegion region) {
|
||||||
final BlockVector2 min = region.getMinimumPoint().toBlockVector2();
|
final BlockVector2 min = region.getMinimumPoint().toBlockVector2();
|
||||||
final BlockVector2 max = region.getMaximumPoint().toBlockVector2();
|
final BlockVector2 max = region.getMaximumPoint().toBlockVector2();
|
||||||
|
@ -39,6 +39,10 @@ public class StringMan {
|
|||||||
// Stolen from https://stackoverflow.com/a/366532/12620913 | Debug: https://regex101.com/r/DudJLb/1
|
// Stolen from https://stackoverflow.com/a/366532/12620913 | Debug: https://regex101.com/r/DudJLb/1
|
||||||
private static final Pattern STRING_SPLIT_PATTERN = Pattern.compile("[^\\s\"]+|\"([^\"]*)\"");
|
private static final Pattern STRING_SPLIT_PATTERN = Pattern.compile("[^\\s\"]+|\"([^\"]*)\"");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static String replaceFromMap(String string, Map<String, String> replacements) {
|
public static String replaceFromMap(String string, Map<String, String> replacements) {
|
||||||
StringBuilder sb = new StringBuilder(string);
|
StringBuilder sb = new StringBuilder(string);
|
||||||
int size = string.length();
|
int size = string.length();
|
||||||
@ -70,6 +74,10 @@ public class StringMan {
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static String getString(Object obj) {
|
public static String getString(Object obj) {
|
||||||
if (obj == null) {
|
if (obj == null) {
|
||||||
return "null";
|
return "null";
|
||||||
@ -102,6 +110,10 @@ public class StringMan {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static String replaceFirst(char c, String s) {
|
public static String replaceFirst(char c, String s) {
|
||||||
if (s == null) {
|
if (s == null) {
|
||||||
return "";
|
return "";
|
||||||
@ -128,6 +140,10 @@ public class StringMan {
|
|||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static String replaceAll(String string, Object... pairs) {
|
public static String replaceAll(String string, Object... pairs) {
|
||||||
StringBuilder sb = new StringBuilder(string);
|
StringBuilder sb = new StringBuilder(string);
|
||||||
for (int i = 0; i < pairs.length; i += 2) {
|
for (int i = 0; i < pairs.length; i += 2) {
|
||||||
@ -144,6 +160,10 @@ public class StringMan {
|
|||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean isAlphanumeric(String str) {
|
public static boolean isAlphanumeric(String str) {
|
||||||
for (int i = 0; i < str.length(); i++) {
|
for (int i = 0; i < str.length(); i++) {
|
||||||
char c = str.charAt(i);
|
char c = str.charAt(i);
|
||||||
@ -165,6 +185,10 @@ public class StringMan {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean isAlpha(String str) {
|
public static boolean isAlpha(String str) {
|
||||||
for (int i = 0; i < str.length(); i++) {
|
for (int i = 0; i < str.length(); i++) {
|
||||||
char c = str.charAt(i);
|
char c = str.charAt(i);
|
||||||
@ -185,14 +209,26 @@ public class StringMan {
|
|||||||
return join(array, delimiter);
|
return join(array, delimiter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static String join(Collection<?> collection, char delimiter) {
|
public static String join(Collection<?> collection, char delimiter) {
|
||||||
return join(collection.toArray(), delimiter + "");
|
return join(collection.toArray(), delimiter + "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean isAsciiPrintable(char c) {
|
public static boolean isAsciiPrintable(char c) {
|
||||||
return (c >= ' ') && (c < '');
|
return (c >= ' ') && (c < '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean isAsciiPrintable(String s) {
|
public static boolean isAsciiPrintable(String s) {
|
||||||
for (char c : s.toCharArray()) {
|
for (char c : s.toCharArray()) {
|
||||||
if (!isAsciiPrintable(c)) {
|
if (!isAsciiPrintable(c)) {
|
||||||
@ -249,6 +285,10 @@ public class StringMan {
|
|||||||
return result.toString();
|
return result.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static String join(int[] array, String delimiter) {
|
public static String join(int[] array, String delimiter) {
|
||||||
Integer[] wrapped = new Integer[array.length];
|
Integer[] wrapped = new Integer[array.length];
|
||||||
for (int i = 0; i < array.length; i++) {
|
for (int i = 0; i < array.length; i++) {
|
||||||
@ -257,6 +297,10 @@ public class StringMan {
|
|||||||
return join(wrapped, delimiter);
|
return join(wrapped, delimiter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean isEqualToAny(String a, String... args) {
|
public static boolean isEqualToAny(String a, String... args) {
|
||||||
for (String arg : args) {
|
for (String arg : args) {
|
||||||
if (StringMan.isEqual(a, arg)) {
|
if (StringMan.isEqual(a, arg)) {
|
||||||
@ -284,6 +328,10 @@ public class StringMan {
|
|||||||
return a.equals(b);
|
return a.equals(b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean isEqualIgnoreCase(String a, String b) {
|
public static boolean isEqualIgnoreCase(String a, String b) {
|
||||||
return a.equals(b) || ((a != null) && (b != null) && (a.length() == b.length()) && a
|
return a.equals(b) || ((a != null) && (b != null) && (a.length() == b.length()) && a
|
||||||
.equalsIgnoreCase(b));
|
.equalsIgnoreCase(b));
|
||||||
@ -295,6 +343,10 @@ public class StringMan {
|
|||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean contains(String name, char c) {
|
public static boolean contains(String name, char c) {
|
||||||
for (char current : name.toCharArray()) {
|
for (char current : name.toCharArray()) {
|
||||||
if (c == current) {
|
if (c == current) {
|
||||||
@ -304,6 +356,10 @@ public class StringMan {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public <T> Collection<T> match(Collection<T> col, String startsWith) {
|
public <T> Collection<T> match(Collection<T> col, String startsWith) {
|
||||||
if (col == null) {
|
if (col == null) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -58,6 +58,10 @@ public class WEManager {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dy, double dz) {
|
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 x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
|
||||||
int y = Math.toIntExact(Math.round(dy - 0.5));
|
int y = Math.toIntExact(Math.round(dy - 0.5));
|
||||||
@ -70,6 +74,10 @@ public class WEManager {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dz) {
|
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 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));
|
int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
|
||||||
@ -116,10 +124,18 @@ public class WEManager {
|
|||||||
return regions;
|
return regions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean intersects(CuboidRegion region1, CuboidRegion region2) {
|
public static boolean intersects(CuboidRegion region1, CuboidRegion region2) {
|
||||||
return RegionUtil.intersects(region1, region2);
|
return RegionUtil.intersects(region1, region2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Unused internally. Scheduled for removal in next major release.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "6.11.1")
|
||||||
public static boolean regionContains(CuboidRegion selection, HashSet<CuboidRegion> mask) {
|
public static boolean regionContains(CuboidRegion selection, HashSet<CuboidRegion> mask) {
|
||||||
for (CuboidRegion region : mask) {
|
for (CuboidRegion region : mask) {
|
||||||
if (intersects(region, selection)) {
|
if (intersects(region, selection)) {
|
||||||
|
@ -18,7 +18,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
version = "6.11.0"
|
version = "6.11.1"
|
||||||
|
|
||||||
if (!File("$rootDir/.git").exists()) {
|
if (!File("$rootDir/.git").exists()) {
|
||||||
logger.lifecycle("""
|
logger.lifecycle("""
|
||||||
@ -74,7 +74,7 @@ subprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.23"))
|
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.24"))
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@ -155,7 +155,7 @@ subprojects {
|
|||||||
id.set("NotMyFault")
|
id.set("NotMyFault")
|
||||||
name.set("Alexander Brandes")
|
name.set("Alexander Brandes")
|
||||||
organization.set("IntellectualSites")
|
organization.set("IntellectualSites")
|
||||||
email.set("contact@notmyfault.dev")
|
email.set("contact(at)notmyfault.dev")
|
||||||
}
|
}
|
||||||
developer {
|
developer {
|
||||||
id.set("SirYwell")
|
id.set("SirYwell")
|
||||||
|
@ -11,18 +11,18 @@ essentialsx = "2.19.7"
|
|||||||
mvdwapi = "3.1.1"
|
mvdwapi = "3.1.1"
|
||||||
|
|
||||||
# Third party
|
# Third party
|
||||||
prtree = "2.0.0"
|
prtree = "2.0.1"
|
||||||
aopalliance = "1.0"
|
aopalliance = "1.0"
|
||||||
cloud-services = "1.8.0"
|
cloud-services = "1.8.2"
|
||||||
arkitektonika = "2.1.1"
|
arkitektonika = "2.1.2"
|
||||||
squirrelid = "0.3.1"
|
squirrelid = "0.3.1"
|
||||||
http4j = "1.3"
|
http4j = "1.3"
|
||||||
|
|
||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "7.1.2"
|
shadow = "7.1.2"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "6.14.1"
|
spotless = "6.16.0"
|
||||||
nexus = "1.1.0"
|
nexus = "1.2.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
# Platform expectations
|
# Platform expectations
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
"config:base",
|
"config:base",
|
||||||
":semanticCommitsDisabled"
|
":semanticCommitsDisabled"
|
||||||
],
|
],
|
||||||
"labels": ["Renovate"],
|
"labels": ["dependencies"],
|
||||||
"rebaseWhen": "conflicted"
|
"rebaseWhen": "conflicted",
|
||||||
|
"schedule": ["on the first day of the week"]
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user