Remove spaces

build.gradle

@@ -31,10 +31,15 @@ repositories {
     maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM
     maven { url = "https://maven.tterrag.com/" } // Flywheel
 
-    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"
         }
     }
 }
@@ -56,7 +61,10 @@ dependencies {
     modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_version}")
 
     // Thin Air
-    modImplementation("curse.maven:new-thin-air-878379:4611944")
+    modImplementation("maven.modrinth:thin-air:v8.1.3-1.20.1-Fabric")
+
+    // Ad Astra
+    modImplementation("curse.maven:ad-astra-635042:4774341")
 
     // Development QOL
     modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}")

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
 	# 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
+	fabric_loader_version=0.14.21
 	# check this on https://modmuss50.me/fabric.html
 	fabric_api_version=0.90.0+1.20.1
 

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

@@ -1,12 +1,12 @@
 package ru.bitheaven.createairfabric;
 
 import com.simibubi.create.Create;
-import fuzs.thinair.helper.AirHelper;
-import fuzs.thinair.helper.AirQualityLevel;
+import earth.terrarium.ad_astra.common.util.OxygenUtils;
+import fuzs.thinair.helper.AirQualityHelperImpl;
 import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
 import net.fabricmc.api.ModInitializer;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.LivingEntity;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.world.entity.Entity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,12 +24,15 @@ public class CreateAirFabric implements ModInitializer {
         ), NAME);
     }
 
-    public static boolean airQualityActivatesHelmet(LivingEntity entity) {
-        final var 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(Entity 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 &= OxygenUtils.levelHasOxygen(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,17 +1,13 @@
 package ru.bitheaven.createairfabric.mixin;
 
-import fuzs.thinair.helper.AirHelper;
-import fuzs.thinair.helper.AirQualityLevel;
 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.simibubi.create.content.equipment.armor.DivingHelmetItem;
-
-import net.minecraft.world.entity.LivingEntity;
+import ru.bitheaven.createairfabric.CreateAirFabric;
 
 @Mixin(DivingHelmetItem.class)
 public abstract class DivingHelmetItemMixin {
@@ -21,6 +17,11 @@ public abstract class DivingHelmetItemMixin {
     @Redirect(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);
+        boolean oxygen = true;
+        oxygen &= !entity.isEyeInFluid(fluidTagKey);
+        oxygen &= !entity.isUnderWater();
+        oxygen &= CreateAirFabric.isOxygen(entity);
+        
+        return !oxygen;
     }
 }

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

@@ -0,0 +1,25 @@
+package ru.bitheaven.createairfabric.mixin;
+
+import com.simibubi.create.content.equipment.armor.BacktankUtil;
+import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
+import earth.terrarium.ad_astra.common.entity.system.EntityOxygenSystem;
+import earth.terrarium.ad_astra.common.util.ModUtils;
+import net.minecraft.world.entity.LivingEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(EntityOxygenSystem.class)
+public abstract class EntityOxygenSystemMixin {
+    /**
+     * Make air exists if Create Air
+     */
+    @Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/ad_astra/common/util/ModUtils;armourIsOxygenated(Lnet/minecraft/world/entity/LivingEntity;)Z"),
+            method = "oxygenTick(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)V")
+    private static boolean redirectOxygenTick(LivingEntity entity) {
+        boolean createOxygen = true;
+        createOxygen &= !DivingHelmetItem.getWornItem(entity).isEmpty();
+        createOxygen &= !BacktankUtil.getAllWithAir(entity).isEmpty();
+        return ModUtils.armourIsOxygenated(entity) || createOxygen;
+    }
+}

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

@@ -0,0 +1,33 @@
+package ru.bitheaven.createairfabric.mixin;
+
+import earth.terrarium.ad_astra.common.config.AdAstraConfig;
+import earth.terrarium.ad_astra.common.entity.system.EntityTemperatureSystem;
+import earth.terrarium.ad_astra.common.item.armor.NetheriteSpaceSuit;
+import earth.terrarium.ad_astra.common.registry.ModTags;
+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;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(EntityTemperatureSystem.class)
+public abstract class EntityTemperatureSystemMixin {
+    @Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/ad_astra/common/entity/system/EntityTemperatureSystem;burnEntity(Lnet/minecraft/world/entity/LivingEntity;)V"),
+            method = "temperatureTick(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)V")
+    private static void redirectTemperatureTick(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(ModTags.HEAT_RESISTANT)
+                || entity.getItemBySlot(EquipmentSlot.LEGS).getItem() instanceof NetheriteSpaceSuit
+                || entity.getItemBySlot(EquipmentSlot.LEGS).getItem().isFireResistant();
+        createNetherite &= entity.getItemBySlot(EquipmentSlot.FEET).is(ModTags.HEAT_RESISTANT)
+                || entity.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof NetheriteSpaceSuit
+                || entity.getItemBySlot(EquipmentSlot.FEET).getItem().isFireResistant();
+
+        if(!createNetherite) {
+            entity.hurt(entity.damageSources().onFire(), (float) AdAstraConfig.heatDamage);
+            entity.setSecondsOnFire(10);
+        }
+    }
+}

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

@@ -0,0 +1,22 @@
+package ru.bitheaven.createairfabric.mixin;
+
+import com.simibubi.create.content.equipment.armor.RemainingAirOverlay;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.tags.TagKey;
+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;
+
+@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"),
+            method = "render(Lnet/minecraft/client/gui/GuiGraphics;II)V")
+    private static boolean redirectRender(LocalPlayer player, TagKey<Fluid> fluidTagKey) {
+        return player.isEyeInFluid(fluidTagKey) || !CreateAirFabric.isOxygen(player);
+    }
+}

src/main/resources/createairfabric.mixins.json

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

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"
   ],