Code cleanup

magemonkeystudio · May 26, 2024 · e080a82 · e080a82
1 parent d9e411d
commit e080a82
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/src/main/java/studio/magemonkey/divinity/config/EngineCfg.java b/src/main/java/studio/magemonkey/divinity/config/EngineCfg.java
@@ -279,7 +279,7 @@ public void setup() {
         if (EngineCfg.LORE_STYLE_REQ_USER_DYN_UPDATE = cfg.getBoolean(path + "enabled")) {
             EngineCfg.LORE_STYLE_REQ_USER_DYN_STATE = new HashMap<>();
             for (boolean b : new boolean[]{true, false}) {
-                String reqState = cfg.getString(path + "format." + String.valueOf(b));
+                String reqState = cfg.getString(path + "format." + b);
                 if (reqState == null) {
                     if (b) reqState = "&a&l✓ &r&a";
                     else reqState = "&c&l✗ &r&c";

diff --git a/...main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java b/...main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java
@@ -747,8 +747,7 @@ protected ItemStack build(int itemLvl, int uses, @Nullable ItemType mat) {
                         }
                         int index = Rnd.get(size);
                         int i     = 0;
-                        for (Iterator<TrimPattern> iterator = Registry.TRIM_PATTERN.iterator(); iterator.hasNext(); ) {
-                            TrimPattern next = iterator.next();
+                        for (TrimPattern next : Registry.TRIM_PATTERN) {
                             if (index == i) {
                                 trimPattern = next;
                                 break;

diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/refine/RefineManager.java b/src/main/java/studio/magemonkey/divinity/modules/list/refine/RefineManager.java
@@ -1,6 +1,17 @@
 package studio.magemonkey.divinity.modules.list.refine;
 
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import studio.magemonkey.codex.config.api.JYML;
+import studio.magemonkey.codex.manager.api.gui.*;
 import studio.magemonkey.codex.util.*;
 import studio.magemonkey.codex.util.actions.ActionManipulator;
 import studio.magemonkey.codex.util.random.Rnd;
@@ -21,17 +32,6 @@
 import studio.magemonkey.divinity.stats.items.attributes.api.SimpleStat;
 import studio.magemonkey.divinity.utils.ItemUtils;
 import studio.magemonkey.divinity.utils.LoreUT;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import studio.magemonkey.codex.manager.api.gui.*;
 
 import java.util.*;
 import java.util.function.BiFunction;
@@ -254,7 +254,6 @@ public void refineItem(@NotNull ItemStack item, @NotNull RefineItem stone) {
         this.addFines(item, stone, lvl + 1);
     }
 
-    @NotNull
     public void downgradeItem(@NotNull ItemStack item, boolean force) {
         String stoneId = this.getRefineStoneId(item);
         if (stoneId == null) return;
@@ -294,19 +293,17 @@ public String getNameWithLevel(@NotNull ItemStack item, int lvl) {
 
         String format = entry.getValue().replace("%level%", String.valueOf(lvl));
         if (this.formatNameAsPrefix) {
-            return StringUT.colorFix(new StringBuilder(format).append(name).toString());
+            return StringUT.colorFix(format + name);
         } else {
-            return StringUT.colorFix(new StringBuilder(name).append(format).toString());
+            return StringUT.colorFix(name + format);
         }
     }
 
     /**
      * @param item      An refined ItemStack
      * @param stone     EnchantmentStone (if level is greater than 0)
      * @param refineLvl Enchantment Stone level
-     * @return
      */
-    @NotNull
     private void setRefineLevel(
             @NotNull ItemStack item,
             @Nullable RefineItem stone,

diff --git a/src/main/java/studio/magemonkey/divinity/stats/items/api/ItemLoreStat.java b/src/main/java/studio/magemonkey/divinity/stats/items/api/ItemLoreStat.java
@@ -1,12 +1,5 @@
 package studio.magemonkey.divinity.stats.items.api;
 
-import studio.magemonkey.codex.util.ItemUT;
-import studio.magemonkey.codex.util.StringUT;
-import studio.magemonkey.divinity.Divinity;
-import studio.magemonkey.divinity.config.EngineCfg;
-import studio.magemonkey.divinity.stats.items.ItemStats;
-import studio.magemonkey.divinity.stats.items.attributes.api.TypedStat;
-import studio.magemonkey.divinity.utils.LoreUT;
 import org.bukkit.ChatColor;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
@@ -15,6 +8,13 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import studio.magemonkey.codex.util.ItemUT;
+import studio.magemonkey.codex.util.StringUT;
+import studio.magemonkey.divinity.Divinity;
+import studio.magemonkey.divinity.config.EngineCfg;
+import studio.magemonkey.divinity.stats.items.ItemStats;
+import studio.magemonkey.divinity.stats.items.attributes.api.TypedStat;
+import studio.magemonkey.divinity.utils.LoreUT;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -193,7 +193,6 @@ public boolean add(@NotNull ItemStack item, @NotNull Z value, int line) {
         return !isEmpty;
     }
 
-    @NotNull
     public final void remove(@NotNull ItemStack item) {
         this.validateMethod();
 
@@ -278,9 +277,9 @@ public final int getLoreIndex(@NotNull ItemStack item) {
     }
 
     /**
-     * @param item
+     * @param item Item to check.
      * @return true if stat is present in item lore (position >= 0).
-     * Does not checks for item meta.
+     * Does not check for item meta.
      */
     public final boolean isApplied(@NotNull ItemStack item) {
         return this.getLoreIndex(item) >= 0;
@@ -295,7 +294,6 @@ public final boolean hasPlaceholder(@NotNull ItemStack item) {
         return lore.contains(this.getPlaceholder());
     }
 
-    @NotNull
     protected final void preparePlaceholder(@NotNull ItemStack item, int line) {
         this.validateMethod();
 
@@ -319,7 +317,7 @@ protected final void preparePlaceholder(@NotNull ItemStack item, int line) {
     @NotNull
     public abstract String formatValue(@NotNull ItemStack item, @NotNull Z value);
 
-    private final void validateMethod() {
+    private void validateMethod() {
         if (this instanceof DuplicableItemLoreStat) {
             throw new UnsupportedOperationException(
                     "Attempt to manage duplicable stat at NULL index. Index must be provided.");