From 1f05e6ef595deefba2072f0fb21500140c841ae0 Mon Sep 17 00:00:00 2001
From: alexcrea <a.dujardin511@laposte.net>
Date: Sun, 3 Mar 2024 17:44:34 +0100
Subject: [PATCH] remove comment-out code & optimise import

---
 .../gui/config/AbstractEnchantConfigGui.java  | 12 +-------
 .../settings/EnchantCostSettingsGui.java      |  1 -
 .../xyz/alexcrea/cuanvil/util/Metrics.java    | 28 ++++++-------------
 src/main/kotlin/io/delilaheve/CustomAnvil.kt  |  2 +-
 .../cuanvil/group/AbstractMaterialGroup.kt    |  2 +-
 .../alexcrea/cuanvil/group/ExcludeGroup.kt    |  1 -
 .../alexcrea/cuanvil/group/IncludeGroup.kt    |  2 +-
 7 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/AbstractEnchantConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/AbstractEnchantConfigGui.java
index a249be1..c1e57c6 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/AbstractEnchantConfigGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/AbstractEnchantConfigGui.java
@@ -65,14 +65,7 @@ public abstract class AbstractEnchantConfigGui<T extends AbstractSettingGui.Sett
         enchantments.sort(Comparator.comparing(ench -> ench.getKey().getKey()));
 
         for (Enchantment enchant : enchantments) {
-            //String key = enchant.getKey().getKey().toLowerCase(Locale.ROOT);
-            //String prettyKey = StringUtil.snakeToUpperSpacedCase(key);
-
             T factory = getFactoryFromEnchant(enchant);
-                    /*IntSettingsGui.factory(prettyKey, this,
-                    SECTION_NAME+'.'+key, ConfigHolder.DEFAULT_CONFIG, 0, 255,
-                    enchant.getMaxLevel(),
-                    1, 5, 10, 50, 100);*/
 
             bookItemFactoryList.add(factory);
         }
@@ -86,11 +79,8 @@ public abstract class AbstractEnchantConfigGui<T extends AbstractSettingGui.Sett
         this.filledEnchant.clear();
 
         for (T inventoryFactory : this.bookItemFactoryList) {
-
             GuiItem item = getItemFromFactory(inventoryFactory);
-                    /*GuiGlobalItems.intSettingGuiItem(inventoryFactory,
-                    Material.ENCHANTED_BOOK,
-                    inventoryFactory.getTitle());*/
+
             this.filledEnchant.addItem(item);
         }
 
diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantCostSettingsGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantCostSettingsGui.java
index c8b20c8..e0bfe2e 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantCostSettingsGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantCostSettingsGui.java
@@ -16,7 +16,6 @@ import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions;
 import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.function.Consumer;
 
 public class EnchantCostSettingsGui extends IntSettingsGui {
diff --git a/src/main/java/xyz/alexcrea/cuanvil/util/Metrics.java b/src/main/java/xyz/alexcrea/cuanvil/util/Metrics.java
index fe1ffb7..f21a15c 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/util/Metrics.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/util/Metrics.java
@@ -14,22 +14,18 @@
  */
 package xyz.alexcrea.cuanvil.util;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.*;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -40,12 +36,6 @@ import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.zip.GZIPOutputStream;
-import javax.net.ssl.HttpsURLConnection;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
 
 public class Metrics {
 
diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt
index 4172392..dbdca63 100644
--- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt
+++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt
@@ -4,8 +4,8 @@ import io.delilaheve.util.ConfigOptions
 import org.bukkit.Bukkit
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.plugin.java.JavaPlugin
-import xyz.alexcrea.cuanvil.command.ReloadExecutor
 import xyz.alexcrea.cuanvil.command.EditConfigExecutor
+import xyz.alexcrea.cuanvil.command.ReloadExecutor
 import xyz.alexcrea.cuanvil.config.ConfigHolder
 import xyz.alexcrea.cuanvil.util.Metrics
 import xyz.alexcrea.cuanvil.util.MetricsUtil
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
index fbc007a..ffcaab4 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/AbstractMaterialGroup.kt
@@ -1,7 +1,7 @@
 package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.Material
-import java.util.EnumSet
+import java.util.*
 
 abstract class AbstractMaterialGroup(private val name: String) {
     protected val includedMaterial by lazy {createDefaultSet()}
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
index fe70cb6..d8ee38b 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/ExcludeGroup.kt
@@ -2,7 +2,6 @@ package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.Material
 import java.util.*
-import kotlin.collections.HashSet
 
 class ExcludeGroup(name: String): AbstractMaterialGroup(name) {
     override fun createDefaultSet(): EnumSet<Material> {
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
index 8f97b94..bd962c2 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/group/IncludeGroup.kt
@@ -1,7 +1,7 @@
 package xyz.alexcrea.cuanvil.group
 
 import org.bukkit.Material
-import java.util.EnumSet
+import java.util.*
 
 class IncludeGroup(name: String): AbstractMaterialGroup(name) {
     override fun createDefaultSet(): EnumSet<Material> {