diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterType.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterType.java index cf52fa969f..f0aef43471 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterType.java @@ -24,20 +24,9 @@ */ package net.runelite.client.plugins.chatfilter; -import lombok.RequiredArgsConstructor; - -@RequiredArgsConstructor public enum ChatFilterType { - CENSOR_WORDS("Censor words"), - CENSOR_MESSAGE("Censor message"), - REMOVE_MESSAGE("Remove message"); - - private final String name; - - @Override - public String toString() - { - return name; - } + CENSOR_WORDS, + CENSOR_MESSAGE, + REMOVE_MESSAGE } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index b71d5e8b0e..cfd5fca7c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -492,7 +492,7 @@ public class ConfigPanel extends PluginPanel { Enum selectedItem = Enum.valueOf(type, configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName())); box.setSelectedItem(selectedItem); - box.setToolTipText(selectedItem.toString()); + box.setToolTipText(Text.titleCase(selectedItem)); } catch (IllegalArgumentException ex) { @@ -503,7 +503,7 @@ public class ConfigPanel extends PluginPanel if (e.getStateChange() == ItemEvent.SELECTED) { changeConfiguration(listItem, config, box, cd, cid); - box.setToolTipText(box.getSelectedItem().toString()); + box.setToolTipText(Text.titleCase((Enum) box.getSelectedItem())); } }); item.add(box, BorderLayout.EAST); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsLimitMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsLimitMode.java index 8536f7a67a..25f855f1c5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsLimitMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsLimitMode.java @@ -24,22 +24,9 @@ */ package net.runelite.client.plugins.fps; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor public enum FpsLimitMode { - NEVER("Never"), - UNFOCUSED("Unfocused"), - ALWAYS("Always"); - - private final String name; - - @Override - public String toString() - { - return name; - } + NEVER, + UNFOCUSED, + ALWAYS } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationMode.java index 7b9f11217c..3a692822b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationMode.java @@ -24,21 +24,8 @@ */ package net.runelite.client.plugins.itemidentification; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor public enum ItemIdentificationMode { - SHORT("Short"), - MEDIUM("Medium"); - - private final String type; - - @Override - public String toString() - { - return type; - } + SHORT, + MEDIUM } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/RenderStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/RenderStyle.java index d00029abe0..811ee5dda9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/RenderStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/RenderStyle.java @@ -26,21 +26,8 @@ package net.runelite.client.plugins.npchighlight; public enum RenderStyle { - OFF("Off"), - TILE("Tile"), - HULL("Hull"), - SOUTH_WEST_TILE("South West Tile"); - - private final String name; - - RenderStyle(String name) - { - this.name = name; - } - - @Override - public String toString() - { - return name; - } + OFF, + TILE, + HULL, + SOUTH_WEST_TILE } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickLocation.java index a39825677e..593ad87bc8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickLocation.java @@ -26,23 +26,10 @@ package net.runelite.client.plugins.prayer; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor public enum PrayerFlickLocation { - NONE("Off"), - PRAYER_ORB("Prayer Orb"), - PRAYER_BAR("Prayer Bar"), - BOTH("Both"); - - private final String name; - - @Override - public String toString() - { - return name; - } + NONE, + PRAYER_ORB, + PRAYER_BAR, + BOTH } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/config/RunePouchOverlayMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/config/RunePouchOverlayMode.java index 2ea02e883c..70d2564f26 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/config/RunePouchOverlayMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/config/RunePouchOverlayMode.java @@ -24,22 +24,9 @@ */ package net.runelite.client.plugins.runepouch.config; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor public enum RunePouchOverlayMode { - INVENTORY("Inventory"), - MOUSE_HOVER("Mouse hover"), - BOTH("Both"); - - private final String name; - - @Override - public String toString() - { - return name; - } + INVENTORY, + MOUSE_HOVER, + BOTH } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/SubscriptionFilterMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/SubscriptionFilterMode.java index 42352f64aa..b95a41a468 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/SubscriptionFilterMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/SubscriptionFilterMode.java @@ -24,22 +24,9 @@ */ package net.runelite.client.plugins.worldhopper; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor public enum SubscriptionFilterMode { - BOTH("Both"), - FREE("Free"), - MEMBERS("Member"); - - private final String name; - - @Override - public String toString() - { - return name; - } + BOTH, + FREE, + MEMBERS } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerConfig.java index 6bac32802a..d3ded4f54c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerConfig.java @@ -35,18 +35,10 @@ public interface XpTrackerConfig extends Config @AllArgsConstructor enum OnScreenDisplayMode { - XP_GAINED("XP Gained"), - XP_LEFT("XP Left"), - ACTIONS_DONE("Actions Done"), - ACTIONS_LEFT("Actions Left"); - - private final String name; - - @Override - public String toString() - { - return name; - } + XP_GAINED, + XP_LEFT, + ACTIONS_DONE, + ACTIONS_LEFT } @ConfigItem( diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java index a397cc3050..5aeb710115 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ComboBoxListRenderer.java @@ -31,6 +31,7 @@ import javax.swing.JList; import javax.swing.ListCellRenderer; import javax.swing.border.EmptyBorder; import net.runelite.client.ui.ColorScheme; +import net.runelite.client.util.Text; /** * A custom list renderer to avoid substance's weird coloring. @@ -57,7 +58,16 @@ public final class ComboBoxListRenderer extends JLabel implements ListCellRender setBorder(new EmptyBorder(5, 5, 5, 0)); - String text = o.toString(); + String text; + if (o instanceof Enum) + { + text = Text.titleCase((Enum) o); + } + else + { + text = o.toString(); + } + setText(text); return this; diff --git a/runelite-client/src/main/java/net/runelite/client/util/Text.java b/runelite-client/src/main/java/net/runelite/client/util/Text.java index 890b24fd32..6158b9a32f 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/Text.java +++ b/runelite-client/src/main/java/net/runelite/client/util/Text.java @@ -31,6 +31,7 @@ import com.google.common.base.Splitter; import java.util.Collection; import java.util.List; import java.util.regex.Pattern; +import org.apache.commons.text.WordUtils; /** * A set of utilities to use when dealing with text. @@ -159,4 +160,28 @@ public class Text String cleaned = name.contains("') + 1) : name; return cleaned.replace('\u00A0', ' '); } + + /** + * If passed in enum doesn't implement its own toString, + * converts enum name format from THIS_FORMAT to This Format. + * + * @param o an enum + * @return the enum's name in title case, + * or if it overrides toString, + * the value returned by toString + */ + public static String titleCase(Enum o) + { + String toString = o.toString(); + + // .toString() returns the value of .name() if not overridden + if (o.name().equals(toString)) + { + return WordUtils + .capitalize(toString.toLowerCase(), '_') + .replace("_", " "); + } + + return toString; + } }