From 5ab66ecca3f06f45a21e897658191348bed1ae21 Mon Sep 17 00:00:00 2001 From: Octavia Togami Date: Sat, 26 Sep 2026 13:18:29 -0700 Subject: [PATCH 1/3] Clean up some unused variables and set CS jdkVersion --- .../kotlin/buildlogic.adapter-reobf.gradle.kts | 15 +++++++-------- .../main/kotlin/buildlogic.common-java.gradle.kts | 3 ++- .../src/main/kotlin/buildlogic/GradleExtras.kt | 3 +++ gradle/libs.versions.toml | 2 ++ .../adapter/impl/v1_21_11/PaperweightAdapter.java | 3 +-- .../impl/v1_21_11/PaperweightDataConverters.java | 2 -- .../adapter/impl/v1_21_4/PaperweightAdapter.java | 3 +-- .../adapter/impl/v1_21_5/PaperweightAdapter.java | 3 +-- .../impl/v1_21_5/PaperweightDataConverters.java | 2 -- .../adapter/impl/v1_21_6/PaperweightAdapter.java | 3 +-- .../impl/v1_21_6/PaperweightDataConverters.java | 2 -- .../adapter/impl/v1_21_9/PaperweightAdapter.java | 3 +-- .../impl/v1_21_9/PaperweightDataConverters.java | 2 -- .../impl/v26_1/PaperweightDataConverters.java | 2 -- .../impl/v26_2/PaperweightDataConverters.java | 2 -- .../impl/v26_3/PaperweightDataConverters.java | 2 -- .../bukkit/BukkitBlockCommandSender.java | 6 +----- .../text/adapter/bukkit/SpigotAdapter.java | 6 +++--- .../coremc/internal/CoreMcDataFixer.java | 2 -- 19 files changed, 23 insertions(+), 43 deletions(-) diff --git a/build-logic/src/main/kotlin/buildlogic.adapter-reobf.gradle.kts b/build-logic/src/main/kotlin/buildlogic.adapter-reobf.gradle.kts index bc7a7cc50d..cf881aae14 100644 --- a/build-logic/src/main/kotlin/buildlogic.adapter-reobf.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.adapter-reobf.gradle.kts @@ -1,3 +1,4 @@ +import buildlogic.primaryJavaReleaseVersion import io.papermc.paperweight.userdev.ReobfArtifactConfiguration plugins { @@ -15,15 +16,13 @@ tasks.named("assemble") { dependsOn("reobfJar") } +crankcaseJava { + // We use Java 21 for most of the pre-existing adapters. + javaRelease = 21 +} + java { // Required when we de-sync release option and declared Java versions. disableAutoTargetJvm() + toolchain.languageVersion = JavaLanguageVersion.of(primaryJavaReleaseVersion) } - -tasks - .withType() - .matching { it.name == "compileJava" || it.name == "compileTestJava" } - .configureEach { - // We use Java 21 for most of the pre-existing adapters. - options.release.set(21) - } diff --git a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts index c80538f874..75839b37da 100644 --- a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts @@ -1,5 +1,6 @@ import buildlogic.stringyLibs import buildlogic.getLibrary +import buildlogic.primaryJavaReleaseVersion plugins { id("eclipse") @@ -10,7 +11,7 @@ plugins { } crankcaseJava { - javaRelease = 25 + javaRelease = primaryJavaReleaseVersion disabledLints = listOf("processing", "path", "fallthrough", "serial", "overloads") disabledErrorprone = listOf( // We use reference equality intentionally in several places diff --git a/build-logic/src/main/kotlin/buildlogic/GradleExtras.kt b/build-logic/src/main/kotlin/buildlogic/GradleExtras.kt index d825c472ad..ce9868cdb8 100644 --- a/build-logic/src/main/kotlin/buildlogic/GradleExtras.kt +++ b/build-logic/src/main/kotlin/buildlogic/GradleExtras.kt @@ -19,6 +19,9 @@ val Project.ext: ExtraPropertiesExtension val Project.stringyLibs: VersionCatalog get() = extensions.getByType().named("libs") +val Project.primaryJavaReleaseVersion: Int + get() = stringyLibs.getVersion("primaryJavaRelease").requiredVersion.toInt() + val Project.internalVersion: Provider get() { val version = version.toString() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 881a080474..fbf4383f00 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,8 @@ sponge-vanillagradle = { id = "org.spongepowered.gradle.vanilla", version.ref = fabric-loom = "net.fabricmc.fabric-loom:1.18.2" [versions] +primaryJavaRelease = "25" + kyoriText = "3.0.4" piston = "0.6.0" autoValue = "1.10.4" diff --git a/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java index 816930823e..a4d204d205 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java @@ -222,8 +222,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter { public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { // A simple test - @SuppressWarnings({"ReturnValueIgnored", "unused"}) - var unused = CraftServer.class.cast(Bukkit.getServer()); + checkState(Bukkit.getServer() instanceof CraftServer, "Bukkit Server isn't a CraftServer"); int dataVersion = SharedConstants.getCurrentVersion().dataVersion().version(); if (dataVersion != Constants.DATA_VERSION_MC_1_21_11) { diff --git a/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightDataConverters.java index 05718d41c1..dbdac58d7b 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-1.21.11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightDataConverters.java @@ -2438,8 +2438,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); diff --git a/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java index fcf1579cea..006b575af3 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java @@ -220,8 +220,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter { public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { // A simple test - @SuppressWarnings({"ReturnValueIgnored", "unused"}) - var unused = CraftServer.class.cast(Bukkit.getServer()); + checkState(Bukkit.getServer() instanceof CraftServer, "Bukkit Server isn't a CraftServer"); int dataVersion = SharedConstants.getCurrentVersion().getDataVersion().getVersion(); if (dataVersion != Constants.DATA_VERSION_MC_1_21_4) { diff --git a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java index 4d48915dee..9a1c1bc839 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java @@ -220,8 +220,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter { public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { // A simple test - @SuppressWarnings({"ReturnValueIgnored", "unused"}) - var unused = CraftServer.class.cast(Bukkit.getServer()); + checkState(Bukkit.getServer() instanceof CraftServer, "Bukkit Server isn't a CraftServer"); int dataVersion = SharedConstants.getCurrentVersion().getDataVersion().getVersion(); if (dataVersion != Constants.DATA_VERSION_MC_1_21_5) { diff --git a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightDataConverters.java index 30a82f84bf..7f9fd74619 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightDataConverters.java @@ -2438,8 +2438,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); diff --git a/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightAdapter.java index b7fb495d5f..3d8aa7cd0d 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightAdapter.java @@ -223,8 +223,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter { public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { // A simple test - @SuppressWarnings({"ReturnValueIgnored", "unused"}) - var unused = CraftServer.class.cast(Bukkit.getServer()); + checkState(Bukkit.getServer() instanceof CraftServer, "Bukkit Server isn't a CraftServer"); int dataVersion = SharedConstants.getCurrentVersion().dataVersion().version(); if (dataVersion < Constants.DATA_VERSION_MC_1_21_6 || dataVersion > Constants.DATA_VERSION_MC_1_21_8) { diff --git a/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightDataConverters.java index 53fdd3b5bb..374fd711e9 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-1.21.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightDataConverters.java @@ -2438,8 +2438,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); diff --git a/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightAdapter.java index 65692f02f5..29d3fa76f4 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightAdapter.java @@ -222,8 +222,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter { public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { // A simple test - @SuppressWarnings({"ReturnValueIgnored", "unused"}) - var unused = CraftServer.class.cast(Bukkit.getServer()); + checkState(Bukkit.getServer() instanceof CraftServer, "Bukkit Server isn't a CraftServer"); int dataVersion = SharedConstants.getCurrentVersion().dataVersion().version(); if (dataVersion != Constants.DATA_VERSION_MC_1_21_9 && dataVersion != Constants.DATA_VERSION_MC_1_21_10) { diff --git a/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightDataConverters.java index 81e37d990c..1f9f34bad1 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-1.21.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightDataConverters.java @@ -2438,8 +2438,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); diff --git a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java index bacda4ec61..cfe6db7f5e 100644 --- a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java @@ -2438,8 +2438,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); diff --git a/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java index f5a646743a..73f376a9db 100644 --- a/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java @@ -2438,8 +2438,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); diff --git a/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java index 6fd93f6b3a..e2f80d018d 100644 --- a/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java @@ -2447,8 +2447,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java index e383123aee..808abe7539 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java @@ -173,11 +173,7 @@ public boolean isActive() { updateActive(); } else { // we should update it eventually - // We don't need the future as we handle exceptions in `updateActive` - var _ = Bukkit.getScheduler().callSyncMethod(plugin, () -> { - updateActive(); - return null; - }); + Bukkit.getScheduler().runTask(plugin, this::updateActive); } return active; } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java index 31f9f3edf0..ef5bfeaf61 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java @@ -97,7 +97,7 @@ private static boolean bind() { try { // newer gson releases treeTypeAdapterClass = Class.forName("com.google.gson.internal.bind.TreeTypeAdapter"); - } catch (final ClassNotFoundException e) { + } catch (ClassNotFoundException _) { // old gson releases treeTypeAdapterClass = Class.forName("com.google.gson.TreeTypeAdapter"); } @@ -108,7 +108,7 @@ private static boolean bind() { factoriesField.set(gson, modifiedFactories); return true; - } catch (final Throwable e) { + } catch (Throwable _) { return false; } } @@ -156,7 +156,7 @@ private static void send(final List viewers, final Comp try { consumer.accept(player, components); it.remove(); - } catch (final Throwable ignored) { + } catch (Throwable _) { // If we can't send, don't worry about it } } diff --git a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java index b54d560b6d..da64a7bbb9 100644 --- a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java +++ b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java @@ -2401,8 +2401,6 @@ public int getDataVersion() { } public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) { - boolean flag = true; - try { net.minecraft.nbt.CompoundTag nbttagcompound1 = cmp.getCompoundOrEmpty("Level"); int i = nbttagcompound1.getIntOr("xPos", 0); From f066efebf2b2e2bc9680b9a1d0f7437c9b2b5fc6 Mon Sep 17 00:00:00 2001 From: Octavia Togami Date: Sat, 26 Sep 2026 13:19:05 -0700 Subject: [PATCH 2/3] Rename all unused variables to `_` where possible --- .../impl/v26_1/PaperweightAdapter.java | 22 +++++++++---------- .../impl/v26_1/PaperweightDataConverters.java | 20 ++++++++--------- .../impl/v26_2/PaperweightAdapter.java | 22 +++++++++---------- .../impl/v26_2/PaperweightDataConverters.java | 20 ++++++++--------- .../impl/v26_3/PaperweightAdapter.java | 22 +++++++++---------- .../impl/v26_3/PaperweightDataConverters.java | 20 ++++++++--------- .../bukkit/util/ClassSourceValidator.java | 4 ++-- .../bukkit/util/DynamicPluginCommand.java | 2 +- .../util/DynamicPluginCommandHelpTopic.java | 4 ++-- .../wepif/FlatFilePermissionsResolver.java | 4 ++-- .../com/sk89q/wepif/GroupManagerResolver.java | 2 +- .../sk89q/wepif/NijiPermissionsResolver.java | 10 ++++----- .../sk89q/wepif/PermissionsExResolver.java | 2 +- .../wepif/PermissionsResolverManager.java | 2 +- .../com/sk89q/wepif/bPermissionsResolver.java | 2 +- .../sk89q/worldedit/bukkit/BukkitAdapter.java | 12 +++++----- .../bukkit/BukkitCommandInspector.java | 2 +- .../sk89q/worldedit/bukkit/BukkitEntity.java | 2 +- .../bukkit/BukkitEntityProperties.java | 2 +- .../bukkit/BukkitServerInterface.java | 2 +- .../sk89q/worldedit/bukkit/BukkitWorld.java | 6 ++--- .../EditSessionBlockChangeDelegate.java | 2 +- .../worldedit/bukkit/WorldEditPlugin.java | 10 ++++----- .../worldedit/bukkit/adapter/Refraction.java | 2 +- .../text/adapter/bukkit/SpigotAdapter.java | 2 +- .../coremc/internal/CoreMcDataFixer.java | 20 ++++++++--------- .../coremc/internal/CoreMcWorld.java | 2 +- .../coremc/internal/NBTConverter.java | 2 +- .../worldedit/blocks/MobSpawnerBlock.java | 18 +++++++-------- .../java/com/sk89q/util/ReflectionUtil.java | 2 +- .../java/com/sk89q/util/yaml/YAMLNode.java | 2 +- .../com/sk89q/util/yaml/YAMLProcessor.java | 8 +++---- .../java/com/sk89q/worldedit/EditSession.java | 4 ++-- .../sk89q/worldedit/LocalConfiguration.java | 2 +- .../com/sk89q/worldedit/LocalSession.java | 2 +- .../java/com/sk89q/worldedit/WorldEdit.java | 4 ++-- .../sk89q/worldedit/WorldEditManifest.java | 2 +- .../com/sk89q/worldedit/blocks/Blocks.java | 2 +- .../worldedit/command/ChunkCommands.java | 2 +- .../command/LegacySnapshotCommands.java | 14 ++++++------ .../command/LegacySnapshotUtilCommands.java | 6 ++--- .../worldedit/command/SchematicCommands.java | 2 +- .../worldedit/command/WorldEditCommands.java | 2 +- .../command/argument/RegistryConverter.java | 4 ++-- .../worldedit/command/tool/AreaPickaxe.java | 2 +- .../command/tool/BlockDataCyler.java | 2 +- .../worldedit/command/tool/BlockReplacer.java | 2 +- .../worldedit/command/tool/BrushTool.java | 2 +- .../command/tool/FloatingTreeRemover.java | 2 +- .../worldedit/command/tool/FloodFillTool.java | 2 +- .../command/tool/LongRangeBuildTool.java | 4 ++-- .../command/tool/RecursivePickaxe.java | 2 +- .../worldedit/command/tool/SinglePickaxe.java | 2 +- .../worldedit/command/tool/StackTool.java | 2 +- .../worldedit/command/tool/TreePlanter.java | 4 ++-- .../command/util/AsyncCommandBuilder.java | 2 +- .../command/util/PrintCommandHelp.java | 2 +- .../command/util/SuggestionHelper.java | 2 +- .../factory/parser/DefaultBlockParser.java | 10 ++++----- .../factory/parser/DefaultItemParser.java | 2 +- .../factory/parser/mask/BlocksMaskParser.java | 2 +- .../parser/mask/ClipboardMaskParser.java | 2 +- .../parser/mask/ExpressionMaskParser.java | 2 +- .../factory/parser/mask/RegionMaskParser.java | 2 +- .../pattern/ClipboardPatternParser.java | 2 +- .../platform/AbstractPlayerActor.java | 2 +- .../platform/PlatformCommandManager.java | 6 ++--- .../clipboard/io/BuiltInClipboardFormat.java | 6 ++--- .../extent/clipboard/io/ClipboardFormat.java | 2 +- .../extent/clipboard/io/ClipboardFormats.java | 2 +- .../clipboard/io/MCEditSchematicReader.java | 2 +- .../clipboard/io/SpongeSchematicReader.java | 2 +- .../BannerBlockCompatibilityHandler.java | 2 +- .../BedBlockCompatibilityHandler.java | 2 +- .../NoteBlockCompatibilityHandler.java | 2 +- .../SignCompatibilityHandler.java | 2 +- .../SkullBlockCompatibilityHandler.java | 2 +- .../clipboard/io/sponge/ReaderUtil.java | 2 +- .../io/sponge/SpongeSchematicV1Reader.java | 2 +- .../io/sponge/SpongeSchematicV2Reader.java | 2 +- .../io/sponge/SpongeSchematicV3Reader.java | 2 +- .../worldedit/extent/inventory/BlockBag.java | 2 +- .../extent/inventory/BlockBagExtent.java | 6 ++--- .../extent/world/SideEffectExtent.java | 2 +- .../function/mask/ExpressionMask.java | 2 +- .../function/mask/ExpressionMask2D.java | 2 +- .../function/mask/MaskMemoizer2D.java | 2 +- .../ExtentBufferedCompositePattern.java | 2 +- .../internal/anvil/ChunkDeleter.java | 10 ++++----- .../command/CommandLoggingHandler.java | 6 ++--- .../internal/expression/Functions.java | 2 +- .../internal/expression/SlotTable.java | 2 +- .../util/RecursiveDirectoryWatcher.java | 4 ++-- .../worldedit/regions/AbstractRegion.java | 2 +- .../ConvexPolyhedralRegionSelector.java | 2 +- .../selector/CuboidRegionSelector.java | 2 +- .../selector/CylinderRegionSelector.java | 2 +- .../selector/EllipsoidRegionSelector.java | 2 +- .../selector/Polygonal2DRegionSelector.java | 2 +- .../registry/state/IntegerProperty.java | 2 +- .../scripting/RhinoContextFactory.java | 2 +- .../session/request/RequestSelection.java | 2 +- .../session/storage/JsonFileSessionStore.java | 2 +- .../java/com/sk89q/worldedit/util/Enums.java | 2 +- .../util/PropertiesConfiguration.java | 8 +++---- .../sk89q/worldedit/util/SideEffectSet.java | 2 +- .../worldedit/util/asset/AssetLoader.java | 2 +- .../worldedit/util/collection/BlockMap.java | 8 +++---- .../text/serializer/gson/StyleSerializer.java | 2 +- .../com/sk89q/worldedit/util/io/Closer.java | 4 ++-- .../worldedit/util/io/file/MorePaths.java | 2 +- .../worldedit/util/io/file/SafeFiles.java | 2 +- .../util/lifecycle/FlatMapLifecycled.java | 4 ++-- .../worldedit/util/lifecycle/Lifecycled.java | 2 +- .../util/lifecycle/MapLifecycled.java | 4 ++-- .../worldedit/util/logging/LogFormat.java | 2 +- .../sk89q/worldedit/util/net/HttpRequest.java | 2 +- .../util/report/ShallowObjectReport.java | 2 +- .../util/task/FutureForwardingTask.java | 4 ++-- .../worldedit/world/chunk/AnvilChunk.java | 4 ++-- .../worldedit/world/chunk/AnvilChunk13.java | 2 +- .../worldedit/world/chunk/AnvilChunk18.java | 2 +- .../sk89q/worldedit/world/chunk/OldChunk.java | 4 ++-- .../world/registry/LegacyMapper.java | 4 ++-- .../worldedit/world/snapshot/Snapshot.java | 10 ++++----- .../world/snapshot/SnapshotRestore.java | 4 ++-- .../experimental/SnapshotRestore.java | 4 ++-- .../world/storage/FileLegacyChunkStore.java | 2 +- .../world/storage/FileMcRegionChunkStore.java | 2 +- .../world/storage/McRegionReader.java | 2 +- .../storage/TrueZipLegacyChunkStore.java | 2 +- .../storage/TrueZipMcRegionChunkStore.java | 2 +- .../world/storage/ZippedLegacyChunkStore.java | 2 +- .../storage/ZippedMcRegionChunkStore.java | 2 +- .../sk89q/worldedit/BaseWorldEditTest.java | 2 +- .../expression/RealExpressionTest.java | 2 +- .../util/collection/BlockMapTest.java | 22 +++++++++---------- .../fabric/internal/FabricWorldEdit.java | 2 +- .../internal/NeoForgeResourceLoader.java | 4 ++-- .../sk89q/worldedit/sponge/SpongePlayer.java | 2 +- .../sk89q/worldedit/sponge/SpongeWorld.java | 2 +- 141 files changed, 296 insertions(+), 296 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java index 00290bbaf5..0c48a5dbe5 100644 --- a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightAdapter.java @@ -261,10 +261,10 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { try { Class.forName("org.spigotmc.WatchdogThread"); watchdog = new SpigotWatchdog(); - } catch (ClassNotFoundException | NoSuchFieldException e) { + } catch (ClassNotFoundException | NoSuchFieldException _) { try { watchdog = new MojangWatchdog(((CraftServer) Bukkit.getServer()).getServer()); - } catch (NoSuchFieldException ex) { + } catch (NoSuchFieldException _) { watchdog = null; } } @@ -273,7 +273,7 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { try { Class.forName("org.spigotmc.SpigotConfig"); SpigotConfig.config.set("world-settings.worldeditregentempworld.verbose", false); - } catch (ClassNotFoundException ignored) { + } catch (ClassNotFoundException _) { // It's fine if we couldn't set it } } @@ -608,9 +608,9 @@ public BlockMaterial getBlockMaterial(BlockType blockType) { @Override public Property load(net.minecraft.world.level.block.state.properties.Property state) { return switch (state) { - case net.minecraft.world.level.block.state.properties.BooleanProperty ignored -> + case net.minecraft.world.level.block.state.properties.BooleanProperty _ -> new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); - case net.minecraft.world.level.block.state.properties.EnumProperty ignored -> { + case net.minecraft.world.level.block.state.properties.EnumProperty _ -> { if (state.getValueClass() == net.minecraft.core.Direction.class) { yield new DirectionalProperty(state.getName(), (List) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).toList()); @@ -618,7 +618,7 @@ yield new DirectionalProperty(state.getName(), yield new EnumProperty(state.getName(), (List) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).toList()); } - case net.minecraft.world.level.block.state.properties.IntegerProperty ignored -> + case net.minecraft.world.level.block.state.properties.IntegerProperty _ -> new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); default -> throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); @@ -649,7 +649,7 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) structureBlock.setLevel(((CraftPlayer) player).getHandle().level()); ((CraftPlayer) player).getHandle().connection.send(ClientboundBlockEntityDataPacket.create( structureBlock, - (blockEntity, registryAccess) -> (net.minecraft.nbt.CompoundTag) fromNative(nbtData) + (_, _) -> (net.minecraft.nbt.CompoundTag) fromNative(nbtData) )); } @@ -715,7 +715,7 @@ public boolean simulateItemUse(World world, BlockVector3 position, BaseItem item PaperweightFakePlayer fakePlayer; try { fakePlayer = fakePlayers.get(worldServer); - } catch (ExecutionException ignored) { + } catch (ExecutionException _) { return false; } fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack); @@ -809,7 +809,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio @SuppressWarnings("unchecked") Map map = (Map) serverWorldsField.get(Bukkit.getServer()); map.remove("worldeditregentempworld"); - } catch (IllegalAccessException ignored) { + } catch (IllegalAccessException _) { // It's fine if we couldn't remove it } SafeFiles.tryHardToDeleteDir(tempDir); @@ -1030,7 +1030,7 @@ public boolean generateStructure(StructureType type, World world, EditSession se structureRegistry.wrapAsHolder(structure), originalWorld.dimension(), originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, - proxyLevel.level(), biome -> true + proxyLevel.level(), _ -> true ); if (!structureStart.isValid()) { @@ -1273,7 +1273,7 @@ private static class MojangWatchdog implements Watchdog { public void tick() { try { tickField.set(server, Util.getMillis()); - } catch (IllegalAccessException ignored) { + } catch (IllegalAccessException _) { // It's fine if we couldn't set it } } diff --git a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java index cfe6db7f5e..b448b13c1c 100644 --- a/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_1/PaperweightDataConverters.java @@ -323,13 +323,13 @@ public interface DataConverter { private void registerInspector(LegacyType type, DataInspector inspector) { - this.inspectors.computeIfAbsent(type, k -> new ArrayList<>()).add(inspector); + this.inspectors.computeIfAbsent(type, _ -> new ArrayList<>()).add(inspector); } private void registerConverter(LegacyType type, DataConverter converter) { int version = converter.getDataVersion(); - List list = this.converters.computeIfAbsent(type, k -> new ArrayList<>()); + List list = this.converters.computeIfAbsent(type, _ -> new ArrayList<>()); if (!list.isEmpty() && list.get(list.size() - 1).getDataVersion() > version) { for (int j = 0; j < list.size(); ++j) { if (list.get(j).getDataVersion() > version) { @@ -1894,14 +1894,14 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -1909,7 +1909,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } @@ -1972,7 +1972,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) i = cmp.getInt("VillagerProfession").flatMap(profession -> { try { return Optional.of(this.convert(profession)); - } catch (RuntimeException runtimeexception) { + } catch (RuntimeException _) { return Optional.empty(); } }).orElse(i); @@ -2465,7 +2465,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) } } } - } catch (Exception exception) { + } catch (Exception _) { DataConverterBedBlock.a.warn("Unable to datafix Bed blocks, level format may be missing tags."); } @@ -2555,14 +2555,14 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s1, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -2570,7 +2570,7 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s1, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } diff --git a/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightAdapter.java index 4b784b494c..bbe9951708 100644 --- a/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightAdapter.java @@ -262,10 +262,10 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { try { Class.forName("org.spigotmc.WatchdogThread"); watchdog = new SpigotWatchdog(); - } catch (ClassNotFoundException | NoSuchFieldException e) { + } catch (ClassNotFoundException | NoSuchFieldException _) { try { watchdog = new MojangWatchdog(((CraftServer) Bukkit.getServer()).getServer()); - } catch (NoSuchFieldException ex) { + } catch (NoSuchFieldException _) { watchdog = null; } } @@ -274,7 +274,7 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { try { Class.forName("org.spigotmc.SpigotConfig"); SpigotConfig.config.set("world-settings.worldeditregentempworld.verbose", false); - } catch (ClassNotFoundException ignored) { + } catch (ClassNotFoundException _) { // It's fine if we couldn't set it } } @@ -613,9 +613,9 @@ public BlockMaterial getBlockMaterial(BlockType blockType) { @Override public Property load(net.minecraft.world.level.block.state.properties.Property state) { return switch (state) { - case net.minecraft.world.level.block.state.properties.BooleanProperty ignored -> + case net.minecraft.world.level.block.state.properties.BooleanProperty _ -> new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); - case net.minecraft.world.level.block.state.properties.EnumProperty ignored -> { + case net.minecraft.world.level.block.state.properties.EnumProperty _ -> { if (state.getValueClass() == net.minecraft.core.Direction.class) { yield new DirectionalProperty(state.getName(), (List) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).toList()); @@ -623,7 +623,7 @@ yield new DirectionalProperty(state.getName(), yield new EnumProperty(state.getName(), (List) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).toList()); } - case net.minecraft.world.level.block.state.properties.IntegerProperty ignored -> + case net.minecraft.world.level.block.state.properties.IntegerProperty _ -> new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); default -> throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); @@ -654,7 +654,7 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) structureBlock.setLevel(((CraftPlayer) player).getHandle().level()); ((CraftPlayer) player).getHandle().connection.send(ClientboundBlockEntityDataPacket.create( structureBlock, - (blockEntity, registryAccess) -> (net.minecraft.nbt.CompoundTag) fromNative(nbtData) + (_, _) -> (net.minecraft.nbt.CompoundTag) fromNative(nbtData) )); } @@ -720,7 +720,7 @@ public boolean simulateItemUse(World world, BlockVector3 position, BaseItem item PaperweightFakePlayer fakePlayer; try { fakePlayer = fakePlayers.get(worldServer); - } catch (ExecutionException ignored) { + } catch (ExecutionException _) { return false; } fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack); @@ -814,7 +814,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio @SuppressWarnings("unchecked") Map map = (Map) serverWorldsField.get(Bukkit.getServer()); map.remove("worldeditregentempworld"); - } catch (IllegalAccessException ignored) { + } catch (IllegalAccessException _) { // It's fine if we couldn't remove it } SafeFiles.tryHardToDeleteDir(tempDir); @@ -1035,7 +1035,7 @@ public boolean generateStructure(StructureType type, World world, EditSession se structureRegistry.wrapAsHolder(structure), originalWorld.dimension(), originalWorld.registryAccess(), chunkManager.getGenerator(), chunkManager.getGenerator().getBiomeSource(), chunkManager.randomState(), originalWorld.getStructureManager(), originalWorld.getSeed(), chunkPos, 0, - proxyLevel.level(), biome -> true + proxyLevel.level(), _ -> true ); if (!structureStart.isValid()) { @@ -1278,7 +1278,7 @@ private static class MojangWatchdog implements Watchdog { public void tick() { try { tickField.set(server, Util.getMillis()); - } catch (IllegalAccessException ignored) { + } catch (IllegalAccessException _) { // It's fine if we couldn't set it } } diff --git a/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java index 73f376a9db..6178ecc046 100644 --- a/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_2/PaperweightDataConverters.java @@ -323,13 +323,13 @@ public interface DataConverter { private void registerInspector(LegacyType type, DataInspector inspector) { - this.inspectors.computeIfAbsent(type, k -> new ArrayList<>()).add(inspector); + this.inspectors.computeIfAbsent(type, _ -> new ArrayList<>()).add(inspector); } private void registerConverter(LegacyType type, DataConverter converter) { int version = converter.getDataVersion(); - List list = this.converters.computeIfAbsent(type, k -> new ArrayList<>()); + List list = this.converters.computeIfAbsent(type, _ -> new ArrayList<>()); if (!list.isEmpty() && list.get(list.size() - 1).getDataVersion() > version) { for (int j = 0; j < list.size(); ++j) { if (list.get(j).getDataVersion() > version) { @@ -1894,14 +1894,14 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -1909,7 +1909,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } @@ -1972,7 +1972,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) i = cmp.getInt("VillagerProfession").flatMap(profession -> { try { return Optional.of(this.convert(profession)); - } catch (RuntimeException runtimeexception) { + } catch (RuntimeException _) { return Optional.empty(); } }).orElse(i); @@ -2465,7 +2465,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) } } } - } catch (Exception exception) { + } catch (Exception _) { DataConverterBedBlock.a.warn("Unable to datafix Bed blocks, level format may be missing tags."); } @@ -2555,14 +2555,14 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s1, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -2570,7 +2570,7 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s1, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } diff --git a/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightAdapter.java index 1daeeb6e83..c2508cb3f0 100644 --- a/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightAdapter.java @@ -265,10 +265,10 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { try { Class.forName("org.spigotmc.WatchdogThread"); watchdog = new SpigotWatchdog(); - } catch (ClassNotFoundException | NoSuchFieldException e) { + } catch (ClassNotFoundException | NoSuchFieldException _) { try { watchdog = new MojangWatchdog(((CraftServer) Bukkit.getServer()).getServer()); - } catch (NoSuchFieldException ex) { + } catch (NoSuchFieldException _) { watchdog = null; } } @@ -277,13 +277,13 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { try { Class.forName("org.spigotmc.SpigotConfig"); SpigotConfig.config.set("world-settings.worldeditregentempworld.verbose", false); - } catch (ClassNotFoundException ignored) { + } catch (ClassNotFoundException _) { // It's fine if we couldn't set it } try { asCraftMirror = CraftItemStack.class.getMethod("asCraftMirror", ItemStack.class); - } catch (NoSuchMethodException ignored) { + } catch (NoSuchMethodException _) { // This is purely for Spigot compatibility. It'll fail on Paper. asCraftMirror = null; } @@ -623,9 +623,9 @@ public BlockMaterial getBlockMaterial(BlockType blockType) { @Override public Property load(net.minecraft.world.level.block.state.properties.Property state) { return switch (state) { - case net.minecraft.world.level.block.state.properties.BooleanProperty ignored -> + case net.minecraft.world.level.block.state.properties.BooleanProperty _ -> new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); - case net.minecraft.world.level.block.state.properties.EnumProperty ignored -> { + case net.minecraft.world.level.block.state.properties.EnumProperty _ -> { if (state.getValueClass() == net.minecraft.core.Direction.class) { yield new DirectionalProperty(state.getName(), (List) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).toList()); @@ -633,7 +633,7 @@ yield new DirectionalProperty(state.getName(), yield new EnumProperty(state.getName(), (List) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).toList()); } - case net.minecraft.world.level.block.state.properties.IntegerProperty ignored -> + case net.minecraft.world.level.block.state.properties.IntegerProperty _ -> new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); default -> throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); @@ -664,7 +664,7 @@ public void sendFakeNBT(Player player, BlockVector3 pos, LinCompoundTag nbtData) structureBlock.setLevel(((CraftPlayer) player).getHandle().level()); ((CraftPlayer) player).getHandle().connection.send(ClientboundBlockEntityDataPacket.create( structureBlock, - (blockEntity, registryAccess) -> (net.minecraft.nbt.CompoundTag) fromNative(nbtData) + (_, _) -> (net.minecraft.nbt.CompoundTag) fromNative(nbtData) )); } @@ -740,7 +740,7 @@ public boolean simulateItemUse(World world, BlockVector3 position, BaseItem item PaperweightFakePlayer fakePlayer; try { fakePlayer = fakePlayers.get(worldServer); - } catch (ExecutionException ignored) { + } catch (ExecutionException _) { return false; } fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack); @@ -834,7 +834,7 @@ private void doRegen(World bukkitWorld, Region region, Extent extent, RegenOptio @SuppressWarnings("unchecked") Map map = (Map) serverWorldsField.get(Bukkit.getServer()); map.remove("worldeditregentempworld"); - } catch (IllegalAccessException ignored) { + } catch (IllegalAccessException _) { // It's fine if we couldn't remove it } SafeFiles.tryHardToDeleteDir(tempDir); @@ -1301,7 +1301,7 @@ private static class MojangWatchdog implements Watchdog { public void tick() { try { tickField.set(server, Util.getMillis()); - } catch (IllegalAccessException ignored) { + } catch (IllegalAccessException _) { // It's fine if we couldn't set it } } diff --git a/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java b/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java index e2f80d018d..33002903c8 100644 --- a/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java +++ b/worldedit-bukkit/adapters/adapter-26.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v26_3/PaperweightDataConverters.java @@ -332,13 +332,13 @@ public interface DataConverter { private void registerInspector(LegacyType type, DataInspector inspector) { - this.inspectors.computeIfAbsent(type, k -> new ArrayList<>()).add(inspector); + this.inspectors.computeIfAbsent(type, _ -> new ArrayList<>()).add(inspector); } private void registerConverter(LegacyType type, DataConverter converter) { int version = converter.getDataVersion(); - List list = this.converters.computeIfAbsent(type, k -> new ArrayList<>()); + List list = this.converters.computeIfAbsent(type, _ -> new ArrayList<>()); if (!list.isEmpty() && list.get(list.size() - 1).getDataVersion() > version) { for (int j = 0; j < list.size(); ++j) { if (list.get(j).getDataVersion() > version) { @@ -1903,14 +1903,14 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -1918,7 +1918,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } @@ -1981,7 +1981,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) i = cmp.getInt("VillagerProfession").flatMap(profession -> { try { return Optional.of(this.convert(profession)); - } catch (RuntimeException runtimeexception) { + } catch (RuntimeException _) { return Optional.empty(); } }).orElse(i); @@ -2474,7 +2474,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) } } } - } catch (Exception exception) { + } catch (Exception _) { DataConverterBedBlock.a.warn("Unable to datafix Bed blocks, level format may be missing tags."); } @@ -2564,14 +2564,14 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s1, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -2579,7 +2579,7 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s1, MinecraftServer.getServer().registryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/ClassSourceValidator.java b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/ClassSourceValidator.java index 261805b766..0c7c47b1b9 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/ClassSourceValidator.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/ClassSourceValidator.java @@ -51,7 +51,7 @@ public class ClassSourceValidator { tmp = pluginClassLoaderClass.getDeclaredMethod("loadClass0", String.class, boolean.class, boolean.class, boolean.class); tmp.setAccessible(true); - } catch (NoSuchMethodException | ClassNotFoundException e) { + } catch (NoSuchMethodException | ClassNotFoundException _) { tmp = null; } loadClass = tmp; @@ -102,7 +102,7 @@ public Map, Plugin> findMismatches(List> classes) { Class targetClass; try { targetClass = (Class) loadClass.invoke(targetLoader, testClass.getName(), false, false, false); - } catch (IllegalAccessException | InvocationTargetException ignored) { + } catch (IllegalAccessException | InvocationTargetException _) { continue; } if (targetClass.getClassLoader() != expectedClassLoader) { diff --git a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java index 20a40063a2..59bb3e5449 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java @@ -105,7 +105,7 @@ public boolean testPermissionSilent(CommandSender sender) { } } return false; - } catch (Throwable ignored) { + } catch (Throwable _) { // If there are errors, we want to just fallback to the super method } } else if (PermissionsResolverManager.isInitialized() && sender instanceof OfflinePlayer offlinePlayer) { diff --git a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java index 4ef403afef..d761817934 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java @@ -104,7 +104,7 @@ public boolean canSee(CommandSender player) { return true; } } - } catch (Throwable t) { + } catch (Throwable _) { // Doesn't take the CommandSender (Hooray for compile-time generics!), we have other methods at our disposal } } @@ -115,7 +115,7 @@ public boolean canSee(CommandSender player) { return true; } } - } catch (WEPIFRuntimeException e) { + } catch (WEPIFRuntimeException _) { // PermissionsResolverManager not initialized, eat it } } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java index 53f6c8bd21..41382ef5be 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java @@ -106,7 +106,7 @@ public Map> loadGroupPermissions() { if (buff != null) { buff.close(); } - } catch (IOException ignored) { + } catch (IOException _) { // If we can't close the stream, oh well } } @@ -173,7 +173,7 @@ public void load() { if (buff != null) { buff.close(); } - } catch (IOException ignored) { + } catch (IOException _) { // If we can't close the stream, oh well } } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/GroupManagerResolver.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/GroupManagerResolver.java index 40731d0bd7..e2b78c72bc 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/GroupManagerResolver.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/GroupManagerResolver.java @@ -39,7 +39,7 @@ public static PermissionsResolver factory(Server server, YAMLProcessor config) { } return new GroupManagerResolver(server, worldsHolder); - } catch (Throwable t) { + } catch (Throwable _) { return null; } } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java index 759cffc162..c060741adc 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java @@ -42,7 +42,7 @@ public static PermissionsResolver factory(Server server, YAMLProcessor config) { PluginManager pluginManager = server.getPluginManager(); try { Class.forName("com.nijikokun.bukkit.Permissions.Permissions"); - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException _) { return null; } @@ -80,7 +80,7 @@ public boolean hasPermission(String name, String permission) { } try { return api.getHandler().has(player, permission); - } catch (Throwable t) { + } catch (Throwable _) { return Permissions.Security.permission(player, permission); } } catch (Throwable t) { @@ -94,7 +94,7 @@ public boolean hasPermission(String worldName, String name, String permission) { try { try { return api.getHandler().has(worldName, name, permission); - } catch (Throwable t) { + } catch (Throwable _) { return api.getHandler().has(server.getPlayerExact(name), permission); } } catch (Throwable t) { @@ -112,7 +112,7 @@ public boolean inGroup(String name, String group) { } try { return api.getHandler().inGroup(player.getWorld().getName(), name, group); - } catch (Throwable t) { + } catch (Throwable _) { return Permissions.Security.inGroup(name, group); } } catch (Throwable t) { @@ -131,7 +131,7 @@ public String[] getGroups(String name) { String[] groups = null; try { groups = api.getHandler().getGroups(player.getWorld().getName(), player.getName()); - } catch (Throwable t) { + } catch (Throwable _) { String group = Permissions.Security.getGroup(player.getWorld().getName(), player.getName()); if (group != null) { groups = new String[] { group }; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsExResolver.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsExResolver.java index d7e1ae4070..b8a04724c2 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsExResolver.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsExResolver.java @@ -38,7 +38,7 @@ public static PermissionsResolver factory(Server server, YAMLProcessor config) { } return new PermissionsExResolver(server, manager); - } catch (Throwable t) { + } catch (Throwable _) { return null; } } 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 6f6f523175..717c8359eb 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java @@ -229,7 +229,7 @@ private boolean loadConfig(Path path) { Class next = null; try { next = Class.forName(getClass().getPackage().getName() + "." + nextName); - } catch (ClassNotFoundException ignored) { + } catch (ClassNotFoundException _) { // It's okay, we'll just log below } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/wepif/bPermissionsResolver.java b/worldedit-bukkit/src/main/java/com/sk89q/wepif/bPermissionsResolver.java index a544dc846e..eecfae184b 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/wepif/bPermissionsResolver.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/wepif/bPermissionsResolver.java @@ -31,7 +31,7 @@ public class bPermissionsResolver implements PermissionsResolver { public static PermissionsResolver factory(Server server, YAMLProcessor config) { try { Class.forName("de.bananaco.bpermissions.api.ApiLayer"); - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException _) { return null; } 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 017e941173..331950d7c0 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 @@ -375,8 +375,8 @@ public static Biome adapt(BiomeType biomeType) { throw new IllegalArgumentException("Biome key '" + biomeType.id() + "' does not map to Bukkit"); } try { - return biomeTypeBiomeCache.computeIfAbsent(biomeType, type -> Registry.BIOME.get(biomeKey)); - } catch (IllegalArgumentException e) { + return biomeTypeBiomeCache.computeIfAbsent(biomeType, _ -> Registry.BIOME.get(biomeKey)); + } catch (IllegalArgumentException _) { return null; } } @@ -412,7 +412,7 @@ public static org.bukkit.entity.EntityType adapt(EntityType entityType) { @Nullable public static BlockType asBlockType(Material material) { checkNotNull(material); - return materialBlockTypeCache.computeIfAbsent(material, input -> BlockTypes.get(material.getKey().toString())); + return materialBlockTypeCache.computeIfAbsent(material, _ -> BlockTypes.get(material.getKey().toString())); } /** @@ -424,7 +424,7 @@ public static BlockType asBlockType(Material material) { @Nullable public static ItemType asItemType(Material material) { checkNotNull(material); - return materialItemTypeCache.computeIfAbsent(material, input -> ItemTypes.get(material.getKey().toString())); + return materialItemTypeCache.computeIfAbsent(material, _ -> ItemTypes.get(material.getKey().toString())); } private static final Int2ObjectMap blockStateCache = Int2ObjectMaps.synchronize( @@ -456,7 +456,7 @@ public static BlockState adapt(BlockData blockData) { adapter.getInternalBlockStateId(blockData).orElseGet( () -> blockData.getAsString().hashCode() ), - input -> { + _ -> { try { return WorldEdit.getInstance().getBlockFactory().parseFromInput(blockData.getAsString(), TO_BLOCK_CONTEXT).toImmutableState(); } catch (InputParseException e) { @@ -482,7 +482,7 @@ public static > BlockData adapt(B block) { if (cacheKey == BlockStateIdAccess.invalidId()) { cacheKey = block.hashCode(); } - return blockDataCache.computeIfAbsent(cacheKey, input -> Bukkit.createBlockData(block.toImmutableState().getAsString())).clone(); + return blockDataCache.computeIfAbsent(cacheKey, _ -> Bukkit.createBlockData(block.toImmutableState().getAsString())).clone(); } /** diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java index b192b3ac0d..aeaaadebec 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java @@ -76,7 +76,7 @@ public boolean testPermission(CommandSender sender, Command command) { Optional mapping = dispatcher.getCommand(command.getName()); if (mapping.isPresent()) { InjectedValueStore store = MapBackedValueStore.create(); - store.injectValue(Key.of(Actor.class), context -> + store.injectValue(Key.of(Actor.class), _ -> Optional.of(plugin.wrapCommandSender(sender))); return mapping.get().getCondition().satisfied(store); } else { diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java index 4799eb580e..be7f57a275 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java @@ -116,7 +116,7 @@ public boolean remove() { if (entity != null) { try { entity.remove(); - } catch (UnsupportedOperationException e) { + } catch (UnsupportedOperationException _) { return false; } return entity.isDead(); 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 824cd28ae4..6d64b93b38 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 @@ -55,7 +55,7 @@ class BukkitEntityProperties implements EntityProperties { try { Class.forName("org.bukkit.entity.AbstractVillager"); temp = true; - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException _) { temp = false; } HAS_ABSTRACT_VILLAGER = temp; 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 dde4ebce01..d626f891f1 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 @@ -122,7 +122,7 @@ public void reload() { @Override public int schedule(long delay, long period, Runnable task) { if (plugin.isFolia()) { - Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, scheduledTask -> task.run(), delay, period); + Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, _ -> task.run(), delay, period); // TODO Paper doesn't appear to have a concept of task IDs, so return 1 here for now. // We may want to store these tasks and map them to our own IDs to cancel them later. return 1; 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 e4a9088516..3facb13992 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 @@ -223,7 +223,7 @@ public boolean clearContainerBlockContents(BlockVector3 pt) { if (adapter != null) { try { return adapter.clearContainerBlockContents(getWorld(), pt); - } catch (Exception ignored) { + } catch (Exception _) { // It's fine if we can't, we'll try the generic way below. } } @@ -264,7 +264,7 @@ private static void generateTreeMap() { try { TreeType bukkitType = TreeType.valueOf(type.name()); treeTypeMapping.put(type, bukkitType); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException _) { // Unhandled TreeType } } @@ -309,7 +309,7 @@ public boolean generateTree(TreeGenerator.TreeType type, EditSession editSession } try { editSession.setBlock(blockVector, BukkitAdapter.adapt(block.getBlockData())); - } catch (MaxChangedBlocksException ignored) { + } catch (MaxChangedBlocksException _) { // It's fine, we just stop generating. } return false; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java index b156a951d7..9ba6b452ad 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java @@ -40,7 +40,7 @@ public EditSessionBlockChangeDelegate(EditSession editSession) { public boolean setBlockData(int x, int y, int z, BlockData blockData) { try { editSession.setBlock(BlockVector3.at(x, y, z), BukkitAdapter.adapt(blockData)); - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { return false; } return true; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java index 900a033b72..9e8242a2ae 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java @@ -172,7 +172,7 @@ public void onEnable() { setupPreWorldData(); // since worlds are loaded already, we can do this now setupWorldData(); - } catch (Throwable ignored) { + } catch (Throwable _) { // If we bork during reload, oh well } } @@ -270,7 +270,7 @@ private void loadAdapter() { try { adapterLoader.addFromPath(getClass().getClassLoader()); - } catch (IOException e) { + } catch (IOException _) { LOGGER.warn("Failed to search path for Bukkit adapters"); } @@ -289,7 +289,7 @@ private void loadAdapter() { LOGGER.warn(e.getMessage()); try { Class.forName("org.spigotmc.SpigotConfig"); - } catch (ClassNotFoundException e1) { + } catch (ClassNotFoundException _) { LOGGER.warn("CraftBukkit is not a supported Bukkit platform. Please use a supported platform, such as Paper."); } } else { @@ -348,7 +348,7 @@ protected void createDefaultConfiguration(String name) { throw new FileNotFoundException(); } copyDefaultConfig(stream, actual, name); - } catch (IOException e) { + } catch (IOException _) { getLogger().severe("Unable to read default configuration: " + name); } } @@ -539,7 +539,7 @@ BukkitImplAdapter getBukkitImplAdapter() { try { Class.forName("io.papermc.paper.threadedregions.RegionizedServer"); hiddenFoliaCheckPassed = true; - } catch (ClassNotFoundException ignored) { + } catch (ClassNotFoundException _) { // This is a class existence check, it's fine if not present. } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/Refraction.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/Refraction.java index 536c348cb1..6b95b079c4 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/Refraction.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/Refraction.java @@ -34,7 +34,7 @@ public class Refraction { try { Class.forName(MOJANG_MAPPED_CLASS_NAME, false, Refraction.class.getClassLoader()); isMojangMapped = true; - } catch (ClassNotFoundException e) { + } catch (ClassNotFoundException _) { isMojangMapped = false; } IS_MOJANG_MAPPED = isMojangMapped; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java index ef5bfeaf61..cef539a0cc 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/util/formatting/text/adapter/bukkit/SpigotAdapter.java @@ -70,7 +70,7 @@ private static boolean bind() { try { final Field gsonField = field(ComponentSerializer.class, "gson"); tmpGson = (Gson) gsonField.get(null); - } catch (NoSuchFieldException ignored) { + } catch (NoSuchFieldException _) { tmpGson = VersionedComponentSerializer.forVersion(ChatVersion.V1_21_5).getGson(); } gson = tmpGson; diff --git a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java index da64a7bbb9..03bff0a557 100644 --- a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java +++ b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcDataFixer.java @@ -326,13 +326,13 @@ public interface DataConverter { private void registerInspector(LegacyType type, DataInspector inspector) { - this.inspectors.computeIfAbsent(type, k -> new ArrayList<>()).add(inspector); + this.inspectors.computeIfAbsent(type, _ -> new ArrayList<>()).add(inspector); } private void registerConverter(LegacyType type, DataConverter converter) { int version = converter.getDataVersion(); - List list = this.converters.computeIfAbsent(type, k -> new ArrayList<>()); + List list = this.converters.computeIfAbsent(type, _ -> new ArrayList<>()); if (!list.isEmpty() && list.getLast().getDataVersion() > version) { for (int j = 0; j < list.size(); ++j) { if (list.get(j).getDataVersion() > version) { @@ -1857,14 +1857,14 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s, platform.serverRegistryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -1872,7 +1872,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s, platform.serverRegistryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } @@ -1935,7 +1935,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) i = cmp.getInt("VillagerProfession").flatMap(profession -> { try { return Optional.of(this.convert(profession)); - } catch (RuntimeException runtimeexception) { + } catch (RuntimeException _) { return Optional.empty(); } }).orElse(i); @@ -2428,7 +2428,7 @@ public net.minecraft.nbt.CompoundTag convert(net.minecraft.nbt.CompoundTag cmp) } } } - } catch (Exception exception) { + } catch (Exception _) { DataConverterBedBlock.a.warn("Unable to datafix Bed blocks, level format may be missing tags."); } @@ -2518,14 +2518,14 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { object = Component.literal(""); } - } catch (JsonParseException jsonparseexception) { + } catch (JsonParseException _) { ; } if (object == null) { try { object = ComponentConverter.Serializer.fromJson(s1, platform.serverRegistryAccess()); - } catch (JsonParseException jsonparseexception1) { + } catch (JsonParseException _) { ; } } @@ -2533,7 +2533,7 @@ private void convert(net.minecraft.nbt.CompoundTag nbttagcompound, String s) { if (object == null) { try { object = ComponentConverter.Serializer.fromJsonLenient(s1, platform.serverRegistryAccess()); - } catch (JsonParseException jsonparseexception2) { + } catch (JsonParseException _) { ; } } diff --git a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcWorld.java b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcWorld.java index c382c04070..fa12d94373 100644 --- a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcWorld.java +++ b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcWorld.java @@ -263,7 +263,7 @@ public boolean useItem(BlockVector3 position, BaseItem item, Direction face) { final CoreMcFakePlayer fakePlayer; try { fakePlayer = fakePlayers.get(world); - } catch (ExecutionException ignored) { + } catch (ExecutionException _) { return false; } fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack); diff --git a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/NBTConverter.java b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/NBTConverter.java index d0230a9b30..54d1aaafcd 100644 --- a/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/NBTConverter.java +++ b/worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/NBTConverter.java @@ -75,7 +75,7 @@ public static Tag toNative(LinTag tag) { case LinFloatTag t -> toNative(t); case LinShortTag t -> toNative(t); case LinDoubleTag t -> toNative(t); - case LinEndTag ignored -> EndTag.INSTANCE; + case LinEndTag _ -> EndTag.INSTANCE; }; } 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 ebade3f095..ba9d25f30e 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 @@ -173,13 +173,13 @@ public void setNbtData(CompoundTag rootTag) { } this.mobType = mobType; this.spawnData = spawnDataTag; - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { throw new RuntimeException("Invalid mob spawner data: no SpawnData and/or no Delay"); } try { delayTag = NBTUtils.getChildTag(values, "Delay", ShortTag.class); this.delay = delayTag.getValue(); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { this.delay = -1; } @@ -192,37 +192,37 @@ public void setNbtData(CompoundTag rootTag) { ListTag spawnPotentialsTag = null; try { spawnCountTag = NBTUtils.getChildTag(values, "SpawnCount", ShortTag.class); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { // We're just trying to get as much data as possible } try { spawnRangeTag = NBTUtils.getChildTag(values, "SpawnRange", ShortTag.class); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { // We're just trying to get as much data as possible } try { minSpawnDelayTag = NBTUtils.getChildTag(values, "MinSpawnDelay", ShortTag.class); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { // We're just trying to get as much data as possible } try { maxSpawnDelayTag = NBTUtils.getChildTag(values, "MaxSpawnDelay", ShortTag.class); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { // We're just trying to get as much data as possible } try { maxNearbyEntitiesTag = NBTUtils.getChildTag(values, "MaxNearbyEntities", ShortTag.class); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { // We're just trying to get as much data as possible } try { requiredPlayerRangeTag = NBTUtils.getChildTag(values, "RequiredPlayerRange", ShortTag.class); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { // We're just trying to get as much data as possible } try { spawnPotentialsTag = NBTUtils.getChildTag(values, "SpawnPotentials", ListTag.class); - } catch (InvalidFormatException ignored) { + } catch (InvalidFormatException _) { // We're just trying to get as much data as possible } diff --git a/worldedit-core/src/main/java/com/sk89q/util/ReflectionUtil.java b/worldedit-core/src/main/java/com/sk89q/util/ReflectionUtil.java index 6bcb522f4b..254ebe9909 100644 --- a/worldedit-core/src/main/java/com/sk89q/util/ReflectionUtil.java +++ b/worldedit-core/src/main/java/com/sk89q/util/ReflectionUtil.java @@ -35,7 +35,7 @@ public static T getField(Object from, String name) { Field field = checkClass.getDeclaredField(name); field.setAccessible(true); return (T) field.get(from); - } catch (NoSuchFieldException | IllegalAccessException ignored) { + } catch (NoSuchFieldException | IllegalAccessException _) { // We want to keep searching } } while (checkClass.getSuperclass() != Object.class && ((checkClass = checkClass.getSuperclass()) != null)); diff --git a/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLNode.java b/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLNode.java index 4b09c2c576..9608ed99f5 100644 --- a/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLNode.java +++ b/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLNode.java @@ -91,7 +91,7 @@ public Object getProperty(String path) { try { node = (Map) o; - } catch (ClassCastException e) { + } catch (ClassCastException _) { return null; } } diff --git a/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java b/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java index 6e372ea265..5fdc491093 100644 --- a/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java +++ b/worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java @@ -109,7 +109,7 @@ public YAMLProcessor(Path path, boolean writeDefaults, YAMLFormat format) { // 64 MB default int yamlCodePointLimit = Integer.getInteger("worldedit.yaml.codePointLimit", 64 * 1024 * 1024); loaderOptions.setCodePointLimit(yamlCodePointLimit); - } catch (NoSuchMethodError ignored) { + } catch (NoSuchMethodError _) { // pre-1.32 snakeyaml } @@ -155,7 +155,7 @@ public void load() throws IOException { throw new IOException("Stream is null!"); } read(yaml.load(new UnicodeReader(stream))); - } catch (YAMLProcessorException e) { + } catch (YAMLProcessorException _) { root = new LinkedHashMap<>(); } } @@ -256,7 +256,7 @@ private void read(Object input) throws YAMLProcessorException { } else { root = new LinkedHashMap<>((Map) input); } - } catch (ClassCastException e) { + } catch (ClassCastException _) { throw new YAMLProcessorException("Root document must be an key-value structure"); } } @@ -352,7 +352,7 @@ public static YAMLNode getEmptyNode(boolean writeDefaults) { private static class FancyRepresenter extends Representer { private FancyRepresenter() { super(new DumperOptions()); - this.nullRepresenter = o -> representScalar(Tag.NULL, ""); + this.nullRepresenter = _ -> representScalar(Tag.NULL, ""); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java index b34878e117..de17d09826 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java @@ -2507,7 +2507,7 @@ protected BaseBlock getMaterial(int x, int y, int z, BaseBlock defaultMaterial) } else { return defaultMaterial; } - } catch (ExpressionTimeoutException e) { + } catch (ExpressionTimeoutException _) { timedOut[0] = timedOut[0] + 1; return null; } catch (RuntimeException e) { @@ -3026,7 +3026,7 @@ protected BiomeType getBiome(int x, int y, int z, BiomeType defaultBiomeType) { // TODO: Allow biome setting via a script variable (needs BiomeType<->int mapping) return defaultBiomeType; - } catch (ExpressionTimeoutException e) { + } catch (ExpressionTimeoutException _) { timedOut.getAndIncrement(); return null; } catch (Exception e) { 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 62a0979ab0..7cfa033982 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java @@ -228,7 +228,7 @@ public String convertLegacyItem(String legacy) { data = Byte.parseByte(splitter[1]); } item = LegacyMapper.getInstance().getItemFromLegacy(id, data).id(); - } catch (Throwable ignored) { + } catch (Throwable _) { // If we can't parse it, just return it as-is } 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 3219cab9e1..d5dbf50559 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java @@ -1037,7 +1037,7 @@ public void handleCUIInitializationMessage(String eventType, List args, int version; try { version = Integer.parseInt(args.getFirst()); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { WorldEdit.logger.warn("Error while reading CUI init message"); this.failedCuiAttempts++; return; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java index 12896bf333..86f3821f1b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java @@ -354,7 +354,7 @@ private File getSafeFile(@Nullable Actor actor, File dir, String filename, Strin } return filePath.toFile(); - } catch (IOException | InvalidPathException e) { + } catch (IOException | InvalidPathException _) { throw new FilenameResolutionException(filename, TranslatableComponent.of("worldedit.error.file-resolution.resolve-failed")); } } @@ -750,7 +750,7 @@ public void runScript(Player player, File f, String[] args) throws WorldEditExce try { engine = new RhinoCraftScriptEngine(); - } catch (NoClassDefFoundError ignored) { + } catch (NoClassDefFoundError _) { player.printError(TranslatableComponent.of("worldedit.script.missing-script-engine") .append(TextComponent.newline()) .append(TranslatableComponent.of("worldedit.script.please-see", diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEditManifest.java b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEditManifest.java index 4c0769cbba..ddc21ec221 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEditManifest.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEditManifest.java @@ -54,7 +54,7 @@ public static WorldEditManifest load() { Kind kind; try { kind = Kind.valueOf(readAttribute(attributes, WORLD_EDIT_KIND, () -> "UNKNOWN")); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException _) { kind = Kind.UNKNOWN; } return new WorldEditManifest( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/Blocks.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/Blocks.java index a6f55f5c08..86e3ff4e2a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/Blocks.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/Blocks.java @@ -71,7 +71,7 @@ public static Map, Object> resolveProperties(Map RegistryConverter from(Class registry Field registryField = registryType.getDeclaredField("REGISTRY"); Registry registry = (Registry) registryField.get(null); return new RegistryConverter<>(registry); - } catch (NoSuchFieldException e) { + } catch (NoSuchFieldException _) { throw new IllegalArgumentException("Not a registry-backed type: " + registryType.getName()); - } catch (IllegalAccessException e) { + } catch (IllegalAccessException _) { throw new IllegalStateException("Registry field inaccessible on " + registryType.getName()); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java index 8841a359cb..1676899f71 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java @@ -89,7 +89,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla } } } - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); 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 85cd5d239c..c95ae81de7 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 @@ -97,7 +97,7 @@ private boolean handleCycle(LocalConfiguration config, Player player, LocalSessi TextComponent.of(currentProperty.name()), TextComponent.of(String.valueOf(currentProperty.values().get(index))) )); - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java index 7340bd313c..365e09decc 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java @@ -61,7 +61,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla editSession.disableBuffering(); BlockVector3 position = clicked.toVector().toBlockPoint(); editSession.setBlock(position, pattern); - } catch (MaxChangedBlocksException ignored) { + } catch (MaxChangedBlocksException _) { // Just finish up if we hit max blocks } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java index abd332e551..f00087192c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java @@ -220,7 +220,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla try { brush.build(editSession, target.toVector().toBlockPoint(), material, size); - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java index d2654dcc96..884f5c1623 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java @@ -93,7 +93,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, editSession.setBlock(blockVector, BlockTypes.AIR.getDefaultState()); } } - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java index 08a13ae938..714abc1a5b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java @@ -75,7 +75,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla try (EditSession editSession = BlockTool.createEditSession(player, session, clicked)) { try { recurse(editSession, origin, origin, range, initialType, new HashSet<>()); - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java index dedf42e68e..01226f4fd4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java @@ -71,7 +71,7 @@ public boolean actSecondary(Platform server, LocalConfiguration config, Player p } else { editSession.setBlock(pos.toVector().subtract(pos.getDirection()).toBlockPoint(), secondary); } - } catch (MaxChangedBlocksException ignored) { + } catch (MaxChangedBlocksException _) { // Just finish up if we hit max blocks } finally { session.remember(editSession); @@ -102,7 +102,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla } else { editSession.setBlock(pos.toVector().subtract(pos.getDirection()).toBlockPoint(), primary); } - } catch (MaxChangedBlocksException ignored) { + } catch (MaxChangedBlocksException _) { // Just finish up if we hit max blocks } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java index 988fee1dd7..70b8abe6f3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java @@ -76,7 +76,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla try { recurse(server, editSession, world, clicked.toVector().toBlockPoint(), clicked.toVector().toBlockPoint(), range, initialType, new HashSet<>()); - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java index f1be41886a..cccd7a50fd 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java @@ -58,7 +58,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla try (EditSession editSession = BlockTool.createEditSession(player, session, clicked)) { editSession.getSurvivalExtent().setToolUse(config.superPickaxeDrop); editSession.setBlock(blockPoint, BlockTypes.AIR.getDefaultState()); - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/StackTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/StackTool.java index de3ac61b94..667dbf54ea 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/StackTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/StackTool.java @@ -65,7 +65,7 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla } editSession.setBlock(position, block); } - } catch (MaxChangedBlocksException ignored) { + } catch (MaxChangedBlocksException _) { // Just finish up if we hit max blocks } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java index 73632e76c8..c9caaf7853 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java @@ -61,9 +61,9 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla if (!successful) { player.printError(TranslatableComponent.of("worldedit.tool.tree.obstructed")); } - } catch (MaxChangedBlocksException e) { + } catch (MaxChangedBlocksException _) { player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); - } catch (WorldEditException ignored) { + } catch (WorldEditException _) { // This should never happen } finally { session.remember(editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java index b916c44d7c..85cdafaa5a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java @@ -206,7 +206,7 @@ private T runTask() { } else { throw orig; } - } catch (Throwable unknown) { + } catch (Throwable _) { sender.printError(failure.append(TextComponent.of(": Unknown error. Please see console."))); LOGGER.error("Uncaught exception occurred in task: " + description, orig); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java index 5b4e12e9a6..25ef08e3d2 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java @@ -131,7 +131,7 @@ private static String toCommandString(List visited) { private static void printCommands(int page, Stream commandStream, Actor actor, List commandList, String helpRootCommand) throws InvalidComponentException { InjectedValueStore store = MapBackedValueStore.create(); - store.injectValue(Key.of(Actor.class), context -> + store.injectValue(Key.of(Actor.class), _ -> Optional.of(actor)); // Get a list of aliases diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/SuggestionHelper.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/SuggestionHelper.java index 2f7c6707eb..68b09383dd 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/SuggestionHelper.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/SuggestionHelper.java @@ -132,7 +132,7 @@ public static Stream getBlockPropertySuggestions(String blockTypeString, try { prop.getValueFor(propVal[1]); matchedProperties.add(prop.name()); - } catch (IllegalArgumentException ignored) { + } catch (IllegalArgumentException _) { return Stream.empty(); } } 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 aeb693e2de..1ca5c77790 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 @@ -177,7 +177,7 @@ private static Map, Object> parseProperties(BlockType type, String[] Object value; try { value = propertyKey.getValueFor(parts[1]); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException _) { throw new NoMatchException(TranslatableComponent.of( "worldedit.error.parser.unknown-value", TextComponent.of(parts[1]), @@ -188,7 +188,7 @@ private static Map, Object> parseProperties(BlockType type, String[] blockStates.put(propertyKey, value); } catch (InputParseException e) { throw e; // Pass-through - } catch (Exception e) { + } catch (Exception _) { throw new InputParseException(TranslatableComponent.of( "worldedit.error.parser.bad-state-format", TextComponent.of(parseableData) @@ -234,7 +234,7 @@ public Stream getSuggestions(String input, ParserContext context) { try { BlockVector3 primaryPosition = session.getRegionSelector(world).getPrimaryPosition(); type = world.getBlock(primaryPosition).getBlockType(); - } catch (IncompleteRegionException ignored) { + } catch (IncompleteRegionException _) { // We don't care if the region is incomplete here, we'll just not provide suggestions } } @@ -288,7 +288,7 @@ private BaseBlock parseLogic(String input, ParserContext context) throws InputPa if (state != null) { blockType = state.getBlockType(); } - } catch (NumberFormatException ignored) { + } catch (NumberFormatException _) { // If it doesn't match legacy, just parse it normally } } @@ -389,7 +389,7 @@ private BaseBlock parseLogic(String input, ParserContext context) throws InputPa final BlockVector3 primaryPosition; try { primaryPosition = context.requireSession().getRegionSelector(world).getPrimaryPosition(); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { throw new InputParseException(TranslatableComponent.of("worldedit.error.incomplete-region")); } final BaseBlock blockInHand = world.getFullBlock(primaryPosition); 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 6ab8b40be6..6bb877b8a7 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 @@ -78,7 +78,7 @@ public BaseItem parseFromInput(String input, ParserContext context) throws Input if (itemType != null) { item = new BaseItem(itemType); } - } catch (NumberFormatException ignored) { + } catch (NumberFormatException _) { // If it doesn't match legacy, just parse it normally } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlocksMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlocksMaskParser.java index a936ae7070..fc482c122e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlocksMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlocksMaskParser.java @@ -56,7 +56,7 @@ public Mask parseFromInput(String component, ParserContext context) throws Input return null; } return new BlockMask(context.requireExtent(), holders); - } catch (NoMatchException e) { + } catch (NoMatchException _) { return null; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ClipboardMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ClipboardMaskParser.java index 3b1aa216ae..0cc484d54d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ClipboardMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ClipboardMaskParser.java @@ -47,7 +47,7 @@ public List getMatchedAliases() { public Mask parseFromSimpleInput(String input, ParserContext context) throws InputParseException { try { return new MatchMask(context.requireExtent(), context.requireSession().getClipboard().getClipboard()); - } catch (EmptyClipboardException e) { + } catch (EmptyClipboardException _) { throw new InputParseException(TranslatableComponent.of("worldedit.error.empty-clipboard")); } } 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 09f684cf2e..c805e68f5e 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 @@ -66,7 +66,7 @@ public Mask parseFromInput(String input, ParserContext context) throws InputPars return new ExpressionMask(exp, timeout); } return new ExpressionMask(exp); - } catch (ExpressionException e) { + } catch (ExpressionException _) { throw new InputParseException(TranslatableComponent.of("worldedit.error.parser.invalid-expression")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/RegionMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/RegionMaskParser.java index 524d8b2cff..111733da3a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/RegionMaskParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/RegionMaskParser.java @@ -48,7 +48,7 @@ public List getMatchedAliases() { public Mask parseFromSimpleInput(String input, ParserContext context) throws InputParseException { try { return new RegionMask(context.requireSession().getSelection(context.requireWorld()).clone()); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { throw new InputParseException(TranslatableComponent.of("worldedit.error.incomplete-region")); } } 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 5a0ed0643e..e3f877a3df 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 @@ -97,7 +97,7 @@ public Pattern parseFromInput(String input, ParserContext context) throws InputP ClipboardHolder holder = session.getClipboard(); Clipboard clipboard = holder.getClipboard(); return new ClipboardPattern(clipboard, offset); - } catch (EmptyClipboardException e) { + } catch (EmptyClipboardException _) { throw new InputParseException(TranslatableComponent.of("worldedit.error.empty-clipboard")); } } else { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java index 37dd275de8..1bc93fbaf0 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java @@ -323,7 +323,7 @@ public void floatAt(int x, int y, int z, boolean alwaysGlass) { if (!world.getBlock(spot).getBlockType().getMaterial().isSolid()) { try (EditSession session = WorldEdit.getInstance().newEditSession(this)) { session.setBlock(spot, BlockTypes.GLASS.getDefaultState()); - } catch (MaxChangedBlocksException ignored) { + } catch (MaxChangedBlocksException _) { // If we can't set the glass, that's OK. } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java index 87350b78b6..183bb29611 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java @@ -288,7 +288,7 @@ private void registerAlwaysInjectedValues() { */ public void registerSubCommands(String name, List aliases, String desc, CommandRegistration registration, CI instance) { - registerSubCommands(name, aliases, desc, registration, instance, m -> { + registerSubCommands(name, aliases, desc, registration, instance, _ -> { }); } @@ -577,13 +577,13 @@ private MemoizingValueAccess initializeInjectedValues(Arguments arguments, Actor store.injectValue(Key.of(Player.class), ValueProvider.constant(player)); store.injectValue(Key.of(Player.class, OptionalArg.class), ValueProvider.constant(player)); } else { - store.injectValue(Key.of(Player.class), context -> { + store.injectValue(Key.of(Player.class), _ -> { throw new CommandException(TranslatableComponent.of("worldedit.command.player-only"), ImmutableList.of()); }); } store.injectValue(Key.of(Arguments.class), ValueProvider.constant(arguments)); store.injectValue(Key.of(LocalSession.class), - context -> { + _ -> { LocalSession localSession = worldEdit.getSessionManager().get(actor); localSession.tellVersion(actor); return Optional.of(localSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java index c2c8173e62..37f1c02825 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java @@ -75,7 +75,7 @@ public boolean isFormat(InputStream inputStream) { try { DataInputStream stream = new DataInputStream(new GZIPInputStream(inputStream)); rootEntry = LinBinaryIO.readUsing(stream, LEGACY_OPTIONS, LinRootEntry::readFrom); - } catch (Exception e) { + } catch (Exception _) { return false; } if (!rootEntry.name().equals("Schematic")) { @@ -157,7 +157,7 @@ public boolean isFormat(InputStream inputStream) { try { DataInputStream stream = new DataInputStream(new GZIPInputStream(inputStream)); root = LinBinaryIO.readUsing(stream, LinRootEntry::readFrom).value(); - } catch (Exception e) { + } catch (Exception _) { return false; } LinCompoundTag schematicTag = root.findTag("Schematic", LinTagType.compoundTag()); @@ -178,7 +178,7 @@ private static boolean detectOldSpongeSchematic(InputStream inputStream, int ver try { DataInputStream stream = new DataInputStream(new GZIPInputStream(inputStream)); rootEntry = LinBinaryIO.readUsing(stream, LEGACY_OPTIONS, LinRootEntry::readFrom); - } catch (Exception e) { + } catch (Exception _) { return false; } if (!rootEntry.name().equals("Schematic")) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormat.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormat.java index 0e826e5500..76c5ab61ff 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormat.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormat.java @@ -85,7 +85,7 @@ default boolean isFormat(File file) { default boolean isFormat(Path path) { try (InputStream stream = Files.newInputStream(path)) { return isFormat(stream); - } catch (IOException e) { + } catch (IOException _) { return false; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java index d639447851..06166c5c79 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java @@ -131,7 +131,7 @@ public static ClipboardFormat findByInputStream(Supplier inputStrea if (format.isFormat(stream)) { return format; } - } catch (IOException ignored) { + } catch (IOException _) { // It's not the right format if we can't read it } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java index e5b194157a..cd6a8c7184 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java @@ -153,7 +153,7 @@ public Clipboard read() throws IOException { origin = min.subtract(offset); region = new CuboidRegion(min, min.add(width, height, length).subtract(BlockVector3.ONE)); - } catch (NoSuchElementException e) { + } catch (NoSuchElementException _) { origin = BlockVector3.ZERO; region = new CuboidRegion(origin, origin.add(width, height, length).subtract(BlockVector3.ONE)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java index 8ab2a8f5dd..b8e2c76ff7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java @@ -80,7 +80,7 @@ public OptionalInt getDataVersion() { } default -> OptionalInt.empty(); }; - } catch (IOException e) { + } catch (IOException _) { return OptionalInt.empty(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BannerBlockCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BannerBlockCompatibilityHandler.java index 4728f51b9c..90efef9e11 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BannerBlockCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BannerBlockCompatibilityHandler.java @@ -41,7 +41,7 @@ public class BannerBlockCompatibilityHandler implements NBTCompatibilityHandler try { tempFacing = BlockTypes.WHITE_WALL_BANNER.getProperty("facing"); tempRotation = BlockTypes.WHITE_BANNER.getProperty("rotation"); - } catch (NullPointerException | IllegalArgumentException | ClassCastException e) { + } catch (NullPointerException | IllegalArgumentException | ClassCastException _) { tempFacing = null; tempRotation = null; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BedBlockCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BedBlockCompatibilityHandler.java index eee84888f2..5c4ed04f31 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BedBlockCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/BedBlockCompatibilityHandler.java @@ -39,7 +39,7 @@ public class BedBlockCompatibilityHandler implements NBTCompatibilityHandler { try { tempFacing = BlockTypes.RED_BED.getProperty("facing"); tempPart = BlockTypes.RED_BED.getProperty("part"); - } catch (NullPointerException | IllegalArgumentException | ClassCastException e) { + } catch (NullPointerException | IllegalArgumentException | ClassCastException _) { tempFacing = null; tempPart = null; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NoteBlockCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NoteBlockCompatibilityHandler.java index 502d6b4b05..be478eb926 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NoteBlockCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NoteBlockCompatibilityHandler.java @@ -32,7 +32,7 @@ public class NoteBlockCompatibilityHandler implements NBTCompatibilityHandler { IntegerProperty temp; try { temp = (IntegerProperty) (Property) BlockTypes.NOTE_BLOCK.getProperty("note"); - } catch (NullPointerException | IllegalArgumentException | ClassCastException e) { + } catch (NullPointerException | IllegalArgumentException | ClassCastException _) { temp = null; } NOTE_PROPERTY = temp; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java index bf190a7db1..2cc1b97e94 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java @@ -53,7 +53,7 @@ public BaseBlock updateNbt(BaseBlock block) { if (storedString.startsWith("{")) { try { jsonElement = JsonParser.parseString(storedString); - } catch (JsonSyntaxException ex) { + } catch (JsonSyntaxException _) { // ignore: jsonElement will be null in the next check } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SkullBlockCompatibilityHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SkullBlockCompatibilityHandler.java index 6c1e7b5bf2..b4348bd2db 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SkullBlockCompatibilityHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SkullBlockCompatibilityHandler.java @@ -35,7 +35,7 @@ public class SkullBlockCompatibilityHandler implements NBTCompatibilityHandler { Property tempFacing; try { tempFacing = BlockTypes.SKELETON_WALL_SKULL.getProperty("facing"); - } catch (NullPointerException | IllegalArgumentException | ClassCastException e) { + } catch (NullPointerException | IllegalArgumentException | ClassCastException _) { tempFacing = null; } FACING_PROPERTY = tempFacing; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/ReaderUtil.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/ReaderUtil.java index c34c6eabd4..272c41365a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/ReaderUtil.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/ReaderUtil.java @@ -130,7 +130,7 @@ static Map decodePalette( BlockState state; try { state = WorldEdit.getInstance().getBlockFactory().parseFromInput(paletteName, parserContext).toImmutableState(); - } catch (InputParseException e) { + } catch (InputParseException _) { LOGGER.warn("Invalid BlockState in palette: " + palettePart + ". Block will be replaced with air."); state = BlockTypes.AIR.getDefaultState(); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV1Reader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV1Reader.java index b8e4f2ea77..5721bcb4c4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV1Reader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV1Reader.java @@ -79,7 +79,7 @@ public OptionalInt getDataVersion() { // Validate schematic version to be sure ReaderUtil.checkSchematicVersion(1, getBaseTag()); return OptionalInt.of(Constants.DATA_VERSION_MC_1_13_2); - } catch (IOException e) { + } catch (IOException _) { return OptionalInt.empty(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Reader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Reader.java index 6cfff8868d..e5374bfcd6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Reader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV2Reader.java @@ -88,7 +88,7 @@ public OptionalInt getDataVersion() { return OptionalInt.empty(); } return OptionalInt.of(dataVersion); - } catch (IOException e) { + } catch (IOException _) { return OptionalInt.empty(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Reader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Reader.java index ac7ecb9b0f..153b80271b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Reader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/sponge/SpongeSchematicV3Reader.java @@ -83,7 +83,7 @@ public OptionalInt getDataVersion() { return OptionalInt.empty(); } return OptionalInt.of(dataVersion); - } catch (IOException e) { + } catch (IOException _) { return OptionalInt.empty(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBag.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBag.java index fb34aaf512..38bacb8129 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBag.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBag.java @@ -106,7 +106,7 @@ public boolean peekBlock(BlockState blockState) { fetchBlock(blockState); storeBlock(blockState); return true; - } catch (BlockBagException e) { + } catch (BlockBagException _) { return false; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java index 7d0df55c10..71f1d7ae6c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java @@ -89,9 +89,9 @@ public > boolean setBlock(BlockVector3 position, B if (!block.getBlockType().getMaterial().isAir()) { try { blockBag.fetchPlacedBlock(block.toImmutableState()); - } catch (UnplaceableBlockException e) { + } catch (UnplaceableBlockException _) { return false; - } catch (BlockBagException e) { + } catch (BlockBagException _) { if (!missingBlocks.containsKey(block.getBlockType())) { missingBlocks.put(block.getBlockType(), 1); } else { @@ -104,7 +104,7 @@ public > boolean setBlock(BlockVector3 position, B if (!existing.getBlockType().getMaterial().isAir()) { try { blockBag.storeDroppedBlock(existing); - } catch (BlockBagException ignored) { + } catch (BlockBagException _) { // If we can't store the block, void it } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/SideEffectExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/SideEffectExtent.java index aab307350c..4e6bbf59d6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/SideEffectExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/SideEffectExtent.java @@ -56,7 +56,7 @@ public class SideEffectExtent extends AbstractDelegateExtent { private static final SideEffectSet INTERNAL_NONE = new SideEffectSet( Arrays.stream(SideEffect.values()) - .collect(Collectors.toMap(Function.identity(), state -> SideEffect.State.OFF)) + .collect(Collectors.toMap(Function.identity(), _ -> SideEffect.State.OFF)) ); /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask.java index 25f3ff722e..0479326e57 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask.java @@ -78,7 +78,7 @@ public boolean test(BlockVector3 vector) { return expression.evaluate(new double[]{ vector.x(), vector.y(), vector.z() }, timeout.getAsInt()) > 0; } - } catch (EvaluationException e) { + } catch (EvaluationException _) { return false; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask2D.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask2D.java index 552ab838f4..efd9260b30 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask2D.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask2D.java @@ -67,7 +67,7 @@ public boolean test(BlockVector2 vector) { } else { return expression.evaluate(new double[]{ vector.x(), 0, vector.z() }, timeout.getAsInt()) > 0; } - } catch (EvaluationException e) { + } catch (EvaluationException _) { return false; } } 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 02372de9db..3ad765c413 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 @@ -43,7 +43,7 @@ public MaskMemoizer2D(Mask2D mask) { @Override public boolean test(BlockVector2 vector) { // Use a Y=0 BlockVector3 to avoid creating a new BlockMap implementation - return this.cache.computeIfAbsent(vector.toBlockVector3(), ignored -> mask.test(vector)); + return this.cache.computeIfAbsent(vector.toBlockVector3(), _ -> mask.test(vector)); } public void clear() { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ExtentBufferedCompositePattern.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ExtentBufferedCompositePattern.java index 5583e55087..6c52e3a987 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ExtentBufferedCompositePattern.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ExtentBufferedCompositePattern.java @@ -58,7 +58,7 @@ public BaseBlock applyBlock(BlockVector3 position) { lastBlock = pattern.applyBlock(position); try { getExtent().setBlock(position, lastBlock); - } catch (WorldEditException ignored) { // buffer doesn't throw + } catch (WorldEditException _) { // buffer doesn't throw } } return lastBlock; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/anvil/ChunkDeleter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/anvil/ChunkDeleter.java index aae68e4eb5..1f76c5d626 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/anvil/ChunkDeleter.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/anvil/ChunkDeleter.java @@ -205,12 +205,12 @@ private Map> groupChunks(ChunkDeletionInfo.ChunkBatch private BiPredicate createPredicates(List deletionPredicates) { if (deletionPredicates == null) { - return (r, p) -> true; + return (_, _) -> true; } return deletionPredicates.stream() .map(this::createPredicate) .reduce(BiPredicate::and) - .orElse((r, p) -> true); + .orElse((_, _) -> true); } private BiPredicate createPredicate(ChunkDeletionInfo.DeletionPredicate deletionPredicate) { @@ -218,21 +218,21 @@ private BiPredicate createPredicate(ChunkDeletionInf int time; try { time = Integer.parseInt(deletionPredicate.value); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { throw new IllegalStateException("Modification time predicate specified invalid time: " + deletionPredicate.value); } return switch (deletionPredicate.comparison) { case "<" -> (r, p) -> { try { return r.getModificationTime(p) < time; - } catch (IOException e) { + } catch (IOException _) { return false; } }; case ">" -> (r, p) -> { try { return r.getModificationTime(p) > time; - } catch (IOException e) { + } catch (IOException _) { return false; } }; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandLoggingHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandLoggingHandler.java index 88acd58ed0..bd1955249c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandLoggingHandler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandLoggingHandler.java @@ -88,7 +88,7 @@ public void beforeCall(Method method, CommandParameters parameters) { return; } world = worldOpt.get(); - } catch (CommandException ex) { + } catch (CommandException _) { return; } @@ -111,7 +111,7 @@ public void beforeCall(Method method, CommandParameters parameters) { case PLACEMENT: try { position = session.getPlacementPosition(actor).toVector3(); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { break; } /* FALL-THROUGH */ @@ -132,7 +132,7 @@ public void beforeCall(Method method, CommandParameters parameters) { try { builder.append(" - Region: ") .append(session.getSelection(world)); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { break; } break; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/Functions.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/Functions.java index f144396109..9e3d24eb34 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/Functions.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/Functions.java @@ -188,7 +188,7 @@ public void setEnvironment(ExpressionEnvironment environment) { } private static double[] getSubBuffer(Int2ObjectMap megabuf, int key) { - return megabuf.computeIfAbsent(key, k -> new double[1024]); + return megabuf.computeIfAbsent(key, _ -> new double[1024]); } private static double getBufferItem(final Int2ObjectMap megabuf, final int index) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/SlotTable.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/SlotTable.java index 406dd58089..d32c62513d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/SlotTable.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/SlotTable.java @@ -42,7 +42,7 @@ public boolean containsSlot(String name) { } public Optional initVariable(String name) { - slots.computeIfAbsent(name, n -> new LocalSlot.Variable(0)); + slots.computeIfAbsent(name, _ -> new LocalSlot.Variable(0)); return getVariable(name); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/RecursiveDirectoryWatcher.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/RecursiveDirectoryWatcher.java index d8f73b9d2c..db4cf65f48 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/RecursiveDirectoryWatcher.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/RecursiveDirectoryWatcher.java @@ -176,7 +176,7 @@ public void start(Consumer eventConsumer) { while (!Thread.interrupted()) { try { watchKey = watchService.take(); - } catch (InterruptedException e) { + } catch (InterruptedException _) { break; } @@ -234,7 +234,7 @@ public void start(Consumer eventConsumer) { } } } - } catch (ClosedWatchServiceException ignored) { + } catch (ClosedWatchServiceException _) { // Watch service closed, exit } LOGGER.debug("RecursiveDirectoryWatcher::EventConsumer exited"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java index cd03295c68..d0f6ed0b60 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java @@ -75,7 +75,7 @@ public void shift(BlockVector3 change) throws RegionOperationException { public AbstractRegion clone() { try { return (AbstractRegion) super.clone(); - } catch (CloneNotSupportedException exc) { + } catch (CloneNotSupportedException _) { return null; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java index eb33fd7e51..7e64e3ff71 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java @@ -88,7 +88,7 @@ public ConvexPolyhedralRegionSelector(RegionSelector oldSelector) { final Region oldRegion; try { oldRegion = oldSelector.getRegion(); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { region = new ConvexPolyhedralRegion(oldSelector.getIncompleteRegion().getWorld()); return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java index 17eaa63be7..3dde7ee167 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java @@ -83,7 +83,7 @@ public CuboidRegionSelector(RegionSelector oldSelector) { final Region oldRegion; try { oldRegion = oldSelector.getRegion(); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java index c676643fc1..496b30c608 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java @@ -95,7 +95,7 @@ public CylinderRegionSelector(RegionSelector oldSelector) { final Region oldRegion; try { oldRegion = oldSelector.getRegion(); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java index 362ef814bf..5ec7751e16 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java @@ -84,7 +84,7 @@ public EllipsoidRegionSelector(RegionSelector oldSelector) { Region oldRegion; try { oldRegion = oldSelector.getRegion(); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java index 5d7ad4defc..397c3a2a8a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java @@ -83,7 +83,7 @@ public Polygonal2DRegionSelector(RegionSelector oldSelector) { final Region oldRegion; try { oldRegion = oldSelector.getRegion(); - } catch (IncompleteRegionException e) { + } catch (IncompleteRegionException _) { return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/IntegerProperty.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/IntegerProperty.java index b64733a4f9..5de9d5d2b5 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/IntegerProperty.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/IntegerProperty.java @@ -31,7 +31,7 @@ public Integer getValueFor(String string) { throw new IllegalArgumentException("Invalid int value: " + string + ". Must be in " + values()); } return val; - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { throw new IllegalArgumentException("Invalid int value: " + string + ". Not an int."); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoContextFactory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoContextFactory.java index 0b1a7187ae..c20bc3a43e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoContextFactory.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoContextFactory.java @@ -39,7 +39,7 @@ protected Context makeContext() { // Try to set ES6 compat flag (since 1.7.7) var _ = Context.class.getDeclaredField("VERSION_ES6"); cx.setLanguageVersion(RhinoContext.VERSION_ES6); - } catch (NoSuchFieldException e) { + } catch (NoSuchFieldException _) { // best we can do, compatible with 1.7R2 that many people probably use cx.setLanguageVersion(Context.VERSION_1_7); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java index 7965e227ce..118ffed572 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java @@ -56,7 +56,7 @@ protected Region getRegion() { if (session != null && world != null) { try { return session.getSelection(world); - } catch (IncompleteRegionException ignored) { + } catch (IncompleteRegionException _) { // Use NullRegion if incomplete } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/storage/JsonFileSessionStore.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/storage/JsonFileSessionStore.java index 23a657e841..937881109c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/session/storage/JsonFileSessionStore.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/session/storage/JsonFileSessionStore.java @@ -108,7 +108,7 @@ public LocalSession load(UUID id) throws IOException { return session; } catch (JsonParseException e) { throw new IOException(e); - } catch (NoSuchFileException e) { + } catch (NoSuchFileException _) { return new LocalSession(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/Enums.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/Enums.java index a454c4b623..f7d83b4145 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/Enums.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/Enums.java @@ -47,7 +47,7 @@ public static > T findByValue(Class enumType, String... val for (String val : values) { try { return Enum.valueOf(enumType, val); - } catch (IllegalArgumentException ignored) { + } catch (IllegalArgumentException _) { // Ignore if invalid } } 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 23c1bdb1cf..3779a4671a 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 @@ -81,7 +81,7 @@ public PropertiesConfiguration(File path) { public void load() { try (InputStream stream = new FileInputStream(path)) { properties.load(stream); - } catch (FileNotFoundException ignored) { + } catch (FileNotFoundException _) { // We expect to not find the file the first time } catch (IOException e) { LOGGER.warn("Failed to read configuration", e); @@ -202,7 +202,7 @@ protected int getInt(String key, int def) { } else { try { return Integer.parseInt(val); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { properties.setProperty(key, String.valueOf(def)); return def; } @@ -224,7 +224,7 @@ protected double getDouble(String key, double def) { } else { try { return Double.parseDouble(val); - } catch (NumberFormatException e) { + } catch (NumberFormatException _) { properties.setProperty(key, String.valueOf(def)); return def; } @@ -254,7 +254,7 @@ protected Set getIntSet(String key, int[] def) { try { int v = Integer.parseInt(part.trim()); set.add(v); - } catch (NumberFormatException ignored) { + } catch (NumberFormatException _) { // Historically ignored } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java index 3513501f60..06399653e3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/SideEffectSet.java @@ -37,7 +37,7 @@ public final class SideEffectSet { private static final SideEffectSet NONE = new SideEffectSet( Arrays.stream(SideEffect.values()) .filter(SideEffect::isExposed) - .collect(Collectors.toMap(Function.identity(), state -> SideEffect.State.OFF)) + .collect(Collectors.toMap(Function.identity(), _ -> SideEffect.State.OFF)) ); static { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/asset/AssetLoader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/asset/AssetLoader.java index 52ff2c1347..4f58c3a20f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/asset/AssetLoader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/asset/AssetLoader.java @@ -74,7 +74,7 @@ public T getAsset(String path) { extensions[0], extensions ).toPath(); - } catch (FilenameException e) { + } catch (FilenameException _) { return null; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java index 21438ac113..30a46cd467 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/BlockMap.java @@ -128,7 +128,7 @@ private BlockMap(Supplier> subMapSupplier, Map getOrCreateMap(long groupKey) { - return maps.computeIfAbsent(groupKey, k -> subMapSupplier.get()); + return maps.computeIfAbsent(groupKey, _ -> subMapSupplier.get()); } private Int2ObjectMap getOrEmptyMap(long groupKey) { @@ -212,19 +212,19 @@ public V replace(BlockVector3 key, V value) { @Override public V computeIfAbsent(BlockVector3 key, Function mappingFunction) { return cleanlyModifyMap(toGroupKey(key), - map -> map.computeIfAbsent(toInnerKey(key), ik -> mappingFunction.apply(key))); + map -> map.computeIfAbsent(toInnerKey(key), _ -> mappingFunction.apply(key))); } @Override public V computeIfPresent(BlockVector3 key, BiFunction remappingFunction) { return cleanlyModifyMap(toGroupKey(key), - map -> map.computeIfPresent(toInnerKey(key), (ik, block) -> remappingFunction.apply(key, block))); + map -> map.computeIfPresent(toInnerKey(key), (_, block) -> remappingFunction.apply(key, block))); } @Override public V compute(BlockVector3 key, BiFunction remappingFunction) { return cleanlyModifyMap(toGroupKey(key), - map -> map.compute(toInnerKey(key), (ik, block) -> remappingFunction.apply(key, block))); + map -> map.compute(toInnerKey(key), (_, block) -> remappingFunction.apply(key, block))); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java index b27f287eb7..35bd43946a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java @@ -69,7 +69,7 @@ public class StyleSerializer implements JsonDeserializer