From deec09187e3ca624707c015be8ef58c4c393e46c Mon Sep 17 00:00:00 2001
From: Shoshak <shoshak@github.com>
Date: Wed, 10 Jul 2024 23:22:04 +0500
Subject: [PATCH 1/5] Add sum of best splits

---
 .../asodev/islandutils/IslandUtilsClient.java |  26 +-
 .../mixins/network/PacketListenerMixin.java   |  57 ++++-
 .../modules/splits/LevelSplits.java           |  14 ++
 .../modules/splits/LevelTimer.java            |  63 ++++-
 .../modules/splits/sob/AdvancedInfo.java      |   4 +
 .../modules/splits/sob/SobCalc.java           | 227 ++++++++++++++++++
 .../modules/splits/sob/SobRenderer.java       |  43 ++++
 .../modules/splits/sob/TeamInfo.java          |  42 ++++
 .../modules/splits/ui/DojoSplitUI.java        |   7 -
 .../options/categories/SplitsCategory.java    |  12 +
 .../resources/assets/island/lang/en_us.json   |   2 +
 11 files changed, 466 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/net/asodev/islandutils/modules/splits/sob/AdvancedInfo.java
 create mode 100644 src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java
 create mode 100644 src/main/java/net/asodev/islandutils/modules/splits/sob/SobRenderer.java
 create mode 100644 src/main/java/net/asodev/islandutils/modules/splits/sob/TeamInfo.java

diff --git a/src/main/java/net/asodev/islandutils/IslandUtilsClient.java b/src/main/java/net/asodev/islandutils/IslandUtilsClient.java
index 37307a52..d2e5ac4b 100644
--- a/src/main/java/net/asodev/islandutils/IslandUtilsClient.java
+++ b/src/main/java/net/asodev/islandutils/IslandUtilsClient.java
@@ -2,15 +2,15 @@
 
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.noxcrew.noxesium.network.NoxesiumPackets;
-import com.noxcrew.noxesium.network.clientbound.ClientboundMccGameStatePacket;
-import com.noxcrew.noxesium.network.clientbound.ClientboundMccServerPacket;
 import net.asodev.islandutils.discord.DiscordPresenceUpdator;
 import net.asodev.islandutils.modules.DisguiseKeybind;
 import net.asodev.islandutils.modules.NoxesiumIntegration;
 import net.asodev.islandutils.modules.plobby.PlobbyFeatures;
 import net.asodev.islandutils.modules.plobby.PlobbyJoinCodeCopy;
+import net.asodev.islandutils.modules.splits.LevelSplits;
 import net.asodev.islandutils.modules.splits.SplitManager;
+import net.asodev.islandutils.modules.splits.sob.AdvancedInfo;
+import net.asodev.islandutils.modules.splits.sob.SobCalc;
 import net.asodev.islandutils.modules.splits.ui.SplitUI;
 import net.asodev.islandutils.state.Game;
 import net.asodev.islandutils.state.MccIslandState;
@@ -21,6 +21,8 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.network.chat.ClickEvent;
@@ -28,6 +30,8 @@
 import net.minecraft.network.chat.Style;
 import org.lwjgl.glfw.GLFW;
 
