improve: 优化附魔上限限制

Author: StarWishsama

pom.xml

@@ -6,8 +6,6 @@
     <groupId>com.github.thebusybiscuit</groupId>
     <artifactId>Slimefun</artifactId>
 
-    <!-- Our default version will be UNOFFICIAL, this will prevent the auto updater -->
-    <!-- from overriding our local test file -->
     <version>4.8-nightly</version>
 
     <properties>

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoDisenchanter.java

@@ -13,7 +13,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -36,9 +35,13 @@
  */
 public class AutoDisenchanter extends AContainer {
 
+    private final int limit;
+
     @ParametersAreNonnullByDefault
     public AutoDisenchanter(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
         super(category, item, recipeType, recipe);
+
+        limit = SlimefunPlugin.getCfg().getInt("options.enchanter-level-limit");
     }
 
     @Override
@@ -71,13 +74,12 @@ protected MachineRecipe findNextRecipe(BlockMenu menu) {
                 int amount = 0;
 
                 for (Map.Entry<Enchantment, Integer> entry : item.getEnchantments().entrySet()) {
-                    if (entry.getValue() <= SlimefunPlugin.getCfg().getInt("options.enchanter-level-limit") || SlimefunPlugin.getCfg().getInt("options.enchanter-level-limit") == 0) {
+                    if (entry.getValue() <= limit || limit < 1) {
                         enchantments.put(entry.getKey(), entry.getValue());
                         amount++;
                     } else {
                         if (!menu.toInventory().getViewers().isEmpty()) {
-                            HumanEntity p = menu.toInventory().getViewers().get(0);
-                            SlimefunPlugin.getLocalization().sendMessage(p, "messages.above-limit-level", true);
+                            menu.toInventory().getViewers().forEach(p -> SlimefunPlugin.getLocalization().sendMessage(p, "messages.above-limit-level", true));
                         }
                         return null;
                     }

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoEnchanter.java

@@ -11,7 +11,6 @@
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 
@@ -21,16 +20,13 @@
 
 public class AutoEnchanter extends AContainer {
 
-    private final int emeraldEnchantsLimit;
-
     private final int limit;
 
     @ParametersAreNonnullByDefault
     public AutoEnchanter(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
         super(category, item, recipeType, recipe);
 
         limit = SlimefunPlugin.getCfg().getInt("options.enchanter-level-limit");
-        emeraldEnchantsLimit = SlimefunPlugin.getCfg().getInt("options.emerald-enchantment-limit");
     }
 
     @Override
@@ -52,20 +48,17 @@ protected MachineRecipe findNextRecipe(BlockMenu menu) {
 
             if (item != null && item.getType() == Material.ENCHANTED_BOOK && target != null) {
                 Map<Enchantment, Integer> enchantments = new HashMap<>();
-
                 int amount = 0;
-
                 EnchantmentStorageMeta meta = (EnchantmentStorageMeta) item.getItemMeta();
 
                 for (Map.Entry<Enchantment, Integer> e : meta.getStoredEnchants().entrySet()) {
                     if (e.getKey().canEnchantItem(target)) {
-                        if (e.getValue() <= limit || limit == 0) {
+                        if (e.getValue() <= limit || limit < 1) {
                             amount++;
                             enchantments.put(e.getKey(), e.getValue());
                         } else {
                             if (!menu.toInventory().getViewers().isEmpty()) {
-                                HumanEntity p = menu.toInventory().getViewers().get(0);
-                                SlimefunPlugin.getLocalization().sendMessage(p, "messages.above-limit-level", true);
+                                menu.toInventory().getViewers().forEach(p -> SlimefunPlugin.getLocalization().sendMessage(p, "messages.above-limit-level", true));
                             }
                         }
                     }