diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 46e9518..cd3a9be 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ "depends": { "fabricloader": ">=0.14", "fabric": "*", - "minecraft": "1.20.x", - "java": ">=17" + "minecraft": ">=1.21", + "java": ">=21" } } \ No newline at end of file diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle index 99fd0b7..1c0a5e0 100644 --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle @@ -41,7 +41,7 @@ processResources { from project(":Common").sourceSets.main.resources def buildProps = project.properties.clone() - filesMatching("META-INF/mods.toml") { + filesMatching("META-INF/neoforge.mods.toml") { expand buildProps } } diff --git a/NeoForge/src/main/resources/META-INF/mods.toml b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml similarity index 87% rename from NeoForge/src/main/resources/META-INF/mods.toml rename to NeoForge/src/main/resources/META-INF/neoforge.mods.toml index 45b1e55..53602e8 100644 --- a/NeoForge/src/main/resources/META-INF/mods.toml +++ b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,14 +1,14 @@ modLoader="javafml" loaderVersion="[1,)" license="MIT" -issueTrackerURL="https://github.com/minecraftforge/" +issueTrackerURL="https://github.com/neoforged/" [[mods]] modId="${mod_id}" version="${version}" displayName="${mod_name}" #updateJSONURL="https://change.me.example.invalid/updates.json" -displayURL="https://minecraftforge.net" +displayURL="https://neoforged.net" logoFile="assets/examplemod/icon.png" credits="Thanks for this example mod goes to Java" authors="${mod_author}" @@ -22,14 +22,14 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn [[dependencies.${mod_id}]] modId="neoforge" -mandatory=true -versionRange="[20.2,)" +type="required" +versionRange="[21.0.0-beta,)" ordering="NONE" side="BOTH" [[dependencies.${mod_id}]] modId="minecraft" -mandatory=true -versionRange="[1.20.2,1.21)" +type="required" +versionRange="[1.21,1.21.1)" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/build.gradle b/build.gradle index d780ed6..7f19c06 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "xyz.wagyourtail.unimined" version "1.1.0-SNAPSHOT" apply false + id "xyz.wagyourtail.unimined" version "1.2.9" apply false } // Edit in gradle.properties @@ -15,8 +15,8 @@ subprojects { group = rootProject.group version = rootProject.version - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 // Add your maven repositories here repositories { @@ -73,10 +73,10 @@ subprojects { tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' - it.options.release = 17 + it.options.release = 21 } - tasks.withType(GenerateModuleMetadata) { + tasks.withType(GenerateModuleMetadata).configureEach { enabled = false } diff --git a/gradle.properties b/gradle.properties index b930890..de4180c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,14 +10,14 @@ mod_id=examplemod mod_name=ExampleMod # Shared -minecraft_version=1.20.2 +minecraft_version=1.21 # Fabric -fabric_loader=0.14.24 -fabric_api=0.90.7+1.20.2 +fabric_loader=0.15.11 +fabric_api=0.100.1+1.21 -# NeoForged -neoforge_version=64-beta +# NeoForge +neoforge_version=8-beta # Gradle Options org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d021dc5..598b0d6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Nov 05 19:31:04 SAST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/output.lzma b/output.lzma deleted file mode 100644 index 32747eb..0000000 Binary files a/output.lzma and /dev/null differ diff --git a/readme.md b/readme.md index 2fff7e8..f4044a4 100644 --- a/readme.md +++ b/readme.md @@ -40,7 +40,7 @@ This project is powered by [Unimined](https://github.com/unimined/unimined), and 9) `description` -> Your mod description 11) `versionRange` -> `[neoforgeVersionCode,)` and `[1.20.2,)` (Replace with the minecraft versions your mod supports) -6) If your default JVM/JDK is not Java 17 you will encounter an error when opening the project. This error is fixed by going to File > Settings > Build, Execution, Deployment > Build Tools > Gradle > Gradle JVMand changing the value to a valid Java 17 JVM. You will also need to set the Project SDK to Java 17. This can be done by going to File > Project Structure > Project SDK. Once both have been set open the Gradle tab in IDEA and click the refresh button to reload the project. +6) If your default JVM/JDK is not Java 21 you will encounter an error when opening the project. This error is fixed by going to File > Settings > Build, Execution, Deployment > Build Tools > Gradle > Gradle JVM and changing the value to a valid Java 21 JVM. You will also need to set the Project SDK to Java 21. This can be done by going to File > Project Structure > Project SDK. Once both have been set open the Gradle tab in IDEA and click the refresh button to reload the project. 7) Replace the contents of `LICENSE` with your mod license 8) Replace the contents of `readme.md` with your mod readme diff --git a/settings.gradle b/settings.gradle index a6c6cb8..4e30f4f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,7 +13,4 @@ pluginManagement { } rootProject.name = 'fdd-xplat' -include 'Common' -include 'Fabric' -include 'NeoForge' - +include('Common', 'Fabric', 'NeoForge')