Update gradle and mods versions

.gitea/workflows/build.yml

@@ -39,7 +39,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v2
 
       - name: Build with Gradle
-        run: ./gradlew build --no-daemon
+        run: ./gradlew clean build --no-daemon
 
       - name: Upload Mod JAR
         uses: actions/upload-artifact@v3

build.gradle

@@ -8,7 +8,7 @@ base {
     archivesName = project.archives_base_name
 }
 
-String buildNumber = System.getenv("RUN_NUMBER")
+String buildNumber = 30
 version = "${mod_version}+${libs.versions.minecraft.get()}" + (buildNumber != null ? "-${buildNumber}" : "")
 group = project.maven_group
 
@@ -18,28 +18,27 @@ repositories {
     // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
-    maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI
-    maven { url = "https://maven.blamejared.com" } // JEI
-    maven {
-        name = 'ParchmentMC'
-        url = 'https://maven.parchmentmc.org'
-    }
-    maven {
-        name = 'Quilt'
-        url = 'https://maven.quiltmc.org/repository/release'
-    }
-    maven { url = "https://api.modrinth.com/maven" } // LazyDFU
     maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu
-    maven { url = "https://cursemaven.com" } // Forge Config API Port
     maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
+    maven { url = "https://modmaven.dev/" } // Flywheel
+    maven { url = "https://mvn.devos.one/releases" } // Porting Lib releases
+    maven { url = "https://mvn.devos.one/snapshots" } // Create and several dependencies
+    maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven" } // Forge Config API Port
+    maven { url = 'https://maven.quiltmc.org/repository/release' } // QuiltMC
+    maven { url = 'https://maven.parchmentmc.org' } // ParchmentMC
+    maven { url = 'https://maven.fabricmc.net/' } // FabricMC
     maven { // Fabric ASM for Porting Lib
         url = "https://jitpack.io/"
         content { includeGroupAndSubgroups("com.github") }
     }
-    maven { url = "https://maven.tterrag.com/" } // Flywheel
+    maven {
-    maven { url = "https://mvn.devos.one/snapshots/" } // Create and several dependencies
+        url = "https://maven.createmod.net"
-    maven { url = "https://mvn.devos.one/releases/" } // Porting Lib releases
+        content {
-    maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven" } // Forge Config API Port
+            includeGroupAndSubgroups("net.createmod")
+            includeGroupAndSubgroups("dev.engine-room")
+            includeGroupAndSubgroups("com.simibubi")
+        }
+    } // Flywheel, Registrate, Create
 
     exclusiveContent {
         forRepository {
@@ -54,20 +53,6 @@ repositories {
     }
 }
 
-loom {
-    // Loom and Loader both use this block in order to gather more information about your mod.
-    mods {
-        // This should match your mod id.
-        "ru.bitheaven.createairfabric" {
-            // Tell Loom about each source set used by your mod here. This ensures that your mod's classes are properly transformed by Loader.
-            sourceSet("main")
-            // If you shade (directly include classes, not JiJ) a dependency into your mod, include it here using one of these methods:
-            // dependency("com.example.shadowedmod:1.2.3")
-            // configuration("exampleShadedConfigurationName")
-        }
-    }
-}
-
 // All the dependencies are declared at gradle/libs.version.toml and referenced with "libs.<id>"
 dependencies {
     minecraft libs.minecraft
@@ -84,6 +69,9 @@ dependencies {
     // Create - dependencies are added transitively
     modImplementation libs.create
 
+    // Porting Lib - dependencies are added transitively
+    modImplementation libs.porting.lib.base
+
     // Thin Air
     modImplementation libs.thinair
 
@@ -124,7 +112,7 @@ java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 
-    withSourcesJar()
+//    withSourcesJar()
 }
 
 jar {

gradle/libs.versions.toml

@@ -9,14 +9,17 @@ parchment = "2023.09.03"
 fabric_loom = "1.8+"
 # check these on https://modmuss50.me/fabric.html
 fabric_loader = "0.16.9"
-fabric_api = "0.92.2+1.20.1"
+fabric_api = "0.92.6+1.20.1"
 
+# https://modrinth.com/mod/porting_lib/versions
+porting_lib = "2.3.14+1.20.1"
 # https://modrinth.com/mod/create-fabric/versions
-create = "0.5.1-j-build.1631+mc1.20.1"
+create = "6.0.8.0+build.1734-mc1.20.1"
+#create = "6.0.8-289"
 # https://modrinth.com/mod/thin-air/versions
-thinair = "v8.1.5-1.20.1-Fabric"
+thinair = "v8.1.7-1.20.1-Fabric"
 # https://modrinth.com/mod/ad-astra/versions
-adastra = "Xtm1uo8F"
+adastra = "gZClwdxY"
 # https://modrinth.com/mod/botarium/versions
 botarium = "f3ATcSfq"
 
@@ -31,7 +34,9 @@ minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
 fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 
-create = { module = "com.simibubi.create:create-fabric-1.20.1", version.ref = "create" }
+porting_lib_base = { module = "io.github.fabricators_of_create.Porting-Lib:base", version.ref = "porting_lib" }
+create = { module = "maven.modrinth:create-fabric", version.ref = "create" }
+#create = { module = "com.simibubi.create:create-1.20.1", version.ref = "create" }
 thinair = { module = "maven.modrinth:thin-air", version.ref = "thinair" }
 adastra = { module = "maven.modrinth:ad-astra", version.ref = "adastra" }
 botarium = { module = "maven.modrinth:botarium", version.ref = "botarium" }

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -4,6 +4,11 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven {
+            name = 'Quilt'
+            url = 'https://maven.quiltmc.org/repository/release'
+        }
+        mavenCentral()
         gradlePluginPortal()
     }
 }

src/main/java/ru/bitheaven/createairfabric/mixin/EntityOxygenSystemMixin.java

@@ -4,7 +4,6 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.simibubi.create.content.equipment.armor.BacktankItem;
 import com.simibubi.create.content.equipment.armor.BacktankUtil;
 import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
-
 import earth.terrarium.adastra.common.systems.OxygenApiImpl;
 import earth.terrarium.adastra.common.tags.ModItemTags;
 import net.minecraft.server.level.ServerLevel;