+import java.util.Optional;
+
 @Environment(EnvType.CLIENT)
 public class IslandUtilsClient implements ClientModInitializer {
     public static KeyMapping openPlobbyKey;
@@ -58,6 +62,22 @@ public void onInitializeClient() {
             SplitUI.setupFallbackRenderer();
         }
         new NoxesiumIntegration().init();
+
+        // MCCI Commands but better
+        ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("showadvancedpath").executes(context -> {
+            if (MccIslandState.getGame() != Game.PARKOUR_WARRIOR_DOJO) {
+                context.getSource().sendFeedback(Component.literal("Not in PKWD"));
+                return 0;
+            }
+            LevelSplits splits = SplitManager.getCourseSplits(MccIslandState.getMap());
+            Optional<AdvancedInfo> advInfo = SobCalc.advancedTime(splits);
+            if (advInfo.isEmpty()) {
+                context.getSource().sendFeedback(Component.literal("Could not get advanced path"));
+                return 0;
+            }
+            context.getSource().sendFeedback(Component.literal(advInfo.get().path()));
+            return 1;
+        }))));
     }
 
     public static void onJoinMCCI(boolean isProduction) {
diff --git a/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java b/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
index 15ebc992..7ff26da5 100644
--- a/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
+++ b/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
@@ -1,14 +1,18 @@
 package net.asodev.islandutils.mixins.network;
 
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.suggestion.Suggestion;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.asodev.islandutils.IslandUtilsClient;
 import net.asodev.islandutils.IslandUtilsEvents;
 import net.asodev.islandutils.discord.DiscordPresenceUpdator;
 import net.asodev.islandutils.modules.FriendsInGame;
+import net.asodev.islandutils.modules.splits.LevelSplits;
+import net.asodev.islandutils.modules.splits.SplitManager;
+import net.asodev.islandutils.modules.splits.sob.SobCalc;
+import net.asodev.islandutils.modules.splits.sob.SobRenderer;
+import net.asodev.islandutils.modules.splits.sob.TeamInfo;
 import net.asodev.islandutils.options.IslandOptions;
 import net.asodev.islandutils.options.IslandSoundCategories;
 import net.asodev.islandutils.modules.ClassicAnnouncer;
@@ -23,7 +27,7 @@
 import net.minecraft.client.multiplayer.*;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.Connection;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
@@ -33,10 +37,13 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.ProfileKeyPair;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.scores.*;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -51,11 +58,19 @@
 
 @Mixin(ClientPacketListener.class)
 public abstract class PacketListenerMixin extends ClientCommonPacketListenerImpl {
-
     // I should really separate these mixins...
 
     @Shadow private CommandDispatcher<CommandSourceStack> commands;
 
+    @Shadow public abstract RegistryAccess.Frozen registryAccess();
+
+    @Shadow public abstract void setKeyPair(ProfileKeyPair profileKeyPair);
+
+    @Final
+    @Shadow private Scoreboard scoreboard;
+
+    @Shadow public abstract boolean isAcceptingMessages();
+
     protected PacketListenerMixin(Minecraft minecraft, Connection connection, CommonListenerCookie commonListenerCookie) {
         super(minecraft, connection, commonListenerCookie);
     }
@@ -65,8 +80,10 @@ protected PacketListenerMixin(Minecraft minecraft, Connection connection, Common
             "MAP", Pattern.compile("MAP: (?<map>\\w+(?:,? \\w+)*)"),
             "MODIFIER", Pattern.compile("MODIFIER: (?<modifier>\\w+(?:,? \\w+)*)"),
             "COURSE", Pattern.compile("COURSE: (?<course>.*)"),
-            "LEAP", Pattern.compile("LEAP \\[(?<leap>.*/.*)]")
+            "LEAP", Pattern.compile("LEAP \\[(?<leap>.*/.*)]"),
+            "TIME", Pattern.compile("(?<time>\\d{2}:\\d{2}\\.\\d{3})")
     );
+    @Unique private SobRenderer renderer;
     @Inject(method = "handleSetPlayerTeamPacket", at = @At("TAIL")) // Scoreboard lines!
     public void handleSetPlayerTeamPacket(ClientboundSetPlayerTeamPacket clientboundSetPlayerTeamPacket, CallbackInfo ci) {
         if (!MccIslandState.isOnline()) return;
@@ -91,6 +108,14 @@ public void handleSetPlayerTeamPacket(ClientboundSetPlayerTeamPacket clientbound
                         MccIslandState.setMap(value);
                     }
                     case "LEAP" -> DiscordPresenceUpdator.leapScoreboardUpdate(value, true);
+                    case "TIME" -> {
+                        if (!IslandOptions.getSplits().isShowSumOfBest()) break;
+                        Optional<TeamInfo> info = TeamInfo.fromScoreboard(scoreboard);
+                        info.ifPresent(t -> {
+                            renderer = new SobRenderer(t);
+                            renderer.update();
+                        });
+                    }
                 }
 
                 ChatUtils.debug("ScoreboardUpdate - Current %s: \"%s\"", entry.getKey(), value);
@@ -106,9 +131,14 @@ public void handleCustomSoundEvent(ClientboundSoundPacket clientboundCustomSound
         // Get the location of the new sound
         // Previously this was obfuscated by noxcrew, but not anymore yayyyyy :D
         ResourceLocation soundLoc = clientboundCustomSoundPacket.getSound().value().getLocation();
-
+        String soundPath = soundLoc.getPath();
         if (MccIslandState.getGame() == Game.PARKOUR_WARRIOR_DOJO) {
             LevelTimer.onSound(clientboundCustomSoundPacket);
+            if (IslandOptions.getSplits().isShowSumOfBest() &&
+                    (soundPath.contains("games.parkour_warrior.medal_gain")
+                    || soundPath.contains("games.parkour_warrior.parkour_finish")
+                    || soundPath.contains("games.parkour_warrior.teleport_scroll")))
+                renderer.update();
         }
 
         // If we aren't in a game, don't play music
@@ -117,25 +147,25 @@ public void handleCustomSoundEvent(ClientboundSoundPacket clientboundCustomSound
             if (MccIslandState.getGame() != Game.BATTLE_BOX) {
 
                 // Stop the music if you restart the course or switch game mode in Parkour Warrior
-                if(soundLoc.getPath().contains("games.parkour_warrior.mode_swap") || soundLoc.getPath().contains("games.parkour_warrior.restart_course")) {
+                if (soundPath.contains("games.parkour_warrior.mode_swap") || soundPath.contains("games.parkour_warrior.restart_course")) {
                     MusicUtil.stopMusic(false);
                 }
-                if (MccIslandState.getGame() == Game.PARKOUR_WARRIOR_SURVIVOR && Objects.equals(soundLoc.getPath(), "games.global.early_elimination")) {
+                if (MccIslandState.getGame() == Game.PARKOUR_WARRIOR_SURVIVOR && Objects.equals(soundPath, "games.global.early_elimination")) {
                     MusicUtil.startMusic(clientboundCustomSoundPacket, true); // The game started. Start the music!!
-                } else if (Objects.equals(soundLoc.getPath(), "games.global.countdown.go") && !MusicUtil.isMusicPlaying()) {
+                } else if (Objects.equals(soundPath, "games.global.countdown.go") && !MusicUtil.isMusicPlaying()) {
                     MusicUtil.startMusic(clientboundCustomSoundPacket); // The game started. Start the music!!
                 }
             } else {
                 // We're playing battlebox, and the music needs to start early.
-                if (Objects.equals(soundLoc.getPath(), "music.global.gameintro")) {
+                if (Objects.equals(soundPath, "music.global.gameintro")) {
                     MusicUtil.startMusic(clientboundCustomSoundPacket); // Start the music!!
                     ChatUtils.debug("[PacketListener] Canceling gameintro");
                     ci.cancel(); // Stop minecraft from minecrafting
                     return;
                 }
             }
-            if (Objects.equals(soundLoc.getPath(), "games.global.timer.round_end")
-                    || soundLoc.getPath().startsWith("music.global.")) {
+            if (Objects.equals(soundPath, "games.global.timer.round_end")
+                    || soundPath.startsWith("music.global.")) {
                 // The game ended or is about to end. Stop the music!!
                 MusicUtil.stopMusic();
             }
@@ -143,7 +173,7 @@ public void handleCustomSoundEvent(ClientboundSoundPacket clientboundCustomSound
 
         SoundInstance instance;
         // If our sound is music, play in the Core Music slider
-        if (soundLoc.getPath().contains("music.global")) {
+        if (soundPath.contains("music.global")) {
             instance = MusicUtil.createSoundInstance(clientboundCustomSoundPacket, IslandSoundCategories.CORE_MUSIC); // Create the sound
             Minecraft.getInstance().getSoundManager().play(instance); // Play the sound
             ci.cancel(); // Stop minecraft from trying.
@@ -235,6 +265,7 @@ private void titleText(ClientboundSetSubtitleTextPacket clientboundSetSubtitleTe
             LevelTimer instance = LevelTimer.getInstance();
             if (instance == null) return;
             instance.handleSubtitle(clientboundSetSubtitleTextPacket, ci);
+            renderer.update();
         }
     }
 
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/LevelSplits.java b/src/main/java/net/asodev/islandutils/modules/splits/LevelSplits.java
index 1296aff2..c7cd5cd9 100644
--- a/src/main/java/net/asodev/islandutils/modules/splits/LevelSplits.java
+++ b/src/main/java/net/asodev/islandutils/modules/splits/LevelSplits.java
@@ -55,6 +55,20 @@ public Double getSplit(String level) {
         return value / 1000d;
     }
 
+    public Optional<Split> getRawSplit(String level) {
+        return Optional.ofNullable(splits.get(level));
+    }
+
+    public Optional<Split> getSplitNoColor(String level) {
+        List<String> allPossibleLevels = List.of(
+                String.format("green%s", level),
+                String.format("yellow%s", level),
+                String.format("red%s", level)
+        );
+        Optional<String> match = allPossibleLevels.stream().filter(s -> splits.containsKey(s)).findFirst();
+        return match.map(s -> splits.get(s));
+    }
+
     public JsonObject toJson() {
         JsonObject object = new JsonObject();
         object.addProperty("name", name);
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/LevelTimer.java b/src/main/java/net/asodev/islandutils/modules/splits/LevelTimer.java
index adba3911..6a77451b 100644
--- a/src/main/java/net/asodev/islandutils/modules/splits/LevelTimer.java
+++ b/src/main/java/net/asodev/islandutils/modules/splits/LevelTimer.java
@@ -28,8 +28,12 @@ public class LevelTimer {
     private final LevelSplits splits;
     private Long lastSplitTimestamp = System.currentTimeMillis();
 
-    private String levelName = "M1-1";
-    private String levelUid = "";
+    // T - Transition from main to main
+    // TB - transition from main to bonus
+    // U - unfinished bonus level time
+    // R - return to main route
+    private String levelName = "T0-1";
+    private String levelUid = "T0-1";
 
     private boolean isBetween = true; // If the player is inbetween levels;
     public final SplitsCategory options = IslandOptions.getSplits();
@@ -53,11 +57,7 @@ public void handleSubtitle(ClientboundSetSubtitleTextPacket subtitle, CallbackIn
         if (string.startsWith("[")) {
             Matcher matcher = channelTitlePattern.matcher(string);
             if (!matcher.find()) return;
-            // This title is sent 1.5s AFTER the level starts, so we need to compensate
-            lastSplitTimestamp = System.currentTimeMillis() - 1500;
-            levelName = matcher.group(1);
-            isBetween = false;
-
+            String nextLevelName = matcher.group(1);
             StringBuilder hashString = new StringBuilder();
             for (Component sibling : component.getSiblings()) {
                 TextColor color = sibling.getStyle().getColor();
@@ -66,6 +66,32 @@ public void handleSubtitle(ClientboundSetSubtitleTextPacket subtitle, CallbackIn
                 }
             }
             hashString.append(levelName);
+            if (levelName.startsWith("T")) {
+                if (nextLevelName.startsWith("B")) {
+                    String newName;
+                    String newUid;
+                    if (nextLevelName.charAt(1) == '4') { // Finale check
+                        newName = levelName;
+                        String chosenFinale = hashString.toString().split("T")[0];
+                        newUid = String.format("%sT3-4", chosenFinale);
+                    } else { // Transition to bonus route
+                        newName = String.format("TB%c-%c", levelName.charAt(1), levelName.charAt(3));
+                        newUid = newName;
+                    }
+                    levelName = newName;
+                    levelUid = newUid;
+                }
+                saveSplit();
+            }
+            if (levelName.startsWith("R")) {
+                if (nextLevelName.startsWith("B")) return; // Prevent race condition
+                saveSplit();
+            }
+            // This title is sent 1.5s AFTER the level starts, so we need to compensate
+            lastSplitTimestamp = System.currentTimeMillis() - 1500;
+            levelName = nextLevelName;
+            isBetween = false;
+
             levelUid = hashString.toString();
             ChatUtils.debug("Detected level with id: " + levelUid);
         }
@@ -152,12 +178,12 @@ public static void onSound(ClientboundSoundPacket clientboundSoundPacket) {
         ResourceLocation soundLoc = clientboundSoundPacket.getSound().value().getLocation();
         String path = soundLoc.getPath();
         boolean isRoundEnd = path.equals("games.global.timer.round_end");
+        LevelTimer currentInstance = getInstance();
         if (path.contains("games.parkour_warrior.mode_swap") ||
                 path.contains("games.parkour_warrior.restart_course") ||
                 isRoundEnd ||
                 path.equals("ui.queue_teleport")) {
             // Stop split
-            LevelTimer currentInstance = getInstance();
             if (currentInstance != null && isRoundEnd) {
                 currentInstance.saveSplit();
             }
@@ -170,6 +196,27 @@ public static void onSound(ClientboundSoundPacket clientboundSoundPacket) {
             }
             setInstance(new LevelTimer(splits));
             ChatUtils.debug("LevelTimer - Started timer!");
+        } else if (path.equals("games.parkour_warrior.medal_gain")
+                && currentInstance != null
+                && currentInstance.levelName.endsWith("-3")) {
+            String newLevelName;
+            if (currentInstance.levelName.startsWith("M")) {
+                char curLevelName = currentInstance.levelName.charAt(1);
+                int curLevelInt = Integer.parseInt(String.valueOf(curLevelName));
+                newLevelName = String.format("T%d-%d", curLevelInt, curLevelInt + 1);
+            } else {
+                newLevelName = "R";
+            }
+            currentInstance.levelName = newLevelName;
+            currentInstance.levelUid = newLevelName;
+        } else if (path.equals("games.parkour_warrior.teleport_scroll")
+                && currentInstance != null) {
+            currentInstance.levelName = "U";
+            currentInstance.levelUid = "U";
+            currentInstance.saveSplit();
+            currentInstance.levelName = "R";
+            currentInstance.levelUid = "R";
+            currentInstance.lastSplitTimestamp = System.currentTimeMillis();
         }
     }
 
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/sob/AdvancedInfo.java b/src/main/java/net/asodev/islandutils/modules/splits/sob/AdvancedInfo.java
new file mode 100644
index 00000000..85b47949
--- /dev/null
+++ b/src/main/java/net/asodev/islandutils/modules/splits/sob/AdvancedInfo.java
@@ -0,0 +1,4 @@
+package net.asodev.islandutils.modules.splits.sob;
+
+public record AdvancedInfo(Long time, String path) {
+}
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java b/src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java
new file mode 100644
index 00000000..6bacfe66
--- /dev/null
+++ b/src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java
@@ -0,0 +1,227 @@
+package net.asodev.islandutils.modules.splits.sob;
+
+import net.asodev.islandutils.modules.splits.LevelSplits;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.stream.IntStream;
+
+public class SobCalc {
+    private static final List<String> mainStages = List.of(
+            "M1-1", "M1-2", "M1-3",
+            "M2-1", "M2-2", "M2-3",
+            "M3-1", "M3-2", "M3-3"
+    );
+    private static final List<String> bonusStages = List.of(
+            "B1-1", "B1-2", "B1-3",
+            "B2-1", "B2-2", "B2-3",
+            "B3-1", "B3-2", "B3-3"
+    );
+    private static final List<String> finalStages = List.of(
+            "greenB4-1", "yellowB4-1", "redB4-1"
+    );
+    private static final List<String> expertFinale = List.of(
+            "redB4-1", "redT3-4"
+    );
+    private static final List<String> mainTransitions = List.of(
+            "T0-1", "T1-2", "T2-3"
+    );
+    private static final List<String> bonusTransitions = List.of(
+            "TB0-1", "TB1-2", "TB2-3"
+    );
+
+    public static Optional<Long> timesFromSplitsNoColor(LevelSplits splitInfo, List<String> splits) {
+        List<Optional<Long>> splitList = splits
+                .stream()
+                .map(splitInfo::getSplitNoColor)
+                .map(os -> os.map(LevelSplits.Split::best))
+                .toList();
+        if (splitList.stream().anyMatch(Optional::isEmpty)) return Optional.empty();
+        return splitList
+                .stream()
+                .flatMap(Optional::stream)
+                .reduce(Long::sum);
+    }
+
+
+    public static Optional<Long> timesFromSplitsRaw(LevelSplits splitInfo, List<String> splits) {
+        List<Optional<Long>> splitList = splits
+                .stream()
+                .map(splitInfo::getRawSplit)
+                .map(os -> os.map(LevelSplits.Split::best))
+                .toList();
+        if (splitList.stream().anyMatch(Optional::isEmpty)) return Optional.empty();
+        return splitList
+                .stream()
+                .flatMap(Optional::stream)
+                .reduce(Long::sum);
+    }
+
+    public static Optional<Long> bestFinal(LevelSplits splits) {
+        long minTime = Long.MAX_VALUE;
+        String minName = null;
+        for (String splitName : finalStages) {
+            Optional<LevelSplits.Split> splitTime = splits.getRawSplit(splitName);
+            if (splitTime.isEmpty()) continue;
+            long bestTime = splitTime.get().best();
+            if (bestTime < minTime) {
+                minTime = bestTime;
+                minName = splitName;
+            }
+        }
+        if (minName == null) return Optional.empty();
+        String minColor = minName.split("B")[0];
+        String transitionSplitName = String.format("%sT3-4", minColor);
+        Optional<LevelSplits.Split> finaleTransitionTime = splits.getRawSplit(transitionSplitName);
+        if (finaleTransitionTime.isEmpty()) return Optional.empty();
+        return Optional.of(minTime
+                + finaleTransitionTime.get().best()
+                - 1500 // Compensate for 1500 ms delay
+        );
+    }
+
+    public static Optional<Long> standardTime(LevelSplits splits) {
+        Optional<Long> mainTime = timesFromSplitsNoColor(splits, mainStages);
+        Optional<Long> mainTransitionsTime = timesFromSplitsRaw(splits, mainTransitions)
+                .map(s -> s - 4500); // Compensate for three transition delays
+        Optional<Long> finaleTime = bestFinal(splits);
+        return mainTime
+                .flatMap(m -> mainTransitionsTime
+                        .flatMap(mt -> finaleTime
+                                .map(ft -> m + mt + ft)));
+    }
+
+    public static Optional<List<Long>> getTimesFromStage(int howManyComplete, String stageName, LevelSplits splits) {
+        List<Optional<Long>> times = IntStream
+                .range(0, howManyComplete)
+                .mapToObj(i -> String.format("%s-%d", stageName, i + 1))
+                .map(splits::getSplitNoColor)
+                .map(s -> s.map(LevelSplits.Split::best))
+                .toList();
+        if (times.stream().anyMatch(Optional::isEmpty)) return Optional.empty();
+        return Optional.of(times.stream().flatMap(Optional::stream).toList());
+    }
+
+    public static Optional<Long> additionalBonusTime(int howManyComplete, String stageName, LevelSplits splits, long returnTime) {
+        int stage = Integer.parseInt(String.valueOf(stageName.charAt(1)));
+        if (howManyComplete == 0) {
+            String transitionString = String.format("T%d-%d", stage - 1, stage);
+            return splits
+                    .getRawSplit(transitionString)
+                    .map(LevelSplits.Split::best)
+                    .map(s -> s - 1500); // Compensate for 1500 ms delay
+        }
+        long toAdd = returnTime;
+
+        String splitName = String.format("TB%d-%d", stage - 1, stage);
+        Optional<Long> tb = splits.getRawSplit(splitName).map(LevelSplits.Split::best);
+        if (tb.isEmpty()) return Optional.empty();
+        toAdd += tb.get();
+
+        if (howManyComplete != 3) {
+            Optional<Long> uncompletedStageSplit = splits.getRawSplit("U").map(LevelSplits.Split::best);
+            if (uncompletedStageSplit.isEmpty()) return Optional.empty();
+            toAdd += uncompletedStageSplit.get();
+        }
+        toAdd -= 1500; // Compensate for 1500 ms delay
+        return Optional.of(toAdd);
+    }
+
+    public static String buildBonusPathString(int howManyComplete, String stage) {
+        if (howManyComplete == 0) return "";
+        StringBuilder str = new StringBuilder(" ->");
+        for (int i = 1; i <= howManyComplete; i++) {
+            str.append(String.format(" %s-%d -> ", stage, i));
+        }
+        str.append("R");
+        return str.toString();
+    }
+
+    public static Optional<AdvancedInfo> advancedTime(LevelSplits splits) {
+        Optional<Long> mainTime = timesFromSplitsNoColor(splits, mainStages);
+        if (mainTime.isEmpty()) return Optional.empty();
+        Optional<Long> returnTime = splits.getRawSplit("R").map(LevelSplits.Split::best);
+        if (returnTime.isEmpty()) return Optional.empty();
+        Map<Long, String> variants = new HashMap<>();
+        for (int b1 = 0; b1 < 4; b1++) {
+            for (int b2 = 0; b2 < 4; b2++) {
+                for (int b3 = 0; b3 < 4; b3++) {
+                    for (String finalS : finalStages) {
+                        long medalsForFinish;
+                        if (finalS.contains("green")) {
+                            medalsForFinish = 1;
+                        } else if (finalS.contains("yellow")) {
+                            medalsForFinish = 2;
+                        } else {
+                            medalsForFinish = 3;
+                        }
+                        if (9 + b1 + b2 + b3 + medalsForFinish <= 16) continue;
+                        Optional<LevelSplits.Split> finalStageSplit = splits.getRawSplit(finalS);
+                        if (finalStageSplit.isEmpty()) continue;
+                        long finaleTime = finalStageSplit.get().best();
+
+                        Optional<List<Long>> b1_times = getTimesFromStage(b1, "B1", splits);
+                        Optional<List<Long>> b2_times = getTimesFromStage(b2, "B2", splits);
+                        Optional<List<Long>> b3_times = getTimesFromStage(b3, "B3", splits);
+                        if (b1_times.isEmpty() || b2_times.isEmpty() || b3_times.isEmpty()) continue;
+                        ArrayList<Long> combined = new ArrayList<>();
+
+                        Optional<Long> b1_add = additionalBonusTime(b1, "B1", splits, returnTime.get());
+                        Optional<Long> b2_add = additionalBonusTime(b2, "B2", splits, returnTime.get());
+                        Optional<Long> b3_add = additionalBonusTime(b3, "B3", splits, returnTime.get());
+                        if (b1_add.isEmpty() || b2_add.isEmpty() || b3_add.isEmpty()) continue;
+
+                        combined.add(mainTime.get());
+                        combined.addAll(b1_times.get());
+                        combined.addAll(b2_times.get());
+                        combined.addAll(b3_times.get());
+                        combined.add(b1_add.get());
+                        combined.add(b2_add.get());
+                        combined.add(b3_add.get());
+                        combined.add(finaleTime);
+
+                        String path = String.format(
+                                "START%s -> M1%s -> M2%s -> M3 -> %s",
+                                buildBonusPathString(b1, "B1"),
+                                buildBonusPathString(b2, "B2"),
+                                buildBonusPathString(b3, "B3"),
+                                finalS
+                        );
+                        long sum = combined.stream().reduce(Long::sum).get();
+                        variants.put(sum, path);
+                    }
+                }
+            }
+        }
+        return variants.keySet().stream().min(Long::compareTo).map(t -> new AdvancedInfo(t, variants.get(t)));
+    }
+
+    public static Optional<Long> expertTime(LevelSplits splits) {
+        Optional<Long> mainTime = timesFromSplitsNoColor(splits, mainStages);
+        Optional<Long> bonusTime = timesFromSplitsNoColor(splits, bonusStages);
+        Optional<Long> bonusTransitionsTime = timesFromSplitsRaw(splits, bonusTransitions)
+                .map(s -> s - 4500); // Compensate for three transition delays
+        Optional<Long> returnsTime = splits.getRawSplit("R").map(LevelSplits.Split::best);
+        Optional<Long> finaleTime = timesFromSplitsRaw(splits, expertFinale);
+        if (mainTime.isEmpty() ||
+                bonusTime.isEmpty() ||
+                bonusTransitionsTime.isEmpty() ||
+                finaleTime.isEmpty() ||
+                returnsTime.isEmpty())
+            return Optional.empty();
+
+        return Optional.of(mainTime.get() +
+                bonusTime.get() +
+                bonusTransitionsTime.get() +
+                (returnsTime.get() * 3 - 4500) // Compensate for three transition delays
+                + finaleTime.get());
+    }
+
+    public static String format(long sum) {
+        Duration duration = Duration.ofMillis(sum);
+        long MM = duration.toMinutes();
+        long SS = duration.toSecondsPart();
+        long MS = duration.toMillisPart();
+        return String.format(" (%02d:%02d.%03d)", MM, SS, MS);
+    }
+}
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/sob/SobRenderer.java b/src/main/java/net/asodev/islandutils/modules/splits/sob/SobRenderer.java
new file mode 100644
index 00000000..11dc9969
--- /dev/null
+++ b/src/main/java/net/asodev/islandutils/modules/splits/sob/SobRenderer.java
@@ -0,0 +1,43 @@
+package net.asodev.islandutils.modules.splits.sob;
+
+import net.asodev.islandutils.modules.splits.LevelSplits;
+import net.asodev.islandutils.modules.splits.SplitManager;
+import net.asodev.islandutils.state.MccIslandState;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.scores.PlayerTeam;
+
+public class SobRenderer {
+    private static final int SOB_COLOR = 0x32cd32;
+
+    private final TeamInfo teamInfo;
+
+    public SobRenderer(TeamInfo teamInfo) {
+        this.teamInfo = teamInfo;
+    }
+
+    public void update() {
+        LevelSplits splits = SplitManager.getCourseSplits(MccIslandState.getMap());
+        SobCalc.standardTime(splits).ifPresent(t -> updateTeamWithTime(teamInfo.standard(), t));
+        SobCalc.advancedTime(splits).ifPresent(t -> updateTeamWithTime(teamInfo.advanced(), t.time()));
+        SobCalc.expertTime(splits).ifPresent(t -> updateTeamWithTime(teamInfo.expert(), t));
+    }
+
+    private Component getOriginalComp(PlayerTeam from) {
+        Component ogPrefix = from.getPlayerPrefix();
+        MutableComponent newPrefix = Component.empty();
+        for (Component c : ogPrefix.getSiblings()) {
+            if (c.getString().contains("(")) continue;
+            newPrefix.append(c);
+        }
+        return newPrefix;
+    }
+
+    private void updateTeamWithTime(PlayerTeam team, long time) {
+        MutableComponent timeComp = Component
+                .literal(SobCalc.format(time))
+                .withColor(SOB_COLOR);
+        team.setPlayerPrefix(Component.empty().append(getOriginalComp(team)).append(timeComp));
+    }
+
+}
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/sob/TeamInfo.java b/src/main/java/net/asodev/islandutils/modules/splits/sob/TeamInfo.java
new file mode 100644
index 00000000..e6a6b226
--- /dev/null
+++ b/src/main/java/net/asodev/islandutils/modules/splits/sob/TeamInfo.java
@@ -0,0 +1,42 @@
+package net.asodev.islandutils.modules.splits.sob;
+
+import net.minecraft.world.scores.*;
+
+import java.util.Optional;
+
+public record TeamInfo(PlayerTeam standard, PlayerTeam advanced, PlayerTeam expert) {
+    private static final int STANDARD = 10, ADVANCED = 8, EXPERT = 6;
+
+    public static Optional<TeamInfo> fromScoreboard(Scoreboard scoreboard) {
+        String STDName, ADVName, EXPName;
+        STDName = ADVName = EXPName = null;
+        for (ScoreHolder scoreHolder : scoreboard.getTrackedPlayers()) {
+            String name = scoreHolder.getScoreboardName();
+            for (Objective objective : scoreboard.getObjectives()) {
+                ReadOnlyScoreInfo info = scoreboard.getPlayerScoreInfo(scoreHolder, objective);
+                if (info == null) continue;
+                switch (info.value()) {
+                    case STANDARD -> STDName = name;
+                    case ADVANCED -> ADVName = name;
+                    case EXPERT -> EXPName = name;
+                }
+            }
+        }
+        if (STDName == null || ADVName == null || EXPName == null) return Optional.empty();
+        PlayerTeam STDTeam, ADVTeam, EXPTeam;
+        STDTeam = ADVTeam = EXPTeam = null;
+        for (PlayerTeam team : scoreboard.getPlayerTeams()) {
+            for (String playerName : team.getPlayers()) {
+                if (playerName.equals(STDName)) {
+                    STDTeam = team;
+                } else if (playerName.equals(ADVName)) {
+                    ADVTeam = team;
+                } else if (playerName.equals(EXPName)) {
+                    EXPTeam = team;
+                }
+            }
+        }
+        if (STDTeam == null || ADVTeam == null || EXPTeam == null) return Optional.empty();
+        return Optional.of(new TeamInfo(STDTeam, ADVTeam, EXPTeam));
+    }
+}
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/ui/DojoSplitUI.java b/src/main/java/net/asodev/islandutils/modules/splits/ui/DojoSplitUI.java
index b068cc21..1dcaa453 100644
--- a/src/main/java/net/asodev/islandutils/modules/splits/ui/DojoSplitUI.java
+++ b/src/main/java/net/asodev/islandutils/modules/splits/ui/DojoSplitUI.java
@@ -5,17 +5,10 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.LerpingBossEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import net.minecraft.resources.ResourceLocation;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
-
 public class DojoSplitUI implements SplitUI {
     private static final ResourceLocation BAR_TEXTURE = new ResourceLocation("island", "textures/gui/pkw_splits.png");
     private static final int MCC_BAR_WIDTH = 130;
diff --git a/src/main/java/net/asodev/islandutils/options/categories/SplitsCategory.java b/src/main/java/net/asodev/islandutils/options/categories/SplitsCategory.java
index d691eab9..3a91773a 100644
--- a/src/main/java/net/asodev/islandutils/options/categories/SplitsCategory.java
+++ b/src/main/java/net/asodev/islandutils/options/categories/SplitsCategory.java
@@ -24,6 +24,7 @@ public class SplitsCategory implements OptionsCategory {
     boolean sendSplitTime = true;
     boolean showTimer = true;
     boolean showSplitImprovements = true;
+    boolean showSumOfBest = true;
     int showTimerImprovementAt = -3;
     SplitType saveMode = SplitType.BEST;
 
@@ -52,6 +53,12 @@ public ConfigCategory getCategory() {
                 .controller(TickBoxControllerBuilder::create)
                 .binding(defaults.showSplitImprovements, () -> showSplitImprovements, value -> this.showSplitImprovements = value)
                 .build();
+        Option<Boolean> showSumOfBestOption = Option.<Boolean>createBuilder()
+                .name(Component.translatable("text.autoconfig.islandutils.option.showSumOfBest"))
+                .description(OptionDescription.of(Component.translatable("text.autoconfig.islandutils.option.showSumOfBest.@Tooltip")))
+                .controller(TickBoxControllerBuilder::create)
+                .binding(defaults.showSumOfBest, () -> showSumOfBest, value -> this.showSumOfBest = value)
+                .build();
         Option<Integer> showImprovesAtOption = Option.<Integer>createBuilder()
                 .name(Component.translatable("text.autoconfig.islandutils.option.showTimerImprovementAt"))
                 .description(OptionDescription.of(Component.translatable("text.autoconfig.islandutils.option.showTimerImprovementAt.@Tooltip")))
@@ -77,6 +84,7 @@ public ConfigCategory getCategory() {
                 .option(showOption)
                 .option(showImprovesOption)
                 .option(showImprovesAtOption)
+                .option(showSumOfBestOption)
                 .option(saveOption)
                 .option(clearSplits)
                 .build();
@@ -103,6 +111,10 @@ public boolean isShowTimer() {
     public boolean isShowSplitImprovements() {
         return enablePkwSplits && showSplitImprovements;
     }
+    public boolean isShowSumOfBest() {
+        return showSumOfBest;
+    }
+
     public int getShowTimerImprovementAt() {
         return showTimerImprovementAt;
     }
diff --git a/src/main/resources/assets/island/lang/en_us.json b/src/main/resources/assets/island/lang/en_us.json
index 808c3bf5..b23cb0eb 100644
--- a/src/main/resources/assets/island/lang/en_us.json
+++ b/src/main/resources/assets/island/lang/en_us.json
@@ -64,6 +64,8 @@
   "text.autoconfig.islandutils.option.clearSplits.@Tooltip": "This will clear all of your saved segments. These can not be recovered.",
   "text.autoconfig.islandutils.option.saveMode": "Split save mode",
   "text.autoconfig.islandutils.option.saveMode.@Tooltip": "How to save splits\n\n§lBest Time§r: Uses your best time on each segment\n\n§lAverage Time§r: Uses your average time on a segment",
+  "text.autoconfig.islandutils.option.showSumOfBest": "Show sum of best splits",
+  "text.autoconfig.islandutils.option.showSumOfBest.@Tooltip": "Shows the sum your of best splits. To see the path for the best advanced route, use '/showadvancedpath'",
   "islandutils.splittype.best": "Best Time",
   "islandutils.splittype.avg": "Average Time",
 

From 9ad1981d9103682604e4a74d77b9a379ffdea920 Mon Sep 17 00:00:00 2001
From: Shoshak <shoshak@github.com>
Date: Wed, 10 Jul 2024 23:25:02 +0500
Subject: [PATCH 2/5] Update the renderer only if option enabled

---
 .../asodev/islandutils/mixins/network/PacketListenerMixin.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java b/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
index 7ff26da5..5e998324 100644
--- a/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
+++ b/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
@@ -265,7 +265,7 @@ private void titleText(ClientboundSetSubtitleTextPacket clientboundSetSubtitleTe
             LevelTimer instance = LevelTimer.getInstance();
             if (instance == null) return;
             instance.handleSubtitle(clientboundSetSubtitleTextPacket, ci);
-            renderer.update();
+            if (IslandOptions.getSplits().isShowSumOfBest()) renderer.update();
         }
     }
 

From e1d6bf4bddeba3b3bd092a4eab265b0b1b8e70ae Mon Sep 17 00:00:00 2001
From: Shoshak <shoshak@github.com>
Date: Wed, 10 Jul 2024 23:27:59 +0500
Subject: [PATCH 3/5] Remove unused fields

---
 .../mixins/network/PacketListenerMixin.java         | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java b/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
index 5e998324..90eabcf6 100644
--- a/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
+++ b/src/main/java/net/asodev/islandutils/mixins/network/PacketListenerMixin.java
@@ -3,14 +3,10 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.asodev.islandutils.IslandUtilsClient;
 import net.asodev.islandutils.IslandUtilsEvents;
 import net.asodev.islandutils.discord.DiscordPresenceUpdator;
 import net.asodev.islandutils.modules.FriendsInGame;
-import net.asodev.islandutils.modules.splits.LevelSplits;
-import net.asodev.islandutils.modules.splits.SplitManager;
-import net.asodev.islandutils.modules.splits.sob.SobCalc;
 import net.asodev.islandutils.modules.splits.sob.SobRenderer;
 import net.asodev.islandutils.modules.splits.sob.TeamInfo;
 import net.asodev.islandutils.options.IslandOptions;
@@ -27,7 +23,6 @@
 import net.minecraft.client.multiplayer.*;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.Connection;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
@@ -37,7 +32,6 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.ProfileKeyPair;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.scores.*;
 import org.spongepowered.asm.mixin.Final;
@@ -62,20 +56,15 @@ public abstract class PacketListenerMixin extends ClientCommonPacketListenerImpl
 
     @Shadow private CommandDispatcher<CommandSourceStack> commands;
 
-    @Shadow public abstract RegistryAccess.Frozen registryAccess();
-
-    @Shadow public abstract void setKeyPair(ProfileKeyPair profileKeyPair);
-
     @Final
     @Shadow private Scoreboard scoreboard;
 
-    @Shadow public abstract boolean isAcceptingMessages();
-
     protected PacketListenerMixin(Minecraft minecraft, Connection connection, CommonListenerCookie commonListenerCookie) {
         super(minecraft, connection, commonListenerCookie);
     }
 
     // Patterns for the Map & Modifier options on scoreboard
+    @Unique
     final Map<String, Pattern> scoreboardPatterns = Map.of(
             "MAP", Pattern.compile("MAP: (?<map>\\w+(?:,? \\w+)*)"),
             "MODIFIER", Pattern.compile("MODIFIER: (?<modifier>\\w+(?:,? \\w+)*)"),

From 1ab9093e4e3d1f22829f10b1ec99d2f7a0c5f574 Mon Sep 17 00:00:00 2001
From: Shoshak <shoshak@github.com>
Date: Thu, 11 Jul 2024 00:57:39 +0500
Subject: [PATCH 4/5] Handle unused scrolls

---
 .../net/asodev/islandutils/modules/splits/sob/SobCalc.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java b/src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java
index 6bacfe66..ba0249df 100644
--- a/src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java
+++ b/src/main/java/net/asodev/islandutils/modules/splits/sob/SobCalc.java
@@ -120,8 +120,7 @@ public static Optional<Long> additionalBonusTime(int howManyComplete, String sta
 
         if (howManyComplete != 3) {
             Optional<Long> uncompletedStageSplit = splits.getRawSplit("U").map(LevelSplits.Split::best);
-            if (uncompletedStageSplit.isEmpty()) return Optional.empty();
-            toAdd += uncompletedStageSplit.get();
+            if (uncompletedStageSplit.isPresent()) toAdd += uncompletedStageSplit.get();
         }
         toAdd -= 1500; // Compensate for 1500 ms delay
         return Optional.of(toAdd);
@@ -129,9 +128,9 @@ public static Optional<Long> additionalBonusTime(int howManyComplete, String sta
 
     public static String buildBonusPathString(int howManyComplete, String stage) {
         if (howManyComplete == 0) return "";
-        StringBuilder str = new StringBuilder(" ->");
+        StringBuilder str = new StringBuilder(" -> ");
         for (int i = 1; i <= howManyComplete; i++) {
-            str.append(String.format(" %s-%d -> ", stage, i));
+            str.append(String.format("%s-%d -> ", stage, i));
         }
         str.append("R");
         return str.toString();

From 323c902f865ffea48ead1385262cd2506e347cbe Mon Sep 17 00:00:00 2001
From: Shoshak <shoshak@github.com>
Date: Sun, 21 Jul 2024 18:11:50 +0500
Subject: [PATCH 5/5] Extract split commands into their own file

---
 .../asodev/islandutils/IslandUtilsClient.java | 24 ++-------------
 .../modules/splits/SplitCommands.java         | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 src/main/java/net/asodev/islandutils/modules/splits/SplitCommands.java

diff --git a/src/main/java/net/asodev/islandutils/IslandUtilsClient.java b/src/main/java/net/asodev/islandutils/IslandUtilsClient.java
index d2e5ac4b..5d568172 100644
--- a/src/main/java/net/asodev/islandutils/IslandUtilsClient.java
+++ b/src/main/java/net/asodev/islandutils/IslandUtilsClient.java
@@ -7,10 +7,8 @@
 import net.asodev.islandutils.modules.NoxesiumIntegration;
 import net.asodev.islandutils.modules.plobby.PlobbyFeatures;
 import net.asodev.islandutils.modules.plobby.PlobbyJoinCodeCopy;
-import net.asodev.islandutils.modules.splits.LevelSplits;
+import net.asodev.islandutils.modules.splits.SplitCommands;
 import net.asodev.islandutils.modules.splits.SplitManager;
-import net.asodev.islandutils.modules.splits.sob.AdvancedInfo;
-import net.asodev.islandutils.modules.splits.sob.SobCalc;
 import net.asodev.islandutils.modules.splits.ui.SplitUI;
 import net.asodev.islandutils.state.Game;
 import net.asodev.islandutils.state.MccIslandState;
@@ -21,8 +19,6 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.network.chat.ClickEvent;
@@ -30,8 +26,6 @@
 import net.minecraft.network.chat.Style;
 import org.lwjgl.glfw.GLFW;
 
-import java.util.Optional;
-
 @Environment(EnvType.CLIENT)
 public class IslandUtilsClient implements ClientModInitializer {
     public static KeyMapping openPlobbyKey;
@@ -55,6 +49,7 @@ public void onInitializeClient() {
         DisguiseKeybind.registerDisguiseInput();
         PlobbyFeatures.registerEvents();
         IslandUtilsCommand.register();
+        new SplitCommands();
         DiscordPresenceUpdator.init();
         PlobbyJoinCodeCopy.register();
 
@@ -63,21 +58,6 @@ public void onInitializeClient() {
         }
         new NoxesiumIntegration().init();
 
-        // MCCI Commands but better
-        ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("showadvancedpath").executes(context -> {
-            if (MccIslandState.getGame() != Game.PARKOUR_WARRIOR_DOJO) {
-                context.getSource().sendFeedback(Component.literal("Not in PKWD"));
-                return 0;
-            }
-            LevelSplits splits = SplitManager.getCourseSplits(MccIslandState.getMap());
-            Optional<AdvancedInfo> advInfo = SobCalc.advancedTime(splits);
-            if (advInfo.isEmpty()) {
-                context.getSource().sendFeedback(Component.literal("Could not get advanced path"));
-                return 0;
-            }
-            context.getSource().sendFeedback(Component.literal(advInfo.get().path()));
-            return 1;
-        }))));
     }
 
     public static void onJoinMCCI(boolean isProduction) {
diff --git a/src/main/java/net/asodev/islandutils/modules/splits/SplitCommands.java b/src/main/java/net/asodev/islandutils/modules/splits/SplitCommands.java
new file mode 100644
index 00000000..a0bdb5ab
--- /dev/null
+++ b/src/main/java/net/asodev/islandutils/modules/splits/SplitCommands.java
@@ -0,0 +1,30 @@
+package net.asodev.islandutils.modules.splits;
+
+import net.asodev.islandutils.modules.splits.sob.AdvancedInfo;
+import net.asodev.islandutils.modules.splits.sob.SobCalc;
+import net.asodev.islandutils.state.Game;
+import net.asodev.islandutils.state.MccIslandState;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.minecraft.network.chat.Component;
+
+import java.util.Optional;
+
+public class SplitCommands {
+    public SplitCommands() {
+        ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("showadvancedpath").executes(context -> {
+            if (MccIslandState.getGame() != Game.PARKOUR_WARRIOR_DOJO) {
+                context.getSource().sendFeedback(Component.literal("Not in PKWD"));
+                return 0;
+            }
+            LevelSplits splits = SplitManager.getCourseSplits(MccIslandState.getMap());
+            Optional<AdvancedInfo> advInfo = SobCalc.advancedTime(splits);
+            if (advInfo.isEmpty()) {
+                context.getSource().sendFeedback(Component.literal("Could not get advanced path"));
+                return 0;
+            }
+            context.getSource().sendFeedback(Component.literal(advInfo.get().path()));
+            return 1;
+        }))));
+    }
+}