PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-21 12:24:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove some alicorn amulet buffs and make is so passive entities run away from you when wearing it

Browse source
This commit is contained in:
Sollace 2022-10-17 18:01:55 +02:00
parent 184a455c30
commit 6db7f313dd
3 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/minelittlepony/unicopia/entity/AmuletSelectors.java Normal file
View file

@ -0,0 +1,11 @@
package com.minelittlepony.unicopia.entity;
import java.util.function.Predicate;
import com.minelittlepony.unicopia.item.UItems;
import net.minecraft.entity.LivingEntity;
public interface AmuletSelectors {
Predicate<LivingEntity> ALICORN_AMULET = UItems.ALICORN_AMULET::isApplicable;
}

20
src/main/java/com/minelittlepony/unicopia/entity/Creature.java
View file

@ -20,18 +20,15 @@ import com.minelittlepony.unicopia.entity.ai.WantItTakeItGoal;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.SpawnGroup; import net.minecraft.entity.SpawnGroup;
import net.minecraft.entity.ai.goal.ActiveTargetGoal; import net.minecraft.entity.ai.goal.*;
import net.minecraft.entity.ai.goal.GoalSelector;
import net.minecraft.entity.attribute.DefaultAttributeContainer; import net.minecraft.entity.attribute.DefaultAttributeContainer;
import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.DataTracker;
import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedData;
import net.minecraft.entity.data.TrackedDataHandlerRegistry; import net.minecraft.entity.data.TrackedDataHandlerRegistry;
import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.mob.*;
import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.passive.*;
import net.minecraft.entity.mob.SlimeEntity;
import net.minecraft.entity.passive.PigEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.NbtElement;
@ -120,14 +117,21 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned<Living
if (entity.getType().getSpawnGroup() == SpawnGroup.MONSTER) { if (entity.getType().getSpawnGroup() == SpawnGroup.MONSTER) {
goals.add(3, new BreakHeartGoal((MobEntity)entity, targetter)); goals.add(3, new BreakHeartGoal((MobEntity)entity, targetter));
} }
if (entity instanceof PigEntity) { if (entity instanceof PigEntity pig) {
eatMuffinGoal = new EatMuffinGoal((MobEntity)entity, targetter); eatMuffinGoal = new EatMuffinGoal(pig, targetter);
goals.add(3, eatMuffinGoal); goals.add(3, eatMuffinGoal);
} }
if (master.isPresent(getReferenceWorld())) { if (master.isPresent(getReferenceWorld())) {
initMinionAi(); initMinionAi();
} }
if (entity instanceof CreeperEntity mob) {
goals.add(1, new FleeEntityGoal<>(mob, LivingEntity.class, 10, 1.5, 1.9, AmuletSelectors.ALICORN_AMULET));
}
if (entity instanceof PassiveEntity mob) {
goals.add(1, new FleeEntityGoal<>(mob, LivingEntity.class, 10, 1.1, 1.7, AmuletSelectors.ALICORN_AMULET));
}
} }
private void initMinionAi() { private void initMinionAi() {

3
src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java
View file

@ -48,9 +48,6 @@ public class AlicornAmuletItem extends AmuletItem implements PlayerCharmTracker.
public AlicornAmuletItem(FabricItemSettings settings) { public AlicornAmuletItem(FabricItemSettings settings) {
super(settings, 0, new AmuletItem.ModifiersBuilder() super(settings, 0, new AmuletItem.ModifiersBuilder()
.add(EntityAttributes.GENERIC_ARMOR, 9000)
.add(EntityAttributes.GENERIC_ARMOR_TOUGHNESS, 9000)
.add(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, 9000)
.add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 100) .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 100)
.add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, 20) .add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, 20)
.build()); .build());