3 Commits

Author SHA1 Message Date
44b85603da Add UI render in Bad Air (thanx to silopante)
Some checks failed
build / build (17) (push) Has been cancelled
2023-11-01 13:24:41 +05:00
36942712f1 Merge remote-tracking branch 'origin/main'
Some checks failed
build / build (17) (push) Failing after 1m8s
2023-10-31 23:04:09 +05:00
fd5ef6c9f7 Little updates 2023-10-31 23:02:15 +05:00
4 changed files with 28 additions and 7 deletions

View File

@ -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;
}

View File

@ -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 {
/**

View File

@ -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);
}
}

View File

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