BitHeaven/create-air-fabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Update Mixins from Redirect to Update Statement
Some checks failed
build / build (17) (push) Failing after 4m45s
Details
build / upload-release (push) Has been skipped
Details

Browse Source
This commit is contained in:
BitHeaven
2025-01-21 14:45:49 +05:00
parent 824a2cf0a3
commit fc5d12980f
4 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java
View File

@@ -1,11 +1,8 @@
package ru.bitheaven.createairfabric.mixin;
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 com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
import ru.bitheaven.createairfabric.CreateAirFabric;
@@ -15,11 +12,11 @@ public abstract class DivingHelmetItemMixin {
/**
* Activate helmet "if in water or lava" -> "if in water or bad air or lava"
*/
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"),
@ModifyExpressionValue(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) {
private static boolean redirectBreatheUnderwater(boolean original, LivingEntity entity) {
boolean oxygen = true;
oxygen &= !entity.isEyeInFluid(fluidTagKey);
oxygen &= !original;
oxygen &= !entity.isUnderWater();
oxygen &= CreateAirFabric.isOxygen(entity);