From 44b85603dac44b83fe1db73599860441147cdf95 Mon Sep 17 00:00:00 2001 From: bitheaven Date: Wed, 1 Nov 2023 13:24:41 +0500 Subject: [PATCH] Add UI render in Bad Air (thanx to silopante) --- .../mixin/RemainingAirOverlayMixin.java | 24 +++++++++++++++++++ .../resources/createairfabric.mixins.json | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ru/bitheaven/createairfabric/mixin/RemainingAirOverlayMixin.java diff --git a/src/main/java/ru/bitheaven/createairfabric/mixin/RemainingAirOverlayMixin.java b/src/main/java/ru/bitheaven/createairfabric/mixin/RemainingAirOverlayMixin.java new file mode 100644 index 0000000..571d053 --- /dev/null +++ b/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 fluidTagKey) { + return player.isEyeInFluid(fluidTagKey) || CreateAirFabric.airQualityActivatesHelmet(player); + } +} diff --git a/src/main/resources/createairfabric.mixins.json b/src/main/resources/createairfabric.mixins.json index a395171..c36e421 100644 --- a/src/main/resources/createairfabric.mixins.json +++ b/src/main/resources/createairfabric.mixins.json @@ -7,7 +7,8 @@ "DivingHelmetItemMixin" ], "client": [ - "MinecraftMixin" + "MinecraftMixin", + "RemainingAirOverlayMixin" ], "injectors": { "defaultRequire": 1