From 91aa9f5d4fb91677406ef7b1f06ad5e0a65bfc69 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 13 Dec 2018 01:46:51 +1100 Subject: [PATCH] singular names (#251) * singular names * Sound -> SoundEvent --- ....mapping => AbstractSoundInstance.mapping} | 2 +- ...nt.mapping => ElytraSoundInstance.mapping} | 2 +- .../audio/EntityTrackingSoundEvent.mapping | 3 -- .../audio/EntityTrackingSoundInstance.mapping | 3 ++ .../audio/GuardianAttackSoundEvent.mapping | 3 -- .../audio/GuardianAttackSoundInstance.mapping | 3 ++ .../client/audio/ListenerSoundEvent.mapping | 3 -- .../audio/ListenerSoundInstance.mapping | 3 ++ ....mapping => MinecartSoundInstance.mapping} | 2 +- ...nt.mapping => MovingSoundInstance.mapping} | 2 +- ...apping => PositionedSoundInstance.mapping} | 10 ++-- ...ng => RidingMinecartSoundInstance.mapping} | 2 +- ...undEvent.mapping => SoundInstance.mapping} | 2 +- .../client/audio/TickableSoundEvent.mapping | 2 - .../audio/TickableSoundInstance.mapping | 2 + .../{Sound.mapping => SoundEvent.mapping} | 2 +- .../{Sounds.mapping => SoundEvents.mapping} | 2 +- .../minecraft/util/registry/Registry.mapping | 46 +++++++++---------- 18 files changed, 48 insertions(+), 46 deletions(-) rename mappings/net/minecraft/client/audio/{AbstractSoundEvent.mapping => AbstractSoundInstance.mapping} (91%) rename mappings/net/minecraft/client/audio/{ElytraSoundEvent.mapping => ElytraSoundInstance.mapping} (52%) delete mode 100644 mappings/net/minecraft/client/audio/EntityTrackingSoundEvent.mapping create mode 100644 mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping delete mode 100644 mappings/net/minecraft/client/audio/GuardianAttackSoundEvent.mapping create mode 100644 mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping delete mode 100644 mappings/net/minecraft/client/audio/ListenerSoundEvent.mapping create mode 100644 mappings/net/minecraft/client/audio/ListenerSoundInstance.mapping rename mappings/net/minecraft/client/audio/{MinecartSoundEvent.mapping => MinecartSoundInstance.mapping} (65%) rename mappings/net/minecraft/client/audio/{MovingSoundEvent.mapping => MovingSoundInstance.mapping} (57%) rename mappings/net/minecraft/client/audio/{PositionedSoundEvent.mapping => PositionedSoundInstance.mapping} (77%) rename mappings/net/minecraft/client/audio/{RidingMinecartSoundEvent.mapping => RidingMinecartSoundInstance.mapping} (50%) rename mappings/net/minecraft/client/audio/{SoundEvent.mapping => SoundInstance.mapping} (89%) delete mode 100644 mappings/net/minecraft/client/audio/TickableSoundEvent.mapping create mode 100644 mappings/net/minecraft/client/audio/TickableSoundInstance.mapping rename mappings/net/minecraft/sound/{Sound.mapping => SoundEvent.mapping} (50%) rename mappings/net/minecraft/sound/{Sounds.mapping => SoundEvents.mapping} (57%) diff --git a/mappings/net/minecraft/client/audio/AbstractSoundEvent.mapping b/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping similarity index 91% rename from mappings/net/minecraft/client/audio/AbstractSoundEvent.mapping rename to mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping index dc058ef8ae..da048f0bd4 100644 --- a/mappings/net/minecraft/client/audio/AbstractSoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dnr net/minecraft/client/audio/AbstractSoundEvent +CLASS dnr net/minecraft/client/audio/AbstractSoundInstance FIELD a sound Ldoa; FIELD b category Lxi; FIELD c id Lpz; diff --git a/mappings/net/minecraft/client/audio/ElytraSoundEvent.mapping b/mappings/net/minecraft/client/audio/ElytraSoundInstance.mapping similarity index 52% rename from mappings/net/minecraft/client/audio/ElytraSoundEvent.mapping rename to mappings/net/minecraft/client/audio/ElytraSoundInstance.mapping index eff5ced128..77ec41b6a4 100644 --- a/mappings/net/minecraft/client/audio/ElytraSoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/ElytraSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dnu net/minecraft/client/audio/ElytraSoundEvent +CLASS dnu net/minecraft/client/audio/ElytraSoundInstance FIELD n player Ldbx; FIELD o tickCount I METHOD aa_ tick ()V diff --git a/mappings/net/minecraft/client/audio/EntityTrackingSoundEvent.mapping b/mappings/net/minecraft/client/audio/EntityTrackingSoundEvent.mapping deleted file mode 100644 index d4041dc3a6..0000000000 --- a/mappings/net/minecraft/client/audio/EntityTrackingSoundEvent.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dnv net/minecraft/client/audio/EntityTrackingSoundEvent - FIELD n entity Lagk; - METHOD aa_ tick ()V diff --git a/mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping b/mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping new file mode 100644 index 0000000000..b702ef6ab6 --- /dev/null +++ b/mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping @@ -0,0 +1,3 @@ +CLASS dnv net/minecraft/client/audio/EntityTrackingSoundInstance + FIELD n entity Lagk; + METHOD aa_ tick ()V diff --git a/mappings/net/minecraft/client/audio/GuardianAttackSoundEvent.mapping b/mappings/net/minecraft/client/audio/GuardianAttackSoundEvent.mapping deleted file mode 100644 index 50617e3752..0000000000 --- a/mappings/net/minecraft/client/audio/GuardianAttackSoundEvent.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dnw net/minecraft/client/audio/GuardianAttackSoundEvent - FIELD n guardian Lape; - METHOD aa_ tick ()V diff --git a/mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping b/mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping new file mode 100644 index 0000000000..1b55c91cad --- /dev/null +++ b/mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping @@ -0,0 +1,3 @@ +CLASS dnw net/minecraft/client/audio/GuardianAttackSoundInstance + FIELD n guardian Lape; + METHOD aa_ tick ()V diff --git a/mappings/net/minecraft/client/audio/ListenerSoundEvent.mapping b/mappings/net/minecraft/client/audio/ListenerSoundEvent.mapping deleted file mode 100644 index c9e0f9f1ae..0000000000 --- a/mappings/net/minecraft/client/audio/ListenerSoundEvent.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS doz net/minecraft/client/audio/ListenerSoundEvent - METHOD a onSoundPlayed (Ldod;Ldpb;)V - ARG 1 sound diff --git a/mappings/net/minecraft/client/audio/ListenerSoundInstance.mapping b/mappings/net/minecraft/client/audio/ListenerSoundInstance.mapping new file mode 100644 index 0000000000..ba28fc2643 --- /dev/null +++ b/mappings/net/minecraft/client/audio/ListenerSoundInstance.mapping @@ -0,0 +1,3 @@ +CLASS doz net/minecraft/client/audio/ListenerSoundInstance + METHOD a onSoundPlayed (Ldod;Ldpb;)V + ARG 1 sound diff --git a/mappings/net/minecraft/client/audio/MinecartSoundEvent.mapping b/mappings/net/minecraft/client/audio/MinecartSoundInstance.mapping similarity index 65% rename from mappings/net/minecraft/client/audio/MinecartSoundEvent.mapping rename to mappings/net/minecraft/client/audio/MinecartSoundInstance.mapping index 9850eb6f31..7e59751f46 100644 --- a/mappings/net/minecraft/client/audio/MinecartSoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/MinecartSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dny net/minecraft/client/audio/MinecartSoundEvent +CLASS dny net/minecraft/client/audio/MinecartSoundInstance FIELD n player Laql; FIELD o minecart Larp; METHOD (Laql;Larp;)V diff --git a/mappings/net/minecraft/client/audio/MovingSoundEvent.mapping b/mappings/net/minecraft/client/audio/MovingSoundInstance.mapping similarity index 57% rename from mappings/net/minecraft/client/audio/MovingSoundEvent.mapping rename to mappings/net/minecraft/client/audio/MovingSoundInstance.mapping index b998d14131..1227a0f722 100644 --- a/mappings/net/minecraft/client/audio/MovingSoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/MovingSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dns net/minecraft/client/audio/MovingSoundEvent +CLASS dns net/minecraft/client/audio/MovingSoundInstance FIELD m done Z METHOD (Lxg;Lxi;)V ARG 1 sound diff --git a/mappings/net/minecraft/client/audio/PositionedSoundEvent.mapping b/mappings/net/minecraft/client/audio/PositionedSoundInstance.mapping similarity index 77% rename from mappings/net/minecraft/client/audio/PositionedSoundEvent.mapping rename to mappings/net/minecraft/client/audio/PositionedSoundInstance.mapping index cb5c0e2349..9ee25e7781 100644 --- a/mappings/net/minecraft/client/audio/PositionedSoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/PositionedSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dnz net/minecraft/client/audio/PositionedSoundEvent +CLASS dnz net/minecraft/client/audio/PositionedSoundInstance METHOD (Lpz;Lxi;FFZILdod$a;FFF)V ARG 1 id ARG 2 category @@ -9,6 +9,7 @@ CLASS dnz net/minecraft/client/audio/PositionedSoundEvent ARG 7 attenuationType ARG 8 x ARG 9 y + ARG 10 z METHOD (Lxg;Lxi;FFFFF)V ARG 1 sound ARG 2 category @@ -31,12 +32,13 @@ CLASS dnz net/minecraft/client/audio/PositionedSoundEvent ARG 7 attenuationType ARG 8 x ARG 9 y - METHOD a create (Lxg;)Ldnz; + METHOD a music (Lxg;)Ldnz; ARG 0 sound - METHOD a create (Lxg;FF)Ldnz; + METHOD a master (Lxg;F)Ldnz; + METHOD a master (Lxg;FF)Ldnz; ARG 0 sound ARG 2 pitch - METHOD a create (Lxg;FFF)Ldnz; + METHOD a record (Lxg;FFF)Ldnz; ARG 0 sound ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/audio/RidingMinecartSoundEvent.mapping b/mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping similarity index 50% rename from mappings/net/minecraft/client/audio/RidingMinecartSoundEvent.mapping rename to mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping index 07352d9c1d..1c8b3992a8 100644 --- a/mappings/net/minecraft/client/audio/RidingMinecartSoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dnx net/minecraft/client/audio/RidingMinecartSoundEvent +CLASS dnx net/minecraft/client/audio/RidingMinecartSoundInstance FIELD n minecart Larp; FIELD o distance F METHOD aa_ tick ()V diff --git a/mappings/net/minecraft/client/audio/SoundEvent.mapping b/mappings/net/minecraft/client/audio/SoundInstance.mapping similarity index 89% rename from mappings/net/minecraft/client/audio/SoundEvent.mapping rename to mappings/net/minecraft/client/audio/SoundInstance.mapping index 50dc8a0509..456938f736 100644 --- a/mappings/net/minecraft/client/audio/SoundEvent.mapping +++ b/mappings/net/minecraft/client/audio/SoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dod net/minecraft/client/audio/SoundEvent +CLASS dod net/minecraft/client/audio/SoundInstance CLASS dod$a AttenuationType FIELD a NONE Ldod$a; FIELD b LINEAR Ldod$a; diff --git a/mappings/net/minecraft/client/audio/TickableSoundEvent.mapping b/mappings/net/minecraft/client/audio/TickableSoundEvent.mapping deleted file mode 100644 index 6bbdf4a116..0000000000 --- a/mappings/net/minecraft/client/audio/TickableSoundEvent.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS doe net/minecraft/client/audio/TickableSoundEvent - METHOD m isDone ()Z diff --git a/mappings/net/minecraft/client/audio/TickableSoundInstance.mapping b/mappings/net/minecraft/client/audio/TickableSoundInstance.mapping new file mode 100644 index 0000000000..8bf27287e9 --- /dev/null +++ b/mappings/net/minecraft/client/audio/TickableSoundInstance.mapping @@ -0,0 +1,2 @@ +CLASS doe net/minecraft/client/audio/TickableSoundInstance + METHOD m isDone ()Z diff --git a/mappings/net/minecraft/sound/Sound.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping similarity index 50% rename from mappings/net/minecraft/sound/Sound.mapping rename to mappings/net/minecraft/sound/SoundEvent.mapping index e96ccc0624..346c337212 100644 --- a/mappings/net/minecraft/sound/Sound.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -1,3 +1,3 @@ -CLASS xg net/minecraft/sound/Sound +CLASS xg net/minecraft/sound/SoundEvent FIELD a id Lpz; METHOD a getId ()Lpz; diff --git a/mappings/net/minecraft/sound/Sounds.mapping b/mappings/net/minecraft/sound/SoundEvents.mapping similarity index 57% rename from mappings/net/minecraft/sound/Sounds.mapping rename to mappings/net/minecraft/sound/SoundEvents.mapping index f16c2be0e7..80f99e4356 100644 --- a/mappings/net/minecraft/sound/Sounds.mapping +++ b/mappings/net/minecraft/sound/SoundEvents.mapping @@ -1,3 +1,3 @@ -CLASS xh net/minecraft/sound/Sounds +CLASS xh net/minecraft/sound/SoundEvents METHOD a register (Ljava/lang/String;)Lxg; ARG 0 id diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 481aa7e23f..9a7ca1db37 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -1,33 +1,33 @@ CLASS fk net/minecraft/util/registry/Registry FIELD A CHUNK_STATUS Lex; - FIELD B STRUCTURE_FEATURES Lfk; - FIELD C STRUCTURE_PIECES Lfk; + FIELD B STRUCTURE_FEATURE Lfk; + FIELD C STRUCTURE_PIECE Lfk; FIELD D RULE_TEST Lfk; FIELD E STRUCTURE_PROCESSOR Lfk; FIELD F STRUCTURE_POOL_ELEMENT Lfk; - FIELD G STAT_TYPES Lfk; + FIELD G STAT_TYPE Lfk; FIELD e LOGGER Lorg/apache/logging/log4j/Logger; FIELD f REGISTRIES Lfo; - FIELD g SOUNDS Lfk; - FIELD h FLUIDS Lex; - FIELD i POTION_EFFECT_TYPES Lfk; - FIELD j BLOCKS Lex; - FIELD k ENCHANTMENTS Lfk; - FIELD l ENTITY_TYPES Lfk; - FIELD m ITEMS Lex; - FIELD n POTIONS Lfk; - FIELD o CARVERS Lfk; - FIELD p SURFACE_BUILDERS Lfk; - FIELD q FEATURES Lfk; - FIELD r DECORATORS Lfk; - FIELD s BIOMES Lfk; - FIELD t PARTICLE_TYPES Lfk; - FIELD u BIOME_SOURCE_TYPES Lfk; - FIELD v BLOCK_ENTITIES Lfk; - FIELD w CHUNK_GENERATOR_TYPES Lfk; - FIELD x DIMENSIONS Lfk; - FIELD y MOTIVES Lex; - FIELD z CUSTOM_STATS Lfk; + FIELD g SOUND_EVENT Lfk; + FIELD h FLUID Lex; + FIELD i STATUS_EFFECT Lfk; + FIELD j BLOCK Lex; + FIELD k ENCHANTMENT Lfk; + FIELD l ENTITY_TYPE Lfk; + FIELD m ITEM Lex; + FIELD n POTION Lfk; + FIELD o CARVER Lfk; + FIELD p SURFACE_BUILDER Lfk; + FIELD q FEATURE Lfk; + FIELD r DECORATOR Lfk; + FIELD s BIOME Lfk; + FIELD t PARTICLE_TYPE Lfk; + FIELD u BIOME_SOURCE_TYPE Lfk; + FIELD v BLOCK_ENTITY Lfk; + FIELD w CHUNK_GENERATOR_TYPE Lfk; + FIELD x DIMENSION Lfk; + FIELD y MOTIVE Lex; + FIELD z CUSTOM_STAT Lfk; METHOD a set (Lfk;ILjava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; METHOD a register (Lfk;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; METHOD a register (Lfk;Lpz;Ljava/lang/Object;)Ljava/lang/Object;