From d5e0e1709e1f2c2f4145059589ee7a21fb05ffbd Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Fri, 24 Jul 2020 01:50:08 +0200 Subject: [PATCH] Some biome mappings (#1603) * Some biome mappings * weather inner class --- mappings/net/minecraft/item/ItemGroup.mapping | 1 + .../net/minecraft/world/biome/Biome.mapping | 36 ++++++++++++++++++- .../world/biome/BiomeEffects.mapping | 24 +++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping index a612f4e43e..c29bbedd2c 100644 --- a/mappings/net/minecraft/item/ItemGroup.mapping +++ b/mappings/net/minecraft/item/ItemGroup.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup + FIELD field_26391 translationKey Lnet/minecraft/class_2561; FIELD field_7914 REDSTONE Lnet/minecraft/class_1761; FIELD field_7915 SEARCH Lnet/minecraft/class_1761; FIELD field_7916 COMBAT Lnet/minecraft/class_1761; diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index f5e867d8ca..c600ae60a3 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_20335 temperatureCache Ljava/lang/ThreadLocal; FIELD field_22039 effects Lnet/minecraft/class_4763; + FIELD field_26393 weather Lnet/minecraft/class_1959$class_5482; FIELD field_9323 BIOMES Ljava/util/Set; FIELD field_9324 FOLIAGE_NOISE Lnet/minecraft/class_3543; FIELD field_9329 category Lnet/minecraft/class_1959$class_1961; @@ -12,6 +13,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_9343 depth F METHOD (Lnet/minecraft/class_1959$class_1960;)V ARG 1 settings + METHOD (Lnet/minecraft/class_1959$class_5482;Lnet/minecraft/class_1959$class_1961;FFLnet/minecraft/class_4763;Lnet/minecraft/class_1959$class_5485;Lnet/minecraft/class_1959$class_5483;Ljava/util/Optional;)V + ARG 1 weather METHOD method_21740 getTemperature (Lnet/minecraft/class_2338;)F ARG 1 blockPos METHOD method_24376 getFogColor ()I @@ -20,6 +23,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_24935 getLoopSound ()Ljava/util/Optional; METHOD method_24936 getMoodSound ()Ljava/util/Optional; METHOD method_24937 getAdditionsSound ()Ljava/util/Optional; + METHOD method_27343 getMusic ()Ljava/util/Optional; METHOD method_27835 getSpawnDensity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1959$class_5265; ARG 1 type METHOD method_27836 addSpawnDensity (Lnet/minecraft/class_1299;DD)V @@ -73,6 +77,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 1 world ARG 2 blockPos METHOD method_8707 computeTemperature (Lnet/minecraft/class_2338;)F + ARG 1 pos METHOD method_8708 addSpawn (Lnet/minecraft/class_1311;Lnet/minecraft/class_1959$class_1964;)V ARG 1 group ARG 2 spawnEntry @@ -83,7 +88,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 3 z METHOD method_8712 getTemperature ()F METHOD method_8713 getWaterFogColor ()I - METHOD method_8715 getRainfall ()F + METHOD method_8715 getDownfall ()F METHOD method_8717 getCarversForStep (Lnet/minecraft/class_2893$class_2894;)Ljava/util/List; ARG 1 carver METHOD method_8718 getFlowerFeatures ()Ljava/util/List; @@ -95,6 +100,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8725 getParent ()Ljava/lang/String; CLASS class_1960 Settings FIELD field_22042 specialEffects Lnet/minecraft/class_4763; + FIELD field_26396 temperatureModifier Lnet/minecraft/class_1959$class_5484; + FIELD field_26397 creatureGenerationProbability F FIELD field_9344 depth Ljava/lang/Float; FIELD field_9345 category Lnet/minecraft/class_1959$class_1961; FIELD field_9346 precipitation Lnet/minecraft/class_1959$class_1963; @@ -105,6 +112,10 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome FIELD field_9353 surfaceBuilder Ljava/util/function/Supplier; METHOD method_24379 effects (Lnet/minecraft/class_4763;)Lnet/minecraft/class_1959$class_1960; ARG 1 effects + METHOD method_30777 temperatureModifier (Lnet/minecraft/class_1959$class_5484;)Lnet/minecraft/class_1959$class_1960; + ARG 1 temperatureModifier + METHOD method_30778 creatureGenerationProbability (F)Lnet/minecraft/class_1959$class_1960; + ARG 1 probability METHOD method_8727 downfall (F)Lnet/minecraft/class_1959$class_1960; ARG 1 downfall METHOD method_8731 surfaceBuilder (Ljava/util/function/Supplier;)Lnet/minecraft/class_1959$class_1960; @@ -125,10 +136,13 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8747 temperature (F)Lnet/minecraft/class_1959$class_1960; ARG 1 temperature CLASS class_1961 Category + FIELD field_24678 CODEC Lcom/mojang/serialization/Codec; FIELD field_9359 NAME_MAP Ljava/util/Map; FIELD field_9372 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name + METHOD method_28424 byName (Ljava/lang/String;)Lnet/minecraft/class_1959$class_1961; + ARG 0 name METHOD method_8749 getName ()Ljava/lang/String; CLASS class_1962 TemperatureGroup FIELD field_9374 NAME_MAP Ljava/util/Map; @@ -137,10 +151,13 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 3 name METHOD method_8750 getName ()Ljava/lang/String; CLASS class_1963 Precipitation + FIELD field_24680 CODEC Lcom/mojang/serialization/Codec; FIELD field_9381 NAME_MAP Ljava/util/Map; FIELD field_9385 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name + METHOD method_28431 byName (Ljava/lang/String;)Lnet/minecraft/class_1959$class_1963; + ARG 0 name METHOD method_8752 getName ()Ljava/lang/String; CLASS class_1964 SpawnEntry FIELD field_24681 CODEC Lcom/mojang/serialization/Codec; @@ -196,6 +213,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome COMMENT than a specific type of entity. FIELD field_24407 gravityLimit D FIELD field_24408 mass D + FIELD field_25820 CODEC Lcom/mojang/serialization/Codec; METHOD (DD)V ARG 1 gravityLimit ARG 3 mass @@ -207,3 +225,19 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_27838 getMass ()D COMMENT Represents the mass of each entity spawned. Will affect gravity COMMENT calculation. + CLASS class_5482 Weather + FIELD field_26398 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_26399 precipitation Lnet/minecraft/class_1959$class_1963; + FIELD field_26400 temperature F + FIELD field_26401 temperatureModifier Lnet/minecraft/class_1959$class_5484; + FIELD field_26402 downfall F + METHOD (Lnet/minecraft/class_1959$class_1963;FLnet/minecraft/class_1959$class_5484;F)V + ARG 1 precipitation + ARG 2 temperature + ARG 3 temperatureModifier + ARG 4 downfall + CLASS class_5484 TemperatureModifier + FIELD field_26409 CODEC Lcom/mojang/serialization/Codec; + FIELD field_26411 NAME_MAP Ljava/util/Map; + METHOD method_30799 byName (Ljava/lang/String;)Lnet/minecraft/class_1959$class_5484; + ARG 0 name diff --git a/mappings/net/minecraft/world/biome/BiomeEffects.mapping b/mappings/net/minecraft/world/biome/BiomeEffects.mapping index 2ef7ce51b9..5bd29e539b 100644 --- a/mappings/net/minecraft/world/biome/BiomeEffects.mapping +++ b/mappings/net/minecraft/world/biome/BiomeEffects.mapping @@ -8,10 +8,21 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects FIELD field_22493 additionsSound Ljava/util/Optional; FIELD field_24113 music Ljava/util/Optional; FIELD field_24714 CODEC Lcom/mojang/serialization/Codec; + FIELD field_26418 skyColor I + FIELD field_26419 foliageColor Ljava/util/Optional; + FIELD field_26420 grassColor Ljava/util/Optional; METHOD (IIIILjava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_4763$class_5486;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 fogColor ARG 2 waterColor ARG 3 waterFogColor + ARG 4 skyColor + ARG 5 foliageColor + ARG 6 grassColor + ARG 8 particleConfig + ARG 9 loopSound + ARG 10 moodSound + ARG 11 additionsSound + ARG 12 music METHOD method_24387 getFogColor ()I METHOD method_24388 getWaterColor ()I METHOD method_24389 getWaterFogColor ()I @@ -35,6 +46,10 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects COMMENT COMMENT

An additions sound is played at 1.1% chance every tick as an ambient COMMENT sound whenever the player is in the biome with this effect. + METHOD method_27345 getMusic ()Ljava/util/Optional; + METHOD method_30810 getSkyColor ()I + METHOD method_30811 getFoliageColor ()Ljava/util/Optional; + METHOD method_30812 getGrassColor ()Ljava/util/Optional; CLASS class_4764 Builder FIELD field_22071 fogColor Ljava/util/OptionalInt; FIELD field_22072 waterColor Ljava/util/OptionalInt; @@ -44,6 +59,9 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects FIELD field_22495 moodSound Ljava/util/Optional; FIELD field_22496 additionsSound Ljava/util/Optional; FIELD field_24114 musicSound Ljava/util/Optional; + FIELD field_26422 skyColor Ljava/util/OptionalInt; + FIELD field_26423 foliageColor Ljava/util/Optional; + FIELD field_26424 grassColor 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 @@ -61,3 +79,9 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects ARG 1 additionsSound METHOD method_27346 music (Lnet/minecraft/class_5195;)Lnet/minecraft/class_4763$class_4764; ARG 1 music + METHOD method_30820 skyColor (I)Lnet/minecraft/class_4763$class_4764; + ARG 1 skyColor + METHOD method_30821 foliageColor (I)Lnet/minecraft/class_4763$class_4764; + ARG 1 foliageColor + METHOD method_30822 grassColor (I)Lnet/minecraft/class_4763$class_4764; + ARG 1 grassColor