From 17de5f2016e662f0b7e6fa826feae1b76321d942 Mon Sep 17 00:00:00 2001
From: Mysticdrew <drewhaas@gmail.com>
Date: Tue, 18 Jun 2024 11:00:39 -0500
Subject: [PATCH] cleanup and re-add journeymap from CF as a dependency

---
 Fabric/build.gradle   | 24 ------------------------
 Forge/build.gradle    | 18 ------------------
 NeoForge/build.gradle | 18 ------------------
 build.gradle          |  4 ++--
 gradle.properties     |  2 +-
 5 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index c85a987..48d09a8 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -237,30 +237,6 @@ if (!project.hasProperty("modrinthApiKey")) {
     ext.modrinthApiKey = project.findProperty("modrinth_api_key") ?: "notset"
 }
 
-//curseforge {
-//    project {
-//        id = '793035'
-//        apiKey = "${curseForgeApiKey}"
-//        changelogType = 'html'
-//        releaseType = release_type
-//        addGameVersion project.minecraft_version
-//        addGameVersion 'Fabric'
-//        addGameVersion 'Quilt'
-//
-//        relations {
-//            requiredDependency 'journeymap'
-//        }
-//
-//        mainArtifact(remapJar) {
-//            displayName = "${archivesBaseName}-${version}"
-//            changelog = file('/build/doc/changelog.html')
-//        }
-//        afterEvaluate {
-//            uploadTask.dependsOn(remapJar)
-//        }
-//    }
-//}
-
 task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
 
     apiToken = "${curseForgeApiKey}"
diff --git a/Forge/build.gradle b/Forge/build.gradle
index 05a274b..bbe0dca 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -283,24 +283,6 @@ if (!project.hasProperty("modrinthApiKey")) {
     ext.modrinthApiKey = project.findProperty("modrinth_api_key") ?: "notset"
 }
 
-//curseforge {
-//    project {
-//        id = '793035'
-//        apiKey = "${curseForgeApiKey}"
-//        changelogType = 'html'
-//        releaseType = release_type
-//        addGameVersion project.minecraft_version
-//        relations {
-//            requiredDependency 'journeymap'
-//        }
-//
-//        mainArtifact(shadowJar) {
-//            displayName = "${archivesBaseName}-${version}-forge"
-//            changelog = file('/build/doc/changelog.html')
-//        }
-//    }
-//}
-
 task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
 
     apiToken = "${curseForgeApiKey}"
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
index 9f4859e..c50d3f4 100644
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -216,24 +216,6 @@ if (!project.hasProperty("modrinthApiKey")) {
     ext.modrinthApiKey = project.findProperty("modrinth_api_key") ?: "notset"
 }
 
-//curseforge {
-//    project {
-//        id = '793035'
-//        apiKey = "${curseForgeApiKey}"
-//        changelogType = 'html'
-//        releaseType = release_type
-//        addGameVersion project.minecraft_version
-//        relations {
-//            requiredDependency 'journeymap'
-//        }
-//
-//        mainArtifact(shadowJar) {
-//            displayName = "${archivesBaseName}-${version}-forge"
-//            changelog = file('/build/doc/changelog.html')
-//        }
-//    }
-//}
-
 task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
 
     apiToken = "${curseForgeApiKey}"
diff --git a/build.gradle b/build.gradle
index e2913a2..c80d23d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ subprojects {
 
     dependencies {
         implementation group: 'info.journeymap', name: 'webmap-client', version: project.journeymap_webmap_version, changing: true
-        compileOnly "ignored:journeymap-forge-1.21-6.0.0-beta.1"
+        compileOnly "curse.maven:journeymap-32274:${project.jourenymap_forge_version}"
         // for annotations
         implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
 
@@ -86,7 +86,7 @@ subprojects {
         implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
         implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.20'
         implementation group: 'io.javalin', name: 'javalin', version: '6.1.6'
-        testImplementation "ignored:journeymap-forge-1.21-6.0.0-beta.1"
+        testImplementation "curse.maven:journeymap-32274:${project.jourenymap_forge_version}"
 
     }
 
diff --git a/gradle.properties b/gradle.properties
index 316ba19..91ebd35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ release_type=release
 # Forge
 mappings_channel=parchment
 forge_version=51.0.0
-journeymap_forge_version=4240527
+journeymap_forge_version=5440965
 
 #neoforge
 neoforge_version=21.0.0-beta