Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-09-08 22:02:50 +02:00
Code Issues Releases Aktivität

Merge pull request #14 from HugoDaBosss/master

Quellcode durchsuchen 
Fixed: ItemFrame crash, remaining missing sounds and Horse Metadata
Dieser Commit ist enthalten in:
Myles 2016-03-01 14:24:51 +00:00
Commit dd36686f1c
3 geänderte Dateien mit 485 neuen und 489 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java
Datei anzeigen

@ -113,7 +113,7 @@ public enum MetaIndex {
FIREWORK_INFO(Firework.class, 8, Type.Slot, 5, NewType.Slot), FIREWORK_INFO(Firework.class, 8, Type.Slot, 5, NewType.Slot),
// item frame // item frame
ITEMFRAME_ITEM(ItemFrame.class, 8, Type.Slot, 5, NewType.Slot), ITEMFRAME_ITEM(ItemFrame.class, 8, Type.Slot, 5, NewType.Slot),
ITEMFRAME_ROTATION(ItemFrame.class, 9, Type.Byte, 5, NewType.VarInt), ITEMFRAME_ROTATION(ItemFrame.class, 9, Type.Byte, 6, NewType.VarInt),
// ender crystal // ender crystal
ENDERCRYSTAL_HEALTH(EnderCrystal.class, 8, Type.Int, NewType.Discontinued),; ENDERCRYSTAL_HEALTH(EnderCrystal.class, 8, Type.Int, NewType.Discontinued),;

54
src/main/java/us/myles/ViaVersion/sounds/SoundEffect.java
Datei anzeigen

@ -223,35 +223,31 @@ public enum SoundEffect {
MOB_SKELETON_DEATH("mob.skeleton.death", "entity.skeleton.death", SoundCategory.HOSTILE), MOB_SKELETON_DEATH("mob.skeleton.death", "entity.skeleton.death", SoundCategory.HOSTILE),
MOB_HORSE_HIT("mob.horse.hit", "entity.horse.hurt", SoundCategory.NEUTRAL), MOB_HORSE_HIT("mob.horse.hit", "entity.horse.hurt", SoundCategory.NEUTRAL),
MOB_VILLAGER_HIT("mob.villager.hit", "entity.villager.hurt", SoundCategory.NEUTRAL), MOB_VILLAGER_HIT("mob.villager.hit", "entity.villager.hurt", SoundCategory.NEUTRAL),
MOB_HORSE_SKELETON_IDLE("mob.horse.skeleton.idle", "entity.skeleton_horse.ambient", SoundCategory.NEUTRAL); MOB_HORSE_SKELETON_IDLE("mob.horse.skeleton.idle", "entity.skeleton_horse.ambient", SoundCategory.NEUTRAL),
RECORDS_CHIRP("records.chirp", "record.chirp", SoundCategory.RECORD),
//NOT ALL SOUNDS INCLUDED! MOB_RABBIT_HURT("mob.rabbit.hurt", "entity.rabbit.hurt", SoundCategory.NEUTRAL),
//Missing all new 1.9 sounds RECORDS_STAL("records.stal", "record.stal", SoundCategory.RECORD),
//Missing (1.8 sound names): MUSIC_GAME_NETHER("music.game.nether", "music.nether", SoundCategory.MUSIC),
//records.ward MUSIC_MENU("music.menu", "music.menu", SoundCategory.MUSIC),
//music.game.nether RECORDS_MELLOHI("records.mellohi", "record.mellohi", SoundCategory.RECORD),
//music.game.end.dragon RECORDS_CAT("records.cat", "record.cat", SoundCategory.RECORD),
//mob.rabbit.death RECORDS_FAR("records.far", "record.far", SoundCategory.RECORD),
//records.chirp MUSIC_GAME_END_DRAGON("music.game.end.dragon", "music.dragon", SoundCategory.MUSIC),
//records.13 MOB_RABBIT_DEATH("mob.rabbit.death", "entity.rabbit.death", SoundCategory.NEUTRAL),
//records.11 MOB_RABBIT_IDLE("mob.rabbit.idle", "entity.rabbit.ambient", SoundCategory.NEUTRAL),
//music.game.end.credits MUSIC_GAME_END("music.game.end", "music.end", SoundCategory.MUSIC),
//records.mellohi MUSIC_GAME("music.game", "music.game", SoundCategory.MUSIC),
//music.game MOB_GUARDIAN_IDLE("mob.guardian.idle", "null", SoundCategory.HOSTILE),
//records.mall RECORDS_WARD("records.ward", "record.ward", SoundCategory.RECORD),
//records.stal RECORDS_13("records.13", "record.13", SoundCategory.RECORD),
//records.far MOB_RABBIT_HOP("mob.rabbit.hop", "entity.rabbit.jump", SoundCategory.NEUTRAL),
//records.blocks RECORDS_STRAD("records.strad", "record.strad", SoundCategory.RECORD),
//music.game.creative RECORDS_11("records.11", "record.11", SoundCategory.RECORD),
//records.wait RECORDS_MALL("records.mall", "record.mall", SoundCategory.RECORD),
//music.menu RECORDS_BLOCKS("records.blocks", "record.blocks", SoundCategory.RECORD),
//music.game.end RECORDS_WAIT("records.wait", "record.wait", SoundCategory.RECORD),
//mob.rabbit.hurt MUSIC_GAME_END_CREDITS("music.game.end.credits", "music.credits", SoundCategory.MUSIC),
//records.cat MUSIC_GAME_CREATIVE("music.game.creative", "music.creative", SoundCategory.MUSIC);
//mob.guardian.idle
//mob.rabbit.hop
//mob.rabbit.idle
//records.strad
private String name; private String name;
private String newname; private String newname;

2
src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
Datei anzeigen

@ -488,7 +488,7 @@ public class OutgoingTransformer {
} }
output.writeBoolean(toWrite != null); output.writeBoolean(toWrite != null);
if (toWrite != null) if (toWrite != null)
PacketUtil.writeUUID((UUID) value, output); PacketUtil.writeUUID((UUID) toWrite, output);
break; break;
case BlockID: case BlockID:
// if we have both sources :)) // if we have both sources :))