From fd5ef6c9f728c3fcf6d43da22dc67cc0d12002e1 Mon Sep 17 00:00:00 2001 From: bitheaven Date: Tue, 31 Oct 2023 23:02:15 +0500 Subject: [PATCH] Little updates --- build.gradle | 3 +-- .../java/ru/bitheaven/createairfabric/CreateAirFabric.java | 2 +- .../createairfabric/mixin/DivingHelmetItemMixin.java | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 86fe39d..f643a39 100644 --- a/build.gradle +++ b/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 = 4 +String buildNumber = System.getenv("GITEA_RUN_NUMBER") version = "${mod_version}+${minecraft_version}" + (buildNumber != null ? "-${buildNumber}" : "") repositories { diff --git a/src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java b/src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java index 493e14d..4d8140d 100644 --- a/src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java +++ b/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; } diff --git a/src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java b/src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java index e962935..19b322f 100644 --- a/src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java +++ b/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 { /**