diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index da472fe83d..c4f6a49108 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl ARG 3 storageSession ARG 4 levelInfo ARG 5 eraseCache + ARG 6 generatorOptions METHOD method_19938 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527; diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index f64d32358d..40485d1718 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -180,7 +180,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_34783 soundDevice Ljava/lang/String; FIELD field_34784 serverViewDistance I FIELD field_34786 hideLightningFlashes Z - FIELD field_34787 prioritizeChunkUpdatesMode Lnet/minecraft/class_6597; + FIELD field_34787 chunkBuilderMode Lnet/minecraft/class_6597; FIELD field_34959 simulationDistance I FIELD field_35426 showAutosaveIndicator Z METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V diff --git a/mappings/net/minecraft/client/option/Option.mapping b/mappings/net/minecraft/client/option/Option.mapping index 032ba33e18..71622084d4 100644 --- a/mappings/net/minecraft/client/option/Option.mapping +++ b/mappings/net/minecraft/client/option/Option.mapping @@ -62,9 +62,12 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option FIELD field_34779 AUDIO_DEVICE Lnet/minecraft/class_4064; FIELD field_34780 HIDE_LIGHTNING_FLASHES Lnet/minecraft/class_4064; FIELD field_34781 HIDE_LIGHTNING_FLASHES_TOOLTIP Lnet/minecraft/class_2561; - FIELD field_34782 PRIORITIZE_CHUNK_UPDATES_MODE Lnet/minecraft/class_4064; + FIELD field_34782 CHUNK_BUILDER_MODE Lnet/minecraft/class_4064; FIELD field_34958 SIMULATION_DISTANCE Lnet/minecraft/class_4067; FIELD field_35425 SHOW_AUTOSAVE_INDICATOR Lnet/minecraft/class_4064; + FIELD field_35553 CHUNK_BUILDER_THREADED_TEXT Lnet/minecraft/class_2561; + FIELD field_35554 CHUNK_BUILDER_SEMI_BLOCKING_TEXT Lnet/minecraft/class_2561; + FIELD field_35555 CHUNK_BUILDER_FULLY_BLOCKING_TEXT Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;)V ARG 1 key METHOD method_18513 (Lnet/minecraft/class_315;)Ljava/lang/Double; @@ -338,7 +341,7 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option METHOD method_32550 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_6597;)V ARG 0 gameOptions ARG 1 option - ARG 2 prioritizeChunkUpdateMode + ARG 2 chunkBuilderMode METHOD method_32551 (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Lnet/minecraft/class_4063;)V ARG 0 gameOptions ARG 1 option @@ -460,7 +463,7 @@ CLASS net/minecraft/class_316 net/minecraft/client/option/Option ARG 1 option ARG 2 audioDevice METHOD method_38517 (Lnet/minecraft/class_6597;)Lnet/minecraft/class_2561; - ARG 0 prioritizeChunkUpdatesMode + ARG 0 chunkBuilderMode METHOD method_38518 (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 device METHOD method_38737 (Lnet/minecraft/class_315;)Ljava/lang/Double; diff --git a/mappings/net/minecraft/client/render/PrioritizeChunkUpdatesMode.mapping b/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping similarity index 80% rename from mappings/net/minecraft/client/render/PrioritizeChunkUpdatesMode.mapping rename to mappings/net/minecraft/client/render/ChunkBuilderMode.mapping index ade19a87f6..75c56dd0a5 100644 --- a/mappings/net/minecraft/client/render/PrioritizeChunkUpdatesMode.mapping +++ b/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6597 net/minecraft/client/render/PrioritizeChunkUpdatesMode +CLASS net/minecraft/class_6597 net/minecraft/client/render/ChunkBuilderMode FIELD field_34791 modes [Lnet/minecraft/class_6597; FIELD field_34792 id I FIELD field_34793 name Ljava/lang/String; diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index bd14cefdcb..7822e53008 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -45,3 +45,5 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD method_20785 getHeight ()F METHOD method_33659 isEqualAndStill (Lnet/minecraft/class_3611;)Z ARG 1 fluid + METHOD method_39360 isOf (Lnet/minecraft/class_3611;)Z + ARG 1 fluid diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index e9d6ec4d61..661ae981a1 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/server/Main ARG 0 session ARG 1 dataFixer ARG 2 eraseCache + ARG 3 continueCheck + ARG 4 generatorOptions METHOD method_29734 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;Lnet/minecraft/class_3807;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176; ARG 0 registryTracker ARG 1 session diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 3af2fe9c5f..b65abdfd35 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -389,3 +389,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper COMMENT {@return {@code a} rounded down to the nearest multiple of {@code b}} ARG 0 a ARG 2 b + METHOD method_39241 hypot (ID)D + ARG 0 a + ARG 1 b diff --git a/mappings/net/minecraft/world/gen/random/AbstractRandom.mapping b/mappings/net/minecraft/world/gen/random/AbstractRandom.mapping index c412d45b96..f87ab4ef98 100644 --- a/mappings/net/minecraft/world/gen/random/AbstractRandom.mapping +++ b/mappings/net/minecraft/world/gen/random/AbstractRandom.mapping @@ -2,7 +2,10 @@ CLASS net/minecraft/class_5819 net/minecraft/world/gen/random/AbstractRandom METHOD method_33650 skip (I)V ARG 1 count METHOD method_38420 derive ()Lnet/minecraft/class_5819; - METHOD method_38421 createBlockPosRandomDeriver ()Lnet/minecraft/class_6574; + METHOD method_38421 createRandomDeriver ()Lnet/minecraft/class_6574; + METHOD method_39332 nextBetween (II)I + ARG 1 min + ARG 2 max METHOD nextInt (I)I ARG 1 bound METHOD setSeed (J)V diff --git a/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping b/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping index bf0ebbbd1b..9618c9702d 100644 --- a/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping +++ b/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping @@ -8,5 +8,6 @@ CLASS net/minecraft/class_6574 net/minecraft/world/gen/random/RandomDeriver METHOD method_38995 createRandom (Ljava/lang/String;)Lnet/minecraft/class_5819; ARG 1 string METHOD method_39000 createRandom (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5819; + ARG 1 id METHOD method_39039 addDebugInfo (Ljava/lang/StringBuilder;)V ARG 1 info diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index cecc36f61d..487d69a3dd 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_19225 eraseCache Z FIELD field_24083 session Lnet/minecraft/class_32$class_5143; FIELD field_24084 dataFixer Lcom/mojang/datafixers/DataFixer; + FIELD field_35454 generatorOptions Lnet/minecraft/class_5285; FIELD field_5755 persistentStateManager Lnet/minecraft/class_26; FIELD field_5756 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; @@ -18,6 +19,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5285;Z)V ARG 1 session ARG 2 dataFixer + ARG 3 generatorOptions ARG 4 eraseCache METHOD method_17829 (Ljava/io/File;Ljava/lang/String;)Z ARG 0 directory