From 35ab556fca722eb4360bbc4f99b1705cdb0d7a1e Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Sat, 20 Jan 2024 23:48:56 +0300
Subject: Changed tips from true random to non-repeating random (#501)

---
 src/main/java/de/hysky/skyblocker/skyblock/Tips.java | 6 +++++-
 src/main/resources/assets/skyblocker/lang/en_us.json | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/Tips.java b/src/main/java/de/hysky/skyblocker/skyblock/Tips.java
index 98e023c7..ad345527 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/Tips.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/Tips.java
@@ -22,6 +22,7 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit
 
 public class Tips {
     private static final Random RANDOM = new Random();
+    private static int previousTipIndex = -1;
     private static final List<Supplier<Text>> TIPS = List.of(
             getTipFactory("skyblocker.tips.customItemNames", ClickEvent.Action.SUGGEST_COMMAND, "/skyblocker custom renameItem"),
             getTipFactory("skyblocker.tips.customArmorDyeColors", ClickEvent.Action.SUGGEST_COMMAND, "/skyblocker custom dyeColor"),
@@ -102,6 +103,9 @@ public class Tips {
     }
 
     private static Text nextTipInternal() {
-        return TIPS.get(RANDOM.nextInt(TIPS.size())).get();
+        int randomInt = RANDOM.nextInt(TIPS.size());
+        while (randomInt == previousTipIndex) randomInt = RANDOM.nextInt(TIPS.size());
+        previousTipIndex = randomInt;
+        return TIPS.get(randomInt).get();
     }
 }
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 461af7e7..dfc0c035 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -408,7 +408,7 @@
   "skyblocker.tips.customItemNames": "Customize the names of your items with /skyblocker custom renameItem",
   "skyblocker.tips.customArmorDyeColors": "Apply a custom dye color to your leather armour with /skyblocker custom dyeColor",
   "skyblocker.tips.customArmorTrims": "You can set custom armor trims on your armor using /skyblocker custom armorTrim.",
-  "skyblocker.tips.fancyTabExtraInfo": "Did you know you can see extra info on our fancy tab menu when holding N or M?\n",
+  "skyblocker.tips.fancyTabExtraInfo": "Did you know you can see extra info on our fancy tab menu when holding N or M?",
   "skyblocker.tips.helpCommand": "Use command /skyblocker help and you might find some more nifty features!",
   "skyblocker.tips.discordRichPresence": "Use Discord Rich Presence to show your friends how loaded you are!",
   "skyblocker.tips.customDungeonSecretWaypoints": "You can add custom secret waypoints to any dungeon room with /skyblocker dungeons secrets addWaypoint.",
-- 
cgit