3.23.1-1.20.1 Merge (#51)

Reviewed-on: https://codeberg.org/Mod-Sauce/IamMusicPlayerRenewed/pulls/51
Co-authored-by: Shadowbee27 <[email protected]>
Co-committed-by: Shadowbee27 <[email protected]>

Author: Shadowbee27

.forgejo/workflows/gradle.yml

@@ -0,0 +1,21 @@
+name: Mod Build
+on:
+  - pull_request
+  - push
+  - workflow_dispatch
+
+jobs:
+  build:
+    runs-on: debian
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 20
+      - name: Setup Java 17 & Java 21
+        run: |
+          sudo apt update
+          sudo apt install openjdk-21-jdk
+          sudo apt install openjdk-17-jdk
+      - name: Build
+        run: ./gradlew clean build

.github/ISSUE_TEMPLATE/bug.yaml

@@ -12,8 +12,8 @@ body:
       label: Already reported ? *
       description: Before opening a new bug report, please take a moment to search through the current open and closed issues to check if it already exists.
       options:
-      - label: I have searched the existing open and closed issues.
-        required: true
+        - label: I have searched the existing open and closed issues.
+          required: true
 
   - type: dropdown
     id: type
@@ -36,6 +36,7 @@ body:
         - "3.22.0-alpha.7"
         - "3.22.0-alpha.6"
         - "3.22.0-alpha.5"
+        - "3.23"
         - "Other"
     validations:
       required: true

.github/workflows/gradle.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up JDK 17
         uses: useblacksmith/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
           cache: gradle
 
@@ -49,26 +49,3 @@ jobs:
           name: IamMusicPlayerRenewedFabric
           path: fabric/build/libs
           compression-level: 9
-          
-      - name: Install GitHub CLI
-        if: failure()
-        run: sudo apt update && sudo apt install -y gh
-
-      - name: Dump logs and notify Discord
-        if: failure()
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DISCORD_WEBHOOK_URL: ${{ secrets.IAMLOGGER }}
-        run: |
-          mkdir logs
-          gh run download $GITHUB_RUN_ID -D logs
-
-          # Extract the last 100 lines from all logs (or change as needed)
-          output=$(find logs -type f -name '*.txt' -exec tail -n 100 {} \; | sed 's/"/\\"/g' | head -c 1800)
-
-          payload="{\"content\": \"❌ **Build failed!**\n\`\`\`\n$output\n\`\`\`\"}"
-
-          curl -H "Content-Type: application/json" \
-               -X POST \
-               -d "$payload" \
-               "$DISCORD_WEBHOOK_URL"

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
-    id 'org.jetbrains.changelog' version "2.0.0"
+    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
+    id "org.jetbrains.changelog" version "2.0.0"
 }
 
 architectury {
@@ -11,8 +11,8 @@ architectury {
 changelog {
     repositoryUrl = rootProject.repository_url
     introduction = """
-    Changelog to track updates for this mod.  
-    Add your changes to Unreleased if you want to commit.  
+    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
@@ -26,11 +26,15 @@ subprojects {
     }
 
     dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings loom.officialMojangMappings()
-    }
+            minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
+            mappings loom.layered() {
+                officialMojangMappings()
+                parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:2023.09.03@zip")
+            }
+        }
 }
 
+
 allprojects {
     apply plugin: "java"
     apply plugin: "architectury-plugin"
@@ -48,20 +52,23 @@ allprojects {
                 password = repsyPassword
             }
         }
+        maven {
+          url =  "https://maven.parchmentmc.org"
+        }
         maven {
             url = "https://maven.felnull.dev"
         }
         maven {
-            url = 'https://m2.dv8tion.net/releases'
+            url = "https://m2.dv8tion.net/releases"
         }
         maven {
-            url = 'https://jitpack.io'
+            url = "https://jitpack.io"
         }
         maven {
-            url = 'https://maven.blamejared.com'
+            url = "https://maven.blamejared.com"
         }
         maven {
-            url = "https://cursemaven.com"
+            url = "https://api.modrinth.com/maven"
         }
         maven {
             url = "https://maven.lavalink.dev/releases"
@@ -76,4 +83,4 @@ allprojects {
     java {
         withSourcesJar()
     }
-}
+}

common/build.gradle

@@ -22,7 +22,7 @@ dependencies {
     implementation("dev.arbjerg:lavaplayer:${rootProject.lava_version_youtube}") {
         exclude group: 'dev.arbjerg', module: 'lavaplayer-natives'
     }
-    implementation("dev.lavalink.youtube:v2:${rootProject.lavalink}")
+    implementation("dev.lavalink.youtube:v2:${rootProject.yt_src}")
 
     implementation "com.github.sealedtx:java-youtube-downloader:${rootProject.ytdownloader}"
     implementation 'com.mpatric:mp3agic:0.9.1'

common/src/main/java/dev/felnull/imp/IMPConfig.java

@@ -8,55 +8,50 @@
 @Config.Gui.Background("textures/block/note_block.png")
 public class IMPConfig implements ConfigData {
 
-    @ConfigEntry.Category("client")
-    public double volume = 1f;
+  @ConfigEntry.Category("client")
+  public double volume = 1f;
 
-    @ConfigEntry.Category("client")
-    public int maxPlayCont = 8;
+  @ConfigEntry.Category("client")
+  public int maxPlayCont = 8;
 
-    @ConfigEntry.Category("client")
-    public boolean spatial = true;
+  @ConfigEntry.Category("client")
+  public boolean spatial = true;
 
-    @ConfigEntry.Category("client")
-    public int sampleRate = 44100;
+  @ConfigEntry.Category("client")
+  public int sampleRate = 44100;
 
-    @ConfigEntry.Category("client")
-    public boolean useYoutubeDownloader = true;
+  @ConfigEntry.Category("client")
+  public boolean useYoutubeDownloader = true;
 
-    @ConfigEntry.Category("client")
-    public String relayServerURL = "https://raw.githubusercontent.com/TeamFelnull/IamMusicPlayer/master/relay_server.json";
+  @ConfigEntry.Category("client")
+  public String relayServerURL =
+    "https://raw.githubusercontent.com/TeamFelnull/IamMusicPlayer/master/relay_server.json";
 
-    @ConfigEntry.Category("client")
-    public String lavaPlayerNativesURL = "https://raw.githubusercontent.com/Mod-Sauce/test_lavaplayer_IMP/refs/heads/main/lavaplayer/natives_link.json";
-/*
-    @ConfigEntry.Category("client")
-    public String neteaseCloudMusicApiURL = "https://raw.githubusercontent.com/TeamFelnull/IamMusicPlayer/master/api_server.json";
-*/
-    @ConfigEntry.Category("client")
-    public boolean hideDisplaySprite = false;
+  @ConfigEntry.Category("client")
+  public String lavaPlayerNativesURL =
+    "https://raw.githubusercontent.com/Mod-Sauce/test_lavaplayer_IMP/refs/heads/main/lavaplayer/natives_link.json";
 
-    @ConfigEntry.Category("client")
-    public boolean hideDecorativeAntenna = false;
+  @ConfigEntry.Category("client")
+  public boolean hideDisplaySprite = false;
 
-    @ConfigEntry.Category("server")
-    public long maxWaitTime = 1000 * 10;
+  @ConfigEntry.Category("client")
+  public boolean hideDecorativeAntenna = false;
 
-    @ConfigEntry.Category("server")
-    public long retryTime = 1000 * 3;
+  @ConfigEntry.Category("server")
+  public long maxWaitTime = 1000 * 10;
 
-    @ConfigEntry.Category("server")
-    public boolean dropItemRing = true;
+  @ConfigEntry.Category("server")
+  public long retryTime = 1000 * 3;
 
-    @ConfigEntry.Gui.RequiresRestart
-    @ConfigEntry.Category("integration")
-    public boolean patchouliIntegration = true;
+  @ConfigEntry.Category("server")
+  public boolean dropItemRing = true;
 
-    @ConfigEntry.Category("integration")
-    public boolean soundPhysicsRemasteredIntegration = true;
+  @ConfigEntry.Category("integration")
+  public boolean soundPhysicsRemasteredIntegration = true;
 
-    @ConfigEntry.Category("debug")
-    public boolean showMusicLines = false;
+  @ConfigEntry.Category("debug")
+  public boolean showMusicLines = false;
 
-    @ConfigEntry.Category("debug")
-    public boolean showSpeakerRange = false;
+  @ConfigEntry.Category("debug")
+  public boolean showSpeakerRange = false;
 }