Skip to content

feat: add pacifist enchantment #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
123FLO321 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: add pacifist enchantment #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c6db47
feat: add pacifist enchantment
123FLO321 Aug 26, 2023
1731a8c
Merge remote-tracking branch 'upstream/main' into pacifist
123FLO321 Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/java/com/github/alexthe668/domesticationinnovation/mixin/MobMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import net.minecraft.world.entity.Mob;
import net.minecraft.world.entity.ai.control.MoveControl;
import net.minecraft.world.entity.ai.navigation.PathNavigation;
import net.minecraft.world.entity.animal.Animal;
import net.minecraft.world.entity.animal.WaterAnimal;
import net.minecraft.world.entity.animal.axolotl.Axolotl;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
Expand All @@ -21,6 +23,8 @@
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import javax.annotation.Nullable;

@Mixin(Mob.class)
public abstract class MobMixin extends LivingEntity {

Expand Down Expand Up @@ -98,4 +102,11 @@ private void di_playAmbientSound(CallbackInfo ci) {
ci.cancel();
}
}

@Inject(method = "setTarget", at = @At(value = "HEAD"), cancellable = true)
private void di_setTarget(@Nullable LivingEntity livingEntity, CallbackInfo ci) {
if (TameableUtils.hasEnchant(this, DIEnchantmentRegistry.PACIFIST) && (livingEntity instanceof Animal || livingEntity instanceof WaterAnimal) ) {
ci.cancel();
}
}
}
3 changes: 2 additions & 1 deletion ...m/github/alexthe668/domesticationinnovation/server/enchantment/DIEnchantmentRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public class DIEnchantmentRegistry {
public static final PetEnchantment BLAZING_PROTECTION = new PetEnchantmentLootOnly("blazing_protection", Enchantment.Rarity.VERY_RARE, 3, 8);
public static final PetEnchantment HEALING_AURA = new PetEnchantment("healing_aura", Enchantment.Rarity.RARE, 2, 12);

public static final PetEnchantment REJUVENATION = new PetEnchantment("rejuvenation", Enchantment.Rarity.UNCOMMON, 1, 6);
public static final PetEnchantment REJUVENATION = new PetEnchantment("rejuvenation", Enchantment.Rarity.COMMON, 1, 1);
public static final PetEnchantment PACIFIST = new PetEnchantment("pacifist", Enchantment.Rarity.UNCOMMON, 1, 4);
public static final PetEnchantment UNDEAD_CURSE = new PetEnchantmentCurse("undead_curse", Enchantment.Rarity.VERY_RARE);
public static final PetEnchantment INFAMY_CURSE = new PetEnchantmentCurse("infamy_curse", Enchantment.Rarity.VERY_RARE);
public static final PetEnchantment BLIGHT_CURSE = new PetEnchantmentCurse("blight_curse", Enchantment.Rarity.VERY_RARE);
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/domesticationinnovation/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@
"enchantment.domesticationinnovation.healing_aura.desc": "Pet will ocassionally heal owner and other pets around it, level determines strength of healing effect.",
"enchantment.domesticationinnovation.rejuvenation": "Rejuvenation",
"enchantment.domesticationinnovation.rejuvenation.desc": "When injured, pet may absorb experience orbs to heal itself.",
"enchantment.domesticationinnovation.pacifist": "Pacifist",
"enchantment.domesticationinnovation.pacifist.desc": "Pet will not attack other animals.",
"domesticationinnovation.sound.subtitle.collar_tag": "equipped Collar Tag",
"domesticationinnovation.sound.subtitle.magnet_loop": "Magnet buzzes",
"domesticationinnovation.sound.subtitle.chain_lightning": "Lightning zaps",
Expand Down