From c466dab8d2bd496389e0502af0c7ce378db120e0 Mon Sep 17 00:00:00 2001
From: sisby-folk <nora.herrah.heartstrings@gmail.com>
Date: Sat, 12 Oct 2024 00:14:07 +1100
Subject: [PATCH] uninclude surveyor and bump

---
 README.md                             | 4 ++--
 build.gradle                          | 3 +--
 libs.versions.toml                    | 2 +-
 src/main/resources/META-INF/mods.toml | 7 +++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index defd745c..bae3cd07 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 A hand-drawn client-side world map with biomes, structures, waypoints, and less!<br/>
 
 A rewrite of <a href="https://modrinth.com/mod/antique-atlas">Antique Atlas</a> by <a href="https://github.com/Hunternif">Hunternif</a>, as continued by <a href="https://github.com/Kenkron">Kenkron</a>, <a href="https://github.com/asiekierka">asie</a>, and <a href="https://github.com/tyra314">tyra314</a>.<br/>
-Utilizes <a href="https://modrinth.com/mod/surveyor">Surveyor Map Framework</a>.
+<b>Requires <a href="https://modrinth.com/mod/surveyor">Surveyor Map Framework</a>.</b>
 <b>Requires <a href="https://modrinth.com/mod/connector">Connector</a> and <a href="https://modrinth.com/mod/forgified-fabric-api">FFAPI</a> on (neo)forge.</b><br/>
 </center>
 
@@ -47,7 +47,7 @@ Antique Atlas can be configured from `config/antique-atlas.toml`:<br/>
 > `structureMarkers` can be edited to toggle markers for structures - this is populated at runtime.<br/>
 > `graveStyle` will change the icon and tooltip for player graves - try each out to suit your pack's aesthetics.<br/>
 
-Further options, including options for map sharing & visibility, are documented in `config/surveyor.toml`
+Surveyor, which handles features including map sharing & visibility, can be configured from `config/surveyor.toml`
 
 ## Resource Packs
 Tiles, markers, biome detection, and structure detection is fully data-driven via resource packs.<br/>
diff --git a/build.gradle b/build.gradle
index d1699406..01048076 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     modImplementation libs.fapi
 
     modImplementation libs.surveyor
-    include libs.surveyor
 }
 
 processResources {
@@ -91,7 +90,7 @@ modrinth {
     syncBodyFrom = rootProject.file("README.md").text
     dependencies {
         required.version libs.fapi.get().getName(), libs.versions.fapi.get()
-        embedded.version libs.surveyor.get().getName(), libs.versions.surveyor.get()
+        required.version libs.surveyor.get().getName(), libs.versions.surveyor.get()
     }
 }
 
diff --git a/libs.versions.toml b/libs.versions.toml
index f6697974..b19d3eca 100644
--- a/libs.versions.toml
+++ b/libs.versions.toml
@@ -10,7 +10,7 @@ fl = "0.15.0"
 yarn = "1.20.1+build.10"
 fapi = "0.83.0+1.20.1"
 
-surveyor = "0.6.23+1.20"
+surveyor = "0.6.24+1.20"
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index ae514fad..c5a06f92 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -42,3 +42,10 @@ mandatory = true
 versionRange = "[${fapi},)"
 ordering = "NONE"
 side = "BOTH"
+
+[[dependencies.${ modId }]]
+modId = "surveyor"
+mandatory = true
+versionRange = "[${surveyor},)"
+ordering = "NONE"
+side = "BOTH"