From 6b9a8c7259026dc38673724df7e78c35b84b0a0c Mon Sep 17 00:00:00 2001
From: Michael Hillcox <michaelhillcox@gmail.com>
Date: Wed, 6 Dec 2023 01:10:22 +0000
Subject: [PATCH] feat: updated to 1.20.3

---
 CHANGELOG.md                             |  6 +++
 build.gradle                             | 58 ++++++++++++++++++------
 gradle.properties                        | 11 +++--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 settings.gradle                          |  7 ++-
 5 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51183f5..888dbff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [83.0.0]
+
+### Changed
+
+- Updated to 1.20.3
+
 ## [1.8.0]
 
 ### Changed
diff --git a/build.gradle b/build.gradle
index 93cc2fe..f8f853a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'fabric-loom' version '1.4-SNAPSHOT'
     id 'maven-publish'
-    id "com.matthewprenger.cursegradle" version "1.4.0"
+    id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
+    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -10,7 +11,7 @@ targetCompatibility = JavaVersion.VERSION_17
 def ENV = System.getenv()
 
 archivesBaseName = project.archives_base_name
-version = "${project.minecraft_version}-${project.mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}"
+version = project.mod_version
 group = project.maven_group
 
 dependencies {
@@ -72,17 +73,48 @@ publishing {
     }
 }
 
-if (ENV.CURSE_DEPLOY_TOKEN) {
+def changelogData = insaniamUtils.createChangelog {
+    file = file('CHANGELOG.md')
+    versionPattern = ~/## \[[^]]+]/
+    fallbackValue = "No changelog provided"
+    version = project.mod_version
+}
+
+publishMods {
+    def curseToken = providers.environmentVariable("CURSE_DEPLOY_TOKEN")
+
+    dryRun = !curseToken.isPresent()
+    changelog = changelogData
+    version = project.mod_version
+    type = STABLE
+    file = remapJar.archiveFile
+
     curseforge {
-        apiKey = ENV.CURSE_DEPLOY_TOKEN
-        project {
-            id = project.curseforge_id
-            releaseType = "release"
-            addGameVersion "Fabric"
-            addGameVersion "$minecraft_version"
-            changelog = file("./CHANGELOG.md")
-            changelogType = 'markdown'
-            mainArtifact(remapJar)
+        displayName = "Advanced XRay Fabric ${mod_version}"
+        modLoaders.add("fabric")
+        accessToken = curseToken
+        projectId = project.curseforge_id
+        minecraftVersions.add("${minecraft_version}")
+        requires {
+            slug = "fabric-api"
         }
     }
+
+    modrinth {
+        displayName = "Advanced XRay Fabric ${mod_version}"
+        modLoaders.add("fabric")
+        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        projectId = project.modrinth_id
+        minecraftVersions.add("${minecraft_version}")
+        requires {
+            slug = "fabric-api"
+        }
+    }
+
+    github {
+        repository = "AdvancedXRay/XRay-Fabric"
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        commitish = providers.environmentVariable("GITHUB_SHA").orElse("main")
+        tagName = providers.environmentVariable("GITHUB_REF_NAME").orElse("v${mod_version}")
+    }
 }
diff --git a/gradle.properties b/gradle.properties
index 780fd72..ef8e0bf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,14 +2,15 @@
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.1
-loader_version=0.14.22
+minecraft_version=1.20.3
+yarn_mappings=1.20.3+build.1
 # Mod Properties
-mod_version=1.9.0
+mod_version=83.0.0
 maven_group=pro.mikey.mods
 archives_base_name=auto-clicker-fabric
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.89.2+1.20.2
+loader_version=0.15.0
+fabric_version=0.91.1+1.20.3
 curseforge_id=445095
+modrinth_id=r8axuw4u
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fae0804..a595206 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index f91a4fe..ded7aa8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,8 @@
 pluginManagement {
     repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
         gradlePluginPortal()
+        maven { url "https://maven.saps.dev/mirror" }
+        maven { url "https://maven.saps.dev/releases" }
+        maven { url "https://maven.saps.dev/snapshots" }
     }
 }