diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 4d0b91df0e..40da703545 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_22143 BASALT Lnet/minecraft/class_2498; FIELD field_22144 WART_BLOCK Lnet/minecraft/class_2498; FIELD field_22145 NETHERRACK Lnet/minecraft/class_2498; - FIELD field_22146 NETHER_BRICK Lnet/minecraft/class_2498; + FIELD field_22146 NETHER_BRICKS Lnet/minecraft/class_2498; FIELD field_22147 NETHER_SPROUTS Lnet/minecraft/class_2498; FIELD field_22148 NETHER_ORE Lnet/minecraft/class_2498; FIELD field_22149 BONE Lnet/minecraft/class_2498; @@ -48,6 +48,9 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_22154 FUNGUS Lnet/minecraft/class_2498; FIELD field_23083 VINE Lnet/minecraft/class_2498; FIELD field_23265 LODESTONE Lnet/minecraft/class_2498; + FIELD field_24119 CHAIN Lnet/minecraft/class_2498; + FIELD field_24120 NETHER_GOLD_ORE Lnet/minecraft/class_2498; + FIELD field_24121 GILDED_BLACKSTONE Lnet/minecraft/class_2498; METHOD (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 1 volume ARG 2 pitch diff --git a/mappings/net/minecraft/sound/MusicSound.mapping b/mappings/net/minecraft/sound/MusicSound.mapping new file mode 100644 index 0000000000..a2c346d610 --- /dev/null +++ b/mappings/net/minecraft/sound/MusicSound.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5195 net/minecraft/sound/MusicSound + FIELD field_24057 event Lnet/minecraft/class_3414; + METHOD (Lnet/minecraft/class_3414;IIZ)V + ARG 1 event + METHOD method_27279 getEvent ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/world/LocalDifficulty.mapping b/mappings/net/minecraft/world/LocalDifficulty.mapping index 6ac0e4657e..14ccfe7d8b 100644 --- a/mappings/net/minecraft/world/LocalDifficulty.mapping +++ b/mappings/net/minecraft/world/LocalDifficulty.mapping @@ -4,11 +4,15 @@ CLASS net/minecraft/class_1266 net/minecraft/world/LocalDifficulty METHOD (Lnet/minecraft/class_1267;JJF)V ARG 1 difficulty ARG 2 timeOfDay + ARG 4 inhabitedTime + ARG 6 moonSize METHOD method_5454 getGlobalDifficulty ()Lnet/minecraft/class_1267; METHOD method_5455 isHarderThan (F)Z ARG 1 difficulty METHOD method_5456 setLocalDifficulty (Lnet/minecraft/class_1267;JJF)F ARG 1 difficulty ARG 2 timeOfDay + ARG 4 inhabitedTime + ARG 6 moonSize METHOD method_5457 getLocalDifficulty ()F METHOD method_5458 getClampedLocalDifficulty ()F diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 26303ead92..1368d30fe3 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8687 getWaterColor ()I METHOD method_8688 getCategory ()Lnet/minecraft/class_1959$class_1961; METHOD method_8689 getTranslationKey ()Ljava/lang/String; - METHOD method_8690 getMaxSpawnLimit ()F + METHOD method_8690 getMaxSpawnChance ()F METHOD method_8691 addCarver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_2922;)V ARG 1 step ARG 2 configuredCarver diff --git a/mappings/net/minecraft/world/biome/BiomeEffects.mapping b/mappings/net/minecraft/world/biome/BiomeEffects.mapping index ced6238cdf..fd875ddf77 100644 --- a/mappings/net/minecraft/world/biome/BiomeEffects.mapping +++ b/mappings/net/minecraft/world/biome/BiomeEffects.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects FIELD field_22491 loopSound Ljava/util/Optional; FIELD field_22492 moodSound Ljava/util/Optional; FIELD field_22493 additionsSound Ljava/util/Optional; + FIELD field_24113 music Ljava/util/Optional; METHOD (IIILjava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 fogColor ARG 2 waterColor @@ -14,6 +15,7 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects ARG 5 loopSound ARG 6 moodSound ARG 7 additionsSound + ARG 8 music METHOD method_24387 getFogColor ()I METHOD method_24388 getWaterColor ()I METHOD method_24389 getWaterFogColor ()I @@ -45,6 +47,7 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects FIELD field_22494 loopSound Ljava/util/Optional; FIELD field_22495 moodSound Ljava/util/Optional; FIELD field_22496 additionsSound Ljava/util/Optional; + FIELD field_24114 musicSound Ljava/util/Optional; METHOD method_24391 build ()Lnet/minecraft/class_4763; METHOD method_24392 fogColor (I)Lnet/minecraft/class_4763$class_4764; ARG 1 fogColor @@ -57,4 +60,8 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects METHOD method_24942 loopSound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_4763$class_4764; ARG 1 sound METHOD method_24943 moodSound (Lnet/minecraft/class_4968;)Lnet/minecraft/class_4763$class_4764; + ARG 1 moodSound METHOD method_24944 additionsSound (Lnet/minecraft/class_4967;)Lnet/minecraft/class_4763$class_4764; + ARG 1 additionsSound + METHOD method_27346 music (Lnet/minecraft/class_5195;)Lnet/minecraft/class_4763$class_4764; + ARG 1 music diff --git a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping similarity index 95% rename from mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping rename to mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index 0c53779b80..05cd28a2ea 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeature +CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_12774 setBlockStateWithoutUpdatingNeighbors (Lnet/minecraft/class_1945;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos @@ -49,3 +49,5 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeatu METHOD method_23384 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_27371 canReplace (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos