Compare commits

..

5 Commits

Author SHA1 Message Date
renovate[bot]
62de0b9d2c Update dependency io.github.gradle-nexus.publish-plugin to v1.3.0 2023-03-12 00:02:28 +00:00
Alexander Brandes
e9cab5f1a3 Update bom to 1.25 2023-03-07 17:25:36 +01:00
Alexander Brandes
956deb2144 Update adventure javadoc URL 2023-03-07 00:06:29 +01:00
Alexander Brandes
45b012f38b ÂEnable workflows 2023-03-06 12:08:43 +01:00
Alexander Brandes
f11f5f0dfb v7 is here (#3982)
* 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

* build: Update to Paper 1.18.2 (#3622)

build: Align MM and Adventure version

* Replace legacy color codes in flag examples (#3520)

* chore: Change maven group and artifact ID (#3632)

chore: Change maven group and artifact ID

* v7 is 7.0.0-SNAPSHOT

* build: Update bom

* Chore: General deprecations (#3660)

Address deprecations for removal throughout the plugin

* Address deprecations in queue/generation code (#3658)

* 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

* Ensure use of new generation methods only on 1.19 and above

* refactor: simplify timeout logic in uuid pipeline (#3760)

simplify timeout logic

* Fix compile errors

* Revert GAV changes

* Update javadoc links

* Start deployment of v7 snapshots

* Temporarily create javadocs for v7 snapshots

* Temporarily create javadocs for v7 snapshots

* Fixes #3919

* Fix relocation of informative annotations

* Drop HTTP4J (#3916)

* Fixes #3906 by fine-graining the help menu generation localization support

* Clean up merge

* *Actually clean up

* 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>

* Resolved conflicts

* Cleanup deprecated methods

* Revert "Cleanup deprecated methods"

This reverts commit 26692d6633.

* Record-inize methods (#3976)

* Delete unused HyperverseWorldManager file

* Migrate left over occurrences to enhanced switches (#3979)

* Migrate left-overs to enhanced switches

* More

* Cleanup deprecated methods (#3980)

* Perform code formatting according to editorconfig (#3981)

* Perform code reformatting

* Fix javadoc errors

* Don't format JSON files

---------

Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
2023-03-06 12:04:39 +01:00
3 changed files with 3 additions and 41 deletions

View File

@@ -185,35 +185,6 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
world.setWaterAnimalSpawnLimit(limit); 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 @Override
public void generateSurface( public void generateSurface(
@NotNull final WorldInfo worldInfo, @NotNull final WorldInfo worldInfo,
@@ -277,11 +248,6 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
return super.getBaseHeight(worldInfo, random, x, z, heightMap); 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 @SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
@Override @Override
@Deprecated(since = "TODO") @Deprecated(since = "TODO")
@@ -292,8 +258,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
if (this.platformGenerator != this) { if (this.platformGenerator != this) {
return this.platformGenerator.generateChunkData(world, random, x, z, biome); return this.platformGenerator.generateChunkData(world, random, x, z, biome);
} else { } else {
// Throw exception to be caught by the server that indicates the new generation API is being used. // Return super as it will throw an exception caught by the server that will mean this method is no longer used.
throw new UnsupportedOperationException("Using new generation methods. This method is unsupported."); return super.generateChunkData(world, random, x, z, biome);
} }
} }

View File

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

View File

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