-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
104 additions
and
90 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
25 changes: 25 additions & 0 deletions
25
src/main/java/com/bawnorton/bettertrims/mixin/EscapeDanagerGoalMixin.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,25 @@ | ||
package com.bawnorton.bettertrims.mixin; | ||
|
||
import com.bawnorton.bettertrims.effect.ArmorTrimEffects; | ||
import com.bawnorton.bettertrims.extend.EntityExtender; | ||
import com.llamalad7.mixinextras.injector.ModifyReturnValue; | ||
import net.minecraft.entity.ai.goal.EscapeDangerGoal; | ||
import net.minecraft.entity.mob.PathAwareEntity; | ||
import org.spongepowered.asm.mixin.Final; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.Shadow; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
|
||
@Mixin(EscapeDangerGoal.class) | ||
public abstract class EscapeDanagerGoalMixin { | ||
@Shadow @Final protected PathAwareEntity mob; | ||
|
||
@SuppressWarnings("unused") | ||
@ModifyReturnValue(method = "isInDanger", at = @At("RETURN")) | ||
private boolean checkPlayerTrims(boolean original) { | ||
if (!original) return false; | ||
if(!(mob.getAttacker() instanceof EntityExtender extender)) return true; | ||
|
||
return !ArmorTrimEffects.RABBIT_HIDE.appliesTo(extender.betterTrims$getTrimmables()); | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
src/main/java/com/bawnorton/bettertrims/mixin/FleeEntityGoalMixin.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,38 @@ | ||
package com.bawnorton.bettertrims.mixin; | ||
|
||
import com.bawnorton.bettertrims.effect.ArmorTrimEffects; | ||
import com.bawnorton.bettertrims.extend.EntityExtender; | ||
import com.bawnorton.bettertrims.util.NumberWrapper; | ||
import com.llamalad7.mixinextras.sugar.Local; | ||
import net.minecraft.entity.LivingEntity; | ||
import net.minecraft.entity.ai.goal.FleeEntityGoal; | ||
import net.minecraft.entity.mob.PathAwareEntity; | ||
import net.minecraft.entity.passive.AnimalEntity; | ||
import net.minecraft.entity.player.PlayerEntity; | ||
import org.jetbrains.annotations.Nullable; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.Unique; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.ModifyArg; | ||
|
||
import java.util.function.Predicate; | ||
|
||
@Mixin(FleeEntityGoal.class) | ||
public abstract class FleeEntityGoalMixin { | ||
@ModifyArg(method = "<init>(Lnet/minecraft/entity/mob/PathAwareEntity;Ljava/lang/Class;Ljava/util/function/Predicate;FDDLjava/util/function/Predicate;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/ai/TargetPredicate;setPredicate(Ljava/util/function/Predicate;)Lnet/minecraft/entity/ai/TargetPredicate;")) | ||
private Predicate<LivingEntity> checkPlayerTrims(@Nullable Predicate<LivingEntity> predicate, @Local Class<LivingEntity> classToFleeFrom, @Local PathAwareEntity mob) { | ||
if(mob instanceof AnimalEntity && classToFleeFrom.isAssignableFrom(PlayerEntity.class)) { | ||
return getTrimPredicate(predicate); | ||
} | ||
return predicate; | ||
} | ||
|
||
@Unique | ||
private Predicate<LivingEntity> getTrimPredicate(Predicate<LivingEntity> original) { | ||
return target -> { | ||
NumberWrapper trimCount = NumberWrapper.zero(); | ||
ArmorTrimEffects.RABBIT_HIDE.apply(((EntityExtender) target).betterTrims$getTrimmables(), () -> trimCount.increment(1)); | ||
return trimCount.getInt() < 1 && (original == null || original.test(target)); | ||
}; | ||
} | ||
} |
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
24 changes: 24 additions & 0 deletions
24
src/main/java/com/bawnorton/bettertrims/mixin/compat/IllagerEntityMixin.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,24 @@ | ||
package com.bawnorton.bettertrims.mixin.compat; | ||
|
||
import com.bawnorton.bettertrims.effect.ArmorTrimEffects; | ||
import com.bawnorton.bettertrims.extend.EntityExtender; | ||
import com.bawnorton.bettertrims.mixin.LivingEntityMixin; | ||
import com.llamalad7.mixinextras.injector.ModifyReturnValue; | ||
import net.minecraft.entity.LivingEntity; | ||
import net.minecraft.entity.mob.IllagerEntity; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
|
||
@Mixin(IllagerEntity.class) | ||
public abstract class IllagerEntityMixin extends LivingEntityMixin { | ||
@SuppressWarnings("BooleanMethodIsAlwaysInverted") | ||
@ModifyReturnValue(method = "canTarget(Lnet/minecraft/entity/LivingEntity;)Z", at = @At("RETURN")) | ||
protected boolean canTargetTrimmedPlayer(boolean original, LivingEntity target) { | ||
return original && !ArmorTrimEffects.PLATINUM.appliesTo(((EntityExtender) target).betterTrims$getTrimmables()); | ||
} | ||
} | ||
|
||
|
||
|
||
|
||
|
26 changes: 0 additions & 26 deletions
26
src/main/java/com/bawnorton/bettertrims/mixin/compat/friendsandfoes/IceologerMixin.java
This file was deleted.
Oops, something went wrong.
42 changes: 0 additions & 42 deletions
42
src/main/java/com/bawnorton/bettertrims/mixin/compat/illagerinvasion/IllagerEntityMixin.java
This file was deleted.
Oops, something went wrong.
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