From 5a21492a04f6dda015551c8b1ebf303ef2d4b9d5 Mon Sep 17 00:00:00 2001 From: ryantheleach Date: Wed, 12 Jan 2022 05:48:26 +1030 Subject: [PATCH] fixup! chore: Add namedspaced_key method & change clashing Util methods. --- .../java/org/oddlama/vane/core/module/ModuleComponent.java | 1 - .../org/oddlama/vane/enchantments/CustomEnchantment.java | 2 -- .../oddlama/vane/enchantments/enchantments/Soulbound.java | 7 ++++--- .../java/org/oddlama/vane/portals/menu/ConsoleMenu.java | 2 -- .../java/org/oddlama/vane/portals/menu/SettingsMenu.java | 2 -- .../org/oddlama/vane/regions/menu/RegionGroupMenu.java | 2 -- .../java/org/oddlama/vane/regions/menu/RegionMenu.java | 1 - .../main/java/org/oddlama/vane/regions/menu/RoleMenu.java | 2 -- 8 files changed, 4 insertions(+), 15 deletions(-) diff --git a/vane-core/src/main/java/org/oddlama/vane/core/module/ModuleComponent.java b/vane-core/src/main/java/org/oddlama/vane/core/module/ModuleComponent.java index 4c0eaf019..f1ec086a5 100644 --- a/vane-core/src/main/java/org/oddlama/vane/core/module/ModuleComponent.java +++ b/vane-core/src/main/java/org/oddlama/vane/core/module/ModuleComponent.java @@ -2,7 +2,6 @@ import java.io.IOException; import java.util.function.Consumer; - import org.bukkit.NamespacedKey; import org.bukkit.scheduler.BukkitTask; import org.json.JSONObject; diff --git a/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/CustomEnchantment.java b/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/CustomEnchantment.java index 2a9a5c3b9..2e3800f49 100644 --- a/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/CustomEnchantment.java +++ b/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/CustomEnchantment.java @@ -1,7 +1,5 @@ package org.oddlama.vane.enchantments; -import static org.oddlama.vane.util.Util.namespaced_key; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/enchantments/Soulbound.java b/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/enchantments/Soulbound.java index 4b733c54b..f1fc9ef4d 100644 --- a/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/enchantments/Soulbound.java +++ b/vane-enchantments/src/main/java/org/oddlama/vane/enchantments/enchantments/Soulbound.java @@ -1,7 +1,5 @@ package org.oddlama.vane.enchantments.enchantments; -import static org.oddlama.vane.util.Util.namespaced_key; - import java.util.ArrayList; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -193,7 +191,10 @@ public void on_player_drop_item(final PlayerDropItemEvent event) { if (inventory.firstEmpty() != -1) { // We still have space in the inventory, so the player tried to drop it with Q. event.setCancelled(true); - lang_drop_lock_warning.send_action_bar(event.getPlayer(), event.getItemDrop().getItemStack().displayName()); + lang_drop_lock_warning.send_action_bar( + event.getPlayer(), + event.getItemDrop().getItemStack().displayName() + ); } else { // Inventory is full (e.g. when exiting crafting table with soulbound item in it) // so we drop the first non-soulbound item (if any) instead. diff --git a/vane-portals/src/main/java/org/oddlama/vane/portals/menu/ConsoleMenu.java b/vane-portals/src/main/java/org/oddlama/vane/portals/menu/ConsoleMenu.java index d4b5c8bde..f024cfb25 100644 --- a/vane-portals/src/main/java/org/oddlama/vane/portals/menu/ConsoleMenu.java +++ b/vane-portals/src/main/java/org/oddlama/vane/portals/menu/ConsoleMenu.java @@ -1,7 +1,5 @@ package org.oddlama.vane.portals.menu; -import static org.oddlama.vane.util.Util.namespaced_key; - import java.util.Objects; import java.util.stream.Collectors; import net.kyori.adventure.text.Component; diff --git a/vane-portals/src/main/java/org/oddlama/vane/portals/menu/SettingsMenu.java b/vane-portals/src/main/java/org/oddlama/vane/portals/menu/SettingsMenu.java index ce615e93b..43b38cb72 100644 --- a/vane-portals/src/main/java/org/oddlama/vane/portals/menu/SettingsMenu.java +++ b/vane-portals/src/main/java/org/oddlama/vane/portals/menu/SettingsMenu.java @@ -1,7 +1,5 @@ package org.oddlama.vane.portals.menu; -import static org.oddlama.vane.util.Util.namespaced_key; - import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionGroupMenu.java b/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionGroupMenu.java index df33bb022..286602a4b 100644 --- a/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionGroupMenu.java +++ b/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionGroupMenu.java @@ -1,7 +1,5 @@ package org.oddlama.vane.regions.menu; -import static org.oddlama.vane.util.Util.namespaced_key; - import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionMenu.java b/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionMenu.java index 22fe3b73b..53ccd382b 100644 --- a/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionMenu.java +++ b/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RegionMenu.java @@ -1,7 +1,6 @@ package org.oddlama.vane.regions.menu; import static org.oddlama.vane.util.PlayerUtil.give_items; -import static org.oddlama.vane.util.Util.namespaced_key; import java.util.stream.Collectors; import org.bukkit.Bukkit; diff --git a/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RoleMenu.java b/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RoleMenu.java index 42b23a4e2..5ab7170b1 100644 --- a/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RoleMenu.java +++ b/vane-regions/src/main/java/org/oddlama/vane/regions/menu/RoleMenu.java @@ -1,7 +1,5 @@ package org.oddlama.vane.regions.menu; -import static org.oddlama.vane.util.Util.namespaced_key; - import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Material;