Compare commits

..

65 Commits

Author SHA1 Message Date
dordsor21
f241b4acfe fix: account for false permissions when checking range
- Fixes #3905
2023-03-17 18:46:49 +00:00
dordsor21
745b06a008 fix: fix generation by re-adding important method 2023-03-16 17:42:48 +00:00
renovate[bot]
77b2bd166a Update dependency io.github.gradle-nexus.publish-plugin to v1.3.0 (#3987)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-03-15 09:43:41 +00:00
Alexander Brandes
8e02336c44 Reapply stash 2023-03-15 10:30:38 +01:00
Alexander Brandes
3adfbde45a Don't format JSON files 2023-03-06 11:49:18 +01:00
Alexander Brandes
e6db8e2750 Perform code formatting according to editorconfig (#3981)
* Perform code reformatting

* Fix javadoc errors
2023-03-06 11:38:30 +01:00
Alexander Brandes
9cd0ee9b49 Cleanup deprecated methods (#3980) 2023-03-06 11:21:14 +01:00
Alexander Brandes
d455d1fcd7 Merge branch 'v6' into v7 2023-03-06 10:48:51 +01:00
Alexander Brandes
89031447f2 Migrate left over occurrences to enhanced switches (#3979)
* Migrate left-overs to enhanced switches

* More
2023-03-06 10:25:02 +01:00
Alexander Brandes
42e146b8c7 Delete unused HyperverseWorldManager file 2023-03-05 20:53:00 +01:00
Alexander Brandes
a5fdcda673 Merge branch 'v6' into v7 2023-03-05 10:18:55 +01:00
Alexander Brandes
a5c53a96d1 Record-inize methods (#3976) 2023-03-05 10:07:36 +01:00
Alexander Brandes
276e619caa Merge branch 'v6' into v7 2023-03-04 11:19:48 +01:00
Alexander Brandes
f636a5ec63 Merge branch 'v6' into v7 2023-03-02 20:48:43 +01:00
Alexander Brandes
785362c576 Merge branch 'v6' into v7 2023-03-02 12:34:18 +01:00
Alexander Brandes
1e7ba7d173 Merge branch 'v6' into v7 2023-02-12 19:06:11 +01:00
Alexander Brandes
aa784e98f8 Merge branch 'v6' into v7 2023-02-10 16:44:57 +01:00
Alexander Brandes
586474c8e6 Merge branch 'v6' into v7 2023-01-23 13:40:52 +01:00
Alexander Brandes
70b6636f50 Revert "Cleanup deprecated methods"
This reverts commit 26692d6633.
2023-01-23 13:40:47 +01:00
Alexander Brandes
bd62d1a1c7 Merge branch 'v6' into v7 2023-01-23 13:28:12 +01:00
Alexander Brandes
26692d6633 Cleanup deprecated methods 2023-01-23 13:27:08 +01:00
Alexander Brandes
bb0f200429 Merge branch 'v6' into v7 2023-01-23 13:18:28 +01:00
Alexander Brandes
bed62edc02 Resolved conflicts 2023-01-23 13:03:26 +01:00
Alexander Brandes
ee0f389c78 Merge branch 'v6' into v7 2023-01-23 13:01:48 +01:00
Jordan
5af8be4293 chore: Remove things marked as for removal (#3941)
* chore: Remove things marked as for removal

* Address feedback

Co-authored-by: Alexander Brandes <mc.cache@web.de>
2023-01-21 16:44:28 +01:00
Alexander Brandes
cbacdd67eb Merge branch 'v6' into v7 2023-01-21 16:39:14 +01:00
dordsor21
746028afbc *Actually clean up 2023-01-17 13:25:46 +00:00
dordsor21
b79537ebbc Clean up merge 2023-01-17 12:59:16 +00:00
dordsor21
6efd581500 Merge branch 'v6' into v7
# Conflicts:
#	.github/workflows/codeql.yml
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Add.java
#	Core/src/main/java/com/plotsquared/core/command/Caps.java
#	Core/src/main/java/com/plotsquared/core/command/Cluster.java
#	Core/src/main/java/com/plotsquared/core/command/Continue.java
#	Core/src/main/java/com/plotsquared/core/command/Copy.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/command/Visit.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	build.gradle.kts
2023-01-17 11:51:39 +00:00
Alexander Brandes
1448d8d4af Fixes #3906 by fine-graining the help menu generation localization support 2023-01-14 00:42:46 +01:00
Alexander Brandes
8d9a387587 Merge branch 'v6' into v7 2023-01-14 00:31:05 +01:00
Alexander Brandes
0707aa47c9 Merge branch 'v6' into v7 2023-01-11 22:12:31 +01:00
Alexander Brandes
8c57d616cf Drop HTTP4J (#3916) 2023-01-11 18:18:49 +01:00
Alexander Brandes
66660507e0 Fix relocation of informative annotations 2023-01-11 08:48:12 +01:00
Alexander Brandes
a12490c3eb Fixes #3919 2023-01-09 23:50:13 +01:00
Alexander Brandes
36e5f36660 Merge branch 'v6' into v7 2023-01-09 11:50:56 +01:00
Alexander Brandes
350eae7813 Temporarily create javadocs for v7 snapshots 2023-01-09 11:35:11 +01:00
Alexander Brandes
12dc198a86 Temporarily create javadocs for v7 snapshots 2023-01-09 11:33:49 +01:00
Alexander Brandes
fb2533d66a Start deployment of v7 snapshots 2023-01-09 10:42:08 +01:00
Alexander Brandes
37d6dcc7ea Update javadoc links 2023-01-09 10:21:55 +01:00
Alexander Brandes
530fcc0fea Revert GAV changes 2023-01-08 16:36:57 +01:00
Alexander Brandes
7135bdd6aa Fix compile errors 2023-01-08 10:36:41 +01:00
Alexander Brandes
3198c3b081 Merge branch 'v6' into v7 2023-01-08 10:20:15 +01:00
Hannes Greule
7669e79da1 refactor: simplify timeout logic in uuid pipeline (#3760)
simplify timeout logic
2022-08-06 16:32:11 +02:00
dordsor21
c0bfa297bb Ensure use of new generation methods only on 1.19 and above 2022-06-27 17:40:46 +01:00
Jordan
75fd9b2631 Update to new Spigot generation API (#3659)
* Address deprecations in queue/generation code

* Move to new generation API
 - Currently not working due to lack of biome-setting capability via BiomeProvider for flat worlds

* Any fixes to flat world biome setting will target 1.19

* Ensure compiled is actually set to true in BlockBucket

* Delegate to platformGenerator in deprecated generation method if applicable when using new generation methods (1.19)

* Re-add wrongly removed method

* Handle exceptions using logger

* We can simplify getting relative offset using floormod

* Replace many booleans with EnumSet

* Address comments, remove needless boolean return for populateChunk
2022-06-22 14:57:39 +02:00
Alexander Brandes
6b680fb2c0 Merge v6/v7 2022-06-21 11:00:53 +02:00
Jordan
27ffe4fcdc Address deprecations in queue/generation code (#3658) 2022-06-16 15:41:03 +01:00
dordsor21
8afcaccb8a Merge branch 'v6' into v7 2022-06-16 15:26:03 +01:00
dordsor21
c83b13e374 Merge branch 'v6' into v7
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/command/Chat.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegExUtil.java
#	build.gradle.kts
#	gradle/libs.versions.toml
2022-06-16 15:25:33 +01:00
Jordan
23360057b9 Chore: General deprecations (#3660)
Address deprecations for removal throughout the plugin
2022-06-13 23:45:27 +02:00
Alexander Brandes
60f7113105 build: Update bom 2022-06-11 14:53:39 +02:00
Alexander Brandes
26c0c1b7cd Merge branch 'v6' into v7 2022-06-11 14:11:25 +02:00
Alexander Brandes
764c94c9cc Merge branch 'v6' into v7 2022-06-10 01:14:09 +02:00
dordsor21
3d87ee41b3 v7 is 7.0.0-SNAPSHOT 2022-06-08 14:42:14 +01:00
NotMyFault
fd8832ac98 Merge branch 'v6' into v7 2022-06-01 20:13:07 +02:00
Alexander Brandes
228acc196c Merge branch 'v7' of https://github.com/IntellectualSites/PlotSquared into v7 2022-05-29 22:05:37 +02:00
Alexander Brandes
62197f3deb Merge branch 'v6' into v7 2022-05-29 22:05:17 +02:00
Alexander Brandes
daa9348993 chore: Change maven group and artifact ID (#3632)
chore: Change maven group and artifact ID
2022-05-21 11:58:30 +02:00
Alexander Brandes
7e4499e092 Merge branch 'v7' of https://github.com/IntellectualSites/PlotSquared into v7 2022-05-18 22:14:35 +02:00
Alexander Brandes
396a1575d2 Merge branch 'v6' into v7 2022-05-18 22:13:29 +02:00
Hannes Greule
953d57d1b5 Replace legacy color codes in flag examples (#3520) 2022-05-16 13:28:03 +01:00
Alexander Brandes
b53d2d03a4 Merge branch 'v6' into v7 2022-05-15 15:41:17 +02:00
Alexander Brandes
c1431c0971 build: Update to Paper 1.18.2 (#3622)
build: Align MM and Adventure version
2022-05-15 12:31:40 +02:00
Pierre Maurice Schwang
62ee60a76c Update MiniMessage to 4.10.1 (#3617)
* chore!: bump MiniMessage to 4.10.1

BREAKING CHANGE: bumping MiniMessage and Adventure removes the adventure Template class and breaks the whole messaging system api wise

* chore: fix minimessage messages, fix circular method reference
2022-05-14 17:05:28 +02:00
3 changed files with 41 additions and 3 deletions

View File

@@ -185,6 +185,35 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
world.setWaterAnimalSpawnLimit(limit);
}
@Override
public void generateNoise(
@NotNull final WorldInfo worldInfo,
@NotNull final Random random,
final int chunkX,
final int chunkZ,
@NotNull final ChunkData chunkData
) {
if (this.platformGenerator != this) {
this.platformGenerator.generateNoise(worldInfo, random, chunkX, chunkZ, chunkData);
return;
}
int minY = chunkData.getMinHeight();
int maxY = chunkData.getMaxHeight();
GenChunk result = new GenChunk(minY, maxY);
// Set the chunk location
result.setChunk(new ChunkWrapper(worldInfo.getName(), chunkX, chunkZ));
// Set the result data
result.setChunkData(chunkData);
result.result = null;
// Catch any exceptions (as exceptions usually thrown)
try {
generate(BlockVector2.at(chunkX, chunkZ), worldInfo.getName(), result, false);
} catch (Throwable e) {
LOGGER.error("Error attempting to generate chunk.", e);
}
}
@Override
public void generateSurface(
@NotNull final WorldInfo worldInfo,
@@ -248,6 +277,11 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
return super.getBaseHeight(worldInfo, random, x, z, heightMap);
}
/**
* The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
* The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
* release.
*/
@SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
@Override
@Deprecated(since = "TODO")
@@ -258,8 +292,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
if (this.platformGenerator != this) {
return this.platformGenerator.generateChunkData(world, random, x, z, biome);
} else {
// Return super as it will throw an exception caught by the server that will mean this method is no longer used.
return super.generateChunkData(world, random, x, z, biome);
// Throw exception to be caught by the server that indicates the new generation API is being used.
throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
}
}

View File

@@ -176,6 +176,10 @@ public class BukkitPlayer extends PlotPlayer<Player> {
final Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
if (!effective.isEmpty()) {
for (PermissionAttachmentInfo attach : effective) {
// Ignore all "false" permissions
if (!attach.getValue()) {
continue;
}
String permStr = attach.getPermission();
if (permStr.startsWith(stubPlus)) {
hasAny = true;

View File

@@ -74,7 +74,7 @@ subprojects {
}
dependencies {
implementation(platform("com.intellectualsites.bom:bom-newest:1.25"))
implementation(platform("com.intellectualsites.bom:bom-newest:1.24"))
}
dependencies {