Moved forge to neoforge, bumped up versions to 1.21.1

Co-authored-by: mooo0042 <us3r0@mod-sauce.ddns-ip.net>

Author: Shadowbee27

.gitignore

@@ -17,4 +17,6 @@ classes/
 .metadata
 .vscode
 .settings
-*.launch
+*.launch
+*.factorypath
+.env

.zed/tasks.json

@@ -0,0 +1,7 @@
+[
+  {
+    "label": "Run Fabric client",
+    "command": "./gradlew",
+    "args": ["fabric:runClient"]
+  }
+]

build.gradle

@@ -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
@@ -48,6 +48,9 @@ allprojects {
                 password = repsyPassword
             }
         }
+        maven {
+            url = "https://maven.neoforged.net/#/releases"
+        }
         maven {
             url = "https://maven.felnull.dev"
         }
@@ -61,7 +64,7 @@ allprojects {
             url = 'https://maven.blamejared.com'
         }
         maven {
-            url = "https://cursemaven.com"
+            url = "https://api.modrinth.com/maven"
         }
         maven {
             url = "https://maven.lavalink.dev/releases"
@@ -70,10 +73,10 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
         withSourcesJar()
     }
-}
+}

common/build.gradle

@@ -11,7 +11,7 @@ dependencies {
 
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 
-    modApi "dev.felnull:otyacraftengine:${rootProject.oe_version}"
+    modApi "org.modsauce:otyacraftenginerenewed:${rootProject.oe_version}"
     modApi "me.shedaniel.cloth:cloth-config:${rootProject.cloth_config_version}"
 
     implementation "dev.felnull:felnull-java-library:${rootProject.felnull_version}"
@@ -67,4 +67,4 @@ publishing {
         }
     }
 }
-*/
+*/

fabric/build.gradle

@@ -51,7 +51,6 @@ configurations {
 repositories {
     maven { url "https://maven.terraformersmc.com/releases/" }//modmenu
       mavenCentral()
-  maven { url "https://jitpack.io" } // For com.github.walkyst.JAADec-fork:jaadec-ext-aac & ibxm-fork:com.github.walkyst:ibxm-fork
 }
 
 dependencies {
@@ -63,15 +62,15 @@ dependencies {
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 
-    modApi "dev.felnull:otyacraftengine-fabric:${rootProject.oe_version}"
+    modApi "dev.felnull:otyacraftenginerenewed-fabric:${rootProject.oe_version}"
 
     modApi "com.terraformersmc:modmenu:${rootProject.modmenu_version}"
     modApi "me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}"
     modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
 
     modApi "dev.felnull:special-model-loader:1.2.0"
     include "dev.felnull:special-model-loader:1.2.0"
-    modApi "curse.maven:sound-physics-remastered-535489:${rootProject.sound_physics_remastered_fabric}"
+    modApi "maven.modrinth:sound-physics-remastered:fabric-${rootProject.sound_physics_remastered}"
 
     shadowIn("dev.arbjerg:lavaplayer:${rootProject.lava_version_youtube}") {
         exclude group: 'dev.arbjerg', module: 'lavaplayer-natives'
@@ -264,4 +263,4 @@ if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
         changelog = file('../LATEST_CHANGELOG.md').text
     }
 }
-*/
+*/

forge/gradle.properties

@@ -1,31 +1,30 @@
 # Gradle
 org.gradle.jvmargs=-Xmx6152M
 # Environment
-minecraft_version=1.20.1
-support_versions=1.20.1
-enabled_platforms=fabric,forge
+minecraft_version=1.21.1
+support_versions=1.21.1
+enabled_platforms=fabric,neoforge
 # Mod
 archives_base_name=iammusicplayer_renewed
 mod_display_name=IamMusicPlayer_Renewed
-mod_version=3.22.0-1.20.1
+mod_version=3.22.1-1.21.1-alpha0
 # Dependencies
-architectury_version=9.2.14
+architectury_version=13.0.8
 # mod loader
 fabric_loader_version=0.17.2
-fabric_api_version=0.92.6+1.20.1
-forge_version=1.20.1-47.4.0
+fabric_api_version=0.116.7+1.21.1
+neoforge_version=1.21.1-21.1.213
 # mod dependencies
-sound_physics_remastered_fabric=6352921
-sound_physics_remastered_forge=6352920
-cloth_config_version=11.1.136
-modmenu_version=7.2.2
-rei_version=12.1.785
-oe_version=3.7.1-1.20.1
+sound_physics_remastered=1.21.1-1.5.1
+cloth_config_version=15.0.140
+modmenu_version=11.0.3
+rei_version=16.0.799
+oe_version=3.7.1-1.21.1-alpha0
 # other
 felnull_version=1.75
 # lavalink
 lava_version_youtube=2.2.4
-lavalink=1.13.4
+lavalink=1.14.0
 ytdownloader=3.2.8
 # Maven Upload
 repository_url=https://github.com/Mod-Sauce/IamMusicPlayer_FIX

gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -6,9 +6,9 @@ plugins {
 
 architectury {
     platformSetupLoomIde()
-    forge()
+    neoForge()
 }
-
+/*
 loom {
     accessWidenerPath = project(":common").loom.accessWidenerPath
 
@@ -23,37 +23,37 @@ loom {
         }
     }
 
-    /*launches {
+    launches {
         data {
             arg "--existing", file("src/main/resources").absolutePath, "--existing", file("../common/src/main/resources").absolutePath
         }
-    }*/
-}
+    }
+}*/
 
 configurations {
     common
     shadowCommon
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-    forgeDependencies.extendsFrom shadowIn
+    developmentNeoForge.extendsFrom common
+    neoforgeDependencies.extendsFrom shadowIn
     shadowCommon.extendsFrom shadowIn
 }
 
 dependencies {
-    forge "net.minecraftforge:forge:${rootProject.forge_version}"
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
 
-    modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    common(project(path: ":common", configuration: "namedElements")) { transitive = false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 
-    modApi "dev.felnull:otyacraftengine-forge:${rootProject.oe_version}"
+    modApi "org.modsauce:otyacraftenginerenewed-neoforge:${rootProject.oe_version}"
 
-    modApi "me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}"
-    modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-forge:${rootProject.rei_version}"
+    modApi "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}"
+    modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rootProject.rei_version}"
 
-    modApi "curse.maven:ctm-535489:${rootProject.sound_physics_remastered_forge}"
+    modApi "maven.modrinth:sound-physics-remastered:neoforge-${rootProject.sound_physics_remastered}"
 
     shadowIn("dev.arbjerg:lavaplayer:${rootProject.lava_version_youtube}") {
         exclude group: 'dev.arbjerg', module: 'lavaplayer-natives'
@@ -69,7 +69,7 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }
@@ -236,4 +236,4 @@ if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
         changelog = file('../LATEST_CHANGELOG.md').text
     }
 }
-*/
+*/

forge/build.gradle neoforge/build.gradleforge/build.gradle renamed to neoforge/build.gradle

@@ -0,0 +1 @@
+loom.platform=neoforge