From 875038dab01d56582bd815f4935a86161177805a Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Wed, 27 Oct 2021 00:11:35 +1100 Subject: [PATCH] 21w42a stuff (#2776) * 21w42a stuff * stuff * AutoSave -> Autosave * Update mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping Co-authored-by: YanisBft * Update mappings/net/minecraft/client/gui/hud/InGameHud.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: YanisBft Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> --- .../client/gui/hud/InGameHud.mapping | 3 +++ .../client/option/GameOptions.mapping | 1 + .../minecraft/client/option/Option.mapping | 7 +++++++ .../noise/DoublePerlinNoiseSampler.mapping | 7 +++++++ .../noise/OctavePerlinNoiseSampler.mapping | 19 +++++++++++++++++++ .../util/registry/BuiltinRegistries.mapping | 6 ++++++ .../world/gen/NoiseColumnSampler.mapping | 6 +++++- .../gen/chunk/ChunkGeneratorSettings.mapping | 19 ++++++++++++++++++- .../world/gen/chunk/SlideConfig.mapping | 4 ++++ .../gen/decorator/ScatterDecorator.mapping | 1 + .../decorator/ScatterDecoratorConfig.mapping | 7 +++++++ 11 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping create mode 100644 mappings/net/minecraft/world/gen/decorator/ScatterDecoratorConfig.mapping diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 8691cf2c26..75e5b7c6bd 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_27959 spyglassScale F FIELD field_27960 POWDER_SNOW_OUTLINE Lnet/minecraft/class_2960; FIELD field_32167 WHITE I + FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V @@ -154,6 +155,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 5 v ARG 6 blinking ARG 7 halfHeart + METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_4587;)V + ARG 1 matrices CLASS class_6411 HeartType FIELD field_33950 textureIndex I FIELD field_33951 hasBlinkingTexture Z diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 2c990e97f4..5ba8eb1aa4 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -183,6 +183,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_34786 hideLightningFlashes Z FIELD field_34787 prioritizeChunkUpdatesMode Lnet/minecraft/class_6597; FIELD field_34959 simulationDistance I + FIELD field_35426 showAutosaveIndicator Z METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile diff --git a/mappings/net/minecraft/client/option/Option.mapping b/mappings/net/minecraft/client/option/Option.mapping index 956c5922b5..47294b1ddc 100644 --- a/mappings/net/minecraft/client/option/Option.mapping +++ b/mappings/net/minecraft/client/option/Option.mapping @@ -65,6 +65,7 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option FIELD field_34781 HIDE_LIGHTNING_FLASHES_TOOLTIP Lnet/minecraft/class_2561; FIELD field_34782 PRIORITIZE_CHUNK_UPDATES_MODE Lnet/minecraft/class_4064; FIELD field_34958 SIMULATION_DISTANCE Lnet/minecraft/class_4067; + FIELD field_35425 SHOW_AUTOSAVE_INDICATOR Lnet/minecraft/class_4064; METHOD (Ljava/lang/String;)V ARG 1 key METHOD method_18513 (Lnet/minecraft/class_315;)Ljava/lang/Double; @@ -483,3 +484,9 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option METHOD method_38739 (Lnet/minecraft/class_315;Ljava/lang/Double;)V ARG 0 gameOptions ARG 1 mouseSensitivity + METHOD method_39189 (Lnet/minecraft/class_315;)Ljava/lang/Boolean; + ARG 0 gameOptions + METHOD method_39190 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Boolean;)V + ARG 0 gameOptions + ARG 1 option + ARG 2 showAutosaveIndicator diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index eca3f4f5be..93d8fac74b 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa ARG 1 random ARG 2 offset ARG 3 octaves + ARG 4 xoroshiro METHOD method_27406 sample (DDD)D ARG 1 x ARG 3 y @@ -21,17 +22,23 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa ARG 0 random ARG 1 offset ARG 2 octaves + METHOD method_38475 copy ()Lnet/minecraft/class_5216$class_5487; METHOD method_38476 create (Lnet/minecraft/class_5819;Lnet/minecraft/class_5216$class_5487;)Lnet/minecraft/class_5216; ARG 0 random ARG 1 parameters METHOD method_39124 addDebugInfo (Ljava/lang/StringBuilder;)V ARG 1 info + METHOD method_39186 createLegacy (Lnet/minecraft/class_5819;Lnet/minecraft/class_5216$class_5487;)Lnet/minecraft/class_5216; + ARG 0 random + ARG 1 parameters CLASS class_5487 NoiseParameters FIELD field_26438 CODEC Lcom/mojang/serialization/Codec; FIELD field_26439 firstOctave I FIELD field_26440 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; METHOD (ID[D)V ARG 1 firstOctave + ARG 2 firstAmplitude + ARG 4 amplitudes METHOD (ILjava/util/List;)V ARG 1 firstOctave ARG 2 amplitudes diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index 692f2e44cb..e9f92d4cd1 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa FIELD field_20659 persistence D FIELD field_20660 lacunarity D FIELD field_26445 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; + FIELD field_34758 firstOctave I + METHOD (Lnet/minecraft/class_5819;Lcom/mojang/datafixers/util/Pair;Z)V + ARG 1 random + ARG 3 xoroshiro METHOD method_15416 sample (DDD)D ARG 1 x ARG 3 y @@ -27,6 +31,21 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa METHOD method_34401 skipCalls (Lnet/minecraft/class_5819;)V ARG 0 random METHOD method_35480 create (Lnet/minecraft/class_5819;ID[D)Lnet/minecraft/class_3537; + ARG 0 random ARG 1 offset + ARG 2 firstAmplitude + ARG 4 amplitudes + METHOD method_38477 getFirstOctave ()I + METHOD method_38478 getAmplitudes ()Lit/unimi/dsi/fastutil/doubles/DoubleList; + METHOD method_39126 createLegacy (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_3537; + ARG 0 random + ARG 1 offset + ARG 2 amplitudes + METHOD method_39127 create (Lnet/minecraft/class_5819;Ljava/util/List;)Lnet/minecraft/class_3537; + ARG 0 random + METHOD method_39128 create (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)Lnet/minecraft/class_3537; + ARG 0 random METHOD method_39130 addDebugInfo (Ljava/lang/StringBuilder;)V ARG 1 info + METHOD method_39187 createLegacy (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)Lnet/minecraft/class_3537; + ARG 0 random diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping index 01becbab12..0bff63d91d 100644 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries METHOD method_30559 init ()V METHOD method_30560 set (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry + ARG 1 key + ARG 2 object METHOD method_30561 add (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id @@ -43,3 +45,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries METHOD method_30565 addRegistry (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; ARG 0 registryRef ARG 1 defaultValueSupplier + METHOD method_39203 add (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 registry + ARG 1 key + ARG 2 object diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping index b0a2062091..67ed007773 100644 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -55,6 +55,10 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler ARG 2 verticalNoiseResolution ARG 3 noiseSizeY ARG 4 config + ARG 5 hasNoiseCaves + ARG 6 seed + ARG 8 noiseRegistry + ARG 9 randomProvider METHOD method_33645 applySlides (DI)D COMMENT Interpolates the noise at the top and bottom of the world. ARG 1 noise @@ -77,7 +81,7 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler ARG 1 x ARG 2 y ARG 3 z - METHOD method_38378 (IIIDDFFFD)Lnet/minecraft/class_6544$class_6553; + METHOD method_38378 sample (IIIDDFFFD)Lnet/minecraft/class_6544$class_6553; ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 1e7df3882a..764ca52321 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -22,11 +22,24 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_33587 oreVeins Z FIELD field_33651 noodleCaves Z FIELD field_35051 LARGE_BIOMES Lnet/minecraft/class_5321; + FIELD field_35130 randomProvider Lnet/minecraft/class_2919$class_6675; FIELD field_35184 surfaceRule Lnet/minecraft/class_6686$class_6708; METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6686$class_6708;IIIZZZZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig - ARG 4 defaultBlock + ARG 3 defaultBlock + ARG 4 defaultFluid + ARG 5 surfaceRule + ARG 6 bedrockCeilingY + ARG 7 bedrockFloorY + ARG 8 seaLevel + ARG 9 mobGenerationDisabled + ARG 10 aquifers + ARG 11 noiseCaves + ARG 12 deepslate + ARG 13 oreVeins + ARG 14 noodleCaves + ARG 15 legacy METHOD method_16400 getBedrockCeilingY ()I COMMENT Returns the Y level of the bedrock ceiling. COMMENT @@ -68,4 +81,8 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_33839 hasDeepslate ()Z METHOD method_36396 hasOreVeins ()Z METHOD method_36468 hasNoodleCaves ()Z + METHOD method_38997 createRandom (J)Lnet/minecraft/class_5819; + ARG 1 seed + METHOD method_38998 usesLegacyRandom ()Z + METHOD method_38999 getRandomProvider ()Lnet/minecraft/class_2919$class_6675; METHOD method_39042 getSurfaceRule ()Lnet/minecraft/class_6686$class_6708; diff --git a/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping b/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping index e2551cc2b2..b97db2197c 100644 --- a/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping @@ -3,5 +3,9 @@ CLASS net/minecraft/class_5310 net/minecraft/world/gen/chunk/SlideConfig FIELD field_24818 target D FIELD field_24819 size I FIELD field_24820 offset I + METHOD (DII)V + ARG 1 target + ARG 3 size + ARG 4 offset METHOD method_28595 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping new file mode 100644 index 0000000000..58048efc43 --- /dev/null +++ b/mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_6733 net/minecraft/world/gen/decorator/ScatterDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/ScatterDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/ScatterDecoratorConfig.mapping new file mode 100644 index 0000000000..1eb855ade4 --- /dev/null +++ b/mappings/net/minecraft/world/gen/decorator/ScatterDecoratorConfig.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_6732 net/minecraft/world/gen/decorator/ScatterDecoratorConfig + FIELD field_35419 CODEC Lcom/mojang/serialization/Codec; + FIELD field_35420 xzSpread Lnet/minecraft/class_6017; + FIELD field_35421 ySpread Lnet/minecraft/class_6017; + METHOD (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V + ARG 1 xzSpread + ARG 2 ySpread