Change version

.gitea/workflows/build.yml

@@ -6,36 +6,63 @@ on:
 
 jobs:
   build:
+    env:
+      RUN_NUMBER: ${{ gitea.run_number }}
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ '17' ]
     runs-on: ubuntu-latest
     steps:
-      - name: checkout repository
-        uses: https://git.bitheaven.ru/actions/checkout@v2
+      - name: Checkout Code
+        uses: actions/checkout@v4
 
-      - name: setup jdk ${{ matrix.java }}
-        uses: https://git.bitheaven.ru/actions/setup-java@v1
+      - name: Setup JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
         with:
+          distribution: 'oracle'
           java-version: ${{ matrix.java }}
+          cache: 'gradle'
 
-      - uses: https://git.bitheaven.ru/actions/cache@v2
+      - name: Loom Cache
+        uses: actions/cache@v4
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/loom-cache
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: "**/.gradle/loom-cache"
+          key: "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}"
+          restore-keys: "${{ runner.os }}-gradle-"
 
-      - name: make gradle wrapper executable
-        run: chmod +x ./gradlew
-
-      - name: build
-        run: ./gradlew build
-
-      - name: capture build artifacts
-        uses: https://git.bitheaven.ru/actions/upload-artifact@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          name: Artifacts
-          path: build/libs/
+          gradle-home-cache-cleanup: true
+
+      - name: Validate Gradle Wrapper Integrity
+        uses: gradle/wrapper-validation-action@v2
+
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon
+
+      - name: Upload Mod JAR
+        uses: actions/upload-artifact@v3
+        with:
+          name: create-air-fabric
+          path: build/libs/*.jar
+
+  upload-release:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download build artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: create-air-fabric
+
+      - name: Make release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          name: Create Air Fabric 1.0-${{ gitea.run_number }} for 1.20.1
+          tag_name: createairfabric-1.0+1.20.1-${{ gitea.run_number }}
+          md5sum: true
+          sha256sum: true
+          files: |-
+            *.jar
+#            build/libs/**

build.gradle

@@ -1,18 +1,17 @@
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    alias libs.plugins.fabric.loom
     id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+base {
+    archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
+String buildNumber = System.getenv("RUN_NUMBER")
+version = "${mod_version}+${libs.versions.minecraft.get()}" + (buildNumber != null ? "-${buildNumber}" : "")
 group = project.maven_group
 
-String buildNumber = System.getenv("GITEA_RUN_NUMBER")
-version = "${mod_version}+${minecraft_version}" + (buildNumber != null ? "-${buildNumber}" : "")
-
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because
@@ -20,69 +19,96 @@ repositories {
     // 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://dvs1.progwml6.com/files/maven/" } // JEI
-    maven { url = "https://maven.parchmentmc.org" } // Parchment mappings
-    maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings
+    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://mvn.devos.one/snapshots/" } // Create, Porting Lib, Forge Tags, Milk Lib, Registrate
     maven { url = "https://cursemaven.com" } // Forge Config API Port
     maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
-    maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM
+    maven { // Fabric ASM for Porting Lib
+        url = "https://jitpack.io/"
+        content { includeGroupAndSubgroups("com.github") }
+    }
     maven { url = "https://maven.tterrag.com/" } // Flywheel
+    maven { url = "https://mvn.devos.one/snapshots/" } // Create and several dependencies
+    maven { url = "https://mvn.devos.one/releases/" } // Porting Lib releases
+    maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven" } // Forge Config API Port
 
-    maven {
-        url 'https://www.cursemaven.com'
-        content {
-            includeGroup "curse.maven"
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = "Modrinth"
+                url = "https://api.modrinth.com/maven"
+            }
+        }
+        filter {
+            includeGroup "maven.modrinth"
         }
     }
 }
 
+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 {
-    // To change the versions see the gradle.properties file
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings(loom.layered {
-        it.mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${qm_version}:intermediary-v2")
-        it.parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
-        it.officialMojangMappings { nameSyntheticMembers = false }
-    })
-    modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
+    minecraft libs.minecraft
+    mappings loom.layered {
+        mappings "org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:intermediary-v2"
+        officialMojangMappings()
+    }
+
+    modImplementation libs.fabric.loader
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}")
+    modImplementation libs.fabric.api
 
     // Create - dependencies are added transitively
-    modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_version}")
+    modImplementation libs.create
 
     // Thin Air
-    modImplementation("curse.maven:new-thin-air-878379:4611944")
+    modImplementation libs.thinair
+
+    // Ad Astra
+    modImplementation libs.adastra
+    modImplementation libs.botarium
 
     // Development QOL
-    modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}")
-    modLocalRuntime("com.terraformersmc:modmenu:${modmenu_version}")
+    modLocalRuntime libs.lazydfu
+    modLocalRuntime libs.modmenu
 
-    // Recipe Viewers - Create Fabric supports JEI, REI, and EMI.
-    // See root gradle.properties to choose which to use at runtime.
-    switch (recipe_viewer.toLowerCase(Locale.ROOT)) {
-        case "jei": modLocalRuntime("mezz.jei:jei-${minecraft_version}-fabric:${jei_version}"); break
-        case "rei": modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}"); break
-        case "emi": modLocalRuntime("dev.emi:emi:${emi_version}"); break
-        case "disabled": break
-        default: println("Unknown recipe viewer specified: ${recipe_viewer}. Must be JEI, REI, EMI, or disabled.")
-    }
+    include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.4.1")))
 }
 
 processResources {
     // require dependencies to be the version compiled against or newer
-    Map<String, String> properties = new HashMap<>()
-    properties.put("version", version)
-    properties.put("fabric_loader_version", fabric_loader_version)
-    properties.put("fabric_api_version", fabric_api_version)
-    properties.put("create_version", create_version)
-    properties.put("minecraft_version", minecraft_version)
+    Map<String, Object> properties = [
+            "version": version,
+            "fabric_loader_version": libs.versions.fabric.loader.get(),
+            "fabric_api_version": libs.versions.fabric.api.get(),
+            "create_version": libs.versions.create.get(),
+            "minecraft_version": libs.versions.minecraft.get()
+    ]
 
-    properties.forEach((k, v) -> inputs.property(k, v))
+    inputs.properties(properties)
 
     filesMatching("fabric.mod.json") {
         expand properties
@@ -91,32 +117,18 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
-    it.options.release = Integer.parseInt(sourceCompatibility)
+    it.options.release = 17
 }
 
 java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+
     withSourcesJar()
 }
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}"}
-    }
-}
-
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-        // Notice: This block does NOT have the same function as the block in the top level.
-        // The repositories here will be used for publishing your artifact, not for
-        // retrieving dependencies.
+        rename { "${it}_${base.archivesName.get()}"}
     }
 }

gradle.properties

@@ -1,31 +1,9 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-
-# Fabric Properties
-	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.10
-	fabric_loader_version=0.14.24
-	# check this on https://modmuss50.me/fabric.html
-	fabric_api_version=0.90.0+1.20.1
-
-# Mappings
-	# https://lambdaurora.dev/tools/import_quilt.html
-	qm_version = 23
-	# https://parchmentmc.org/docs/getting-started
-	parchment_version = 2023.06.26
+org.gradle.jvmargs = -Xmx1G
 
 # Mod Properties
-	mod_version = 1.0
-	maven_group = ru.bitheaven
-	archives_base_name = createairfabric
+mod_version = 1.0
+maven_group = ru.bitheaven
+archives_base_name = createairfabric
 
-# Dependencies
-	# https://modrinth.com/mod/create-fabric/versions
-	create_version = 0.5.1-d-build.1161+mc1.20.1
-	# set to disabled to have none of them.
-	recipe_viewer = disabled
-	# Mod Menu - https://modrinth.com/mod/modmenu/versions
-	modmenu_version = 4.1.2
-	# LazyDFU - https://modrinth.com/mod/lazydfu/versions
-	lazydfu_version = 0.1.3
+# Dependencies are managed at gradle/libs.versions.toml

gradle/libs.versions.toml

@@ -0,0 +1,46 @@
+# The latest versions are available at https://quiltmc.org/en/usage/latest-versions
+[versions]
+minecraft = "1.20.1"
+# https://lambdaurora.dev/tools/import_quilt.html
+quilt_mappings = "1.20.1+build.23"
+# https://parchmentmc.org/docs/getting-started
+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"
+
+# https://modrinth.com/mod/create-fabric/versions
+create = "0.5.1-j-build.1631+mc1.20.1"
+# https://modrinth.com/mod/thin-air/versions
+thinair = "v8.1.5-1.20.1-Fabric"
+# https://modrinth.com/mod/ad-astra/versions
+adastra = "Xtm1uo8F"
+# https://modrinth.com/mod/botarium/versions
+botarium = "f3ATcSfq"
+
+# LazyDFU - https://modrinth.com/mod/lazydfu/versions
+lazydfu = "0.1.3"
+# Mod Menu - https://modrinth.com/mod/modmenu/versions
+modmenu = "7.2.2"
+
+[libraries]
+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" }
+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" }
+
+lazydfu = { module = "maven.modrinth:lazydfu", version.ref = "lazydfu" }
+modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
+
+# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
+[bundles]
+
+[plugins]
+fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java

@@ -1,11 +1,10 @@
 package ru.bitheaven.createairfabric;
 
 import com.simibubi.create.Create;
-import fuzs.thinair.helper.AirHelper;
-import fuzs.thinair.helper.AirQualityLevel;
-import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
+import earth.terrarium.adastra.api.systems.OxygenApi;
+import fuzs.thinair.helper.AirQualityHelperImpl;
 import net.fabricmc.api.ModInitializer;
-import net.minecraft.resources.ResourceLocation;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.world.entity.LivingEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,18 +17,17 @@ public class CreateAirFabric implements ModInitializer {
     @Override
     public void onInitialize() {
         LOGGER.info("Create addon mod [{}] is loading alongside Create [{}]!", NAME, Create.VERSION);
-        LOGGER.info(EnvExecutor.unsafeRunForDist(
-                () -> () -> "{} is accessing Porting Lib from the client!",
-                () -> () -> "{} is accessing Porting Lib from the server!"
-        ), NAME);
     }
 
-    public static boolean airQualityActivatesHelmet(LivingEntity entity) {
-        final AirQualityLevel air = AirHelper.getO2LevelFromLocation(entity.getEyePosition(), entity.level()).getFirst();
-        return air == AirQualityLevel.RED || air == AirQualityLevel.YELLOW;
-    }
-
-    public static ResourceLocation id(String path) {
-        return new ResourceLocation(ID, path);
+    public static boolean isOxygen(LivingEntity entity) {
+        boolean oxygen = true;
+        if (FabricLoader.getInstance().isModLoaded("thinair")) {
+            oxygen &= new AirQualityHelperImpl()
+                    .getAirQualityAtLocation(entity.level(), entity.getEyePosition()).canBreathe;
+        }
+        if (FabricLoader.getInstance().isModLoaded("ad_astra")) {
+            oxygen &= OxygenApi.API.hasOxygen(entity.level());
+        }
+        return oxygen;
     }
 }

src/main/java/ru/bitheaven/createairfabric/CreateAirFabricMixinPlugin.java

@@ -0,0 +1,69 @@
+package ru.bitheaven.createairfabric;
+
+import com.google.common.collect.ImmutableMap;
+import net.fabricmc.loader.api.FabricLoader;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+
+public class CreateAirFabricMixinPlugin implements IMixinConfigPlugin {
+    private static final Supplier<Boolean> TRUE = () -> true;
+
+    private static final Map<String, Supplier<Boolean>> CONDITIONS = ImmutableMap.of(
+            "ru.bitheaven.createairfabric.mixin.DivingHelmetItemMixin",
+                () -> FabricLoader.getInstance().isModLoaded("thinair")
+                        || FabricLoader.getInstance().isModLoaded("ad_astra"),
+
+            "ru.bitheaven.createairfabric.mixin.RemainingAirOverlayMixin",
+               () -> FabricLoader.getInstance().isModLoaded("thinair")
+                        || FabricLoader.getInstance().isModLoaded("ad_astra"),
+
+            "ru.bitheaven.createairfabric.mixin.EntityOxygenSystemMixin",
+               () -> FabricLoader.getInstance().isModLoaded("ad_astra"),
+
+            "ru.bitheaven.createairfabric.mixin.EntityTemperatureSystemMixin",
+                () -> FabricLoader.getInstance().isModLoaded("ad_astra")
+    );
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        return CONDITIONS.getOrDefault(mixinClassName, TRUE).get();
+    }
+
+    // Boilerplate
+
+    @Override
+    public void onLoad(String mixinPackage) {
+
+    }
+
+    @Override
+    public String getRefMapperConfig() {
+        return null;
+    }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+    }
+
+    @Override
+    public List<String> getMixins() {
+        return null;
+    }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
+}

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

@@ -1,22 +1,25 @@
 package ru.bitheaven.createairfabric.mixin;
 
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.material.Fluid;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import ru.bitheaven.createairfabric.CreateAirFabric;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
+import ru.bitheaven.createairfabric.CreateAirFabric;
 
 @Mixin(DivingHelmetItem.class)
 public abstract class DivingHelmetItemMixin {
     /**
      * Activate helmet "if in water or lava" -> "if in water or bad air or lava"
      */
