Skip to content
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

feat: use dropCustomDeathLoot rather than die to spawn helper charms #1660

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −16
Open

feat: use dropCustomDeathLoot rather than die to spawn helper charms #1660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/main/java/com/hollingsworth/arsnouveau/common/entity/Alakarkinos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,14 @@ protected void pickUpItem(ItemEntity itemEntity) {
}
}


@Override
public void die(DamageSource source) {
protected void dropCustomDeathLoot(ServerLevel level, DamageSource damageSource, boolean recentlyHit) {
super.dropCustomDeathLoot(level, damageSource, recentlyHit);
if (!level.isClientSide && tamed) {
ItemStack stack = new ItemStack(ItemsRegistry.ALAKARKINOS_CHARM);
stack.set(DataComponentRegistry.PERSISTENT_FAMILIAR_DATA, createCharmData());
level.addFreshEntity(new ItemEntity(level, getX(), getY(), getZ(), stack));
}
super.die(source);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/hollingsworth/arsnouveau/common/entity/AmethystGolem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,15 @@ public void getTooltip(List<Component> tooltip) {
}

@Override
public void die(DamageSource source) {
protected void dropCustomDeathLoot(ServerLevel level, DamageSource damageSource, boolean recentlyHit) {
super.dropCustomDeathLoot(level, damageSource, recentlyHit);
if (!level.isClientSide) {
ItemStack stack = new ItemStack(ItemsRegistry.AMETHYST_GOLEM_CHARM.get());
stack.set(DataComponentRegistry.PERSISTENT_FAMILIAR_DATA, createCharmData());
level.addFreshEntity(new ItemEntity(level, getX(), getY(), getZ(), stack));
if (this.getMainHandItem() != null)
level.addFreshEntity(new ItemEntity(level, getX(), getY(), getZ(), this.getMainHandItem()));
}
super.die(source);
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/hollingsworth/arsnouveau/common/entity/EntityBookwyrm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,13 @@ public void setHeldStack(ItemStack stack) {
}

@Override
public void die(DamageSource source) {
protected void dropCustomDeathLoot(ServerLevel level, DamageSource damageSource, boolean recentlyHit) {
super.dropCustomDeathLoot(level, damageSource, recentlyHit);
if (!level.isClientSide) {
ItemStack stack = new ItemStack(ItemsRegistry.BOOKWYRM_CHARM.get());
stack.set(DataComponentRegistry.PERSISTENT_FAMILIAR_DATA, createCharmData());
level.addFreshEntity(new ItemEntity(level, getX(), getY(), getZ(), stack));
}

super.die(source);
}

public static AttributeSupplier.Builder attributes() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/hollingsworth/arsnouveau/common/entity/EntityDrygmy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ public boolean hurt(DamageSource pSource, float pAmount) {
}

@Override
public void die(DamageSource source) {
protected void dropCustomDeathLoot(ServerLevel level, DamageSource damageSource, boolean recentlyHit) {
super.dropCustomDeathLoot(level, damageSource, recentlyHit);
if (!level.isClientSide && isTamed()) {
ItemStack stack = new ItemStack(ItemsRegistry.DRYGMY_CHARM);
stack.set(DataComponentRegistry.PERSISTENT_FAMILIAR_DATA, createCharmData());
level.addFreshEntity(new ItemEntity(level, getX(), getY(), getZ(), stack));
}
super.die(source);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/hollingsworth/arsnouveau/common/entity/EntityWixie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,13 @@ public void startAnimation(int arg) {
}

@Override
public void die(DamageSource source) {
protected void dropCustomDeathLoot(ServerLevel level, DamageSource damageSource, boolean recentlyHit) {
super.dropCustomDeathLoot(level, damageSource, recentlyHit);
if (!level.isClientSide) {
ItemStack stack = new ItemStack(ItemsRegistry.WIXIE_CHARM);
stack.set(DataComponentRegistry.PERSISTENT_FAMILIAR_DATA, createCharmData());
level.addFreshEntity(new ItemEntity(level, getX(), getY(), getZ(), stack));
}
super.die(source);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/hollingsworth/arsnouveau/common/entity/Starbuncle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,11 @@ protected float getWaterSlowDown() {
}

@Override
public void die(@NotNull DamageSource source) {
protected void dropCustomDeathLoot(ServerLevel level, DamageSource damageSource, boolean recentlyHit) {
super.dropCustomDeathLoot(level, damageSource, recentlyHit);
if (!level.isClientSide && isTamed()) {
dropData();
}
super.die(source);
}

public void dropData() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/hollingsworth/arsnouveau/common/entity/Whirlisprig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,13 @@ public boolean hurt(DamageSource pSource, float pAmount) {
}

@Override
public void die(DamageSource source) {
protected void dropCustomDeathLoot(ServerLevel level, DamageSource damageSource, boolean recentlyHit) {
super.dropCustomDeathLoot(level, damageSource, recentlyHit);
if (!level.isClientSide && isTamed()) {
ItemStack stack = new ItemStack(ItemsRegistry.WHIRLISPRIG_CHARM);
stack.set(DataComponentRegistry.PERSISTENT_FAMILIAR_DATA, this.createCharmData());
level.addFreshEntity(new ItemEntity(level, getX(), getY(), getZ(), stack));
}
super.die(source);
}

//MOJANG MAKES THIS SO CURSED WHAT THE HECK
Expand Down