diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e1e3521128..095eca217c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -52,7 +52,7 @@ dependencies { implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.1.14") implementation("org.spongepowered:spongegradle-plugin-development:2.2.0") implementation("org.spongepowered:vanillagradle:0.2.1-20231105.223944-69") - implementation("net.minecraftforge.gradle:ForgeGradle:6.0.20") + implementation("net.minecraftforge.gradle:ForgeGradle:6.0.21") implementation("net.fabricmc:fabric-loom:$loomVersion") implementation("net.fabricmc:sponge-mixin:$mixinVersion") implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0") diff --git a/buildSrc/src/main/kotlin/CommonJavaConfig.kt b/buildSrc/src/main/kotlin/CommonJavaConfig.kt index 1c424dfb87..c71ec265f6 100644 --- a/buildSrc/src/main/kotlin/CommonJavaConfig.kt +++ b/buildSrc/src/main/kotlin/CommonJavaConfig.kt @@ -22,13 +22,14 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, javaRelease: Int = .matching { it.name == "compileJava" || it.name == "compileTestJava" } .configureEach { val disabledLint = listOf( - "processing", "path", "fallthrough", "serial" + "processing", "path", "fallthrough", "serial", "overloads", ) options.release.set(javaRelease) options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" }) options.isDeprecation = true options.encoding = "UTF-8" options.compilerArgs.add("-parameters") + options.compilerArgs.add("-Werror") } configure { @@ -53,7 +54,9 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, javaRelease: Int = tasks.withType().configureEach { options.encoding = "UTF-8" (options as StandardJavadocDocletOptions).apply { - addStringOption("Xdoclint:none", "-quiet") + addBooleanOption("Werror", true) + addBooleanOption("Xdoclint:all", true) + addBooleanOption("Xdoclint:-missing", true) tags( "apiNote:a:API Note:", "implSpec:a:Implementation Requirements:", diff --git a/buildSrc/src/main/kotlin/LibsConfig.kt b/buildSrc/src/main/kotlin/LibsConfig.kt index be97b63496..9c112d3a47 100644 --- a/buildSrc/src/main/kotlin/LibsConfig.kt +++ b/buildSrc/src/main/kotlin/LibsConfig.kt @@ -52,6 +52,7 @@ fun Project.applyLibrariesConfiguration() { exclude(dependency("com.google.guava:guava")) exclude(dependency("com.google.code.gson:gson")) exclude(dependency("com.google.errorprone:error_prone_annotations")) + exclude(dependency("com.google.guava:failureaccess")) exclude(dependency("org.checkerframework:checker-qual")) exclude(dependency("org.jetbrains:annotations")) exclude(dependency("org.apache.logging.log4j:log4j-api")) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1c51b6f38b..4498454ae2 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -3,13 +3,13 @@ import org.gradle.api.Project object Versions { const val TEXT = "3.0.4" const val TEXT_EXTRAS = "3.0.6" - const val PISTON = "0.5.8" - const val AUTO_VALUE = "1.9" - const val JUNIT = "5.8.1" - const val MOCKITO = "4.3.1" - const val FAST_UTIL = "8.5.9" - const val GUAVA = "31.1-jre" - const val GSON = "2.10" + const val PISTON = "0.5.10" + const val AUTO_VALUE = "1.10.4" + const val JUNIT = "5.10.2" + const val MOCKITO = "5.11.0" + const val FAST_UTIL = "8.5.12" + const val GUAVA = "32.1.3-jre" + const val GSON = "2.10.1" const val LOG4J = "2.19.0" const val LIN_BUS = "0.1.0-SNAPSHOT" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49177..e6441136f3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e0930b..b82aa23a4f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85bee..7101f8e467 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/verification/build.gradle.kts b/verification/build.gradle.kts index 818a012fd3..98aea05f62 100644 --- a/verification/build.gradle.kts +++ b/verification/build.gradle.kts @@ -44,7 +44,8 @@ tasks.check { // Pull the version before our current version. val baseVersion = "(,${rootProject.version.toString().substringBefore("-SNAPSHOT")}[" for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "forge", "sponge")) { - val capitalizedFragment = projectFragment.capitalize(Locale.ROOT) + val capitalizedFragment = + projectFragment.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() } val proj = project(":worldedit-$projectFragment") evaluationDependsOn(proj.path) diff --git a/verification/src/changes/accepted-bukkit-public-api-changes.json b/verification/src/changes/accepted-bukkit-public-api-changes.json index b8efb6870e..40636d7bf1 100644 --- a/verification/src/changes/accepted-bukkit-public-api-changes.json +++ b/verification/src/changes/accepted-bukkit-public-api-changes.json @@ -1,11 +1,25 @@ { - "Removal of override method that exists in superclass": [ - { - "type": "com.sk89q.worldedit.bukkit.BukkitWorld", - "member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.fullySupports3DBiomes()", - "changes": [ - "METHOD_REMOVED" - ] - } - ] -} \ No newline at end of file + "Incorrect removal detection due to problems with classpath": [ + { + "type": "com.sk89q.worldedit.bukkit.BukkitWorld", + "member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.fullySupports3DBiomes()", + "changes": [ + "METHOD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.bukkit.BukkitServerInterface", + "member": "Method com.sk89q.worldedit.bukkit.BukkitServerInterface.getId()", + "changes": [ + "METHOD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.bukkit.BukkitWorld", + "member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.getId()", + "changes": [ + "METHOD_REMOVED" + ] + } + ] +} diff --git a/verification/src/changes/accepted-cli-public-api-changes.json b/verification/src/changes/accepted-cli-public-api-changes.json index 7a73a41bfd..6334378e95 100644 --- a/verification/src/changes/accepted-cli-public-api-changes.json +++ b/verification/src/changes/accepted-cli-public-api-changes.json @@ -1,2 +1,11 @@ { -} \ No newline at end of file + "Incorrect removal detection due to problems with classpath": [ + { + "type": "com.sk89q.worldedit.cli.schematic.ClipboardWorld", + "member": "Method com.sk89q.worldedit.cli.schematic.ClipboardWorld.getId()", + "changes": [ + "METHOD_REMOVED" + ] + } + ] +} diff --git a/verification/src/changes/accepted-core-public-api-changes.json b/verification/src/changes/accepted-core-public-api-changes.json index 1e4f65b51f..8f5725fbfe 100644 --- a/verification/src/changes/accepted-core-public-api-changes.json +++ b/verification/src/changes/accepted-core-public-api-changes.json @@ -1,377 +1,32 @@ { - "Nothing should be implementing a conflicting method": [ + "Removing useless Authorizer classes": [ { - "type": "com.sk89q.worldedit.extent.clipboard.Clipboard", - "member": "Method com.sk89q.worldedit.extent.clipboard.Clipboard.transform(com.sk89q.worldedit.math.transform.Transform)", + "type": "com.sk89q.worldedit.util.auth.Authorizer", + "member": "Class com.sk89q.worldedit.util.auth.Authorizer", "changes": [ - "METHOD_NEW_DEFAULT" + "CLASS_REMOVED" ] }, { - "type": "com.sk89q.worldedit.function.mask.Mask", - "member": "Method com.sk89q.worldedit.function.mask.Mask.toMask2D()", + "type": "com.sk89q.worldedit.util.auth.Authorizer", + "member": "Method com.sk89q.worldedit.util.auth.Authorizer.testPermission(com.sk89q.minecraft.util.commands.CommandLocals,java.lang.String)", "changes": [ - "METHOD_ABSTRACT_NOW_DEFAULT" + "METHOD_REMOVED" ] }, { - "type": "com.sk89q.worldedit.util.paste.Paster", - "member": "Method com.sk89q.worldedit.util.paste.Paster.paste(java.lang.String)", + "type": "com.sk89q.worldedit.util.auth.NullAuthorizer", + "member": "Class com.sk89q.worldedit.util.auth.NullAuthorizer", "changes": [ - "METHOD_ABSTRACT_NOW_DEFAULT" + "CLASS_REMOVED" ] }, { - "type": "com.sk89q.worldedit.world.block.BlockStateHolder", - "member": "Method com.sk89q.worldedit.world.block.BlockStateHolder.toBaseBlock(com.sk89q.jnbt.CompoundTag)", - "changes": [ - "METHOD_ABSTRACT_NOW_DEFAULT", - "ANNOTATION_DEPRECATED_ADDED" - ] - }, - { - "type": "com.sk89q.worldedit.world.block.BlockStateHolder", - "member": "Method com.sk89q.worldedit.world.block.BlockStateHolder.toBaseBlock(com.sk89q.worldedit.util.concurrency.LazyReference)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.block.BlockStateHolder", - "member": "Method com.sk89q.worldedit.world.block.BlockStateHolder.toBaseBlock(com.sk89q.worldedit.util.nbt.CompoundBinaryTag)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.getNbt()", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.getNbtData()", - "changes": [ - "METHOD_ABSTRACT_NOW_DEFAULT", - "ANNOTATION_DEPRECATED_ADDED" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.getNbtReference()", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.hasNbtData()", - "changes": [ - "METHOD_ABSTRACT_NOW_DEFAULT", - "ANNOTATION_DEPRECATED_ADDED" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.setNbt(com.sk89q.worldedit.util.nbt.CompoundBinaryTag)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.setNbtData(com.sk89q.jnbt.CompoundTag)", - "changes": [ - "METHOD_ABSTRACT_NOW_DEFAULT", - "ANNOTATION_DEPRECATED_ADDED" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.setNbtReference(com.sk89q.worldedit.util.concurrency.LazyReference)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.extent.clipboard.io.legacycompat.EntityNBTCompatibilityHandler", - "member": "Method com.sk89q.worldedit.extent.clipboard.io.legacycompat.EntityNBTCompatibilityHandler.updateNbt(com.sk89q.worldedit.world.entity.EntityType,org.enginehub.linbus.tree.LinCompoundTag)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.extent.clipboard.io.legacycompat.NBTCompatibilityHandler", - "member": "Method com.sk89q.worldedit.extent.clipboard.io.legacycompat.NBTCompatibilityHandler.updateNbt(com.sk89q.worldedit.world.block.BaseBlock)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.block.BlockStateHolder", - "member": "Method com.sk89q.worldedit.world.block.BlockStateHolder.toBaseBlock(org.enginehub.linbus.tree.LinCompoundTag)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.NbtValued", - "member": "Method com.sk89q.worldedit.world.NbtValued.setNbt(org.enginehub.linbus.tree.LinCompoundTag)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.World", - "member": "Method com.sk89q.worldedit.world.World.generateFeature(com.sk89q.worldedit.world.generation.ConfiguredFeatureType,com.sk89q.worldedit.EditSession,com.sk89q.worldedit.math.BlockVector3)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.World", - "member": "Method com.sk89q.worldedit.world.World.generateStructure(com.sk89q.worldedit.world.generation.StructureType,com.sk89q.worldedit.EditSession,com.sk89q.worldedit.math.BlockVector3)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.registry.Keyed", - "member": "Method com.sk89q.worldedit.registry.Keyed.id()", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.registry.ItemMaterial", - "member": "Method com.sk89q.worldedit.world.registry.ItemMaterial.maxDamage()", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - }, - { - "type": "com.sk89q.worldedit.world.registry.ItemMaterial", - "member": "Method com.sk89q.worldedit.world.registry.ItemMaterial.maxStackSize()", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - } - ], - "LazyReference was never publicly extensible": [ - { - "type": "com.sk89q.worldedit.util.concurrency.LazyReference", - "member": "Class com.sk89q.worldedit.util.concurrency.LazyReference", - "changes": [ - "CLASS_NOW_FINAL" - ] - } - ], - "Extending Tag never made sense": [ - { - "type": "com.sk89q.jnbt.Tag", - "member": "Constructor com.sk89q.jnbt.Tag()", + "type": "com.sk89q.worldedit.util.auth.NullAuthorizer", + "member": "Constructor com.sk89q.worldedit.util.auth.NullAuthorizer()", "changes": [ "CONSTRUCTOR_REMOVED" ] } - ], - "DataFixer isn't API": [ - { - "type": "com.sk89q.worldedit.world.DataFixer$FixTypes", - "member": "Field ENTITY", - "changes": [ - "FIELD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.DataFixer$FixTypes", - "member": "Field BIOME", - "changes": [ - "FIELD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.DataFixer$FixTypes", - "member": "Field BLOCK_STATE", - "changes": [ - "FIELD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.DataFixer$FixTypes", - "member": "Field BLOCK_ENTITY", - "changes": [ - "FIELD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.DataFixer$FixTypes", - "member": "Field ITEM_TYPE", - "changes": [ - "FIELD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.DataFixer$FixTypes", - "member": "Field CHUNK", - "changes": [ - "FIELD_NOW_FINAL" - ] - } - ], - "This now delegates to the InputStream method if not implemented": [ - { - "type": "com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat", - "member": "Method com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat.isFormat(java.io.File)", - "changes": [ - "METHOD_ABSTRACT_NOW_DEFAULT" - ] - } - ], - "New method added with default implementation": [ - { - "type": "com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat", - "member": "Method com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat.isFormat(java.io.InputStream)", - "changes": [ - "METHOD_NEW_DEFAULT" - ] - } - ], - "Should not have been extended anyway": [ - { - "type": "com.sk89q.worldedit.math.transform.AffineTransform", - "member": "Class com.sk89q.worldedit.math.transform.AffineTransform", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.history.change.BiomeChange3D", - "member": "Class com.sk89q.worldedit.history.change.BiomeChange3D", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.history.change.BlockChange", - "member": "Class com.sk89q.worldedit.history.change.BlockChange", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.biome.BiomeType", - "member": "Class com.sk89q.worldedit.world.biome.BiomeType", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.biome.BiomeType", - "member": "Method com.sk89q.worldedit.world.biome.BiomeType.equals(java.lang.Object)", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.biome.BiomeType", - "member": "Method com.sk89q.worldedit.world.biome.BiomeType.hashCode()", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.entity.EntityType", - "member": "Class com.sk89q.worldedit.world.entity.EntityType", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.entity.EntityType", - "member": "Method com.sk89q.worldedit.world.entity.EntityType.equals(java.lang.Object)", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.entity.EntityType", - "member": "Method com.sk89q.worldedit.world.entity.EntityType.hashCode()", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.fluid.FluidType", - "member": "Class com.sk89q.worldedit.world.fluid.FluidType", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.fluid.FluidType", - "member": "Method com.sk89q.worldedit.world.fluid.FluidType.equals(java.lang.Object)", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.fluid.FluidType", - "member": "Method com.sk89q.worldedit.world.fluid.FluidType.hashCode()", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.gamemode.GameMode", - "member": "Class com.sk89q.worldedit.world.gamemode.GameMode", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.gamemode.GameMode", - "member": "Method com.sk89q.worldedit.world.gamemode.GameMode.equals(java.lang.Object)", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.gamemode.GameMode", - "member": "Method com.sk89q.worldedit.world.gamemode.GameMode.hashCode()", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.registry.SimpleItemMaterial", - "member": "Class com.sk89q.worldedit.world.registry.SimpleItemMaterial", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.weather.WeatherType", - "member": "Class com.sk89q.worldedit.world.weather.WeatherType", - "changes": [ - "CLASS_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.weather.WeatherType", - "member": "Method com.sk89q.worldedit.world.weather.WeatherType.equals(java.lang.Object)", - "changes": [ - "METHOD_NOW_FINAL" - ] - }, - { - "type": "com.sk89q.worldedit.world.weather.WeatherType", - "member": "Method com.sk89q.worldedit.world.weather.WeatherType.hashCode()", - "changes": [ - "METHOD_NOW_FINAL" - ] - } ] } diff --git a/verification/src/changes/accepted-fabric-public-api-changes.json b/verification/src/changes/accepted-fabric-public-api-changes.json index 7a73a41bfd..d28380d9c1 100644 --- a/verification/src/changes/accepted-fabric-public-api-changes.json +++ b/verification/src/changes/accepted-fabric-public-api-changes.json @@ -1,2 +1,11 @@ { -} \ No newline at end of file + "Incorrect removal detection due to problems with classpath": [ + { + "type": "com.sk89q.worldedit.fabric.FabricWorld", + "member": "Method com.sk89q.worldedit.fabric.FabricWorld.getId()", + "changes": [ + "METHOD_REMOVED" + ] + } + ] +} diff --git a/verification/src/changes/accepted-forge-public-api-changes.json b/verification/src/changes/accepted-forge-public-api-changes.json index 7a73a41bfd..d4edefd49f 100644 --- a/verification/src/changes/accepted-forge-public-api-changes.json +++ b/verification/src/changes/accepted-forge-public-api-changes.json @@ -1,2 +1,11 @@ { -} \ No newline at end of file + "Incorrect removal detection due to problems with classpath": [ + { + "type": "com.sk89q.worldedit.forge.ForgeWorld", + "member": "Method com.sk89q.worldedit.forge.ForgeWorld.getId()", + "changes": [ + "METHOD_REMOVED" + ] + } + ] +} diff --git a/worldedit-bukkit/adapters/adapter-1.18.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R2/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.18.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R2/PaperweightAdapter.java index 90287b42f9..da5fc9c5d7 100644 --- a/worldedit-bukkit/adapters/adapter-1.18.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R2/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.18.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_18_R2/PaperweightAdapter.java @@ -297,11 +297,11 @@ private static void readEntityIntoTag(Entity entity, CompoundTag tag) { } private static Block getBlockFromType(BlockType blockType) { - return Registry.BLOCK.get(ResourceLocation.tryParse(blockType.getId())); + return Registry.BLOCK.get(ResourceLocation.tryParse(blockType.id())); } private static Item getItemFromType(ItemType itemType) { - return Registry.ITEM.get(ResourceLocation.tryParse(itemType.getId())); + return Registry.ITEM.get(ResourceLocation.tryParse(itemType.id())); } @Override @@ -599,7 +599,7 @@ public void sendFakeOP(Player player) { @Override public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) { - ItemStack stack = new ItemStack(Registry.ITEM.get(ResourceLocation.tryParse(item.getType().getId())), item.getAmount()); + ItemStack stack = new ItemStack(Registry.ITEM.get(ResourceLocation.tryParse(item.getType().id())), item.getAmount()); stack.setTag(((CompoundTag) fromNative(item.getNbt()))); return CraftItemStack.asCraftMirror(stack); } diff --git a/worldedit-bukkit/adapters/adapter-1.19.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R3/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.19.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R3/PaperweightAdapter.java index 30490b60da..bfbdb51c3c 100644 --- a/worldedit-bukkit/adapters/adapter-1.19.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R3/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.19.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_19_R3/PaperweightAdapter.java @@ -314,11 +314,11 @@ private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundT } private static Block getBlockFromType(BlockType blockType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id())); } private static Item getItemFromType(ItemType itemType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id())); } public BiomeType adapt(Biome biome) { @@ -633,7 +633,7 @@ public void sendFakeOP(Player player) { @Override public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) { ItemStack stack = new ItemStack( - DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())), + DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())), item.getAmount() ); stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt()))); @@ -735,6 +735,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio levelProperties.settings.getDataConfiguration() ); + @SuppressWarnings("deprecation") PrimaryLevelData.SpecialWorldProperty specialWorldProperty = levelProperties.isFlatWorld() ? PrimaryLevelData.SpecialWorldProperty.FLAT diff --git a/worldedit-bukkit/adapters/adapter-1.20.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.20.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightAdapter.java index 46e6ee1828..19b96c9691 100644 --- a/worldedit-bukkit/adapters/adapter-1.20.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.20.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightAdapter.java @@ -314,11 +314,11 @@ private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundT } private static Block getBlockFromType(BlockType blockType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id())); } private static Item getItemFromType(ItemType itemType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id())); } @Override @@ -633,7 +633,7 @@ public void sendFakeOP(Player player) { @Override public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) { ItemStack stack = new ItemStack( - DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())), + DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())), item.getAmount() ); stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt()))); @@ -735,6 +735,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio levelProperties.settings.getDataConfiguration() ); + @SuppressWarnings("deprecation") PrimaryLevelData.SpecialWorldProperty specialWorldProperty = levelProperties.isFlatWorld() ? PrimaryLevelData.SpecialWorldProperty.FLAT diff --git a/worldedit-bukkit/adapters/adapter-1.20.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.20.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightAdapter.java index 68e409c62e..d7abcbaa38 100644 --- a/worldedit-bukkit/adapters/adapter-1.20.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.20.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightAdapter.java @@ -314,11 +314,11 @@ private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundT } private static Block getBlockFromType(BlockType blockType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id())); } private static Item getItemFromType(ItemType itemType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id())); } @Override @@ -632,7 +632,7 @@ public void sendFakeOP(Player player) { @Override public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) { ItemStack stack = new ItemStack( - DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())), + DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())), item.getAmount() ); stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt()))); @@ -734,6 +734,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio levelProperties.settings.getDataConfiguration() ); + @SuppressWarnings("deprecation") PrimaryLevelData.SpecialWorldProperty specialWorldProperty = levelProperties.isFlatWorld() ? PrimaryLevelData.SpecialWorldProperty.FLAT diff --git a/worldedit-bukkit/adapters/adapter-1.20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java index f2b1913e0b..2396fbbe6d 100644 --- a/worldedit-bukkit/adapters/adapter-1.20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java @@ -314,11 +314,11 @@ private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundT } private static Block getBlockFromType(BlockType blockType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id())); } private static Item getItemFromType(ItemType itemType) { - return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId())); + return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id())); } @Override @@ -633,7 +633,7 @@ public void sendFakeOP(Player player) { @Override public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) { ItemStack stack = new ItemStack( - DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())), + DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())), item.getAmount() ); stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbt()))); @@ -735,6 +735,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio levelProperties.settings.getDataConfiguration() ); + @SuppressWarnings("deprecation") PrimaryLevelData.SpecialWorldProperty specialWorldProperty = levelProperties.isFlatWorld() ? PrimaryLevelData.SpecialWorldProperty.FLAT diff --git a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandRegistration.java b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandRegistration.java index e24078e11d..1f983042d9 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandRegistration.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandRegistration.java @@ -68,6 +68,7 @@ public Plugin getCommandOwner(String label) { return null; } + @SuppressWarnings("deprecation") public boolean register(List registered) { CommandMap commandMap = getCommandMap(); if (registered == null || commandMap == null) { @@ -82,6 +83,7 @@ public boolean register(List registered) { return true; } + @SuppressWarnings("deprecation") public CommandMap getCommandMap() { if (serverCommandMap != null) { return serverCommandMap; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java index 23a1311f24..2af0eae438 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java @@ -277,6 +277,7 @@ class ServerListener implements org.bukkit.event.Listener { @EventHandler public void onPluginEnable(PluginEnableEvent event) { Plugin plugin = event.getPlugin(); + @SuppressWarnings("deprecation") String name = plugin.getDescription().getName(); if (plugin instanceof PermissionsProvider) { setPluginPermissionsResolver(plugin); @@ -289,6 +290,7 @@ public void onPluginEnable(PluginEnableEvent event) { @EventHandler public void onPluginDisable(PluginDisableEvent event) { + @SuppressWarnings("deprecation") String name = event.getPlugin().getDescription().getName(); if (event.getPlugin() instanceof PermissionsProvider diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PluginPermissionsResolver.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PluginPermissionsResolver.java index 062608c37d..f239a83133 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PluginPermissionsResolver.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PluginPermissionsResolver.java @@ -98,6 +98,7 @@ public String[] getGroups(OfflinePlayer player) { } @Override + @SuppressWarnings("deprecation") public String getDetectionMessage() { return "Using plugin '" + this.plugin.getDescription().getName() + "' for permissions."; } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java index 50084b464d..f2815405e4 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java @@ -92,7 +92,7 @@ private BukkitAdapter() { * @return If they are equal */ public static boolean equals(BlockType blockType, Material type) { - return Objects.equals(blockType.getId(), type.getKey().toString()); + return Objects.equals(blockType.id(), type.getKey().toString()); } /** @@ -334,7 +334,7 @@ public static Entity adapt(org.bukkit.entity.Entity entity) { */ public static Material adapt(ItemType itemType) { checkNotNull(itemType); - return Material.matchMaterial(itemType.getId()); + return Material.matchMaterial(itemType.id()); } /** @@ -345,7 +345,7 @@ public static Material adapt(ItemType itemType) { */ public static Material adapt(BlockType blockType) { checkNotNull(blockType); - return Material.matchMaterial(blockType.getId()); + return Material.matchMaterial(blockType.id()); } /** diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java index 5bccb32833..f893cbbef4 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java @@ -40,7 +40,7 @@ class BukkitBiomeRegistry implements BiomeRegistry { @Override public Component getRichName(BiomeType biomeType) { return TranslatableComponent.of( - TranslationManager.makeTranslationKey("biome", biomeType.getId()) + TranslationManager.makeTranslationKey("biome", biomeType.id()) ); } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntityProperties.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntityProperties.java index 7e9e785f71..e170f06031 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntityProperties.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntityProperties.java @@ -152,6 +152,7 @@ public boolean isTamed() { } @Override + @SuppressWarnings("deprecation") public boolean isTagged() { return entity instanceof LivingEntity && entity.getCustomName() != null; } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java index d30b8e494c..8aed036162 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java @@ -197,6 +197,7 @@ public LocalConfiguration getConfiguration() { } @Override + @SuppressWarnings("deprecation") public String getVersion() { return plugin.getDescription().getVersion(); } @@ -207,12 +208,13 @@ public String getPlatformName() { } @Override + @SuppressWarnings("deprecation") public String getPlatformVersion() { return plugin.getDescription().getVersion(); } @Override - public String getId() { + public String id() { return "enginehub:bukkit"; } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index a699adb789..6f94aa6886 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.sk89q.worldedit.EditSession; +import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.blocks.BaseItem; import com.sk89q.worldedit.blocks.BaseItemStack; @@ -29,6 +30,7 @@ import com.sk89q.worldedit.bukkit.adapter.UnsupportedVersionEditException; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.extent.Extent; +import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.internal.util.LogManagerCompat; import com.sk89q.worldedit.internal.wna.WorldNativeAccess; import com.sk89q.worldedit.math.BlockVector2; @@ -69,6 +71,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.concurrent.ThreadLocalRandom; import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -167,7 +170,7 @@ public String getName() { } @Override - public String getId() { + public String id() { return getWorld().getName().replace(" ", "_").toLowerCase(Locale.ROOT); } @@ -272,8 +275,23 @@ public boolean generateTree(TreeGenerator.TreeType type, EditSession editSession if (bukkitType == TreeType.CHORUS_PLANT) { pt = pt.add(0, 1, 0); // bukkit skips the feature gen which does this offset normally, so we have to add it back } - return type != null && world.generateTree(BukkitAdapter.adapt(world, pt), bukkitType, - new EditSessionBlockChangeDelegate(editSession)); + return type != null && world.generateTree( + BukkitAdapter.adapt(world, pt), + ThreadLocalRandom.current(), + bukkitType, + block -> { + Mask mask = editSession.getMask(); + var blockVector = BukkitAdapter.asBlockVector(block.getLocation()); + if (mask != null && !mask.test(blockVector)) { + return false; + } + try { + editSession.setBlock(blockVector, BukkitAdapter.adapt(block.getBlockData())); + } catch (MaxChangedBlocksException ignored) { + } + return false; + } + ); } @Override diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIBlockRegistry.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIBlockRegistry.java index 46a804d8e9..35338249ed 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIBlockRegistry.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIBlockRegistry.java @@ -52,7 +52,7 @@ private Property createProperty(String type, String key, List values) @Override public Map> getProperties(BlockType blockType) { Map properties = - CLIWorldEdit.inst.getFileRegistries().getDataFile().blocks.get(blockType.getId()).properties; + CLIWorldEdit.inst.getFileRegistries().getDataFile().blocks.get(blockType.id()).properties; Maps.EntryTransformer> entryTransform = (key, value) -> createProperty(value.type, key, value.values); return ImmutableMap.copyOf(Maps.transformEntries(properties, entryTransform)); diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIPlatform.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIPlatform.java index e0a2d4123d..221f99bba5 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIPlatform.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIPlatform.java @@ -112,7 +112,7 @@ public Player matchPlayer(Player player) { @Override public World matchWorld(World world) { return this.worlds.stream() - .filter(w -> w.getId().equals(world.getId())) + .filter(w -> w.id().equals(world.id())) .findAny() .orElse(null); } @@ -146,7 +146,7 @@ public String getPlatformVersion() { } @Override - public String getId() { + public String id() { return "enginehub:cli"; } diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/schematic/ClipboardWorld.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/schematic/ClipboardWorld.java index 825934f9c4..ae42d0fd21 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/schematic/ClipboardWorld.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/schematic/ClipboardWorld.java @@ -73,7 +73,7 @@ public String getName() { } @Override - public String getId() { + public String id() { return getName().replace(" ", "_").toLowerCase(Locale.ROOT); } diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index a7f6ea9692..17a8a7cf46 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -48,12 +48,8 @@ dependencies { "implementation"("com.thoughtworks.paranamer:paranamer:2.6") "implementation"("com.sk89q.lib:jlibnoise:1.0.0") "api"(platform("org.enginehub.lin-bus:lin-bus-bom:${Versions.LIN_BUS}")) - "api"("org.enginehub.lin-bus:lin-bus-tree") { - exclude(group = "org.jetbrains", module = "annotations") - } - "api"("org.enginehub.lin-bus.format:lin-bus-format-snbt") { - exclude(group = "org.jetbrains", module = "annotations") - } + "api"("org.enginehub.lin-bus:lin-bus-tree") + "api"("org.enginehub.lin-bus.format:lin-bus-format-snbt") "implementation"("org.apache.logging.log4j:log4j-api:${Versions.LOG4J}") { because("Mojang provides Log4J") @@ -72,21 +68,25 @@ dependencies { "compileOnly"("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}") "annotationProcessor"("com.google.auto.value:auto-value:${Versions.AUTO_VALUE}") + "compileOnly"("com.google.auto.service:auto-service:1.1.1") { + because("Needed to resolve annotations in Piston") + } + "languageFiles"("${project.group}:worldedit-lang:7.3.1:1309@zip") "testRuntimeOnly"("org.apache.logging.log4j:log4j-core:${Versions.LOG4J}") } -tasks.named("test") { +tasks.test { maxHeapSize = "1G" } -tasks.withType().configureEach { +tasks.compileJava { dependsOn(":worldedit-libs:build") options.compilerArgs.add("-Aarg.name.key.prefix=") } -tasks.named("generateGrammarSource").configure { +tasks.generateGrammarSource { val pkg = "com.sk89q.worldedit.antlr" outputDirectory = file("build/generated-src/antlr/main/${pkg.replace('.', '/')}") arguments = listOf( diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java index d4b7ba8777..1d3f4f179b 100644 --- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java +++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java @@ -38,6 +38,7 @@ * @deprecated WorldEdit does not handle interpreting NBT, * deprecated for removal without replacement */ +@SuppressWarnings({"rawtypes", "unchecked"}) @Deprecated public class MobSpawnerBlock extends LegacyBaseBlockWrapper { @@ -48,7 +49,7 @@ public class MobSpawnerBlock extends LegacyBaseBlockWrapper { private short spawnCount = 4; private short spawnRange = 4; private CompoundTag spawnData; - private ListTag spawnPotentials; + private ListTag spawnPotentials; private short minSpawnDelay = 200; private short maxSpawnDelay = 800; private short maxNearbyEntities = 6; diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java index 938c9dfc4d..f0225512de 100644 --- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java +++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java @@ -113,7 +113,7 @@ public void setNbtData(CompoundTag rootTag) { Map> values = rootTag.getValue(); - Tag t; + Tag t; t = values.get("id"); if (!(t instanceof StringTag) || !((StringTag) t).getValue().equals(getNbtId())) { diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Command.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Command.java index 711a535c37..c990d79a7c 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Command.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Command.java @@ -28,6 +28,7 @@ * Note that the method name can actually be anything. */ @Retention(RetentionPolicy.RUNTIME) +@Deprecated public @interface Command { /** diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandAlias.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandAlias.java index 5c3eed5bc2..81db6fec1f 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandAlias.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandAlias.java @@ -29,6 +29,7 @@ */ @Retention(RetentionPolicy.RUNTIME) +@Deprecated public @interface CommandAlias { /** diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java index e3340dbbfb..742c14a8e9 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Set; +@Deprecated public class CommandContext { protected final String command; diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java index 8459f51d43..f200e116b8 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java @@ -27,6 +27,7 @@ import javax.annotation.Nullable; +@Deprecated public class CommandException extends Exception { private final List commandStack = new ArrayList<>(); diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java index ca0930595b..71dda26dbf 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; +@Deprecated public class CommandLocals { private final Map locals = new HashMap<>(); diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissions.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissions.java index 1a0c5a1cf4..889beed880 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissions.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissions.java @@ -26,6 +26,7 @@ * Indicates a list of permissions that should be checked. */ @Retention(RetentionPolicy.RUNTIME) +@Deprecated public @interface CommandPermissions { /** diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissionsException.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissionsException.java index c2f2e8614a..756c8234d6 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissionsException.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandPermissionsException.java @@ -22,6 +22,7 @@ /** * Thrown when not enough permissions are satisfied. */ +@Deprecated public class CommandPermissionsException extends CommandException { } diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandUsageException.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandUsageException.java index 3639dabfac..d97df7a392 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandUsageException.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandUsageException.java @@ -19,6 +19,7 @@ package com.sk89q.minecraft.util.commands; +@Deprecated public class CommandUsageException extends CommandException { protected String usage; diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Console.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Console.java index 366cf11999..819c9c4377 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Console.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Console.java @@ -26,6 +26,7 @@ * This annotation indicates that a command can be used from the console. */ @Retention(RetentionPolicy.RUNTIME) +@Deprecated public @interface Console { } diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Injector.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Injector.java index 5100d0758f..daa3c4710b 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Injector.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/Injector.java @@ -24,6 +24,7 @@ /** * Constructs new instances. */ +@Deprecated public interface Injector { /** diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/MissingNestedCommandException.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/MissingNestedCommandException.java index 290a29dff3..0dc4522a8a 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/MissingNestedCommandException.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/MissingNestedCommandException.java @@ -19,6 +19,7 @@ package com.sk89q.minecraft.util.commands; +@Deprecated public class MissingNestedCommandException extends CommandUsageException { public MissingNestedCommandException(String message, String usage) { diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/NestedCommand.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/NestedCommand.java index 076f921367..febf8c371e 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/NestedCommand.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/NestedCommand.java @@ -31,6 +31,7 @@ * are still required. */ @Retention(RetentionPolicy.RUNTIME) +@Deprecated public @interface NestedCommand { /** diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java index dab1edd8d0..b0cb32bb49 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java @@ -25,6 +25,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +@Deprecated public class SimpleInjector implements Injector { private static final Logger LOGGER = LogManagerCompat.getLogger(); diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SuggestionContext.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SuggestionContext.java index 01a715cd05..4d1f1370d6 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SuggestionContext.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SuggestionContext.java @@ -19,6 +19,7 @@ package com.sk89q.minecraft.util.commands; +@Deprecated public class SuggestionContext { private static final SuggestionContext FOR_LAST = new SuggestionContext(null, true); diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/UnhandledCommandException.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/UnhandledCommandException.java index d9eec56190..bce8cbc0d3 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/UnhandledCommandException.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/UnhandledCommandException.java @@ -19,6 +19,7 @@ package com.sk89q.minecraft.util.commands; +@Deprecated public class UnhandledCommandException extends CommandException { } diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/WrappedCommandException.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/WrappedCommandException.java index d7a9bee219..4c0c8df5ae 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/WrappedCommandException.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/WrappedCommandException.java @@ -19,6 +19,7 @@ package com.sk89q.minecraft.util.commands; +@Deprecated public class WrappedCommandException extends CommandException { public WrappedCommandException(Throwable t) { diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/package-info.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/package-info.java index dbc3530c42..c764b59fe0 100644 --- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/package-info.java +++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/package-info.java @@ -21,5 +21,4 @@ * This package contains the old command system. It is no longer in use. Please switch * to Piston, Intake, ACF, or similar systems. */ -@Deprecated package com.sk89q.minecraft.util.commands; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java index 3224f0fc7f..c3a2748451 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java @@ -95,6 +95,7 @@ public abstract class LocalConfiguration { public String defaultLocaleName = "default"; public Locale defaultLocale = Locale.getDefault(); + @SuppressWarnings("deprecation") protected String[] getDefaultDisallowedBlocks() { List blockTypes = Lists.newArrayList( BlockTypes.OAK_SAPLING, @@ -161,7 +162,7 @@ protected String[] getDefaultDisallowedBlocks() { // ores and stuff BlockTypes.BEDROCK ); - return blockTypes.stream().filter(Objects::nonNull).map(BlockType::getId).toArray(String[]::new); + return blockTypes.stream().filter(Objects::nonNull).map(BlockType::id).toArray(String[]::new); } /** @@ -224,7 +225,7 @@ public String convertLegacyItem(String legacy) { id = Integer.parseInt(splitter[0]); data = Byte.parseByte(splitter[1]); } - item = LegacyMapper.getInstance().getItemFromLegacy(id, data).getId(); + item = LegacyMapper.getInstance().getItemFromLegacy(id, data).id(); } catch (Throwable ignored) { } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java index 0dec8cef3c..7eb1a73837 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java @@ -789,7 +789,7 @@ public void setTool(ItemType item, @Nullable Tool tool) throws InvalidToolBindEx }, this.navWandItem, item); } else if (tool == null) { // Check if un-setting sel/nav - String id = item.getId(); + String id = item.id(); if (id.equals(this.wandItem)) { this.wandItem = null; setDirty(); @@ -809,7 +809,7 @@ private void setSingleItemTool(Consumer setter, @Nullable String itemId, this.tools.remove(item); } } - setter.accept(newItem.getId()); + setter.accept(newItem.id()); setDirty(); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseItem.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseItem.java index 7e06d9d6de..281edd80b3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseItem.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseItem.java @@ -111,6 +111,6 @@ public String toString() { nbtString = LinStringIO.writeToString(nbtData.getValue()); } - return getType().getId() + nbtString; + return getType().id() + nbtString; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java index a42f88f24d..4d7f2a4720 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java @@ -91,7 +91,7 @@ public void biomeList(Actor actor, PaginationBox paginationBox = PaginationBox.fromComponents("Available Biomes", "/biomelist -p %page%", BiomeType.REGISTRY.values().stream() .map(biomeType -> TextComponent.builder() - .append(biomeType.getId()) + .append(biomeType.id()) .append(" (") .append(biomeRegistry.getRichName(biomeType)) .append(")") @@ -155,7 +155,7 @@ public void biomeInfo(Actor actor, World world, LocalSession session, List components = biomes.stream().map(biome -> biomeRegistry.getRichName(biome).hoverEvent( - HoverEvent.showText(TextComponent.of(biome.getId())) + HoverEvent.showText(TextComponent.of(biome.id())) ) ).collect(Collectors.toList()); actor.printInfo(TranslatableComponent.of(messageKey, TextUtils.join(components, TextComponent.of(", ")))); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index eab5495167..198c6df445 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -381,7 +381,7 @@ public void world(Actor actor, LocalSession session, if (world == null) { actor.printInfo(TranslatableComponent.of("worldedit.world.remove")); } else { - actor.printInfo(TranslatableComponent.of("worldedit.world.set", TextComponent.of(world.getId()))); + actor.printInfo(TranslatableComponent.of("worldedit.world.set", TextComponent.of(world.id()))); } } @@ -532,7 +532,7 @@ public Component call() throws Exception { if (itemsOnly && searchType.hasBlockType()) { continue; } - final String id = searchType.getId(); + final String id = searchType.id(); if (id.contains(idMatch)) { Component name = searchType.getRichName(); results.put(id, TextComponent.builder() diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java index 8c6254c9a6..007c773525 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java @@ -839,7 +839,7 @@ public Component getComponent(int number) { toolTip = TextComponent.of(state.getAsString(), TextColor.GRAY); blockName = blockName.append(TextComponent.of("*", TextColor.LIGHT_PURPLE)); } else { - toolTip = TextComponent.of(blockType.getId(), TextColor.GRAY); + toolTip = TextComponent.of(blockType.id(), TextColor.GRAY); } blockName = blockName.hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, toolTip)); line.append(blockName); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java index 0e9723817c..9ca817997d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java @@ -144,8 +144,8 @@ static void setToolNone(Player player, LocalSession session, boolean isBrush) throws InvalidToolBindException { ItemType type = player.getItemInHand(HandSide.MAIN_HAND).getType(); boolean set = session.getTool(type) != null - || type.getId().equals(session.getWandItem()) - || type.getId().equals(session.getNavWandItem()); + || type.id().equals(session.getWandItem()) + || type.id().equals(session.getNavWandItem()); if (set) { session.setTool(type, null); player.printInfo(TranslatableComponent.of(isBrush ? "worldedit.brush.none.equip" : "worldedit.tool.none.equip")); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index 488b14ac2f..7844c2c649 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -86,7 +86,7 @@ public void version(Actor actor) { producer.append( TextComponent.of("* ", TextColor.GRAY) .append(TextComponent.of(platform.getPlatformName()) - .hoverEvent(HoverEvent.showText(TextComponent.of(platform.getId())))) + .hoverEvent(HoverEvent.showText(TextComponent.of(platform.id())))) .append(TextComponent.of("(" + platform.getPlatformVersion() + ")")) ).newline(); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/WorldConverter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/WorldConverter.java index af6ce8b41a..9e533eb5fa 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/WorldConverter.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/WorldConverter.java @@ -63,7 +63,7 @@ private Stream getWorlds() { @Override public List getSuggestions(String input, InjectedValueAccess context) { return getWorlds() - .map(World::getId) + .map(World::id) .filter(world -> world.startsWith(input)) .collect(Collectors.toList()); } @@ -71,7 +71,7 @@ public List getSuggestions(String input, InjectedValueAccess context) { @Override public ConversionResult convert(String s, InjectedValueAccess injectedValueAccess) { World result = getWorlds() - .filter(world -> world.getId().equals(s)) + .filter(world -> world.id().equals(s)) .findAny().orElse(null); return result == null ? FailedConversion.from(new IllegalArgumentException( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java index 201e67a42e..0931a41459 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java @@ -64,7 +64,7 @@ private boolean handleCycle(LocalConfiguration config, Player player, LocalSessi if (!config.allowedDataCycleBlocks.isEmpty() && !player.hasPermission("worldedit.override.data-cycler") - && !config.allowedDataCycleBlocks.contains(block.getBlockType().getId())) { + && !config.allowedDataCycleBlocks.contains(block.getBlockType().id())) { player.printError(TranslatableComponent.of("worldedit.tool.data-cycler.block-not-permitted")); return true; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/EditSessionEvent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/EditSessionEvent.java index 3b1904b08d..e493bc4c38 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/EditSessionEvent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/EditSessionEvent.java @@ -38,7 +38,7 @@ /** * Raised (several times) when a new {@link EditSession} is being instantiated. * - *

Block loggers, as well as block set interceptors, can use this event to wrap + *

Block loggers, as well as block set interceptors, can use this event to wrap * the given {@link Extent} with their own, which would allow them to intercept * all changes made to the world. For example, the code below would wrap the * existing extent with a custom one, and the custom extent would receive @@ -49,7 +49,7 @@ * event.setExtent(new MyExtent(event.getExtent()) * * - *

This event is fired several times during the creation of a single + *

This event is fired several times during the creation of a single * {@link EditSession}, but {@link #getStage()} will differ each time. * The stage determines at which point {@link Extent}s added to this event * will be called. For example, if you inject an extent when the stage diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java index f5216d9c68..abcb3be6e9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java @@ -123,22 +123,22 @@ public BaseBlock parseFromInput(String input, ParserContext context) @SuppressWarnings("ConstantConditions") private String woolMapper(String string) { return switch (string.toLowerCase(Locale.ROOT)) { - case "white" -> BlockTypes.WHITE_WOOL.getId(); - case "black" -> BlockTypes.BLACK_WOOL.getId(); - case "blue" -> BlockTypes.BLUE_WOOL.getId(); - case "brown" -> BlockTypes.BROWN_WOOL.getId(); - case "cyan" -> BlockTypes.CYAN_WOOL.getId(); - case "gray", "grey" -> BlockTypes.GRAY_WOOL.getId(); - case "green" -> BlockTypes.GREEN_WOOL.getId(); - case "light_blue", "lightblue" -> BlockTypes.LIGHT_BLUE_WOOL.getId(); - case "light_gray", "light_grey", "lightgray", "lightgrey" -> BlockTypes.LIGHT_GRAY_WOOL.getId(); - case "lime" -> BlockTypes.LIME_WOOL.getId(); - case "magenta" -> BlockTypes.MAGENTA_WOOL.getId(); - case "orange" -> BlockTypes.ORANGE_WOOL.getId(); - case "pink" -> BlockTypes.PINK_WOOL.getId(); - case "purple" -> BlockTypes.PURPLE_WOOL.getId(); - case "yellow" -> BlockTypes.YELLOW_WOOL.getId(); - case "red" -> BlockTypes.RED_WOOL.getId(); + case "white" -> BlockTypes.WHITE_WOOL.id(); + case "black" -> BlockTypes.BLACK_WOOL.id(); + case "blue" -> BlockTypes.BLUE_WOOL.id(); + case "brown" -> BlockTypes.BROWN_WOOL.id(); + case "cyan" -> BlockTypes.CYAN_WOOL.id(); + case "gray", "grey" -> BlockTypes.GRAY_WOOL.id(); + case "green" -> BlockTypes.GREEN_WOOL.id(); + case "light_blue", "lightblue" -> BlockTypes.LIGHT_BLUE_WOOL.id(); + case "light_gray", "light_grey", "lightgray", "lightgrey" -> BlockTypes.LIGHT_GRAY_WOOL.id(); + case "lime" -> BlockTypes.LIME_WOOL.id(); + case "magenta" -> BlockTypes.MAGENTA_WOOL.id(); + case "orange" -> BlockTypes.ORANGE_WOOL.id(); + case "pink" -> BlockTypes.PINK_WOOL.id(); + case "purple" -> BlockTypes.PURPLE_WOOL.id(); + case "yellow" -> BlockTypes.YELLOW_WOOL.id(); + case "red" -> BlockTypes.RED_WOOL.id(); default -> string; }; } @@ -164,10 +164,10 @@ private static Map, Object> parseProperties(BlockType type, String[] throw new NoMatchException(TranslatableComponent.of( "worldedit.error.parser.unknown-property", TextComponent.of(parts[0]), - TextComponent.of(type.getId()) + TextComponent.of(type.id()) )); } else { - WorldEdit.logger.debug("Unknown property " + parts[0] + " for block " + type.getId()); + WorldEdit.logger.debug("Unknown property " + parts[0] + " for block " + type.id()); } return Map.of(); } @@ -423,7 +423,7 @@ private BaseBlock parseLogic(String input, ParserContext context) throws InputPa if (context.isRestricted()) { Actor actor = context.requireActor(); if (actor != null && !actor.hasPermission("worldedit.anyblock") - && worldEdit.getConfiguration().disallowedBlocks.contains(blockType.getId())) { + && worldEdit.getConfiguration().disallowedBlocks.contains(blockType.id())) { throw new DisallowedUsageException(TranslatableComponent.of("worldedit.error.disallowed-block", TextComponent.of(input))); } } @@ -437,7 +437,7 @@ private BaseBlock parseLogic(String input, ParserContext context) throws InputPa if (DeprecationUtil.isSign(blockType) && blockAndExtraData.length > 1) { // Allow special sign text syntax String[] text = new String[4]; - text[0] = blockAndExtraData.length > 1 ? blockAndExtraData[1] : ""; + text[0] = blockAndExtraData[1]; text[1] = blockAndExtraData.length > 2 ? blockAndExtraData[2] : ""; text[2] = blockAndExtraData.length > 3 ? blockAndExtraData[3] : ""; text[3] = blockAndExtraData.length > 4 ? blockAndExtraData[4] : ""; @@ -453,19 +453,19 @@ private BaseBlock parseLogic(String input, ParserContext context) throws InputPa if (ent == null) { throw new NoMatchException(TranslatableComponent.of("worldedit.error.unknown-entity", TextComponent.of(mobName))); } - mobName = ent.getId(); + mobName = ent.id(); if (!worldEdit.getPlatformManager().queryCapability(Capability.USER_COMMANDS).isValidMobType(mobName)) { throw new NoMatchException(TranslatableComponent.of("worldedit.error.unknown-mob", TextComponent.of(mobName))); } } else { - mobName = EntityTypes.PIG.getId(); + mobName = EntityTypes.PIG.id(); } @SuppressWarnings("deprecation") MobSpawnerBlock mobSpawnerBlock = new MobSpawnerBlock(state, mobName); return mobSpawnerBlock; } else if ((blockType == BlockTypes.PLAYER_HEAD || blockType == BlockTypes.PLAYER_WALL_HEAD) && (blockAndExtraData.length > 1 || blockNbtData != null)) { // allow setting type/player/rotation - if (blockAndExtraData.length <= 1) { + if (blockAndExtraData.length == 1) { @SuppressWarnings("deprecation") SkullBlock skullBlock = new SkullBlock(state); return skullBlock; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultItemParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultItemParser.java index 4f3bdc927a..75603f5a33 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultItemParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultItemParser.java @@ -50,7 +50,7 @@ public DefaultItemParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { return SuggestionHelper.getNamespacedRegistrySuggestions(ItemType.REGISTRY, input); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BiomeMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BiomeMaskParser.java index 8e487f45a7..259c83d487 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BiomeMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BiomeMaskParser.java @@ -45,7 +45,7 @@ public BiomeMaskParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { if (input.isEmpty()) { return Stream.of("$"); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockCategoryMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockCategoryMaskParser.java index 2f167aab97..5514151c78 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockCategoryMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockCategoryMaskParser.java @@ -41,7 +41,7 @@ public BlockCategoryMaskParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { return SuggestionHelper.getBlockCategorySuggestions(input, false); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockStateMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockStateMaskParser.java index cc361cb496..348ab7f5be 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockStateMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockStateMaskParser.java @@ -38,7 +38,7 @@ public BlockStateMaskParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { if (input.isEmpty()) { return Stream.of("^[", "^=["); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ExpressionMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ExpressionMaskParser.java index 269f4c4811..c58af7d566 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ExpressionMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ExpressionMaskParser.java @@ -42,7 +42,7 @@ public ExpressionMaskParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { if (input.isEmpty()) { return Stream.of("="); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/NoiseMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/NoiseMaskParser.java index 6466aebc92..5b9378407d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/NoiseMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/NoiseMaskParser.java @@ -35,7 +35,7 @@ public NoiseMaskParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { if (input.isEmpty()) { return Stream.of("%"); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/BlockCategoryPatternParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/BlockCategoryPatternParser.java index 1bf16d8aa4..cf6dd579bf 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/BlockCategoryPatternParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/BlockCategoryPatternParser.java @@ -43,7 +43,7 @@ public BlockCategoryPatternParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { return SuggestionHelper.getBlockCategorySuggestions(input, true); } @@ -67,7 +67,7 @@ public Pattern parseFromInput(String input, ParserContext context) throws InputP Set blocks = category.getAll(); if (blocks.isEmpty()) { - throw new InputParseException(TranslatableComponent.of("worldedit.error.empty-tag", TextComponent.of(category.getId()))); + throw new InputParseException(TranslatableComponent.of("worldedit.error.empty-tag", TextComponent.of(category.id()))); } if (anyState) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/ClipboardPatternParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/ClipboardPatternParser.java index 5c50c9b73e..cf0bbaeb5a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/ClipboardPatternParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/ClipboardPatternParser.java @@ -42,7 +42,7 @@ public ClipboardPatternParser(WorldEdit worldEdit) { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { if (input.isEmpty()) { return Stream.of("#clipboard"); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Platform.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Platform.java index 01b0e825e2..fce2bd6539 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Platform.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Platform.java @@ -203,7 +203,7 @@ default void registerGameHooks() { */ @NonAbstractForCompatibility(delegateName = "getPlatformName", delegateParams = {}) @Override - default String getId() { + default String id() { return "legacy:" + getPlatformName().toLowerCase(Locale.ROOT).replaceAll("[^a-z_.-]", "_"); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java index 1c6cccf7d9..0561b2b9f8 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java @@ -308,7 +308,7 @@ public Collection getSupportedSideEffects() { /** * Get the initialized state of the Platform. - * {@return if the platform manager is initialized} + * @return if the platform manager is initialized */ public boolean isInitialized() { return initialized.get(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/FlowerPotCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/FlowerPotCompatibilityHandler.java index f38860e4a6..d8f48d79dc 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/FlowerPotCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/FlowerPotCompatibilityHandler.java @@ -68,7 +68,7 @@ private BlockState convertLegacyBlockType(String id, int data) { } else { BlockState plantedWithData = LegacyMapper.getInstance().getBlockFromLegacy(newId, data); if (plantedWithData != null) { - plantedName = plantedWithData.getBlockType().getId().substring(10); // remove "minecraft:" + plantedName = plantedWithData.getBlockType().id().substring(10); // remove "minecraft:" } } if (plantedName != null) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NBTCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NBTCompatibilityHandler.java index 4fdd2f8ac7..064e7c47c0 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NBTCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NBTCompatibilityHandler.java @@ -27,6 +27,7 @@ import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockStateHolder; import org.enginehub.linbus.tree.LinCompoundTag; +import org.enginehub.linbus.tree.LinTag; import java.util.HashMap; import java.util.Map; @@ -73,7 +74,6 @@ default > BlockStateHolder updateNBT(B block, M delegateName = "updateNBT", delegateParams = { BlockStateHolder.class, Map.class } ) - @SuppressWarnings("deprecated") default BaseBlock updateNbt(BaseBlock block) { DeprecationUtil.checkDelegatingOverride(getClass()); if (!isAffectedBlock(block)) { @@ -87,8 +87,9 @@ default BaseBlock updateNbt(BaseBlock block) { BlockStateHolder changedBlock = updateNBT(block, values); return changedBlock.toBaseBlock(LazyReference.from(() -> { var builder = LinCompoundTag.builder(); - for (var entry : values.entrySet()) { - builder.put(entry.getKey(), entry.getValue().toLinTag()); + for (@SuppressWarnings("deprecation") var entry : values.entrySet()) { + LinTag linTag = entry.getValue().toLinTag(); + builder.put(entry.getKey(), linTag); } return builder.build(); })); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/Pre13HangingCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/Pre13HangingCompatibilityHandler.java index f0bea016f2..8a72489f1c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/Pre13HangingCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/Pre13HangingCompatibilityHandler.java @@ -29,7 +29,7 @@ public class Pre13HangingCompatibilityHandler implements EntityNBTCompatibilityH @Override public LinCompoundTag updateNbt(EntityType type, LinCompoundTag tag) { - if (!type.getId().startsWith("minecraft:")) { + if (!type.id().startsWith("minecraft:")) { return tag; } Direction newDirection; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java index b228679b26..d42d0300ea 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Writer.java @@ -104,7 +104,7 @@ private LinCompoundTag write2(Clipboard clipboard) { worldEditSection.putString("Version", WorldEdit.getVersion()); worldEditSection.putString( "EditingPlatform", - WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING).getId() + WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING).id() ); worldEditSection.putIntArray("Offset", new int[] { offset.x(), offset.y(), offset.z() @@ -113,7 +113,7 @@ private LinCompoundTag write2(Clipboard clipboard) { LinCompoundTag.Builder platformsSection = LinCompoundTag.builder(); for (Platform platform : WorldEdit.getInstance().getPlatformManager().getPlatforms()) { platformsSection.put( - platform.getId(), + platform.id(), LinCompoundTag.builder() .putString("Name", platform.getPlatformName()) .putString("Version", platform.getPlatformVersion()) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Writer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Writer.java index 3772c495c6..433787385c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Writer.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Writer.java @@ -107,7 +107,7 @@ private LinCompoundTag write3(Clipboard clipboard) { worldEditSection.putString("Version", WorldEdit.getVersion()); worldEditSection.putString( "EditingPlatform", - WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING).getId() + WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING).id() ); worldEditSection.putIntArray("Origin", new int[] { origin.x(), origin.y(), origin.z() @@ -116,7 +116,7 @@ private LinCompoundTag write3(Clipboard clipboard) { LinCompoundTag.Builder platformsSection = LinCompoundTag.builder(); for (Platform platform : WorldEdit.getInstance().getPlatformManager().getPlatforms()) { platformsSection.put( - platform.getId(), + platform.id(), LinCompoundTag.builder() .putString("Name", platform.getPlatformName()) .putString("Version", platform.getPlatformVersion()) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java index 09f784b734..a25824ca74 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java @@ -99,7 +99,9 @@ public static Pattern getTemperatePattern() { BlockType grass = BlockTypes.SHORT_GRASS; if (grass == null) { // Fallback for <1.20.3 compat - grass = BlockTypes.GRASS; + @SuppressWarnings("deprecation") + BlockType deprecatedGrass = BlockTypes.GRASS; + grass = deprecatedGrass; } pattern.add(grass.getDefaultState(), 300); pattern.add(BlockTypes.POPPY.getDefaultState(), 5); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer.java index 3922df273f..5c1612fa0a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer.java @@ -55,7 +55,7 @@ public Mask2D toMask2D() { } @Override - public void close() throws Exception { + public void close() { clear(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer2D.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer2D.java index 786e685245..02372de9db 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer2D.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskMemoizer2D.java @@ -51,7 +51,7 @@ public void clear() { } @Override - public void close() throws Exception { + public void close() { clear(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/BlockOptimizedHistory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/BlockOptimizedHistory.java index fdb646a41b..5c92d8d274 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/BlockOptimizedHistory.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/BlockOptimizedHistory.java @@ -54,11 +54,11 @@ public void add(Change change) { if (isRecordingChanges()) { if (change instanceof BlockChange blockChange) { - BlockVector3 position = blockChange.getPosition(); + BlockVector3 position = blockChange.position(); if (!previous.containsLocation(position)) { - previous.add(position, blockChange.getPrevious()); + previous.add(position, blockChange.previous()); } - current.add(position, blockChange.getCurrent()); + current.add(position, blockChange.current()); } else { super.add(change); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/Chunk3d.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/Chunk3d.java index e97c3dd911..be1cd0bffc 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/Chunk3d.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/Chunk3d.java @@ -30,7 +30,7 @@ * Indicates that this value is for 3d-chunk compatibility. * *

- * For vectors, this means that the vector supports 2D & 3D inputs, + * For vectors, this means that the vector supports 2D & 3D inputs, * with 2D getting a Y value of 0. *

*/ diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/ActorAuthorizer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/ActorAuthorizer.java deleted file mode 100644 index b161fb50d5..0000000000 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/ActorAuthorizer.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * WorldEdit, a Minecraft world manipulation toolkit - * Copyright (C) sk89q - * Copyright (C) WorldEdit team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldedit.internal.command; - -import com.sk89q.minecraft.util.commands.CommandLocals; -import com.sk89q.worldedit.extension.platform.Actor; -import com.sk89q.worldedit.util.auth.Authorizer; - -/** - * Implementation of an authorizer that uses {@link Actor#hasPermission(String)}. - */ -public class ActorAuthorizer implements Authorizer { - - @Override - public boolean testPermission(CommandLocals locals, String permission) { - Actor sender = locals.get(Actor.class); - if (sender == null) { - throw new RuntimeException("Uh oh! No 'Actor' specified so that we can check permissions"); - } else { - return sender.hasPermission(permission); - } - } -} diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/cui/ServerCUIHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/cui/ServerCUIHandler.java index a2bbfbacb8..8534e7bcfe 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/cui/ServerCUIHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/cui/ServerCUIHandler.java @@ -162,7 +162,7 @@ public static BaseBlock createStructureBlock(Player player) { structureTag.putString("mode", "SAVE"); structureTag.putByte("ignoreEntities", (byte) 1); structureTag.putByte("showboundingbox", (byte) 1); - structureTag.putString("id", BlockTypes.STRUCTURE_BLOCK.getId()); + structureTag.putString("id", BlockTypes.STRUCTURE_BLOCK.id()); return BlockTypes.STRUCTURE_BLOCK.getDefaultState().toBaseBlock(structureTag.build()); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/InputParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/InputParser.java index 57ec3a2477..0fce2dddc6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/InputParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/InputParser.java @@ -47,7 +47,7 @@ protected InputParser(WorldEdit worldEdit) { * @return a stream of suggestions * @deprecated Use the version that takes a {@link ParserContext}, {@link #getSuggestions(String, ParserContext)} */ - @Deprecated + @Deprecated(forRemoval = true) public Stream getSuggestions(String input) { return Stream.empty(); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/SimpleInputParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/SimpleInputParser.java index faf9b34522..735f60537c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/SimpleInputParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/SimpleInputParser.java @@ -66,7 +66,7 @@ public String getPrimaryMatcher() { } @Override - public Stream getSuggestions(String input) { + public Stream getSuggestions(String input, ParserContext context) { if (input.isEmpty()) { return Stream.of(getPrimaryMatcher()); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/registry/Category.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/Category.java index a2ad5bbd72..eb8fecc327 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/registry/Category.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/Category.java @@ -23,7 +23,9 @@ import java.util.Set; import java.util.function.Supplier; -public abstract class Category { +import static com.google.common.base.Preconditions.checkState; + +public abstract class Category implements Keyed { private final Set set = new HashSet<>(); private final Supplier> supplier; protected final String id; @@ -39,17 +41,14 @@ public Category(final String id, final Supplier> contentSupplier) { this.supplier = contentSupplier; } - public final String getId() { + @Override + public final String id() { return this.id; } public final Set getAll() { if (this.empty) { - if (supplier != null) { - this.set.addAll(this.supplier.get()); - } else { - this.set.addAll(this.load()); - } + this.set.addAll(this.load()); this.empty = false; } return this.set; @@ -63,7 +62,10 @@ public final Set getAll() { * the platforms via the supplier constructor. */ @Deprecated - protected abstract Set load(); + protected Set load() { + checkState(this.supplier != null, "load() should be overriden or a supplier should be provided in the constructor."); + return this.supplier.get(); + } /** * Checks if this category contains {@code object}. @@ -82,6 +84,6 @@ public void invalidateCache() { @Override public String toString() { - return getId(); + return id(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java index 2362245696..e8bcc6ee95 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java @@ -107,7 +107,7 @@ public void load() { registerHelp = getBool("register-help", registerHelp); wandItem = getString("wand-item", wandItem).toLowerCase(Locale.ROOT); try { - wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).getId(); + wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).id(); } catch (Throwable ignored) { } superPickaxeDrop = getBool("super-pickaxe-drop-items", superPickaxeDrop); @@ -117,7 +117,7 @@ public void load() { useInventoryCreativeOverride = getBool("use-inventory-creative-override", useInventoryCreativeOverride); navigationWand = getString("nav-wand-item", navigationWand).toLowerCase(Locale.ROOT); try { - navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).getId(); + navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).id(); } catch (Throwable ignored) { } navigationWandMaxDistance = getInt("nav-wand-distance", navigationWandMaxDistance); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/auth/Authorizer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/auth/Authorizer.java deleted file mode 100644 index 72a4946df1..0000000000 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/auth/Authorizer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * WorldEdit, a Minecraft world manipulation toolkit - * Copyright (C) sk89q - * Copyright (C) WorldEdit team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldedit.util.auth; - -import com.sk89q.minecraft.util.commands.CommandLocals; - -/** - * Tests whether permission is granted. - */ -public interface Authorizer { - - /** - * Tests whether permission is granted for the given context. - * - * @param locals locals - * @param permission the permission string - * @return true if permitted - */ - boolean testPermission(CommandLocals locals, String permission); - -} diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/auth/NullAuthorizer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/auth/NullAuthorizer.java deleted file mode 100644 index 2f3b47c61c..0000000000 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/auth/NullAuthorizer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * WorldEdit, a Minecraft world manipulation toolkit - * Copyright (C) sk89q - * Copyright (C) WorldEdit team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldedit.util.auth; - -import com.sk89q.minecraft.util.commands.CommandLocals; - -/** - * An implementation of {@link Authorizer} that always returns false for - * tests of permissions. - */ -public class NullAuthorizer implements Authorizer { - - @Override - public boolean testPermission(CommandLocals locals, String permission) { - return false; - } - -} diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/net/HttpRequest.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/net/HttpRequest.java index bd57096caf..cdcb894ead 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/net/HttpRequest.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/net/HttpRequest.java @@ -125,8 +125,8 @@ public HttpRequest header(String key, String value) { /** * Execute the request. - *

- * After execution, {@link #close()} should be called. + * + *

After execution, {@link #close()} should be called. * * @return this object * @throws java.io.IOException on I/O error diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/time/FileNameDateTimeParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/time/FileNameDateTimeParser.java index 2f9d2ebcd6..5ab4426b36 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/time/FileNameDateTimeParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/time/FileNameDateTimeParser.java @@ -41,8 +41,7 @@ * zeroes. *

* - *

- * Valid file name examples: + *

Valid file name examples: *

    *
  • {@code 2019-06-15}
    • *
  • {@code 2019-06-15 10:20:30}
    • @@ -52,7 +51,6 @@ *
  • {@code 2019-06-15-10-20-30}
    • *
  • {@code 2019-6-1-1-2-3}
    • *
- *

*/ public class FileNameDateTimeParser implements SnapshotDateTimeParser { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java index 08fba5e7ed..b6b6c8cbcb 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java @@ -65,7 +65,7 @@ public String getName() { } @Override - public String getId() { + public String id() { return "null"; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeCategory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeCategory.java index a51a868237..06b495f6a3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeCategory.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeCategory.java @@ -34,16 +34,10 @@ public class BiomeCategory extends Category implements Keyed { public static final NamespacedRegistry REGISTRY = new NamespacedRegistry<>("biome tag", true); public BiomeCategory(final String id) { - super(id); + super(id, Set::of); } public BiomeCategory(final String id, final Supplier> contentSupplier) { super(id, contentSupplier); } - - @Override - protected Set load() { - return Set.of(); - } - } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategory.java index a20e74d5be..8108ac1c60 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategory.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategory.java @@ -25,8 +25,6 @@ import com.sk89q.worldedit.registry.Keyed; import com.sk89q.worldedit.registry.NamespacedRegistry; -import java.util.Set; - /** * A category of blocks. This is due to the splitting up of * blocks such as wool into separate ids. @@ -36,14 +34,9 @@ public class BlockCategory extends Category implements Keyed { public static final NamespacedRegistry REGISTRY = new NamespacedRegistry<>("block tag", true); public BlockCategory(final String id) { - super(id); - } - - @Override - protected Set load() { - return WorldEdit.getInstance().getPlatformManager() - .queryCapability(Capability.GAME_HOOKS).getRegistries() - .getBlockCategoryRegistry().getAll(this); + super(id, () -> WorldEdit.getInstance().getPlatformManager() + .queryCapability(Capability.GAME_HOOKS).getRegistries() + .getBlockCategoryRegistry().getCategorisedByName(id)); } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java index 350ce56f7e..00bc788957 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java @@ -137,7 +137,7 @@ static Map, Object>, BlockState> generateStateMap(BlockType bloc } long timeTaken = System.currentTimeMillis() - startTime; if (timeTaken > 5000) { - WorldEdit.logger.warn("Took more than 5 seconds to generate complete state map for " + blockType.getId() + ". This block is likely improperly using properties. State count: " + stateMap.size() + ". " + timeTaken + "ms elapsed."); + WorldEdit.logger.warn("Took more than 5 seconds to generate complete state map for " + blockType.id() + ". This block is likely improperly using properties. State count: " + stateMap.size() + ". " + timeTaken + "ms elapsed."); } return stateMap; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java index 4522d7cbc1..8e2e640b8b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java @@ -135,14 +135,14 @@ default BaseBlock applyBlock(BlockVector3 position) { default String getAsString() { if (getStates().isEmpty()) { - return this.getBlockType().getId(); + return this.getBlockType().id(); } else { String properties = getStates().entrySet().stream() .map(entry -> entry.getKey().getName() + "=" + entry.getValue().toString().toLowerCase(Locale.ROOT)) .collect(Collectors.joining(",")); - return this.getBlockType().getId() + "[" + properties + "]"; + return this.getBlockType().id() + "[" + properties + "]"; } } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java index a24be1a824..331c110374 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java @@ -97,7 +97,7 @@ private Map, Object>, BlockState> getBlockStatesMap() { * @return The id */ @Override - public String getId() { + public String id() { return this.id; } @@ -116,7 +116,7 @@ public Component getRichName() { public String getName() { String name = this.name.getValue(); if (name == null || name.isEmpty()) { - return getId(); + return id(); } return name; } @@ -249,7 +249,7 @@ private int computeLegacy(int index) { @Override public String toString() { - return getId(); + return id(); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java index d5c2e78610..687607c454 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java @@ -119,7 +119,7 @@ public AnvilChunk13(LinCompoundTag tag) throws DataException { try { blockState = getBlockStateWith(blockState, property, value); } catch (IllegalArgumentException e) { - throw new InvalidFormatException("Invalid block state for " + blockState.getBlockType().getId() + ", " + property.getName() + ": " + value); + throw new InvalidFormatException("Invalid block state for " + blockState.getBlockType().id() + ", " + property.getName() + ": " + value); } } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java index ac606423dd..b399359bcc 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java @@ -111,7 +111,7 @@ public AnvilChunk18(LinCompoundTag tag) throws DataException { try { blockState = getBlockStateWith(blockState, property, value); } catch (IllegalArgumentException e) { - throw new InvalidFormatException("Invalid block state for " + blockState.getBlockType().getId() + ", " + property.getName() + ": " + value); + throw new InvalidFormatException("Invalid block state for " + blockState.getBlockType().id() + ", " + property.getName() + ": " + value); } } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategories.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategories.java index 165223d237..1dd97c2804 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategories.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategories.java @@ -37,7 +37,7 @@ private static FluidCategory register(final String id) { } public static FluidCategory register(final FluidCategory tag) { - return FluidCategory.REGISTRY.register(tag.getId(), tag); + return FluidCategory.REGISTRY.register(tag.id(), tag); } public static @Nullable FluidCategory get(final String id) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategory.java index b65f19bb48..509f39000d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategory.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidCategory.java @@ -23,7 +23,6 @@ import com.sk89q.worldedit.registry.Keyed; import com.sk89q.worldedit.registry.NamespacedRegistry; -import java.util.Collections; import java.util.Set; /** @@ -35,14 +34,10 @@ public class FluidCategory extends Category implements Keyed { public static final NamespacedRegistry REGISTRY = new NamespacedRegistry<>("fluid tag"); public FluidCategory(final String id) { - super(id); - } - - @Override - protected Set load() { - return Collections.emptySet(); // TODO Make this work. + // TODO Make this work. // return WorldEdit.getInstance().getPlatformManager() // .queryCapability(Capability.GAME_HOOKS).getRegistries() // .getBlockCategoryRegistry().getCategorisedByName(this.id); + super(id, Set::of); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidTypes.java index 493e0778d2..40cdb8933b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidTypes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidTypes.java @@ -40,7 +40,7 @@ private static FluidType register(final String id) { } public static FluidType register(final FluidType fluid) { - return FluidType.REGISTRY.register(fluid.getId(), fluid); + return FluidType.REGISTRY.register(fluid.id(), fluid); } public static @Nullable FluidType get(final String id) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameModes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameModes.java index ce87f9ce7e..b6d151ba82 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameModes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameModes.java @@ -36,7 +36,7 @@ private static GameMode register(final String id) { } public static GameMode register(final GameMode gameMode) { - return GameMode.REGISTRY.register(gameMode.getId(), gameMode); + return GameMode.REGISTRY.register(gameMode.id(), gameMode); } @Nullable diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategory.java index 4850b1cdea..e35a0bca83 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategory.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategory.java @@ -26,8 +26,6 @@ import com.sk89q.worldedit.registry.Keyed; import com.sk89q.worldedit.registry.NamespacedRegistry; -import java.util.Set; - /** * A category of items. This is due to the splitting up of * items such as wool into separate ids. @@ -37,14 +35,9 @@ public class ItemCategory extends Category implements Keyed { public static final NamespacedRegistry REGISTRY = new NamespacedRegistry<>("item tag"); public ItemCategory(final String id) { - super(id); - } - - @Override - protected Set load() { - return WorldEdit.getInstance().getPlatformManager() - .queryCapability(Capability.GAME_HOOKS).getRegistries() - .getItemCategoryRegistry().getAll(this); + super(id, () -> WorldEdit.getInstance().getPlatformManager() + .queryCapability(Capability.GAME_HOOKS).getRegistries() + .getItemCategoryRegistry().getCategorisedByName(id)); } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java index a9662b9f4a..fc838c3968 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java @@ -44,7 +44,7 @@ public class ItemType implements Keyed { .getRegistries().getItemRegistry().getName(this), "" ); - return name.isEmpty() ? getId() : name; + return name.isEmpty() ? id() : name; }); private final LazyReference richName = LazyReference.from(() -> WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS) @@ -64,7 +64,7 @@ public ItemType(String id) { } @Override - public String getId() { + public String id() { return this.id; } @@ -114,7 +114,7 @@ public ItemMaterial getMaterial() { @Override public String toString() { - return getId(); + return id(); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java index 70f96565c9..6ac361c70e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java @@ -40,7 +40,7 @@ public class BundledBlockRegistry implements BlockRegistry { @Override public Component getRichName(BlockType blockType) { - BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.getId()); + BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.id()); if (blockEntry != null) { // This is more likely to be "right", but not translated // Some vanilla MC blocks have overrides so we need this name here @@ -49,7 +49,7 @@ public Component getRichName(BlockType blockType) { return TextComponent.of(blockEntry.localizedName); } return TranslatableComponent.of( - TranslationManager.makeTranslationKey("block", blockType.getId()) + TranslationManager.makeTranslationKey("block", blockType.id()) ); } @@ -59,14 +59,14 @@ public Component getRichName(BlockType blockType) { // dumb_intellij.jpg @SuppressWarnings("deprecation") public String getName(BlockType blockType) { - BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.getId()); + BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.id()); return blockEntry != null ? blockEntry.localizedName : null; } @Nullable @Override public BlockMaterial getMaterial(BlockType blockType) { - return new PassthroughBlockMaterial(BundledBlockData.getInstance().getMaterialById(blockType.getId())); + return new PassthroughBlockMaterial(BundledBlockData.getInstance().getMaterialById(blockType.id())); } @Nullable diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java index 13e6bb8b06..dcf95ff1d6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java @@ -34,7 +34,7 @@ public class BundledItemRegistry implements ItemRegistry { private BundledItemData.ItemEntry getEntryById(ItemType itemType) { - return BundledItemData.getInstance().findById(itemType.getId()); + return BundledItemData.getInstance().findById(itemType.id()); } @Override @@ -48,7 +48,7 @@ public Component getRichName(ItemType itemType) { return TextComponent.of(itemEntry.localizedName); } return TranslatableComponent.of( - TranslationManager.makeTranslationKey("item", itemType.getId()) + TranslationManager.makeTranslationKey("item", itemType.id()) ); } @@ -62,7 +62,7 @@ public String getName(ItemType itemType) { if (itemEntry != null) { String localized = itemEntry.localizedName; if (localized.equals("Air")) { - String id = itemType.getId(); + String id = itemType.id(); int c = id.indexOf(':'); return c < 0 ? id : id.substring(c + 1); } @@ -74,6 +74,6 @@ public String getName(ItemType itemType) { @Nullable @Override public ItemMaterial getMaterial(ItemType itemType) { - return new PassthroughItemMaterial(BundledItemData.getInstance().getMaterialById(itemType.getId())); + return new PassthroughItemMaterial(BundledItemData.getInstance().getMaterialById(itemType.id())); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/CategoryRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/CategoryRegistry.java index 99ddb106a0..2ea9b8358c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/CategoryRegistry.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/CategoryRegistry.java @@ -38,6 +38,6 @@ public interface CategoryRegistry { Set getCategorisedByName(String category); default Set getAll(final Category category) { - return getCategorisedByName(category.getId()); + return getCategorisedByName(category.id()); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullBiomeRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullBiomeRegistry.java index 7951b25a02..aafa54d274 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullBiomeRegistry.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullBiomeRegistry.java @@ -41,7 +41,7 @@ public NullBiomeRegistry() { @Override public Component getRichName(BiomeType biomeType) { return TranslatableComponent.of( - TranslationManager.makeTranslationKey("biome", biomeType.getId()) + TranslationManager.makeTranslationKey("biome", biomeType.id()) ); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/NBTConversions.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/NBTConversions.java index 6267735225..8b177ebfb4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/NBTConversions.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/NBTConversions.java @@ -50,7 +50,7 @@ private NBTConversions() { * @deprecated Use {@link #toLocation(Extent, LinListTag, LinListTag)} instead. */ @Deprecated - public static Location toLocation(Extent extent, ListTag positionTag, ListTag directionTag) { + public static Location toLocation(Extent extent, ListTag positionTag, ListTag directionTag) { checkNotNull(extent); checkNotNull(positionTag); checkNotNull(directionTag); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java index ee2a819105..859322f1ca 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java @@ -35,7 +35,7 @@ private static WeatherType register(String id) { } public static WeatherType register(WeatherType weather) { - return WeatherType.REGISTRY.register(weather.getId(), weather); + return WeatherType.REGISTRY.register(weather.id(), weather); } @Nullable diff --git a/worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java b/worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java index 838e743d11..4fb55d181f 100644 --- a/worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java +++ b/worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java @@ -34,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +@SuppressWarnings("deprecation") public class CommandContextTest { private static final Logger LOGGER = LogManagerCompat.getLogger(); diff --git a/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java b/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java index 86df52508e..109f5c6d24 100644 --- a/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java +++ b/worldedit-core/src/test/java/com/sk89q/worldedit/util/collection/BlockMapTest.java @@ -20,8 +20,6 @@ package com.sk89q.worldedit.util.collection; import com.google.common.collect.ImmutableMap; -import com.sk89q.jnbt.CompoundTag; -import com.sk89q.jnbt.StringTag; import com.sk89q.worldedit.BaseWorldEditTest; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.registry.Registry; @@ -29,6 +27,7 @@ import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; +import org.enginehub.linbus.tree.LinCompoundTag; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -91,7 +90,9 @@ private static void registerBlock(String id) { private final BaseBlock air = checkNotNull(BlockTypes.AIR).getDefaultState().toBaseBlock(); private final BaseBlock oakWood = checkNotNull(BlockTypes.OAK_WOOD).getDefaultState().toBaseBlock(); - private final BaseBlock chestWithNbt = checkNotNull(BlockTypes.CHEST).getDefaultState().toBaseBlock(new CompoundTag(ImmutableMap.of("dummy", new StringTag("value")))); + private final BaseBlock chestWithNbt = checkNotNull(BlockTypes.CHEST).getDefaultState().toBaseBlock( + LinCompoundTag.builder().putString("dummy", "value").build() + ); private AutoCloseable mocks; @@ -176,6 +177,7 @@ void returnsDefaultFromGetOrDefault() { @Test @DisplayName("never calls the forEach action") + @SuppressWarnings("try") void neverCallsForEachAction() throws Exception { try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) { BlockMap map = BlockMap.createForBaseBlock(); @@ -186,6 +188,7 @@ void neverCallsForEachAction() throws Exception { @Test @DisplayName("never calls the replaceAll function") + @SuppressWarnings("try") void neverCallsReplaceAllFunction() throws Exception { try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) { BlockMap map = BlockMap.createForBaseBlock(); @@ -255,6 +258,7 @@ void doesNothingOnComputeIfPresent() { @Test @DisplayName("inserts on merge, without calling merge function") + @SuppressWarnings("try") void insertsOnMerge() throws Exception { try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) { BlockMap map = BlockMap.createForBaseBlock(); @@ -450,6 +454,7 @@ void returnsDefaultFromGetOrDefaultWrongKey() { @Test @DisplayName("calls the forEach action once") + @SuppressWarnings("try") void neverCallsForEachAction() { generator.makeVectorsStream().sequential().forEach(vec -> { try (AutoCloseable ignored = MockitoAnnotations.openMocks(this)) { diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricAdapter.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricAdapter.java index d11f1a86a8..053a7a4ce4 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricAdapter.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricAdapter.java @@ -209,7 +209,7 @@ public static BaseBlock adapt(BlockEntity blockEntity) { } public static Block adapt(BlockType blockType) { - return FabricWorldEdit.getRegistry(Registries.BLOCK).get(new ResourceLocation(blockType.getId())); + return FabricWorldEdit.getRegistry(Registries.BLOCK).get(new ResourceLocation(blockType.id())); } public static BlockType adapt(Block block) { @@ -217,7 +217,7 @@ public static BlockType adapt(Block block) { } public static Item adapt(ItemType itemType) { - return FabricWorldEdit.getRegistry(Registries.ITEM).get(new ResourceLocation(itemType.getId())); + return FabricWorldEdit.getRegistry(Registries.ITEM).get(new ResourceLocation(itemType.id())); } public static ItemType adapt(Item item) { diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBiomeRegistry.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBiomeRegistry.java index d2e3b1b165..47da8e47be 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBiomeRegistry.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBiomeRegistry.java @@ -34,7 +34,7 @@ class FabricBiomeRegistry implements BiomeRegistry { @Override public Component getRichName(BiomeType biomeType) { - return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.getId()))); + return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.id()))); } @Deprecated @@ -62,7 +62,7 @@ private FabricBiomeData(BiomeType biome) { @SuppressWarnings("deprecation") @Override public String getName() { - return biome.getId(); + return biome.id(); } } diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockMaterial.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockMaterial.java index 05b670783a..f24e195a0e 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockMaterial.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockMaterial.java @@ -51,11 +51,13 @@ public boolean isOpaque() { } @Override + @SuppressWarnings("deprecation") public boolean isLiquid() { return block.liquid(); } @Override + @SuppressWarnings("deprecation") public boolean isSolid() { return block.isSolid(); } @@ -71,6 +73,7 @@ public boolean isUnpushable() { } @Override + @SuppressWarnings("deprecation") public boolean isMovementBlocker() { return block.blocksMotion(); } diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlatform.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlatform.java index 9294447a4e..b51a2105a0 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlatform.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlatform.java @@ -184,7 +184,7 @@ public String getPlatformVersion() { } @Override - public String getId() { + public String id() { return "enginehub:fabric"; } diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java index 9b99de983e..556a633ba0 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java @@ -183,7 +183,7 @@ public String getName() { } @Override - public String getId() { + public String id() { return getName() + "_" + getDimensionRegistryKey(getWorld()); } diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeAdapter.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeAdapter.java index e3bb5ae390..6c691d559a 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeAdapter.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeAdapter.java @@ -195,7 +195,7 @@ public static BlockState adapt(net.minecraft.world.level.block.state.BlockState } public static Block adapt(BlockType blockType) { - return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockType.getId())); + return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockType.id())); } public static BlockType adapt(Block block) { @@ -203,7 +203,7 @@ public static BlockType adapt(Block block) { } public static Item adapt(ItemType itemType) { - return ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemType.getId())); + return ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemType.id())); } public static ItemType adapt(Item item) { diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBiomeRegistry.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBiomeRegistry.java index 48b85119a8..95d970c9d9 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBiomeRegistry.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBiomeRegistry.java @@ -34,7 +34,7 @@ class ForgeBiomeRegistry implements BiomeRegistry { @Override public Component getRichName(BiomeType biomeType) { - return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.getId()))); + return TranslatableComponent.of(Util.makeDescriptionId("biome", new ResourceLocation(biomeType.id()))); } @Deprecated @@ -62,7 +62,7 @@ private ForgeBiomeData(BiomeType biome) { @SuppressWarnings("deprecation") @Override public String getName() { - return biome.getId(); + return biome.id(); } } diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java index 08d218853c..d46e9594b3 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlatform.java @@ -207,7 +207,7 @@ public String getPlatformVersion() { } @Override - public String getId() { + public String id() { return "enginehub:forge"; } diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java index 9b6005f90d..a704dfad78 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java @@ -179,7 +179,7 @@ public String getName() { } @Override - public String getId() { + public String id() { return getName() + "_" + getDimensionRegistryKey(getWorld()); } @@ -516,7 +516,7 @@ public void sendBiomeUpdates(Iterable chunks) { for (BlockVector2 chunk : chunks) { nativeChunks.add(getWorld().getChunk(chunk.x(), chunk.z(), ChunkStatus.BIOMES, false)); } - ((ServerLevel) getWorld()).getChunkSource().chunkMap.resendBiomesForChunks(nativeChunks); + getWorld().getChunkSource().chunkMap.resendBiomesForChunks(nativeChunks); } @Override diff --git a/worldedit-mod/build.gradle.kts b/worldedit-mod/build.gradle.kts index 7d2a8307fc..8cf962c3b5 100644 --- a/worldedit-mod/build.gradle.kts +++ b/worldedit-mod/build.gradle.kts @@ -22,7 +22,7 @@ open class MergeManifests : DefaultTask() { } private fun throwException(old: Any?, new: Any?, key: Attributes.Name) { - throw IllegalStateException("Duplicate $key: $new") + throw IllegalStateException("Duplicate $key: was $old, trying to add $new") } private val MERGE_LOGIC = mapOf( diff --git a/worldedit-sponge/build.gradle.kts b/worldedit-sponge/build.gradle.kts index 57040417c7..2844f523e8 100644 --- a/worldedit-sponge/build.gradle.kts +++ b/worldedit-sponge/build.gradle.kts @@ -58,6 +58,9 @@ dependencies { implementation("org.bstats:bstats-sponge:3.0.0") implementation("it.unimi.dsi:fastutil") testImplementation("org.mockito:mockito-core:${Versions.MOCKITO}") + + // Silence some warnings, since apparently this isn't on the compile classpath like it should be. + compileOnly("com.google.errorprone:error_prone_annotations:2.11.0") } configure { diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java index 26064206c2..401456b4ae 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java @@ -218,7 +218,7 @@ public static BaseItemStack adapt(ItemStack itemStack) { public static ItemStack adapt(BaseItemStack itemStack) { ItemStack stack = ItemStack.builder() .itemType(() -> Sponge.game().registry(RegistryTypes.ITEM_TYPE) - .value(ResourceKey.resolve(itemStack.getType().getId()))) + .value(ResourceKey.resolve(itemStack.getType().id()))) .quantity(itemStack.getAmount()) .build(); LinCompoundTag nbt = itemStack.getNbt(); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBiomeRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBiomeRegistry.java index 48dafb6a2e..66e1b9c427 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBiomeRegistry.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBiomeRegistry.java @@ -37,7 +37,7 @@ class SpongeBiomeRegistry implements BiomeRegistry { @Override public Component getRichName(com.sk89q.worldedit.world.biome.BiomeType biomeType) { return TranslatableComponent.of( - TranslationManager.makeTranslationKey("biome", biomeType.getId()) + TranslationManager.makeTranslationKey("biome", biomeType.id()) ); } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java index e67869a947..861b9d633b 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java @@ -51,11 +51,13 @@ public boolean isOpaque() { } @Override + @SuppressWarnings("deprecation") public boolean isLiquid() { return block.liquid(); } @Override + @SuppressWarnings("deprecation") public boolean isSolid() { return block.isSolid(); } @@ -71,6 +73,7 @@ public boolean isUnpushable() { } @Override + @SuppressWarnings("deprecation") public boolean isMovementBlocker() { return block.blocksMotion(); } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java index 90f316e455..f692e9c278 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java @@ -46,14 +46,14 @@ public class SpongeBlockRegistry extends BundledBlockRegistry { @Override public Component getRichName(BlockType blockType) { return SpongeTextAdapter.convert(Sponge.game().registry(RegistryTypes.BLOCK_TYPE) - .value(ResourceKey.resolve(blockType.getId())).asComponent()); + .value(ResourceKey.resolve(blockType.id())).asComponent()); } @Override public BlockMaterial getMaterial(BlockType blockType) { org.spongepowered.api.block.BlockType spongeBlockType = Sponge.game().registry(RegistryTypes.BLOCK_TYPE) - .value(ResourceKey.resolve(blockType.getId())); + .value(ResourceKey.resolve(blockType.id())); return materialMap.computeIfAbsent( spongeBlockType.defaultState(), m -> { @@ -71,7 +71,7 @@ public BlockMaterial getMaterial(BlockType blockType) { public Map> getProperties(BlockType blockType) { org.spongepowered.api.block.BlockType spongeBlockType = Sponge.game().registry(RegistryTypes.BLOCK_TYPE) - .value(ResourceKey.resolve(blockType.getId())); + .value(ResourceKey.resolve(blockType.id())); Map> map = new TreeMap<>(); Collection> propertyKeys = spongeBlockType .defaultState().stateProperties(); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeItemRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeItemRegistry.java index 61dd1222d9..23936cbb2e 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeItemRegistry.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeItemRegistry.java @@ -34,7 +34,7 @@ public class SpongeItemRegistry extends BundledItemRegistry { @Override public Component getRichName(ItemType itemType) { return SpongeTextAdapter.convert(Sponge.game().registry(RegistryTypes.ITEM_TYPE) - .value(ResourceKey.resolve(itemType.getId())).asComponent()); + .value(ResourceKey.resolve(itemType.id())).asComponent()); } @Override diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlatform.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlatform.java index a2f80c4a3c..011f932b1d 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlatform.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlatform.java @@ -165,7 +165,7 @@ public String getPlatformVersion() { } @Override - public String getId() { + public String id() { return "enginehub:sponge"; } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java index 5b07e2f2ce..28258d5fac 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java @@ -110,7 +110,7 @@ public final class SpongeWorld extends AbstractWorld { * * @param world the world */ - protected SpongeWorld(ServerWorld world) { + SpongeWorld(ServerWorld world) { checkNotNull(world); this.worldRef = new WeakReference<>(world); this.worldNativeAccess = new SpongeWorldNativeAccess(new WeakReference<>((ServerLevel) world)); @@ -139,7 +139,7 @@ public String getName() { } @Override - public String getId() { + public String id() { return getWorld().key().asString(); } @@ -214,9 +214,9 @@ public > boolean setBlock(BlockVector3 position, B LinCompoundTag nbt = baseBlock.getNbt(); if (nbt != null) { BlockEntityArchetype.builder() - .blockEntity((BlockEntityType) + .blockEntity( Sponge.game().registry(RegistryTypes.BLOCK_ENTITY_TYPE) - .value(ResourceKey.resolve(baseBlock.getNbtId())) + .value(ResourceKey.resolve(baseBlock.getNbtId())) ) .blockEntityData(NbtAdapter.adaptFromWorldEdit(nbt)) .state(newState) @@ -319,7 +319,8 @@ public boolean regenerate(Region region, Extent extent, RegenOptions options) { case MANGROVE -> TreeFeatures.MANGROVE; case TALL_MANGROVE -> TreeFeatures.TALL_MANGROVE; case CHERRY -> TreeFeatures.CHERRY; - case RANDOM -> createTreeFeatureGenerator(TreeGenerator.TreeType.values()[ThreadLocalRandom.current().nextInt(TreeGenerator.TreeType.values().length)]); + case RANDOM -> + createTreeFeatureGenerator(TreeGenerator.TreeType.values()[ThreadLocalRandom.current().nextInt(TreeGenerator.TreeType.values().length)]); default -> null; }; } @@ -455,7 +456,7 @@ public List getEntities() { @Override public Entity createEntity(Location location, BaseEntity entity) { Optional> entityType = Sponge.game().registry(RegistryTypes.ENTITY_TYPE) - .findValue(ResourceKey.resolve(entity.getType().id())); + .findValue(ResourceKey.resolve(entity.getType().id())); if (entityType.isEmpty()) { return null; } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java index 0f45b3eb20..ed2e8b7a53 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java @@ -170,7 +170,7 @@ public void serverStarted(StartedEngineEvent event) { id, input -> { BlockType spongeBlockType = Sponge.game().registry(RegistryTypes.BLOCK_TYPE).value( - ResourceKey.resolve(input.getBlockType().getId()) + ResourceKey.resolve(input.getBlockType().id()) ); return SpongeAdapter.adapt(spongeBlockType.defaultState()); } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java index 9e8119766f..b9f0437522 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java @@ -65,7 +65,7 @@ public void load() { traceUnflushedSessions = node.node("debugging", "trace-unflushed-sessions").getBoolean(traceUnflushedSessions); wandItem = node.node("wand-item").getString(wandItem).toLowerCase(Locale.ROOT); try { - wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).getId(); + wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).id(); } catch (Throwable ignored) { } @@ -116,7 +116,7 @@ public void load() { navigationWand = node.node("navigation-wand", "item").getString(navigationWand).toLowerCase(Locale.ROOT); try { - navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).getId(); + navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).id(); } catch (Throwable ignored) { } navigationWandMaxDistance = node.node("navigation-wand", "max-distance").getInt(navigationWandMaxDistance); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java index 642ea00113..0bedfe64ab 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java @@ -191,7 +191,7 @@ private static org.spongepowered.api.block.BlockState transmogToMinecraftPropert public static org.spongepowered.api.block.BlockState transmogToMinecraft(BlockState blockState) { org.spongepowered.api.block.BlockType mcBlock = Sponge.game().registry(RegistryTypes.BLOCK_TYPE) - .value(ResourceKey.resolve(blockState.getBlockType().getId())); + .value(ResourceKey.resolve(blockState.getBlockType().id())); org.spongepowered.api.block.BlockState newState = mcBlock.defaultState(); Map, Object> states = blockState.getStates(); return transmogToMinecraftProperties(newState, states);