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

Clean up vanilla sound references

Browse source
This commit is contained in:
Sollace 2023-09-03 23:38:01 +01:00
parent 9e2e878ae4
commit c938de219c
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/USounds.java
View file

@ -56,6 +56,10 @@ public interface USounds {
SoundEvent ENTITY_SOMBRA_AMBIENT = register("entity.sombra.ambient");
SoundEvent ENTITY_SOMBRA_LAUGH = register("entity.sombra.laugh");
SoundEvent ENTITY_SOMBRA_SNICKER = register("entity.sombra.snicker");
SoundEvent ENTITY_SOMBRA_SCARY = USounds.Vanilla.ENTITY_GHAST_AMBIENT;
SoundEvent ENTITY_CRYSTAL_SHARDS_AMBIENT = BLOCK_AMETHYST_BLOCK_HIT;
SoundEvent ENTITY_CRYSTAL_SHARDS_JOSTLE = BLOCK_AMETHYST_BLOCK_BREAK;
SoundEvent ITEM_AMULET_CHARGING = register("item.amulet.charging");
SoundEvent ITEM_AMULET_RECHARGE = register("item.amulet.recharge");

4
src/main/java/com/minelittlepony/unicopia/entity/mob/CrystalShardsEntity.java
View file

@ -165,7 +165,7 @@ public class CrystalShardsEntity extends StationaryObjectEntity {
if (ticksShaking > 0 || getGrowth() < FULL_GROWTH_AGE) {
if (age % random.nextBetween(2, 5) == 0) {
playSound(USounds.Vanilla.BLOCK_AMETHYST_BLOCK_HIT, 1,
playSound(USounds.ENTITY_CRYSTAL_SHARDS_AMBIENT, 1,
1 - MathHelper.clamp(getGrowth(1), 0, 1) * 0.5F);
}
}
@ -184,7 +184,7 @@ public class CrystalShardsEntity extends StationaryObjectEntity {
@Override
public void remove(RemovalReason reason) {
if (reason == RemovalReason.KILLED) {
playSound(USounds.Vanilla.BLOCK_AMETHYST_BLOCK_BREAK, 1, 1);
playSound(USounds.ENTITY_CRYSTAL_SHARDS_JOSTLE, 1, 1);
dropStack(new ItemStack(UItems.CRYSTAL_SHARD, 6));
}
super.remove(reason);

2
src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
View file

@ -338,7 +338,7 @@ public class SombraEntity extends HostileEntity implements ArenaCombatant, Parti
if (this.age % 150 == 0) {
target.playSound(
random.nextInt(30) == 0 ? USounds.ENTITY_SOMBRA_AMBIENT
: random.nextInt(10) == 0 ? USounds.Vanilla.ENTITY_GHAST_AMBIENT
: random.nextInt(10) == 0 ? USounds.ENTITY_SOMBRA_SCARY
: USounds.Vanilla.AMBIENT_CAVE.value(),
(float)random.nextTriangular(1, 0.2F),
(float)random.nextTriangular(0.3F, 0.2F)