Melhoria do enum ShareMode

ArmaRealms · Feb 21, 2024 · f725217 · f725217
1 parent b6e7e42
commit f725217
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
@@ -45,7 +45,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 
         switch (args.length) {
             case 2:
-                ShareMode mode = ShareMode.getShareModeName(args[1].toUpperCase(Locale.ENGLISH));
+                ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase(Locale.ENGLISH));
 
                 if (mode == null) {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<nenhum | igual | aleatorio>"));

diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java b/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java
@@ -1,25 +1,23 @@
 package com.gmail.nossr50.datatypes.party;
 
-import com.gmail.nossr50.util.commands.CommandUtils;
+import org.jetbrains.annotations.Nullable;
 
 public enum ShareMode {
-    NONE,
-    EQUAL,
-    RANDOM;
+    NONE("nenhum"),
+    EQUAL("igual"),
+    RANDOM("aleatorio");
+    private final String name;
 
-    public static ShareMode getShareMode(String string) {
-        try {
-            return valueOf(string);
-        }
-        catch (IllegalArgumentException ex) {
-            if (string.equalsIgnoreCase("even")) {
-                return EQUAL;
-            }
-            else if (CommandUtils.shouldDisableToggle(string)) {
-                return NONE;
-            }
+    ShareMode(String name) {
+        this.name = name;
+    }
 
-            return null;
+    public static @Nullable ShareMode getShareMode(String string) {
+        for (ShareMode shareMode : ShareMode.values()) {
+            if (shareMode.name.equalsIgnoreCase(string)) {
+                return shareMode;
+            }
         }
+        return null;
     }
 }
diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java
@@ -676,8 +676,8 @@ public void loadParties() {
                         hasAlly.add(party);
                     }
 
-                    party.setXpShareMode(ShareMode.getShareMode(partiesFile.getString(partyName + ".ExpShareMode", "NONE")));
-                    party.setItemShareMode(ShareMode.getShareMode(partiesFile.getString(partyName + ".ItemShareMode", "NONE")));
+                    party.setXpShareMode(ShareMode.getShareMode(partiesFile.getString(partyName + ".ExpShareMode", "nenhum")));
+                    party.setItemShareMode(ShareMode.getShareMode(partiesFile.getString(partyName + ".ItemShareMode", "nenhum")));
 
                     for (ItemShareType itemShareType : ItemShareType.values()) {
                         party.setSharingDrops(itemShareType, partiesFile.getBoolean(partyName + ".ItemShareType." + itemShareType.toString(), true));