Update Logo

.gitea/workflows/build.yml

@@ -1,5 +1,8 @@
 name: build
-on: [ pull_request, push ]
+on:
+  pull_request: {}
+  push: {}
+  workflow_dispatch: {}
 
 jobs:
   build:
@@ -9,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout repository
-        uses: actions/checkout@v2
+        uses: https://git.bitheaven.ru/actions/checkout@v2
 
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: https://git.bitheaven.ru/actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v2
+      - uses: https://git.bitheaven.ru/actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
@@ -32,7 +35,7 @@ jobs:
         run: ./gradlew build
 
       - name: capture build artifacts
-        uses: actions/upload-artifact@v2
+        uses: https://git.bitheaven.ru/actions/upload-artifact@v2
         with:
           name: Artifacts
           path: build/libs/

build.gradle

@@ -10,8 +10,7 @@ targetCompatibility = JavaVersion.VERSION_17
 archivesBaseName = project.archives_base_name
 group = project.maven_group
 
-//String buildNumber = System.getenv("GITHUB_RUN_NUMBER")
+String buildNumber = System.getenv("GITEA_RUN_NUMBER")
-String buildNumber = 4
 version = "${mod_version}+${minecraft_version}" + (buildNumber != null ? "-${buildNumber}" : "")
 
 repositories {

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

@@ -25,7 +25,7 @@ public class CreateAirFabric implements ModInitializer {
     }
 
     public static boolean airQualityActivatesHelmet(LivingEntity entity) {
-        final var air = AirHelper.getO2LevelFromLocation(entity.getEyePosition(), entity.level()).getFirst();
+        final AirQualityLevel air = AirHelper.getO2LevelFromLocation(entity.getEyePosition(), entity.level()).getFirst();
         return air == AirQualityLevel.RED || air == AirQualityLevel.YELLOW;
     }
 

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

@@ -1,18 +1,14 @@
 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;
-
 @Mixin(DivingHelmetItem.class)
 public abstract class DivingHelmetItemMixin {
     /**

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

@@ -0,0 +1,24 @@
+package ru.bitheaven.createairfabric.mixin;
+
+
+import com.simibubi.create.content.equipment.armor.RemainingAirOverlay;
+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;
+
+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"),
+            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);
+    }
+}

src/main/resources/createairfabric.mixins.json

@@ -7,7 +7,8 @@
     "DivingHelmetItemMixin"
   ],
   "client": [
-    "MinecraftMixin"
+    "MinecraftMixin",
+    "RemainingAirOverlayMixin"
   ],
   "injectors": {
     "defaultRequire": 1