fixup! chore: Add namedspaced_key method & change clashing Util methods.

oddlama · Feb 4, 2022 · 5a21492 · 5a21492
1 parent 6cfe2fb
commit 5a21492
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;