backport 3.21.3

TeamFelNull · Apr 28, 2023 · a5b6dc7 · a5b6dc7
1 parent eb057c6
commit a5b6dc7
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 64 deletions.
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
diff --git a/.github/workflows/released.yml b/.github/workflows/released.yml
@@ -0,0 +1,21 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    uses: TeamFelnull/actions-reusable-workflows/.github/workflows/mcmod-release.yml@master
+    with:
+      build_tasks: "build publish curseforge modrinth"
+    secrets:
+      curseforge_token: ${{ secrets.CURSEFORGE_TOKEN_MORI }}
+      modrinth_token: ${{ secrets.MODRINTH_TOKEN_MORI }}
+      maven_password: ${{ secrets.MAVEN_PASSWORD }}
+
+  postRelease:
+    name: Update after release
+    needs: release
+    uses: TeamFelnull/actions-reusable-workflows/.github/workflows/mcmod-post-release.yml@master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Changelog
+
+Changelog to track updates for this mod.  
+Add your changes to Unreleased if you want to commit.  
+Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+
+## [Unreleased]
+
+### Added
+
+### Changed
+
+- Updated LavaPlayer version to 1.4
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- Fixed an issue where YouTube could not be played (Fixed by updating LavaPlayer version)
+
+### Security
+
+[Unreleased]: https://github.com/TeamFelnull/IamMusicPlayer/commits
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,23 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false
+    id 'org.jetbrains.changelog' version "2.0.0"
 }
 
 architectury {
     minecraft = rootProject.minecraft_version
 }
 
+changelog {
+    repositoryUrl = rootProject.repository_url
+    introduction = """
+    Changelog to track updates for this mod.  
+    Add your changes to Unreleased if you want to commit.  
+    Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+    """
+    combinePreReleases = false
+}
+
 subprojects {
     apply plugin: "dev.architectury.loom"
 

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     //  shadowIn('com.github.sedmelluq:lavaplayer:PR650-SNAPSHOT')
     shadowIn 'com.github.sealedtx:java-youtube-downloader:3.0.2'
     shadowIn "dev.felnull:felnull-java-library:${rootProject.felnull_version}"
-   // shadowIn 'org.jsoup:jsoup:1.14.3'
+    // shadowIn 'org.jsoup:jsoup:1.14.3'
     shadowIn 'com.mpatric:mp3agic:0.9.1'
 
 }
@@ -62,6 +62,7 @@ processResources {
 }
 shadowJar {
     configurations = [project.configurations.shadowIn]
+    relocate 'org.json', 'dev.felnull.imp.include.org.json'
     relocate 'org.slf4j', 'dev.felnull.imp.include.org.slf4j'
     relocate 'certificates', 'dev.felnull.imp.include.certificates'
     relocate 'com.fasterxml', 'dev.felnull.imp.include.com.fasterxml'
@@ -164,7 +165,10 @@ curseforge {
         apiKey = System.getenv('curesforgeapikey')
         project {
             id = "${rootProject.curesforge_id}"
-            changelog = ""
+
+            changelogType = 'markdown'
+            changelog = file('../LATEST_CHANGELOG.md')
+
             releaseType = "${rootProject.release_type}"
             addGameVersion "${rootProject.minecraft_version}"
             addGameVersion 'Java 17'
@@ -217,5 +221,6 @@ if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
             required.project("iu3upNjC")//Otyacraft Engine
             optional.project("nU0bVIaL")//Patchouli
         }
+        changelog = file('../LATEST_CHANGELOG.md').text
     }
 }
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -77,6 +77,7 @@ processResources {
 }
 shadowJar {
     configurations = [project.configurations.shadowIn]
+    relocate 'org.json', 'dev.felnull.imp.include.org.json'
     relocate 'org.slf4j', 'dev.felnull.imp.include.org.slf4j'
     relocate 'certificates', 'dev.felnull.imp.include.certificates'
     relocate 'com.fasterxml', 'dev.felnull.imp.include.com.fasterxml'
@@ -179,7 +180,10 @@ curseforge {
         apiKey = System.getenv('curesforgeapikey')
         project {
             id = "${rootProject.curesforge_id}"
-            changelog = ""
+
+            changelogType = 'markdown'
+            changelog = file('../LATEST_CHANGELOG.md')
+
             releaseType = "${rootProject.release_type}"
             addGameVersion "${rootProject.minecraft_version}"
             addGameVersion 'Java 17'
@@ -222,5 +226,6 @@ if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
             required.project("iu3upNjC")//Otyacraft Engine
             optional.project("nU0bVIaL")//Patchouli
         }
+        changelog = file('../LATEST_CHANGELOG.md').text
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ support_versions=1.18.2
 #-------------------MOD Data--------------------#
 archives_base_name=iammusicplayer
 mod_display_name=IamMusicPlayer
-mod_version=3.16.2
+mod_version=3.16.3
 #-----------------Library Version---------------#
 architectury_version=4.1.32
 fabric_loader_version=0.13.3
@@ -20,12 +20,13 @@ felnull_version=1.69
 cloth_config_version=6.2.57
 oe_version=2.14
 oe_repo_pre=
-lava_version=1.3.97
+lava_version=1.4.0
 #---------------------MAVEN---------------------#
 maven_group=dev.felnull
 maven_put_pass=
 #---------------------UPLOAD---------------------#
 curesforge_id=386380
 modrinth_id=ZHHXRhiU
 release_type=release
-#----------------------END----------------------#
+#Other
+repository_url=https://github.com/TeamFelnull/IamMusicPlayer