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

Deliver all items when dropping anvils

Browse source
This commit is contained in:
Sollace 2023-09-03 19:12:54 +01:00
parent 187481ec80
commit 4ea0979f80
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 48 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/main/java/com/minelittlepony/unicopia/entity/Living.java
View file

@ -46,6 +46,7 @@ import net.minecraft.entity.data.*;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.entity.projectile.ProjectileEntity;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
@ -395,13 +396,20 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
DragonBreathStore store = DragonBreathStore.get(entity.getWorld()); DragonBreathStore store = DragonBreathStore.get(entity.getWorld());
String name = entity.getDisplayName().getString(); String name = entity.getDisplayName().getString();
store.popEntries(name).forEach(stack -> { store.popEntries(name).forEach(stack -> {
boolean deliverAggressively = stack.payload().isIn(UTags.IS_DELIVERED_AGGRESSIVELY); ItemStack payload = stack.payload();
Item item = payload.getItem();
boolean deliverAggressively = payload.isIn(UTags.IS_DELIVERED_AGGRESSIVELY);
Vec3d randomPos = deliverAggressively ? targetPos.add(0, 2, 0) : targetPos.add(VecHelper.supply(() -> entity.getRandom().nextTriangular(0.1, 0.5))); Vec3d randomPos = deliverAggressively ? targetPos.add(0, 2, 0) : targetPos.add(VecHelper.supply(() -> entity.getRandom().nextTriangular(0.1, 0.5)));
if (!entity.getWorld().isAir(BlockPos.ofFloored(randomPos))) { if (deliverAggressively && item instanceof BlockItem blockItem) {
store.put(name, stack.payload()); do {
} ItemStack instance = payload.split(1);
BlockPos pos = BlockPos.ofFloored(randomPos);
if (!entity.getWorld().isAir(pos)) {
store.put(name, instance);
} else {
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
ParticleUtils.spawnParticle(entity.getWorld(), ParticleTypes.FLAME, randomPos.add( ParticleUtils.spawnParticle(entity.getWorld(), ParticleTypes.FLAME, randomPos.add(
@ -409,9 +417,7 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
), Vec3d.ZERO); ), Vec3d.ZERO);
} }
if (deliverAggressively && stack.payload().getItem() instanceof BlockItem blockItem) { ItemPlacementContext context = new ItemPlacementContext(entity.getWorld(), (PlayerEntity)null, Hand.MAIN_HAND, instance,
BlockPos pos = BlockPos.ofFloored(randomPos);
ItemPlacementContext context = new ItemPlacementContext(entity.getWorld(), (PlayerEntity)null, Hand.MAIN_HAND, stack.payload(),
BlockHitResult.createMissed(Vec3d.ZERO, Direction.UP, pos) BlockHitResult.createMissed(Vec3d.ZERO, Direction.UP, pos)
); );
@ -423,17 +429,30 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
entity.getWorld().setBlockState(pos, state); entity.getWorld().setBlockState(pos, state);
BlockSoundGroup sound = state.getSoundGroup(); BlockSoundGroup sound = state.getSoundGroup();
entity.getWorld().playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, (sound.getVolume() + 1) * 0.5F, sound.getPitch() * 0.8F); entity.getWorld().playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, (sound.getVolume() + 1) * 0.5F, sound.getPitch() * 0.8F);
}
randomPos = targetPos.add(VecHelper.supply(() -> entity.getRandom().nextTriangular(0.1, 0.5)));
} while (!payload.isEmpty());
} else { } else {
ItemEntity item = EntityType.ITEM.create(entity.getWorld()); if (!entity.getWorld().isAir(BlockPos.ofFloored(randomPos))) {
item.setStack(stack.payload()); store.put(name, stack.payload());
item.setPosition(randomPos); } else {
item.getWorld().spawnEntity(item); for (int i = 0; i < 10; i++) {
entity.getWorld().playSoundFromEntity(null, entity, USounds.ITEM_DRAGON_BREATH_ARRIVE, entity.getSoundCategory(), 1, 1); ParticleUtils.spawnParticle(entity.getWorld(), ParticleTypes.FLAME, randomPos.add(
VecHelper.supply(() -> entity.getRandom().nextTriangular(0.1, 0.5))
), Vec3d.ZERO);
} }
if (stack.payload().getItem() == UItems.OATS && entity instanceof PlayerEntity player) { ItemEntity itemEntity = EntityType.ITEM.create(entity.getWorld());
itemEntity.setStack(payload);
itemEntity.setPosition(randomPos);
itemEntity.getWorld().spawnEntity(itemEntity);
entity.getWorld().playSoundFromEntity(null, entity, USounds.ITEM_DRAGON_BREATH_ARRIVE, entity.getSoundCategory(), 1, 1);
if (item == UItems.OATS && entity instanceof PlayerEntity player) {
UCriteria.RECEIVE_OATS.trigger(player); UCriteria.RECEIVE_OATS.trigger(player);
} }
}
}
}); });
} }
} }