-    @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"),
+    @ModifyExpressionValue(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"),
             method = "breatheUnderwater(Lnet/minecraft/world/entity/LivingEntity;)V")
-    private static boolean redirectBreatheUnderwater(LivingEntity entity, TagKey<Fluid> fluidTagKey) {
-        return entity.isEyeInFluid(fluidTagKey) || CreateAirFabric.airQualityActivatesHelmet(entity);
+    private static boolean redirectBreatheUnderwater(boolean original, LivingEntity entity) {
+        boolean oxygen = true;
+        oxygen &= !original;
+        oxygen &= !entity.isUnderWater();
+        oxygen &= CreateAirFabric.isOxygen(entity);
+        
+        return !oxygen;
     }
 }

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

@@ -0,0 +1,41 @@
+package ru.bitheaven.createairfabric.mixin;
+
+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;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.LivingEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(OxygenApiImpl.class)
+public abstract class EntityOxygenSystemMixin {
+    /**
+     * Make air exists if Create Air
+     */
+    @ModifyExpressionValue(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/common/items/armor/SpaceSuitItem;hasOxygen(Lnet/minecraft/world/entity/Entity;)Z"),
+            method = "entityTick(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V")
+    private boolean redirectHasOxygen(boolean original, ServerLevel level, LivingEntity entity) {
+        boolean createOxygen = true;
+        createOxygen &= !DivingHelmetItem.getWornItem(entity).isEmpty();
+        createOxygen &= !BacktankUtil.getAllWithAir(entity).isEmpty();
+        return original || createOxygen;
+    }
+    @ModifyExpressionValue(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/common/items/armor/SpaceSuitItem;hasFullSet(Lnet/minecraft/world/entity/LivingEntity;)Z"),
+            method = "entityTick(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V")
+    private boolean redirectHasFullSet(boolean original, ServerLevel level, LivingEntity entity) {
+        boolean createArmor = true;
+        createArmor &= entity.getItemBySlot(EquipmentSlot.HEAD).getItem() instanceof DivingHelmetItem;
+        createArmor &= entity.getItemBySlot(EquipmentSlot.CHEST).getItem() instanceof BacktankItem;
+        createArmor &= entity.getItemBySlot(EquipmentSlot.LEGS).is(ModItemTags.SPACE_SUITS);
+        createArmor &= entity.getItemBySlot(EquipmentSlot.FEET).is(ModItemTags.SPACE_SUITS);
+
+        return original || createArmor;
+    }
+}
+

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

