Update ALL

Author: TonimatasDEV

.github/workflows/gradle.yml

@@ -7,31 +7,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v4.1.6
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1.4.4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4.2.1
         with:
-          java-version: 17
+          java-version: 21
+          distribution: temurin
 
       - name: Give permissions to Gradle
         run: chmod +x ./gradlew
 
       - name: Build with Gradle
         run: ./gradlew build
 
-      - name: Upload a Build Artifacts
-        uses: actions/upload-artifact@v3.1.2
-        with:
-          name: KrystalCraft-Common
-          path: common/build/libs/**.jar
-
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v4.3.3
         with:
           name: KrystalCraft-Forge
           path: forge/build/libs/**.jar
 
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v4.3.3
         with:
           name: KrystalCraft-Fabric
           path: fabric/build/libs/**.jar

build.gradle.kts

@@ -13,11 +13,25 @@ architectury {
     minecraft = minecraftVersion
 }
 
+allprojects {
+    apply(plugin = "java")
+
+    version = modVersion
+    group = "dev.tonimatas.krystalcraft"
+
+    repositories {
+        maven(url = "https://maven.blamejared.com")
+        maven(url = "https://maven.shedaniel.me")
+        maven(url = "https://maven.resourcefulbees.com/repository/maven-public")
+    }
+}
+
 subprojects {
     apply(plugin = "dev.architectury.loom")
+    apply(plugin = "architectury-plugin")
 
     base {
-        archivesName.set("KrystalCraft-" + project.name)
+        archivesName.set("krystalcraft-" + project.name)
     }
 
     configure<LoomGradleExtensionAPI> {
@@ -28,27 +42,16 @@ subprojects {
         "minecraft"("com.mojang:minecraft:$minecraftVersion")
         "mappings"(project.the<LoomGradleExtensionAPI>().officialMojangMappings())
     }
-}
-
-allprojects {
-    apply(plugin = "java")
-    apply(plugin = "architectury-plugin")
-
-    version = modVersion
-    group = "dev.tonimatas.krystalcraft"
-
-    repositories {
-        maven(url = "https://maven.blamejared.com")
-        maven(url = "https://maven.shedaniel.me")
-        maven(url = "https://maven.resourcefulbees.com/repository/maven-public")
-    }
 
     tasks.withType<JavaCompile> {
-        options.encoding = "UTF-8"
-        options.release.set(17)
+        options.release.set(21)
     }
 
     java {
         withSourcesJar()
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }

common/build.gradle.kts

@@ -9,10 +9,10 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
 
     modApi("com.teamresourceful.resourcefullib:resourcefullib-common-$minecraftVersion:$resourcefullibVersion")
-    modApi("earth.terrarium.botarium:botarium-common-$minecraftVersion:$botariumVersion")
+    //modApi("earth.terrarium.botarium:botarium-common-$minecraftVersion:$botariumVersion")
 
-    modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
-    modRuntimeOnly("mezz.jei:jei-$minecraftVersion-common:$jeiVersion")
+    //modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
+    //modRuntimeOnly("mezz.jei:jei-$minecraftVersion-common:$jeiVersion")
     //modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion")
     //modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:$reiVersion")
 }

fabric/build.gradle.kts

@@ -38,7 +38,7 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
 
     modApi("com.teamresourceful.resourcefullib:resourcefullib-fabric-$minecraftVersion:$resourcefullibVersion")
-    modApi("earth.terrarium.botarium:botarium-fabric-$minecraftVersion:$botariumVersion")
+    //modApi("earth.terrarium.botarium:botarium-fabric-$minecraftVersion:$botariumVersion")
 
     //modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}"
     //modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${rei_version}"

gradle.properties

@@ -4,20 +4,22 @@ org.gradle.jvmargs=-Xmx3G
 modVersion=0.0.4.4
 
 # Dependencies
+resourcefullibVersion=3.0.0
+resourcefullibRange=3.0
+
+# To update
 jeiVersion=17.3.0.49
-resourcefullibVersion=2.4.10
-resourcefullibRange=2.4
 botariumVersion=3.2.2
 botariumRange=3
 
 # Minecraft Properties
-minecraftVersion=1.20.4
+minecraftVersion=1.21
 
 # Fabric Properties
 fabricLoaderVersion=0.15.7
 fabricLoaderRange=>=0.14.0
 fabricApiVersion=0.96.11
 
 # NeoForge Properties
-neoforgeVersion=20.4.214
-neoforgeLoaderRange=20.4
+neoforgeVersion=21.0.5-beta
+neoforgeLoaderRange=0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/build.gradle.kts

@@ -42,10 +42,10 @@ dependencies {
 
 
     modApi("com.teamresourceful.resourcefullib:resourcefullib-neoforge-$minecraftVersion:$resourcefullibVersion")
-    modApi("earth.terrarium.botarium:botarium-neoforge-$minecraftVersion:$botariumVersion")
+    //modApi("earth.terrarium.botarium:botarium-neoforge-$minecraftVersion:$botariumVersion")
 
-    modCompileOnly("mezz.jei:jei-$minecraftVersion-neoforge-api:$jeiVersion")
-    modLocalRuntime("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion") { isTransitive = false }
+    //modCompileOnly("mezz.jei:jei-$minecraftVersion-neoforge-api:$jeiVersion")
+    //modLocalRuntime("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion") { isTransitive = false }
 
     common(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
     shadowCommon(project(path = ":common", configuration = "transformProductionNeoForge")) { isTransitive = false }
@@ -55,7 +55,7 @@ tasks.withType<ProcessResources> {
     val replaceProperties = mapOf("neoforgeLoaderRange" to neoforgeLoaderRange, "minecraftVersion" to minecraftVersion, "modVersion" to modVersion, "resourcefullibRange" to resourcefullibRange, "botariumRange" to botariumRange)
     inputs.properties(replaceProperties)
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand(replaceProperties)
     }
 }

…ge/src/main/resources/META-INF/mods.toml …in/resources/META-INF/neoforge.mods.tomlneoforge/src/main/resources/META-INF/mods.toml renamed to neoforge/src/main/resources/META-INF/neoforge.mods.toml neoforge/src/main/resources/META-INF/mods.toml renamed to neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        maven(url = "https://maven.fabricmc.net/")
-        maven(url = "https://maven.architectury.dev/")
         maven(url = "https://maven.minecraftforge.net/")
+        maven(url = "https://maven.architectury.dev/")
+        maven(url = "https://maven.fabricmc.net/")
         gradlePluginPortal()
     }
 }