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

This commit is contained in:
2025-01-21 14:45:49 +05:00
parent 824a2cf0a3
commit fc5d12980f
4 changed files with 25 additions and 31 deletions

View File

@ -1,19 +1,20 @@
package ru.bitheaven.createairfabric.mixin;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import earth.terrarium.adastra.common.items.armor.NetheriteSpaceSuitItem;
import earth.terrarium.adastra.common.tags.ModItemTags;
import earth.terrarium.adastra.common.systems.TemperatureApiImpl;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(TemperatureApiImpl.class)
public abstract class EntityTemperatureSystemMixin {
@Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/common/systems/TemperatureApiImpl;burnEntity(Lnet/minecraft/world/entity/LivingEntity;)V"),
@ModifyExpressionValue(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/api/events/AdAstraEvents$HotTemperatureTickEvent;fire(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z"),
method = "entityTick(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V")
private void redirectTemperatureTick(TemperatureApiImpl instance, LivingEntity entity) {
private boolean redirectTemperatureTick(boolean original, ServerLevel level, LivingEntity entity) {
boolean createNetherite = true;
createNetherite &= entity.getItemBySlot(EquipmentSlot.HEAD).getItem().isFireResistant();
createNetherite &= entity.getItemBySlot(EquipmentSlot.CHEST).getItem().isFireResistant();
@ -24,9 +25,6 @@ public abstract class EntityTemperatureSystemMixin {
|| entity.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof NetheriteSpaceSuitItem
|| entity.getItemBySlot(EquipmentSlot.FEET).getItem().isFireResistant();
if(!createNetherite) {
entity.hurt(entity.damageSources().onFire(), 6);
entity.setSecondsOnFire(10);
}
return original && !createNetherite;
}
}