-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
style: rename TraitStates to ServerState
- Loading branch information
Showing
10 changed files
with
120 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/main/java/net/sigmarik/abilitymod/mixin/StatusEffectMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package net.sigmarik.abilitymod.mixin; | ||
|
|
||
| import net.minecraft.entity.LivingEntity; | ||
| import net.minecraft.entity.effect.StatusEffect; | ||
| import net.minecraft.entity.effect.StatusEffects; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.sigmarik.abilitymod.AbilityMod; | ||
| import net.sigmarik.abilitymod.util.ServerState; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Mixin(StatusEffect.class) | ||
| public abstract class StatusEffectMixin { | ||
| @Inject(method = "applyUpdateEffect", at = @At("HEAD"), cancellable = true) | ||
| private void invertRegeneration(LivingEntity entity, int amplifier, CallbackInfo ci) { | ||
| if (entity instanceof PlayerEntity && ServerState.hasTrait((PlayerEntity)entity, AbilityMod.TRAIT_INVERT_EFFECTS)) { | ||
| if ((Object)this == StatusEffects.REGENERATION) { | ||
| if (entity.getHealth() > 1.0F) { | ||
| entity.damage(entity.getDamageSources().magic(), 1.0F); | ||
| } | ||
| ci.cancel(); | ||
| } else if ((Object)this == StatusEffects.POISON) { | ||
| if (entity.getHealth() < entity.getMaxHealth()) { | ||
| entity.heal(1.0F); | ||
| } | ||
| ci.cancel(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Redirect(method = "applyInstantEffect", at = @At( | ||
| value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;isUndead()Z")) | ||
| private boolean traitedIsUndead(LivingEntity entity) { | ||
| return entity.isUndead() || | ||
| (entity instanceof PlayerEntity && | ||
| ServerState.hasTrait((PlayerEntity)entity, AbilityMod.TRAIT_INVERT_EFFECTS)); | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
src/main/java/net/sigmarik/abilitymod/mixin/TargetPredicateMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package net.sigmarik.abilitymod.mixin; | ||
|
|
||
| import net.minecraft.entity.LivingEntity; | ||
| import net.minecraft.entity.ai.TargetPredicate; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.sigmarik.abilitymod.AbilityMod; | ||
| import net.sigmarik.abilitymod.util.ServerState; | ||
| import org.jetbrains.annotations.Nullable; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| @Mixin(TargetPredicate.class) | ||
| public abstract class TargetPredicateMixin { | ||
| @Inject(method = "test", at = @At("HEAD"), cancellable = true) | ||
| private void checkUndead(@Nullable LivingEntity baseEntity, LivingEntity targetEntity, CallbackInfoReturnable<Boolean> cir) { | ||
| if (baseEntity == null) return; | ||
| if (baseEntity.isUndead() && | ||
| targetEntity instanceof PlayerEntity && | ||
| ServerState.hasTrait((PlayerEntity)targetEntity, AbilityMod.TRAIT_IGNORED_BY_UNDEAD) && | ||
| baseEntity.getAttacker() != targetEntity) { | ||
| cir.setReturnValue(false); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters