Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-06-26 10:25:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remap 1_12 sounds

Browse Source
This commit is contained in:
Matsv 2017-06-13 19:30:36 +02:00
parent e4998e267e
commit 258ca46428
No known key found for this signature in database
GPG Key ID: 97CEC2A2EA31350F
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java
View File

@ -339,7 +339,6 @@ public class EntityPackets1_11_1 extends EntityRewriter<Protocol1_11To1_11_1> {
@Override
protected void registerRewrites() {
// TODO tipped arrows check no particles changes?
// Handle non-existing firework metadata (index 7 entity id for boosting)
registerMetaHandler().filter(EntityType.FIREWORK, 7).removed();

2
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/BlockItemPackets1_12.java
View File

@ -296,7 +296,7 @@ public class BlockItemPackets1_12 extends BlockItemRewriter<Protocol1_11_1To1_12
// Glazed Terracotta -> Stained Clay
for (int i = 235; i < 251; i++) {
rewrite(i).repItem(new Item((short) 159, (byte) 1, (short) (i - 235), getNamedTag("1.12 " + BlockColors.get(i - 235) + " Glazed Terracotta")))
rewrite(i).repItem(new Item((short) 159, (byte) 1, (short) (i - 235), getNamedTag("1.12 " + BlockColors.get(i - 235) + " Glazed Terracotta")))
.repBlock(new Block(159, (i - 235)));
}

101
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/SoundPackets1_12.java
View File

@ -68,16 +68,16 @@ public class SoundPackets1_12 extends SoundRewriter<Protocol1_11_1To1_12> {
@Override
protected void registerRewrites() {
// TODO find good replacement sounds
// Replacement sounds, suggestions are always welcome
// Automatically generated from PAaaS
added(26, -1); // block.end_portal.spawn
added(26, 277, 1.4f); // block.end_portal.spawn -> entity.lightning.thunder
added(27, -1); // block.end_portal_frame.fill
added(72, -1); // block.note.bell
added(73, -1); // block.note.chime
added(74, -1); // block.note.flute
added(75, -1); // block.note.guitar
added(80, -1); // block.note.xylophone
added(72, 70); // block.note.bell -> block.note.harp
added(73, 70); // block.note.chime -> block.note.harp
added(74, 70); // block.note.flute -> block.note.harp
added(75, 70); // block.note.guitar -> block.note.harp
added(80, 70); // block.note.xylophone -> block.note.harp
added(150, -1); // entity.boat.paddle_land
added(151, -1); // entity.boat.paddle_water
@ -86,53 +86,54 @@ public class SoundPackets1_12 extends SoundRewriter<Protocol1_11_1To1_12> {
added(195, -1); // entity.endereye.death
added(274, -1); // entity.illusion_illager.ambient
added(275, -1); // entity.illusion_illager.cast_spell
added(276, -1); // entity.illusion_illager.death
added(277, -1); // entity.illusion_illager.hurt
added(278, -1); // entity.illusion_illager.mirror_move
added(279, -1); // entity.illusion_illager.prepare_blindness
added(280, -1); // entity.illusion_illager.prepare_mirror
added(274, 198, 0.8f); // entity.illusion_illager.ambient -> entity.evocation_illager.ambient
added(275, 199, 0.8f); // entity.illusion_illager.cast_spell -> entity.evocation_illager.cast_spell
added(276, 200, 0.8f); // entity.illusion_illager.death -> entity.evocation_illager.death
added(277, 201, 0.8f); // entity.illusion_illager.hurt -> entity.evocation_illager.hurt
added(278, 191, 0.9f); // entity.illusion_illager.mirror_move -> entity.endermen.teleport
added(279, 203, 1.5f); // entity.illusion_illager.prepare_blindness -> entity.evocation_illager.prepare_summon
added(280, 202, 0.8f); // entity.illusion_illager.prepare_mirror -> entity.evocation_illager.prepare_attack
added(319, -1); // entity.parrot.ambient
added(320, -1); // entity.parrot.death
added(321, -1); // entity.parrot.eat
added(322, -1); // entity.parrot.fly
added(323, -1); // entity.parrot.hurt
added(324, -1); // entity.parrot.imitate.blaze
added(325, -1); // entity.parrot.imitate.creeper
added(326, -1); // entity.parrot.imitate.elder_guardian
added(327, -1); // entity.parrot.imitate.enderdragon
added(328, -1); // entity.parrot.imitate.enderman
added(329, -1); // entity.parrot.imitate.endermite
added(330, -1); // entity.parrot.imitate.evocation_illager
added(331, -1); // entity.parrot.imitate.ghast
added(332, -1); // entity.parrot.imitate.husk
added(333, -1); // entity.parrot.imitate.illusion_illager
added(334, -1); // entity.parrot.imitate.magmacube
added(335, -1); // entity.parrot.imitate.polar_bear
added(336, -1); // entity.parrot.imitate.shulker
added(337, -1); // entity.parrot.imitate.silverfish
added(338, -1); // entity.parrot.imitate.skeleton
added(339, -1); // entity.parrot.imitate.slime
added(340, -1); // entity.parrot.imitate.spider
added(341, -1); // entity.parrot.imitate.stray
added(342, -1); // entity.parrot.imitate.vex
added(343, -1); // entity.parrot.imitate.vindication_illager
added(344, -1); // entity.parrot.imitate.witch
added(345, -1); // entity.parrot.imitate.wither
added(346, -1); // entity.parrot.imitate.wither_skeleton
added(347, -1); // entity.parrot.imitate.wolf
added(348, -1); // entity.parrot.imitate.zombie
added(349, -1); // entity.parrot.imitate.zombie_pigman
added(350, -1); // entity.parrot.imitate.zombie_villager
added(351, -1); // entity.parrot.step
added(319, 133, 0.6f); // entity.parrot.ambient -> entity.bat.ambient
added(320, 134, 1.7f); // entity.parrot.death -> entity.bat.death
added(321, 219, 1.5f); // entity.parrot.eat -> entity.generic.eat
added(322, -1); // entity.parrot.fly -> nothing
added(323, 135, 1.6f); // entity.parrot.hurt -> entity.bat.hurt
added(324, 138, 1.5f); // entity.parrot.imitate.blaze -> entity.blaze.ambient
added(325, 163, 1.5f); // entity.parrot.imitate.creeper -> entity.creeper.primed
added(326, 170, 1.5f); // entity.parrot.imitate.elder_guardian -> entity.elder_guardian.ambient
added(327, 178, 1.5f); // entity.parrot.imitate.enderdragon -> entity.enderdragon.ambient
added(328, 186, 1.5f); // entity.parrot.imitate.enderman -> entity.endermen.ambient
added(329, 192, 1.5f); // entity.parrot.imitate.endermite -> entity.endermite.ambient
added(330, 198, 1.5f); // entity.parrot.imitate.evocation_illager -> entity.evocation_illager.ambient
added(331, 226, 1.5f); // entity.parrot.imitate.ghast -> entity.ghast.ambient
added(332, 259, 1.5f); // entity.parrot.imitate.husk -> entity.husk.ambient
added(333, 198, 1.3f); // entity.parrot.imitate.illusion_illager -> entity.evocation_illager.ambient
added(334, 291, 1.5f); // entity.parrot.imitate.magmacube -> entity.magmacube.squish
added(335, 321, 1.5f); // entity.parrot.imitate.polar_bear -> entity.polar_bear.ambient
added(336, 337, 1.5f); // entity.parrot.imitate.shulker -> entity.shulker.ambient
added(337, 347, 1.5f); // entity.parrot.imitate.silverfish -> entity.silverfish.ambient
added(338, 351, 1.5f); // entity.parrot.imitate.skeleton -> entity.skeleton.ambient
added(339, 363, 1.5f); // entity.parrot.imitate.slime -> entity.slime.squish
added(340, 376, 1.5f); // entity.parrot.imitate.spider -> entity.spider.ambient
added(341, 385, 1.5f); // entity.parrot.imitate.stray -> entity.stray.ambient
added(342, 390, 1.5f); // entity.parrot.imitate.vex -> entity.vex.ambient
added(343, 400, 1.5f); // entity.parrot.imitate.vindication_illager -> entity.vindication_illager.ambient
added(344, 403, 1.5f); // entity.parrot.imitate.witch -> entity.witch.ambient
added(345, 408, 1.5f); // entity.parrot.imitate.wither -> entity.wither.ambient
added(346, 414, 1.5f); // entity.parrot.imitate.wither_skeleton -> entity.wither_skeleton.ambient
added(347, 418, 1.5f); // entity.parrot.imitate.wolf -> entity.wolf.ambient
added(348, 427, 1.5f); // entity.parrot.imitate.zombie -> entity.zombie.ambient
added(349, 438, 1.5f); // entity.parrot.imitate.zombie_pigman -> entity.zombie_pig.ambient
added(350, 442, 1.5f); // entity.parrot.imitate.zombie_villager -> entity.zombie_villager.ambient
added(351, 155); // entity.parrot.step -> entity.chicken.step
added(368, -1); // entity.player.hurt_drown
added(369, -1); // entity.player.hurt_on_fire
added(368, 316); // entity.player.hurt_drown -> entity.player.hurt
added(369, 316); // entity.player.hurt_on_fire -> entity.player.hurt
// No replacement sounds for these, since it could be confusing, the toast doesn't show up
added(544, -1); // ui.toast.in
added(545, -1); // ui.toast.out
added(546, -1); // ui.toast.challenge_complete
added(546, 317, 1.5f); // ui.toast.challenge_complete
}
}