Make enums translatable and fix line break issue (#932)

* Make enums translatable and fix line break issue

* an uuid -> a uuid

More accurate to how you would pronounce it

* Remove line1 from translation string key

10 files changed, 44 insertions, 60 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
index 6a622ae6..2bd8f12c 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.config.configs;
 
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Formatting;
 
 public class DungeonsConfig {
@@ -224,11 +225,7 @@ public class DungeonsConfig {
 
             @Override
             public String toString() {
-                return switch (this) {
-                    case HIGHLIGHT -> "Highlight";
-                    case OUTLINED_HIGHLIGHT -> "Outlined Highlight";
-                    case OUTLINE -> "Outline";
-                };
+                return I18n.translate("skyblocker.config.dungeons.doorHighlight.doorHighlightType.type." + name());
             }
         }
     }
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/EventNotificationsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/EventNotificationsConfig.java
index 1fa7016c..93da17a8 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/EventNotificationsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/EventNotificationsConfig.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.config.configs;
 
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import it.unimi.dsi.fastutil.ints.IntList;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 
@@ -22,7 +23,12 @@ public class EventNotificationsConfig {
         NONE,
         SKYBLOCK,
         HYPIXEL,
-        EVERYWHERE
+        EVERYWHERE;
+
+        @Override
+        public String toString() {
+            return I18n.translate("skyblocker.config.eventNotifications.criterion." + name());
+        }
     }
 
     public enum Sound {
@@ -32,13 +38,19 @@ public class EventNotificationsConfig {
         PLING(SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()),
         GOAT(SoundEvents.GOAT_HORN_SOUNDS.getFirst().value());
 
+        private final SoundEvent soundEvent;
+
+        Sound(SoundEvent soundEvent) {
+            this.soundEvent = soundEvent;
+        }
+
         public SoundEvent getSoundEvent() {
             return soundEvent;
         }
 
-        final SoundEvent soundEvent;
-        Sound(SoundEvent soundEvent) {
-            this.soundEvent = soundEvent;
+        @Override
+        public String toString() {
+            return I18n.translate("skyblocker.config.eventNotifications.notificationSound.sound." + name());
         }
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
index 92206c49..0c6bfd40 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
@@ -202,10 +202,7 @@ public class GeneralConfig {
 
         @Override
         public String toString() {
-            return switch (this) {
-                case CIRCULAR -> "Circular";
-                case SQUARE -> "Square";
-            };
+            return I18n.translate("skyblocker.config.general.itemInfoDisplay.itemRarityBackgroundStyle.style." + name());
         }
     }
 
@@ -226,10 +223,7 @@ public class GeneralConfig {
 
         @Override
         public String toString() {
-            return switch (this) {
-                case CLASSIC -> "Classic";
-                case FANCY -> "FANCY";
-            };
+            return I18n.translate("skyblocker.config.general.itemProtection.slotLockStyle.style." + name());
         }
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
index 5236f1eb..2ef5a4dc 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.config.configs;
 
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
+import net.minecraft.client.resource.language.I18n;
 
 import java.awt.*;
 
@@ -133,12 +134,7 @@ public class MiningConfig {
 
         @Override
         public String toString() {
-            return switch (this) {
-                case OFF -> "Off";
-                case DWARVEN -> "Dwarven";
-                case GLACITE -> "Glacite";
-                case BOTH -> "Both";
-            };
+            return I18n.translate("skyblocker.config.mining.commissionWaypoints.mode." + name());
         }
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/QuickNavigationConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/QuickNavigationConfig.java
index ac3e5a72..340266fe 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/QuickNavigationConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/QuickNavigationConfig.java
@@ -68,7 +68,8 @@ public class QuickNavigationConfig {
         /**
          * Default constructor or else gson skips initialization.
          */
-        private QuickNavItem() {}
+        @SuppressWarnings("unused")
+		private QuickNavItem() {}
 
         public QuickNavItem(ItemData itemData, String clickEvent, String tooltip) {
             this(itemData, "none", clickEvent, tooltip);
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/SlayersConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/SlayersConfig.java
index 82713e5d..7503108b 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/SlayersConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/SlayersConfig.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.config.configs;
 
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
+import net.minecraft.client.resource.language.I18n;
 
 public class SlayersConfig {
     @SerialEntry
@@ -10,7 +11,12 @@ public class SlayersConfig {
     public HighlightSlayerEntities highlightBosses = HighlightSlayerEntities.OFF;
 
     public enum HighlightSlayerEntities {
-        OFF, GLOW, HITBOX
+        OFF, GLOW, HITBOX;
+
+        @Override
+        public String toString() {
+            return I18n.translate("skyblocker.config.slayer.highlightBosses." + name());
+        }
     }
 
     @SerialEntry
@@ -79,19 +85,13 @@ public class SlayersConfig {
         public Boolean attunementHighlights = true;
 
         public enum FirePillar {
-            OFF("Off"),
-            VISUAL("Visual Indicator"),
-            SOUND_AND_VISUAL("Sound and Visual Indicator");
-
-            private final String description;
-
-            FirePillar(String description) {
-                this.description = description;
-            }
+            OFF,
+            VISUAL,
+            SOUND_AND_VISUAL;
 
             @Override
             public String toString() {
-                return description;
+                return I18n.translate("skyblocker.config.slayer.blazeSlayer.enableFirePillarAnnouncer.mode." + name());
             }
         }
     }
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
index 80bdb1c9..7333b1ad 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.config.configs;
 
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Formatting;
 
 import java.awt.*;
@@ -104,10 +105,7 @@ public class UIAndVisualsConfig {
 
         @Override
         public String toString() {
-            return switch (this) {
-                case HORIZONTAL -> "Horizontal";
-                case VERTICAL -> "Vertical";
-            };
+            return I18n.translate("skyblocker.config.uiAndVisuals.titleContainer.direction." + name());
         }
     }
 
@@ -116,11 +114,7 @@ public class UIAndVisualsConfig {
 
         @Override
         public String toString() {
-            return switch (this) {
-                case LEFT -> "Left";
-                case RIGHT -> "Right";
-                case MIDDLE -> "Middle";
-            };
+            return I18n.translate("skyblocker.config.uiAndVisuals.titleContainer.alignment." + name());
         }
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java
index f6c53528..1394df07 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java
@@ -59,8 +59,7 @@ public class ReorderHelper extends SimpleContainerSolver implements TooltipAdder
 		switch (focusedSlot.id) {
 			case 11, 13 -> {
 				lines.add(Text.empty());
-				lines.add(Text.empty().append(Text.translatable("skyblocker.reorderHelper.tooltip.line1")).formatted(Formatting.DARK_GRAY, Formatting.ITALIC));
-				lines.add(Text.empty().append(Text.translatable("skyblocker.reorderHelper.tooltip.line2")).formatted(Formatting.DARK_GRAY, Formatting.ITALIC));
+				lines.add(Text.empty().append(Text.translatable("skyblocker.reorderHelper.tooltip")).formatted(Formatting.DARK_GRAY, Formatting.ITALIC));
 			}
 		}
 	}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextMode.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextMode.java
index 1f043888..3b7f58e5 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextMode.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextMode.java
@@ -1,5 +1,7 @@
 package de.hysky.skyblocker.skyblock.item.slottext;
 
+import net.minecraft.client.resource.language.I18n;
+
 /**
  * Used in {@link SlotTextManager#isEnabled()} to determine whether the slot text should be shown or not.
  */
@@ -12,12 +14,6 @@ public enum SlotTextMode {
 
 	@Override
 	public String toString() {
-		return switch (this) {
-			case ENABLED         -> "Enabled";
-			case HOLD_TO_SHOW    -> "Hold to Show";
-			case PRESS_TO_TOGGLE -> "Press to Toggle";
-			case HOLD_TO_HIDE    -> "Hold to Hide";
-			case DISABLED        -> "Disabled";
-		};
+		return I18n.translate("skyblocker.config.general.itemInfoDisplay.slotText.mode." + name());
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
index c991fb9c..da927cb7 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.utils.waypoint;
 import de.hysky.skyblocker.utils.render.RenderHelper;
 import de.hysky.skyblocker.utils.render.Renderable;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
@@ -141,13 +142,7 @@ public class Waypoint implements Renderable {
 
         @Override
         public String toString() {
-            return switch (this) {
-                case WAYPOINT -> "Waypoint";
-                case OUTLINED_WAYPOINT -> "Outlined Waypoint";
-                case HIGHLIGHT -> "Highlight";
-                case OUTLINED_HIGHLIGHT -> "Outlined Highlight";
-                case OUTLINE -> "Outline";
-            };
+            return I18n.translate("skyblocker.waypoints.type." + name());
         }
     }
 }