From 0852ff8d830cd1153e13446817955fe4d885f03a Mon Sep 17 00:00:00 2001
From: CodedSakura <me@codedsakura.dev>
Date: Mon, 6 May 2024 11:29:24 +0300
Subject: [PATCH] update to 1.20.6

---
 .github/workflows/release.yaml           | 12 +++++-------
 CHANGELOG.md                             |  5 +++++
 build.gradle                             | 18 ++++++++++--------
 gradle.properties                        | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9121d24..6ef1840 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -14,12 +14,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-
       - name: Generate changelog
-        run: /bin/sh ./changes.sh ${{ steps.tag.outputs.tag }} ./changelog.out.md
+        run: /bin/sh ./changes.sh ${{ github.ref_name }} ./changelog.out.md
 
       - name: Upload changelog
         uses: actions/upload-artifact@v3
@@ -37,10 +33,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -57,6 +53,8 @@ jobs:
         env:
           USERNAME: ${{ github.actor }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CS_USERNAME: "codedsakura"
+          CS_TOKEN: ${{ secrets.CODEDSAKURA_MAVEN_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CHANGELOG_PATH: "./changelog.out.md"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2b4ec9..7cb1c90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.0.7
+
+* Update to support 1.20.6
+* Switch to self-hosted maven
+
 # 2.0.6
 
 * Update to support 1.20.4
diff --git a/build.gradle b/build.gradle
index 91f6395..e572da6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.4-SNAPSHOT'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'maven-publish'
     id "com.modrinth.minotaur" version "2.+"
 }
@@ -10,15 +10,9 @@ group = project.maven_group
 
 repositories {
     mavenLocal()
-    maven {
-        url "https://maven.pkg.github.com/BlossomMods/BlossomLib"
-        credentials {
-            username = System.getenv("USERNAME")
-            password = System.getenv("TOKEN")
-        }
-    }
     maven { url "https://maven.nucleoid.xyz" }
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+    maven { url "https://maven.codedsakura.dev/releases" }
 }
 
 dependencies {
@@ -78,6 +72,14 @@ publishing {
                 password = System.getenv("TOKEN")
             }
         }
+        maven {
+            name = "codedsakuraMavenReleases"
+            url = uri("https://maven.codedsakura.dev/releases")
+            credentials {
+                username = System.getenv("CS_USERNAME")
+                password = System.getenv("CS_TOKEN")
+            }
+        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 3febcac..97cf446 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,18 +2,18 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-mod_version=2.0.6
+mod_version=2.0.7
 maven_group=dev.codedsakura.blossom
 mod_slug=BlossomWarps
 archives_base_name=blossom-warps
-supported_versions=1.20.4
+supported_versions=1.20.6
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.4
+minecraft_version=1.20.6
 yarn_mappings=build.1
-loader_version=0.15.1
+loader_version=0.15.11
 
 # Dependencies
-fabric_version=0.91.2
-blossomlib_version=2.5.6
+fabric_version=0.97.8
+blossomlib_version=2.5.7
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a595206..48c0a02 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists