From e55af243d8671e052391e18c9eb4f2bea94ccc57 Mon Sep 17 00:00:00 2001
From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
Date: Sun, 31 Mar 2024 21:20:00 +1100
Subject: [PATCH] Fix Migration Issues (#706)

Fixes most migration issues, adds some presence helpers.

1. On the first load of an old world on 1.7-alpha-3, everything migrates correctly.
2. However, if the player saves and quits, then loads the world again, and then loads an old chunk:
 - ex. They were in the overworld when they loaded in, they saved and quit, then loaded their void world base
3. Everything in chunks that were not loaded in the first load is not migrated correctly (hence you get broken items (other players on servers), broken blocks, broken multiblocks, crashes with multiblocks, etc.)

[BUG]
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]

/* Git Stuff */
[FIXUP]
[[fixes]]
sha = "388b670ed1ebd48e7d9dfae6020b09ef3f62a9cc"
newBody = '''
[EXPAND]
[[messages]]
messageTitle = "Fix Small Dust & Tiny Dust Crafting Conversion Recipes (#696)"
messageBody = """
[BUG]
[DETAILS]
detail = \"Recipes are now as Shown in JEI! Change your AE2 Patterns!\"
[DETAILS]
"""

[[messages]]
messageTitle = "Fix Dust to Dye Conversion Recipes (#696)"
messageBody = """
[BUG]

[IGNORE]
checks = { compareNot = \"1.7-alpha-3\" }
[IGNORE]

[DETAILS]
details = [\"Dust to Dye Conversion Recipes are no longer Shapeless.\"]
[DETAILS]
"""
[EXPAND]
'''

[[fixes]]
sha = "776799b8f24e3fefee8b78a77e8cebd56b472197"
mode = "ADDITION"
newBody = '''
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]
'''

[[fixes]]
sha = "63f6f3824450d7fa5a56d25fa548639ec1b1004a"
mode = "ADDITION"
newBody = '''
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]
'''
[FIXUP]
---
 manifest.json                 |   2 +-
 overrides/config/nomilabs.cfg | 131 ++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 498958c..add0a4f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -763,7 +763,7 @@
     },
     {
       "projectID": 932060,
-      "fileID": 5217682,
+      "fileID": 5224350,
       "required": true
     },
     {
diff --git a/overrides/config/nomilabs.cfg b/overrides/config/nomilabs.cfg
index 15d47d8..9026b34 100644
--- a/overrides/config/nomilabs.cfg
+++ b/overrides/config/nomilabs.cfg
@@ -96,6 +96,137 @@ advanced {
         B:logConflictingFluids=false
     }
 
+    ##########################################################################################################
+    # tier settings
+    #--------------------------------------------------------------------------------------------------------#
+    # Tier Detectors, which get the Tier a Player is On based on Quest Completion.
+    # Currently only used in Nomi-CEu for Rich Presence.
+    ##########################################################################################################
+
+    "tier settings" {
+        # Formatted Name for Default Tier (Before Any Quests are Completed).
+        # [default: Before LV ]
+        S:defaultFormatted=Before LV
+
+        # Which Lists to default to if the mode is not Normal or Expert.
+        # [default: NORMAL]
+        # Valid values:
+        # NORMAL
+        # EXPERT
+        S:defaultMode=EXPERT
+
+        # Non-Formatted Name for Default Tier (Before Any Quests are Completed).
+        # [default: pre-lv ]
+        S:defaultSlug=pre-lv
+
+        # Formatted Names for Expert Mode Tiers.
+        # Each Tier must have the same index as the corresponding Quest ID!
+        # [default: ]
+        S:expertModeFormatted <
+            LV
+            MV
+            HV
+            EV
+            IV
+            LuV
+            ZPM
+            UV
+            UHV
+            Stabilized Miner
+            Creative Source
+            Completed the Game!
+         >
+
+        # Better Questing QB IDs for Expert Mode Tiers.
+        # [default: ]
+        I:expertModeQuestIds <
+            764
+            766
+            767
+            768
+            769
+            770
+            771
+            772
+            392
+            367
+            397
+            366
+         >
+
+        # Non-Formatted Names for Expert Mode Tiers.
+        # Each Tier must have the same index as the corresponding Quest ID!
+        # [default: ]
+        S:expertModeSlugs <
+            lv
+            mv
+            hv
+            ev
+            iv
+            luv
+            zpm
+            uv
+            uhv
+            stab
+            source
+            chest
+         >
+
+        # Formatted Names for Normal Mode Tiers.
+        # Each Tier must have the same index as the corresponding Quest ID!
+        # [default: ]
+        S:normalModeFormatted <
+            LV
+            MV
+            HV
+            EV
+            IV
+            LuV
+            ZPM
+            UV
+            UHV
+            Creative Tank
+            Creative Source
+            Completed the Game!
+         >
+
+        # Better Questing QB IDs for Normal Mode Tiers.
+        # These are checked in reverse, so later quests in the list, and in progression, have higher priority
+        # [default: ]
+        I:normalModeQuestIds <
+            764
+            766
+            767
+            768
+            769
+            770
+            771
+            772
+            392
+            367
+            397
+            366
+         >
+
+        # Non-Formatted Names for Normal Mode Tiers.
+        # Each Tier must have the same index as the corresponding Quest ID!
+        # [default: ]
+        S:normalModeSlugs <
+            lv
+            mv
+            hv
+            ev
+            iv
+            luv
+            zpm
+            uv
+            uhv
+            tank
+            source
+            chest
+         >
+    }
+
 }