From 4c2f50541a2c0bc9f194a4350031dc38cf4a9568 Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Sun, 19 Nov 2023 14:04:41 +1100
Subject: [PATCH] Fix changelog generation

---
 Fabric/build.gradle   |  4 ++--
 Forge/build.gradle    |  4 ++--
 NeoForge/build.gradle |  5 ++---
 build.gradle          | 10 ++++++++++
 gradle.properties     |  1 -
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index 0a790d1..8b5d424 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -100,8 +100,8 @@ modrinth {
     versionName = mod_build_version + " for Fabric " + minecraft_version
     versionType = release_channel // can be release, beta, or alpha
     uploadFile = remapJar
-    gameVersions.set {minecraft_version}
-    loaders.set {'fabric'}
+    gameVersions = [minecraft_version]
+    loaders = ['fabric']
 
     if (changelog_file.exists()) {
         def changelog_text = changelog_file.text
diff --git a/Forge/build.gradle b/Forge/build.gradle
index 3841eb4..bc0e148 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -121,8 +121,8 @@ modrinth {
     versionName = mod_build_version + " for Forge " + minecraft_version
     versionType = release_channel // can be release, beta, or alpha
     uploadFile = jar
-    gameVersions.set {minecraft_version}
-    loaders.set {'forge'}
+    gameVersions = [minecraft_version]
+    loaders = ['forge']
 
     if (changelog_file.exists()) {
         def changelog_text = changelog_file.text
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
index 8651a5c..8d8ac46 100644
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -5,7 +5,6 @@ plugins {
     id "com.modrinth.minotaur" version "2.+"
 }
 
-
 base.archivesName.set("${mod_name}-neoforge")
 def mod_build_version = "${mod_version}.${System.getenv().BUILD_NUMBER}"
 
@@ -93,8 +92,8 @@ modrinth {
     versionName = mod_build_version + " for NeoForge " + minecraft_version
     versionType = release_channel // can be release, beta, or alpha
     uploadFile = jar
-    gameVersions.set {minecraft_version}
-    loaders.set {'neoforge'}
+    gameVersions = [minecraft_version]
+    loaders = ['neoforge']
 }
 
 publishing {
diff --git a/build.gradle b/build.gradle
index 95a6df1..ca32fd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,20 @@
 plugins {
     // Required for NeoGradle
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
+    // Used for changelog generation
+    id 'net.minecraftforge.gradleutils' version '[2.1.3,)'
 }
 
 version = "${minecraft_version}-${mod_version}.${System.getenv().BUILD_NUMBER}"
 
+ext {
+    mod_version = gradleutils.getFilteredTagOffsetVersion(true, '[0-9]', MC_VERSION)
+}
+
+changelog {
+    fromMergeBase()
+}
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'idea'
diff --git a/gradle.properties b/gradle.properties
index 38b4933..356acc2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,4 @@
 # Project
-mod_version=3.1.0
 group=com.github.glitchfiend
 release_channel=beta