@@ -0,0 +1,30 @@
+package ru.bitheaven.createairfabric.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import earth.terrarium.adastra.common.items.armor.NetheriteSpaceSuitItem;
+import earth.terrarium.adastra.common.tags.ModItemTags;
+import earth.terrarium.adastra.common.systems.TemperatureApiImpl;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.LivingEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(TemperatureApiImpl.class)
+public abstract class EntityTemperatureSystemMixin {
+    @ModifyExpressionValue(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/api/events/AdAstraEvents$HotTemperatureTickEvent;fire(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z"),
+            method = "entityTick(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V")
+    private boolean redirectTemperatureTick(boolean original, ServerLevel level, LivingEntity entity) {
+        boolean createNetherite = true;
+        createNetherite &= entity.getItemBySlot(EquipmentSlot.HEAD).getItem().isFireResistant();
+        createNetherite &= entity.getItemBySlot(EquipmentSlot.CHEST).getItem().isFireResistant();
+        createNetherite &= entity.getItemBySlot(EquipmentSlot.LEGS).is(ModItemTags.HEAT_RESISTANT_ARMOR)
+                || entity.getItemBySlot(EquipmentSlot.LEGS).getItem() instanceof NetheriteSpaceSuitItem
+                || entity.getItemBySlot(EquipmentSlot.LEGS).getItem().isFireResistant();
+        createNetherite &= entity.getItemBySlot(EquipmentSlot.FEET).is(ModItemTags.HEAT_RESISTANT_ARMOR)
+                || entity.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof NetheriteSpaceSuitItem
+                || entity.getItemBySlot(EquipmentSlot.FEET).getItem().isFireResistant();
+
+        return original && !createNetherite;
+    }
+}

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

@@ -1,11 +1,8 @@
 package ru.bitheaven.createairfabric.mixin;
 
 import ru.bitheaven.createairfabric.CreateAirFabric;
-
 import net.minecraft.client.Minecraft;
-
 import net.minecraft.client.main.GameConfig;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

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

@@ -1,24 +1,23 @@
 package ru.bitheaven.createairfabric.mixin;
 
-
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.simibubi.create.content.equipment.armor.RemainingAirOverlay;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.level.material.Fluid;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import ru.bitheaven.createairfabric.CreateAirFabric;
 
-import net.minecraft.client.player.LocalPlayer;
-
 @Mixin(RemainingAirOverlay.class)
 public class RemainingAirOverlayMixin {
     /**
      * Activate UI "if in water or lava" -> "if in water or bad air or lava"
      */
-    @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"),
+    @ModifyExpressionValue(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"),
             method = "render(Lnet/minecraft/client/gui/GuiGraphics;II)V")
-    private static boolean redirectRender(LocalPlayer player, TagKey<Fluid> fluidTagKey) {
-        return player.isEyeInFluid(fluidTagKey) || CreateAirFabric.airQualityActivatesHelmet(player);
+    private static boolean redirectRender(boolean original) {
+        Minecraft mc = Minecraft.getInstance();
+        LocalPlayer player = mc.player;
+        return original || !CreateAirFabric.isOxygen(player);
     }
 }

src/main/resources/createairfabric.mixins.json

@@ -3,8 +3,11 @@
   "minVersion": "0.8",
   "package": "ru.bitheaven.createairfabric.mixin",
   "compatibilityLevel": "JAVA_17",
+  "plugin": "ru.bitheaven.createairfabric.CreateAirFabricMixinPlugin",
   "mixins": [
-    "DivingHelmetItemMixin"
+    "DivingHelmetItemMixin",
+    "EntityOxygenSystemMixin",
+    "EntityTemperatureSystemMixin"
   ],
   "client": [
     "MinecraftMixin",

src/main/resources/fabric.mod.json

@@ -3,7 +3,7 @@
   "id": "createairfabric",
   "version": "${version}",
   "name": "Create Air Fabric",
-  "description": "Addon for compatibility Create and Thin Air",
+  "description": "Addon for Create that add compatibility with Thin Air, Ad Astra",
   "authors": [
     "BitHeaven"
   ],