AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 12:05:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve order of map names, add /os next prev

Browse Source
This commit is contained in:
Goodlyay 2025-08-21 18:20:51 -07:00
parent 852ccb0e65
commit a1f47fe780
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
MCGalaxy/Commands/Overseer.cs
View File

@ -516,19 +516,34 @@ namespace MCGalaxy.Commands.World {
"&T/os next",
"&H Determines who owns the realm you're in,",
"&H then takes you to that player's next realm.",
"&T/os next prev",
"&H takes you to that player's previous realm.",
};
static void HandleNext(Player p, string unused) {
Level curLevel = p.level; //Cache in case another thread changes it
static void HandleNext(Player p, string arg) {
int direction = 1;
// Allow "/os next next" to work for consistency's sake
if (arg.Length > 0 && !arg.CaselessEq("next")) {
if (arg.CaselessEq("prev") || arg.CaselessEq("previous") || arg.CaselessEq("back")) {
direction = -1;
} else {
p.Message("To go to the next os map, use &T/os next");
p.Message("To go backwards, use &T/os next prev");
return;
}
}
Level curLevel = p.level; // Cache in case another thread changes it
string[] owners = curLevel.Config.RealmOwner.SplitComma();
string curLevelOwner = null;
foreach (string owner in owners) {
if (curLevel.name.CaselessStarts(owner)) { curLevelOwner = owner; break; }
}
if (curLevelOwner == null) {
p.Message("This level is not an OS realm.");
p.Message("Therefore, you cannot go to the next one.");
p.Message("This level is not an os realm.");
p.Message("Therefore, you cannot go to the {0} one.", direction == 1 ? "next" : "previous");
p.Message("If you're looking for more levels to visit, try &T/levels");
p.Message("To go to one of your os realms, use &T/os go");
return;
}
@ -544,17 +559,21 @@ namespace MCGalaxy.Commands.World {
}
bool blockedFromJoining = false;
next:
curIndex++;
if (realms.Count <= curIndex) {
tryAgain:
curIndex += 1 * direction;
if (curIndex >= realms.Count || curIndex < 0) {
string who = curLevelOwner == p.name ? "your" : p.FormatNick(curLevelOwner) + "&S's";
p.Message("You are in {0} last {1}realm.", who, blockedFromJoining ? "accessible " : "");
p.Message("You are in {0} {1} {2}realm.",
who,
direction == 1 ? "last" : "first",
blockedFromJoining ? "accessible " : "");
return;
}
if (!PlayerActions.ChangeMap(p, realms[curIndex])) {
blockedFromJoining = true;
// Try going to the next one until you get to one that can actually be visited
goto next;
goto tryAgain;
}
}

19
MCGalaxy/util/Formatting/Formatter.cs
View File

@ -135,24 +135,23 @@ namespace MCGalaxy
/// Sorts a list of strings such that a1 a2 a3 comes before a10 a11 a12 and so on.
/// </summary>
public class AlphanumComparator : IComparer<string> {
// Simplified but based off of https://www.dotnetperls.com/alphanumeric-sorting
public int Compare(string a, string b) {
int result;
int aLen, bLen;
int aDigit = GetDigits(a, out aLen);
int bDigit = GetDigits(b, out bLen);
if (aDigit != -1 && bDigit != -1) {
result = aDigit.CompareTo(bDigit);
} else {
result = a.Substring(0, aLen).CompareTo(b.Substring(0, bLen));
string aName = a.Substring(0, aLen);
string bName = b.Substring(0, bLen);
if (aName.Length != bName.Length || (aDigit == -1 && bDigit == -1)) {
return aName.CompareTo(bName);
}
if (result != 0) return result;
return a.Length - b.Length;
return aDigit.CompareTo(bDigit);
}
/// <summary>
/// Returns the digits on the end of the string. -1 if no integer found.
/// Returns the digits on the end of the string or -1 if no integer found.
/// </summary>
static int GetDigits(string name, out int nameLength) {
nameLength = name.Length;