SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-14 12:00:00 +10:00
parent b8446f770b
commit 40c8954e17
210 changed files with 2280 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
paper-server/src/main/java/org/bukkit/craftbukkit/CraftSound.java
View File

@@ -37,6 +37,8 @@ public enum CraftSound {
BLOCK_ENDERCHEST_CLOSE("block.enderchest.close"),
BLOCK_ENDERCHEST_OPEN("block.enderchest.open"),
BLOCK_END_GATEWAY_SPAWN("block.end_gateway.spawn"),
BLOCK_END_PORTAL_FRAME_FILL("block.end_portal_frame.fill"),
BLOCK_END_PORTAL_SPAWN("block.end_portal.spawn"),
BLOCK_FENCE_GATE_CLOSE("block.fence_gate.close"),
BLOCK_FENCE_GATE_OPEN("block.fence_gate.open"),
BLOCK_FIRE_AMBIENT("block.fire.ambient"),
@@ -79,10 +81,15 @@ public enum CraftSound {
BLOCK_METAL_STEP("block.metal.step"),
BLOCK_NOTE_BASEDRUM("block.note.basedrum"),
BLOCK_NOTE_BASS("block.note.bass"),
BLOCK_NOTE_BELL("block.note.bell"),
BLOCK_NOTE_CHIME("block.note.chime"),
BLOCK_NOTE_FLUTE("block.note.flute"),
BLOCK_NOTE_GUITAR("block.note.guitar"),
BLOCK_NOTE_HARP("block.note.harp"),
BLOCK_NOTE_HAT("block.note.hat"),
BLOCK_NOTE_PLING("block.note.pling"),
BLOCK_NOTE_SNARE("block.note.snare"),
BLOCK_NOTE_XYLOPHONE("block.note.xylophone"),
BLOCK_PISTON_CONTRACT("block.piston.contract"),
BLOCK_PISTON_EXTEND("block.piston.extend"),
BLOCK_PORTAL_AMBIENT("block.portal.ambient"),
@@ -152,6 +159,9 @@ public enum CraftSound {
ENTITY_BLAZE_DEATH("entity.blaze.death"),
ENTITY_BLAZE_HURT("entity.blaze.hurt"),
ENTITY_BLAZE_SHOOT("entity.blaze.shoot"),
ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"),
ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"),
ENTITY_BOBBER_RETRIEVE("entity.bobber.retrieve"),
ENTITY_BOBBER_SPLASH("entity.bobber.splash"),
ENTITY_BOBBER_THROW("entity.bobber.throw"),
ENTITY_CAT_AMBIENT("entity.cat.ambient"),
@@ -194,6 +204,7 @@ public enum CraftSound {
ENTITY_ENDERDRAGON_GROWL("entity.enderdragon.growl"),
ENTITY_ENDERDRAGON_HURT("entity.enderdragon.hurt"),
ENTITY_ENDERDRAGON_SHOOT("entity.enderdragon.shoot"),
ENTITY_ENDEREYE_DEATH("entity.endereye.death"),
ENTITY_ENDEREYE_LAUNCH("entity.endereye.launch"),
ENTITY_ENDERMEN_AMBIENT("entity.endermen.ambient"),
ENTITY_ENDERMEN_DEATH("entity.endermen.death"),
@@ -272,6 +283,13 @@ public enum CraftSound {
ENTITY_HUSK_DEATH("entity.husk.death"),
ENTITY_HUSK_HURT("entity.husk.hurt"),
ENTITY_HUSK_STEP("entity.husk.step"),
ENTITY_ILLUSION_ILLAGER_AMBIENT("entity.illusion_illager.ambient"),
ENTITY_ILLUSION_ILLAGER_CAST_SPELL("entity.illusion_illager.cast_spell"),
ENTITY_ILLUSION_ILLAGER_DEATH("entity.illusion_illager.death"),
ENTITY_ILLUSION_ILLAGER_HURT("entity.illusion_illager.hurt"),
ENTITY_ILLUSION_ILLAGER_MIRROR_MOVE("entity.illusion_illager.mirror_move"),
ENTITY_ILLUSION_ILLAGER_PREPARE_BLINDNESS("entity.illusion_illager.prepare_blindness"),
ENTITY_ILLUSION_ILLAGER_PREPARE_MIRROR("entity.illusion_illager.prepare_mirror"),
ENTITY_IRONGOLEM_ATTACK("entity.irongolem.attack"),
ENTITY_IRONGOLEM_DEATH("entity.irongolem.death"),
ENTITY_IRONGOLEM_HURT("entity.irongolem.hurt"),
@@ -310,6 +328,39 @@ public enum CraftSound {
ENTITY_MULE_HURT("entity.mule.hurt"),
ENTITY_PAINTING_BREAK("entity.painting.break"),
ENTITY_PAINTING_PLACE("entity.painting.place"),
ENTITY_PARROT_AMBIENT("entity.parrot.ambient"),
ENTITY_PARROT_DEATH("entity.parrot.death"),
ENTITY_PARROT_EAT("entity.parrot.eat"),
ENTITY_PARROT_FLY("entity.parrot.fly"),
ENTITY_PARROT_HURT("entity.parrot.hurt"),
ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"),
ENTITY_PARROT_IMITATE_CREEPER("entity.parrot.imitate.creeper"),
ENTITY_PARROT_IMITATE_ELDER_GUARDIAN("entity.parrot.imitate.elder_guardian"),
ENTITY_PARROT_IMITATE_ENDERDRAGON("entity.parrot.imitate.enderdragon"),
ENTITY_PARROT_IMITATE_ENDERMAN("entity.parrot.imitate.enderman"),
ENTITY_PARROT_IMITATE_ENDERMITE("entity.parrot.imitate.endermite"),
ENTITY_PARROT_IMITATE_EVOCATION_ILLAGER("entity.parrot.imitate.evocation_illager"),
ENTITY_PARROT_IMITATE_GHAST("entity.parrot.imitate.ghast"),
ENTITY_PARROT_IMITATE_HUSK("entity.parrot.imitate.husk"),
ENTITY_PARROT_IMITATE_ILLUSION_ILLAGER("entity.parrot.imitate.illusion_illager"),
ENTITY_PARROT_IMITATE_MAGMACUBE("entity.parrot.imitate.magmacube"),
ENTITY_PARROT_IMITATE_POLAR_BEAR("entity.parrot.imitate.polar_bear"),
ENTITY_PARROT_IMITATE_SHULKER("entity.parrot.imitate.shulker"),
ENTITY_PARROT_IMITATE_SILVERFISH("entity.parrot.imitate.silverfish"),
ENTITY_PARROT_IMITATE_SKELETON("entity.parrot.imitate.skeleton"),
ENTITY_PARROT_IMITATE_SLIME("entity.parrot.imitate.slime"),
ENTITY_PARROT_IMITATE_SPIDER("entity.parrot.imitate.spider"),
ENTITY_PARROT_IMITATE_STRAY("entity.parrot.imitate.stray"),
ENTITY_PARROT_IMITATE_VEX("entity.parrot.imitate.vex"),
ENTITY_PARROT_IMITATE_VINDICATION_ILLAGER("entity.parrot.imitate.vindication_illager"),
ENTITY_PARROT_IMITATE_WITCH("entity.parrot.imitate.witch"),
ENTITY_PARROT_IMITATE_WITHER("entity.parrot.imitate.wither"),
ENTITY_PARROT_IMITATE_WITHER_SKELETON("entity.parrot.imitate.wither_skeleton"),
ENTITY_PARROT_IMITATE_WOLF("entity.parrot.imitate.wolf"),
ENTITY_PARROT_IMITATE_ZOMBIE("entity.parrot.imitate.zombie"),
ENTITY_PARROT_IMITATE_ZOMBIE_PIGMAN("entity.parrot.imitate.zombie_pigman"),
ENTITY_PARROT_IMITATE_ZOMBIE_VILLAGER("entity.parrot.imitate.zombie_villager"),
ENTITY_PARROT_STEP("entity.parrot.step"),
ENTITY_PIG_AMBIENT("entity.pig.ambient"),
ENTITY_PIG_DEATH("entity.pig.death"),
ENTITY_PIG_HURT("entity.pig.hurt"),
@@ -326,6 +377,8 @@ public enum CraftSound {
ENTITY_PLAYER_BURP("entity.player.burp"),
ENTITY_PLAYER_DEATH("entity.player.death"),
ENTITY_PLAYER_HURT("entity.player.hurt"),
ENTITY_PLAYER_HURT_DROWN("entity.player.hurt_drown"),
ENTITY_PLAYER_HURT_ON_FIRE("entity.player.hurt_on_fire"),
ENTITY_PLAYER_LEVELUP("entity.player.levelup"),
ENTITY_PLAYER_SMALL_FALL("entity.player.small_fall"),
ENTITY_PLAYER_SPLASH("entity.player.splash"),