From 372c15cf377415c2a9693f88e5cf3f7e7fa9633c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 27 May 2021 18:09:37 +0100 Subject: [PATCH] 1.17-pre1 --- build.gradle | 2 +- .../criterion/EffectsChangedCriterion.mapping | 9 ++--- .../block/AbstractLichenBlock.mapping | 8 ++-- .../block/entity/SkullBlockEntity.mapping | 4 +- .../net/minecraft/client/Keyboard.mapping | 7 +--- .../minecraft/client/MinecraftClient.mapping | 5 +-- .../client/gui/screen/CreditsScreen.mapping | 5 +-- .../client/gui/screen/StatsScreen.mapping | 1 - .../client/util/profiler/Category.mapping | 14 ------- .../util/profiler/DebugRecorder.mapping | 26 +----------- .../client/util/profiler/Metric.mapping | 5 --- .../util/profiler/MetricSampler.mapping | 11 ----- .../util/profiler/ProfilerDumper.mapping | 17 ++------ .../client/util/profiler/Sample.mapping | 5 +-- .../util/profiler/SamplerFactory.mapping | 11 ----- .../util/profiler/SamplingRecorder.mapping | 40 ++++--------------- mappings/net/minecraft/entity/Entity.mapping | 3 -- .../net/minecraft/entity/LivingEntity.mapping | 6 +-- .../ai/pathing/PathNodeNavigator.mapping | 7 +--- .../entity/passive/AxolotlEntity.mapping | 1 - .../net/minecraft/item/HoneycombItem.mapping | 2 +- mappings/net/minecraft/item/Item.mapping | 2 +- .../predicate/BlockPredicate.mapping | 10 ++--- .../predicate/PlayerPredicate.mapping | 7 ++-- .../predicate/entity/EntityPredicate.mapping | 22 +--------- .../predicate/item/ItemPredicate.mapping | 10 ++--- .../minecraft/screen/ScreenHandler.mapping | 1 - .../minecraft/server/MinecraftServer.mapping | 14 ++----- .../server/command/DebugCommand.mapping | 7 ---- mappings/net/minecraft/util/Util.mapping | 12 ------ .../minecraft/util/crash/CrashReport.mapping | 5 +-- .../util/crash/CrashReportSection.mapping | 4 -- .../minecraft/util/math/MathHelper.mapping | 2 - .../noise/InterpolatedNoiseSampler.mapping | 3 -- .../util/profiler/MetricSuppliers.mapping | 1 - .../util/profiler/ProfilerSystem.mapping | 1 - .../world/chunk/ChunkManager.mapping | 4 -- .../gen/feature/GeodeLayerConfig.mapping | 2 +- .../world/gen/feature/TreeFeature.mapping | 5 --- .../gen/feature/TreeFeatureConfig.mapping | 12 +----- 40 files changed, 54 insertions(+), 259 deletions(-) delete mode 100644 mappings/net/minecraft/client/util/profiler/Category.mapping delete mode 100644 mappings/net/minecraft/client/util/profiler/Metric.mapping delete mode 100644 mappings/net/minecraft/client/util/profiler/MetricSampler.mapping delete mode 100644 mappings/net/minecraft/client/util/profiler/SamplerFactory.mapping diff --git a/build.gradle b/build.gradle index 8d08f90765..08d9760fcb 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "21w20a" +def minecraft_version = "1.17-pre1" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index f43b11f35b..5fa72ad41b 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChangedCriterion FIELD field_9558 ID Lnet/minecraft/class_2960; - METHOD method_22462 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2027$class_2029;)Z - ARG 1 conditions - METHOD method_8863 trigger (Lnet/minecraft/class_3222;)V - ARG 1 player + METHOD method_8863 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V CLASS class_2029 Conditions FIELD field_9562 effects Lnet/minecraft/class_2102; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2102;)V + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2102;Lnet/minecraft/class_2048$class_5258;)V ARG 1 player ARG 2 effects - METHOD method_8868 matches (Lnet/minecraft/class_3222;)Z + METHOD method_8868 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;)Z ARG 1 player METHOD method_8869 create (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2027$class_2029; ARG 0 effects diff --git a/mappings/net/minecraft/block/AbstractLichenBlock.mapping b/mappings/net/minecraft/block/AbstractLichenBlock.mapping index 576a5c5586..3cc5cc83b5 100644 --- a/mappings/net/minecraft/block/AbstractLichenBlock.mapping +++ b/mappings/net/minecraft/block/AbstractLichenBlock.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock ARG 1 direction ARG 2 pos ARG 3 state - METHOD method_33359 addDirection (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + METHOD method_33359 addDirection (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)Z ARG 1 world ARG 2 pos ARG 3 direction @@ -30,13 +30,13 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock ARG 2 world ARG 3 pos ARG 4 direction - METHOD method_33363 trySpreadTo (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z + METHOD method_33363 trySpreadTo (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;Z)Z ARG 1 state ARG 2 world ARG 3 pos ARG 4 from ARG 5 to - METHOD method_33364 trySpreadRandomly (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/Random;)Z + METHOD method_33364 trySpreadRandomly (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/Random;Z)Z ARG 1 state ARG 2 world ARG 3 pos @@ -57,8 +57,6 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock ARG 1 direction METHOD method_33370 (Ljava/util/EnumMap;)V ARG 0 shapes - METHOD method_33371 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z - ARG 5 to METHOD method_33372 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z ARG 1 direction METHOD method_33374 getProperty (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2746; diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index fb23b1798c..b91066502b 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -9,10 +9,8 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity ARG 1 pos ARG 2 state METHOD method_11333 setOwner (Lcom/mojang/authlib/GameProfile;)V - ARG 1 owner METHOD method_11334 getOwner ()Lcom/mojang/authlib/GameProfile; - METHOD method_11335 loadProperties (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; - ARG 0 profile + METHOD method_11335 loadProperties (Lcom/mojang/authlib/GameProfile;Ljava/util/function/Consumer;)V METHOD method_11336 setSessionService (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V ARG 0 value METHOD method_11337 setUserCache (Lnet/minecraft/class_3312;)V diff --git a/mappings/net/minecraft/client/Keyboard.mapping b/mappings/net/minecraft/client/Keyboard.mapping index 24c299f065..ec7d0aa1ad 100644 --- a/mappings/net/minecraft/client/Keyboard.mapping +++ b/mappings/net/minecraft/client/Keyboard.mapping @@ -48,15 +48,12 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard ARG 1 state ARG 2 pos ARG 3 nbt - METHOD method_22675 (JIIII)V + METHOD method_22675 (JII)V ARG 1 window ARG 3 key - ARG 6 modifiers - METHOD method_22676 (JII)V + METHOD method_22676 (JIIII)V ARG 1 window ARG 4 modifiers - METHOD method_34743 (Ljava/nio/file/Path;)V - ARG 1 path METHOD method_35696 (I)Z ARG 1 key METHOD method_35697 (Ljava/lang/String;[Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index ae96d1d3e0..dfd8df9b60 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -416,9 +416,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_31975 getBlockEntityRenderDispatcher ()Lnet/minecraft/class_824; METHOD method_33883 shouldFilterText ()Z METHOD method_33884 getChatRestriction ()Lnet/minecraft/class_310$class_5859; - METHOD method_34745 toggleDebugProfiler (Ljava/lang/Runnable;Ljava/util/function/Consumer;)V - ARG 1 startAction - ARG 2 completeAction + METHOD method_34745 toggleDebugProfiler (Ljava/util/function/Consumer;)Z METHOD method_35698 takePanorama (Ljava/io/File;II)Lnet/minecraft/class_2561; COMMENT Takes a panorama. The panorama is stored in the given {@code directory}, in COMMENT where 6 screenshots of size {@code width} and {@code height} will be taken. @@ -440,7 +438,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 3 unitHeight ARG 4 width ARG 5 height - METHOD method_35702 getCurrentFps ()I METHOD method_35703 getWorldGenerationProgressTracker ()Lnet/minecraft/class_3953; METHOD method_35705 addGlInfo (Lnet/minecraft/class_1276;)V ARG 0 snooper diff --git a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping index 8e167a9fde..7d2720f792 100644 --- a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -16,7 +16,4 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen ARG 1 endCredits ARG 2 finishAction METHOD method_2257 close ()V - METHOD method_2258 renderBackground (IIF)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 tickDelta + METHOD method_2258 renderBackground ()V diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 60b1c6ee1a..146669d52c 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -54,7 +54,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen FIELD field_18754 blockStatTypes Ljava/util/List; FIELD field_18755 itemStatTypes Ljava/util/List; FIELD field_18756 selectedHeaderColumn I - FIELD field_18757 items Ljava/util/List; FIELD field_18758 comparator Ljava/util/Comparator; FIELD field_18759 selectedStatType Lnet/minecraft/class_3448; METHOD (Lnet/minecraft/class_447;Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/util/profiler/Category.mapping b/mappings/net/minecraft/client/util/profiler/Category.mapping deleted file mode 100644 index 1f44c73ad5..0000000000 --- a/mappings/net/minecraft/client/util/profiler/Category.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/class_5969 net/minecraft/client/util/profiler/Category - FIELD field_29612 name Ljava/lang/String; - FIELD field_29613 samplers [Lnet/minecraft/class_5965; - METHOD (Ljava/lang/String;Ljava/util/List;)V - ARG 1 name - ARG 2 samplers - METHOD (Ljava/lang/String;[Lnet/minecraft/class_5965;)V - ARG 1 name - ARG 2 samplers - METHOD method_34793 sample ()V - METHOD method_34794 start ()V - METHOD method_34795 stop ()V - METHOD method_34796 getName ()Ljava/lang/String; - METHOD method_34797 getSamplers ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/util/profiler/DebugRecorder.mapping b/mappings/net/minecraft/client/util/profiler/DebugRecorder.mapping index 07a00a27c0..7131779209 100644 --- a/mappings/net/minecraft/client/util/profiler/DebugRecorder.mapping +++ b/mappings/net/minecraft/client/util/profiler/DebugRecorder.mapping @@ -1,38 +1,16 @@ CLASS net/minecraft/class_5961 net/minecraft/client/util/profiler/DebugRecorder FIELD field_29579 globalPathConsumer Ljava/util/function/Consumer; - FIELD field_29580 categories Ljava/util/List; FIELD field_29581 timeTracker Lnet/minecraft/class_4757; FIELD field_29582 executor Ljava/util/concurrent/Executor; FIELD field_29583 dumper Lnet/minecraft/class_5971; - FIELD field_29584 readAction Ljava/lang/Runnable; + FIELD field_29584 readAction Ljava/util/function/Consumer; FIELD field_29585 pathConsumer Ljava/util/function/Consumer; FIELD field_29586 timeGetter Ljava/util/function/LongSupplier; - FIELD field_29587 samples Ljava/util/List; FIELD field_29588 nanoStartTime J FIELD field_29589 ticks I FIELD field_29590 profiler Lnet/minecraft/class_3693; FIELD field_29591 pendingRead Z - METHOD (Ljava/util/function/LongSupplier;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5971;Ljava/lang/Runnable;Ljava/util/function/Consumer;)V - ARG 1 timeGetter - ARG 2 executor - ARG 3 dumper - ARG 4 readAction - ARG 5 completeAction - METHOD method_34756 (Lnet/minecraft/class_5949;Ljava/util/List;)V - ARG 1 channel - ARG 2 metrics - METHOD method_34758 createFactory (Ljava/lang/String;)Lnet/minecraft/class_5970; - ARG 1 name - METHOD method_34759 createFrameTimeSampler (Ljava/util/function/LongSupplier;)Lnet/minecraft/class_5965; - ARG 1 timeGetter - METHOD method_34760 create (Ljava/util/function/LongSupplier;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5971;Ljava/lang/Runnable;Ljava/util/function/Consumer;)Lnet/minecraft/class_5961; - ARG 0 timeGetter - ARG 1 executore - ARG 2 dumper - ARG 3 readAction - ARG 4 completeAction - METHOD method_34761 createCategories ()V METHOD method_34762 checkState ()V - METHOD method_34763 execute ()V + METHOD method_34763 execute (Lnet/minecraft/class_3696;)V METHOD method_35762 setGlobalPathConsumer (Ljava/util/function/Consumer;)V ARG 0 globalPathConsumer diff --git a/mappings/net/minecraft/client/util/profiler/Metric.mapping b/mappings/net/minecraft/client/util/profiler/Metric.mapping deleted file mode 100644 index 89c9c8493f..0000000000 --- a/mappings/net/minecraft/client/util/profiler/Metric.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5951 net/minecraft/client/util/profiler/Metric - FIELD field_29557 name Ljava/lang/String; - METHOD (Ljava/lang/String;)V - ARG 1 name - METHOD method_34704 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/profiler/MetricSampler.mapping b/mappings/net/minecraft/client/util/profiler/MetricSampler.mapping deleted file mode 100644 index 27d4d63c1e..0000000000 --- a/mappings/net/minecraft/client/util/profiler/MetricSampler.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_5948 net/minecraft/client/util/profiler/MetricSampler - FIELD field_29548 metric Lnet/minecraft/class_5951; - FIELD field_29549 valueSupplier Ljava/util/function/DoubleSupplier; - FIELD field_29550 channel Lnet/minecraft/class_5949; - METHOD (Lnet/minecraft/class_5951;Ljava/util/function/DoubleSupplier;Lnet/minecraft/class_5949;)V - ARG 1 metric - ARG 2 valueSupplier - ARG 3 channel - METHOD method_34697 getMetric ()Lnet/minecraft/class_5951; - METHOD method_34698 getValueSupplier ()Ljava/util/function/DoubleSupplier; - METHOD method_34699 getChannel ()Lnet/minecraft/class_5949; diff --git a/mappings/net/minecraft/client/util/profiler/ProfilerDumper.mapping b/mappings/net/minecraft/client/util/profiler/ProfilerDumper.mapping index 392b36dc19..1b00504dc9 100644 --- a/mappings/net/minecraft/client/util/profiler/ProfilerDumper.mapping +++ b/mappings/net/minecraft/client/util/profiler/ProfilerDumper.mapping @@ -1,22 +1,11 @@ CLASS net/minecraft/class_5971 net/minecraft/client/util/profiler/ProfilerDumper FIELD field_29616 DEBUG_PROFILING_DIRECTORY Ljava/nio/file/Path; - FIELD field_29617 FILE_SYSTEM_PROVIDER Ljava/nio/file/spi/FileSystemProvider; FIELD field_29618 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_32677 METRICS_DIRECTORY Ljava/lang/String; FIELD field_32678 DEVIATIONS_DIRECTORY Ljava/lang/String; FIELD field_32679 FILE_NAME Ljava/lang/String; - METHOD method_34802 save (Lnet/minecraft/class_4757;Ljava/nio/file/Path;)V - ARG 1 timeTracker + METHOD method_34802 save (Lnet/minecraft/class_3696;Ljava/nio/file/Path;)V ARG 2 directory - METHOD method_34803 writeCategory (Lnet/minecraft/class_5969;Ljava/nio/file/Path;)V - ARG 1 category + METHOD method_34803 writeCategory (Ljava/util/Set;Ljava/nio/file/Path;)V ARG 2 directory - METHOD method_34804 compressAndSave (Ljava/nio/file/Path;)Ljava/nio/file/Path; - ARG 1 filePath - METHOD method_34806 writeSamples (Ljava/util/List;Ljava/nio/file/Path;)V - ARG 1 samples - ARG 2 directory - METHOD method_34807 createDump (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_4757;)Ljava/nio/file/Path; - ARG 1 categories - ARG 2 deviations - ARG 3 timeTracker + METHOD method_34807 createDump (Ljava/util/Set;Ljava/util/Map;Lnet/minecraft/class_3696;)Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/client/util/profiler/Sample.mapping b/mappings/net/minecraft/client/util/profiler/Sample.mapping index 6487d32564..7f1d8c9e3d 100644 --- a/mappings/net/minecraft/client/util/profiler/Sample.mapping +++ b/mappings/net/minecraft/client/util/profiler/Sample.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_5964 net/minecraft/client/util/profiler/Sample - FIELD field_29595 samplingTimer Ljava/util/Date; + FIELD field_29595 samplingTimer Ljava/time/Instant; FIELD field_29596 ticks I FIELD field_29597 result Lnet/minecraft/class_3696; - METHOD (Ljava/util/Date;ILnet/minecraft/class_3696;)V - ARG 1 samplingTimer + METHOD (Ljava/time/Instant;ILnet/minecraft/class_3696;)V ARG 2 ticks ARG 3 result diff --git a/mappings/net/minecraft/client/util/profiler/SamplerFactory.mapping b/mappings/net/minecraft/client/util/profiler/SamplerFactory.mapping deleted file mode 100644 index 8623f26011..0000000000 --- a/mappings/net/minecraft/client/util/profiler/SamplerFactory.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_5970 net/minecraft/client/util/profiler/SamplerFactory - FIELD field_29614 metric Lnet/minecraft/class_5951; - FIELD field_29615 profilerGetter Ljava/util/function/Supplier; - METHOD (Ljava/lang/String;Ljava/util/function/Supplier;)V - ARG 1 name - ARG 2 profilerGetter - METHOD (Lnet/minecraft/class_5951;Ljava/util/function/Supplier;)V - ARG 1 metric - ARG 2 profilerGetter - METHOD method_34799 createSampler ([Ljava/lang/String;)Lnet/minecraft/class_5965; - ARG 1 pathNodes diff --git a/mappings/net/minecraft/client/util/profiler/SamplingRecorder.mapping b/mappings/net/minecraft/client/util/profiler/SamplingRecorder.mapping index 291cd2a43f..af7e9028a1 100644 --- a/mappings/net/minecraft/client/util/profiler/SamplingRecorder.mapping +++ b/mappings/net/minecraft/client/util/profiler/SamplingRecorder.mapping @@ -1,59 +1,33 @@ CLASS net/minecraft/class_5965 net/minecraft/client/util/profiler/SamplingRecorder - FIELD field_29598 metric Lnet/minecraft/class_5951; + FIELD field_29598 metric Lnet/minecraft/class_5949; FIELD field_29599 timeGetter Ljava/util/function/DoubleSupplier; FIELD field_29600 buffer Lio/netty/buffer/ByteBuf; FIELD field_29601 active Z FIELD field_29602 startAction Ljava/lang/Runnable; FIELD field_29603 writeAction Lnet/minecraft/class_5965$class_5967; - METHOD (Lnet/minecraft/class_5951;Ljava/util/function/DoubleSupplier;Ljava/lang/Runnable;Lnet/minecraft/class_5965$class_5967;)V - ARG 1 metric - ARG 2 timeGetter - ARG 3 startAction - ARG 4 writeAction - METHOD method_34775 length ()I - METHOD method_34776 create (Lnet/minecraft/class_5951;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965; - ARG 0 metric - ARG 1 timeGetter - METHOD method_34777 create (Ljava/lang/String;Ljava/lang/Object;Ljava/util/function/ToDoubleFunction;)Lnet/minecraft/class_5965; + METHOD method_34776 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965; + METHOD method_34778 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/lang/Object;Ljava/util/function/ToDoubleFunction;)Lnet/minecraft/class_5965; + METHOD method_34779 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)Lnet/minecraft/class_5965$class_5966; ARG 0 name - ARG 1 context - ARG 2 timeFunc - METHOD method_34778 create (Ljava/lang/String;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965; - ARG 0 name - ARG 1 timeGetter - METHOD method_34779 create (Ljava/lang/String;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)Lnet/minecraft/class_5965$class_5966; - ARG 0 name - ARG 1 timeFunc - ARG 2 context METHOD method_34780 start ()V - METHOD method_34781 sample ()V + METHOD method_34781 sample (I)V METHOD method_34782 stop ()V - METHOD method_34783 getMetric ()Lnet/minecraft/class_5951; - METHOD method_34784 canRead ()Z - METHOD method_34785 read ()D METHOD method_34786 checkState ()V CLASS class_5966 Builder - FIELD field_29604 metric Lnet/minecraft/class_5951; FIELD field_29605 timeGetter Ljava/util/function/DoubleSupplier; FIELD field_29606 context Ljava/lang/Object; FIELD field_29607 startAction Ljava/lang/Runnable; FIELD field_29608 writeAction Lnet/minecraft/class_5965$class_5967; - METHOD (Lnet/minecraft/class_5951;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)V - ARG 1 metric - ARG 2 contextTimeFunc - ARG 3 context METHOD method_34787 create ()Lnet/minecraft/class_5965; METHOD method_34788 writeAction (Lnet/minecraft/class_5965$class_5967;)Lnet/minecraft/class_5965$class_5966; ARG 1 writeAction METHOD method_34789 startAction (Ljava/util/function/Consumer;)Lnet/minecraft/class_5965$class_5966; ARG 1 action CLASS class_5967 ValueConsumer - METHOD method_34792 accept (D)V + METHOD method_34792 accept (D)Z ARG 1 value CLASS class_5968 HighPassValueConsumer FIELD field_29609 threshold F - FIELD field_29610 valueConsumer Ljava/util/function/DoubleConsumer; FIELD field_29611 lastValue D - METHOD (FLjava/util/function/DoubleConsumer;)V + METHOD (F)V ARG 1 threshold - ARG 2 valueConsumer diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 92ea37fc84..6c7d0f6e6b 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -103,8 +103,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 4 collisions METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 movement - METHOD method_17996 squaredHorizontalLength (Lnet/minecraft/class_243;)D - ARG 0 vector METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; METHOD method_18003 updateTrackedPosition (DDD)V ARG 1 x @@ -560,7 +558,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 status METHOD method_5712 playStepSound (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos - ARG 2 state METHOD method_5713 checkWaterState ()V METHOD method_5715 isSneaking ()Z METHOD method_5716 updateKilledAdvancementCriterion (Lnet/minecraft/class_1297;ILnet/minecraft/class_1282;)V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index c4a811f2f2..b97c6d04e8 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -196,7 +196,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_24833 getBoundingBox (Lnet/minecraft/class_4050;)Lnet/minecraft/class_238; ARG 1 pose METHOD method_25937 displaySoulSpeedEffects ()V - METHOD method_26082 applyStatusEffect (Lnet/minecraft/class_1293;)V + METHOD method_26082 applyStatusEffect (Lnet/minecraft/class_1293;Lnet/minecraft/class_1297;)V ARG 1 effect METHOD method_26084 (Lnet/minecraft/class_1309;)V ARG 0 player @@ -293,7 +293,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 2 playing METHOD method_6007 tickMovement ()V METHOD method_6008 markEffectsDirty ()V - METHOD method_6009 onStatusEffectUpgraded (Lnet/minecraft/class_1293;Z)V + METHOD method_6009 onStatusEffectUpgraded (Lnet/minecraft/class_1293;ZLnet/minecraft/class_1297;)V ARG 1 effect ARG 2 reapplyEffect METHOD method_6010 swimUpward (Lnet/minecraft/class_3494;)V @@ -319,7 +319,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 riptideTicks METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand - METHOD method_6020 onStatusEffectApplied (Lnet/minecraft/class_1293;)V + METHOD method_6020 onStatusEffectApplied (Lnet/minecraft/class_1293;Lnet/minecraft/class_1297;)V ARG 1 effect METHOD method_6021 clearActiveItem ()V METHOD method_6022 getStuckArrowCount ()I diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping index 7d7dc00716..0aedb198d6 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping @@ -17,12 +17,7 @@ CLASS net/minecraft/class_13 net/minecraft/entity/ai/pathing/PathNodeNavigator ARG 4 followRange ARG 5 distance ARG 6 rangeMultiplier - METHOD method_54 findPathToAny (Lnet/minecraft/class_9;Ljava/util/Map;FIF)Lnet/minecraft/class_11; - ARG 1 startNode - ARG 2 positions - ARG 3 followRange - ARG 4 distance - ARG 5 rangeMultiplier + METHOD method_54 findPathToAny (Lnet/minecraft/class_3695;Lnet/minecraft/class_9;Ljava/util/Map;FIF)Lnet/minecraft/class_11; METHOD method_55 createPath (Lnet/minecraft/class_9;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_11; ARG 1 endNode ARG 2 target diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 32195ee433..2425cd63df 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity METHOD method_33221 shouldBabyBeDifferent (Ljava/util/Random;)Z ARG 0 random METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V - ARG 0 player METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767; METHOD method_33226 isPlayingDead ()Z METHOD method_33227 createAxolotlAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/item/HoneycombItem.mapping b/mappings/net/minecraft/item/HoneycombItem.mapping index aa23a68ac8..1a39da0647 100644 --- a/mappings/net/minecraft/item/HoneycombItem.mapping +++ b/mappings/net/minecraft/item/HoneycombItem.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_5953 net/minecraft/item/HoneycombItem FIELD field_29560 UNWAXED_TO_WAXED_BLOCKS Ljava/util/function/Supplier; FIELD field_29561 WAXED_TO_UNWAXED_BLOCKS Ljava/util/function/Supplier; - METHOD method_34719 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1269; + METHOD method_34719 (Lnet/minecraft/class_1838;Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1269; ARG 3 state METHOD method_34720 getWaxedState (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 0 state diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 0e2db59fe9..3682503c08 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -121,7 +121,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item METHOD method_7858 getRecipeRemainder ()Lnet/minecraft/class_1792; COMMENT Gets the remainder item that should be left behind when this item is used as a crafting ingredient. METHOD method_7859 getGroup ()Lnet/minecraft/class_1761; - METHOD method_7860 postProcessNbt (Lnet/minecraft/class_2487;)Z + METHOD method_7860 postProcessNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_7861 finishUsing (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 stack diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index e192ba09ce..0f7ef911c9 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,12 +1,11 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate FIELD field_20692 ANY Lnet/minecraft/class_4550; FIELD field_20693 tag Lnet/minecraft/class_3494; - FIELD field_20694 block Lnet/minecraft/class_2248; + FIELD field_20694 block Ljava/util/Set; FIELD field_20695 state Lnet/minecraft/class_4559; FIELD field_20696 nbt Lnet/minecraft/class_2105; - METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V + METHOD (Lnet/minecraft/class_3494;Ljava/util/Set;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V ARG 1 tag - ARG 2 block ARG 3 state ARG 4 nbt METHOD method_22452 toJson ()Lcom/google/gson/JsonElement; @@ -18,14 +17,13 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate METHOD method_33185 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; ARG 0 id CLASS class_4710 Builder - FIELD field_21572 block Lnet/minecraft/class_2248; + FIELD field_21572 block Ljava/util/Set; FIELD field_21573 tag Lnet/minecraft/class_3494; FIELD field_21574 state Lnet/minecraft/class_4559; FIELD field_21575 nbt Lnet/minecraft/class_2105; METHOD method_23880 create ()Lnet/minecraft/class_4550$class_4710; METHOD method_23882 build ()Lnet/minecraft/class_4550; - METHOD method_27962 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4550$class_4710; - ARG 1 block + METHOD method_27962 block ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4550$class_4710; METHOD method_27963 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4550$class_4710; ARG 1 state METHOD method_29233 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_4550$class_4710; diff --git a/mappings/net/minecraft/predicate/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/PlayerPredicate.mapping index eb2680e74a..b342252f99 100644 --- a/mappings/net/minecraft/predicate/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/PlayerPredicate.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate FIELD field_20725 stats Ljava/util/Map; FIELD field_20726 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; FIELD field_20727 advancements Ljava/util/Map; - METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1934;Ljava/util/Map;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;)V + METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1934;Ljava/util/Map;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;Lnet/minecraft/class_2048;)V ARG 1 experienceLevel ARG 2 gameMode ARG 3 stats @@ -23,11 +23,10 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate ARG 1 stat METHOD method_22499 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4553; ARG 0 json - METHOD method_22500 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Lnet/minecraft/class_4553$class_4556;)V + METHOD method_22500 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)V ARG 1 id - METHOD method_22501 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)V + METHOD method_22501 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Lnet/minecraft/class_4553$class_4556;)V ARG 1 id - ARG 2 present METHOD method_22503 criterionFromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4553$class_4556; ARG 0 json CLASS class_4554 AdvancementCriteriaPredicate diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index e1cfff7265..fec384440a 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -13,32 +13,14 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_9599 ANY Lnet/minecraft/class_2048; FIELD field_9600 nbt Lnet/minecraft/class_2105; FIELD field_9601 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Ljava/lang/String;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_6404;Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 type ARG 2 distance ARG 3 location - ARG 4 effects - ARG 5 nbt - ARG 6 flags - ARG 7 equipment - ARG 8 player - ARG 9 fishingHook - ARG 10 team - ARG 11 catType - METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_6404;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 type ARG 2 distance ARG 3 location - ARG 4 effects - ARG 5 nbt - ARG 6 flags - ARG 7 equipment - ARG 8 player - ARG 9 fishingHook - ARG 10 vehicle - ARG 11 targetedEntity - ARG 12 team - ARG 13 catType METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 0 player ARG 1 target diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index a8cb63b1c0..35ea6abb57 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -4,13 +4,12 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_9641 count Lnet/minecraft/class_2096$class_2100; FIELD field_9642 potion Lnet/minecraft/class_1842; FIELD field_9643 tag Lnet/minecraft/class_3494; - FIELD field_9644 item Lnet/minecraft/class_1792; + FIELD field_9644 item Ljava/util/Set; FIELD field_9645 nbt Lnet/minecraft/class_2105; FIELD field_9646 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9647 enchantments [Lnet/minecraft/class_2035; - METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_1792;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V + METHOD (Lnet/minecraft/class_3494;Ljava/util/Set;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V ARG 1 tag - ARG 2 item ARG 3 count ARG 4 durability ARG 5 enchantments @@ -30,7 +29,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate FIELD field_20690 storedEnchantments Ljava/util/List; FIELD field_9648 count Lnet/minecraft/class_2096$class_2100; FIELD field_9649 enchantments Ljava/util/List; - FIELD field_9650 item Lnet/minecraft/class_1792; + FIELD field_9650 item Ljava/util/Set; FIELD field_9651 potion Lnet/minecraft/class_1842; FIELD field_9652 tag Lnet/minecraft/class_3494; FIELD field_9653 durability Lnet/minecraft/class_2096$class_2100; @@ -49,7 +48,6 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD method_8975 tag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2073$class_2074; ARG 1 tag METHOD method_8976 build ()Lnet/minecraft/class_2073; - METHOD method_8977 item (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2073$class_2074; - ARG 1 item + METHOD method_8977 item ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2073$class_2074; METHOD method_8978 enchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; ARG 1 enchantment diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index 566a927ed5..c223237642 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -98,7 +98,6 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler METHOD method_7594 unpackQuickCraftStage (I)I ARG 0 quickCraftData METHOD method_7595 close (Lnet/minecraft/class_1657;)V - ARG 1 player METHOD method_7596 addListener (Lnet/minecraft/class_1712;)V ARG 1 listener METHOD method_7597 canUse (Lnet/minecraft/class_1657;)Z diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 81719275fa..042d4fb629 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_19248 nextTickTimestamp J FIELD field_19249 waitingForNextTick Z FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; - FIELD field_22250 tickTimeTracker Lnet/minecraft/class_4757; + FIELD field_22250 tickTimeTracker Lnet/minecraft/class_5962; FIELD field_23784 session Lnet/minecraft/class_32$class_5143; FIELD field_24370 structureManager Lnet/minecraft/class_3485; FIELD field_24371 saveHandler Lnet/minecraft/class_29; @@ -76,7 +76,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4593 metadata Lnet/minecraft/class_2926; FIELD field_4595 dataPackManager Lnet/minecraft/class_3283; FIELD field_4596 playerIdleTimeout I - FIELD field_4597 profilerStartQueued Z FIELD field_4599 proxy Ljava/net/Proxy; FIELD field_4602 random Ljava/util/Random; FIELD field_4603 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; @@ -113,8 +112,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 locked METHOD method_21613 dump (Ljava/nio/file/Path;)V ARG 1 path - METHOD method_21614 dumpExampleCrash (Ljava/nio/file/Path;)V - ARG 1 path METHOD method_21615 dumpGamerules (Ljava/nio/file/Path;)V ARG 1 path METHOD method_21616 dumpClasspath (Ljava/nio/file/Path;)V @@ -127,12 +124,10 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_22827 getDataCommandStorage ()Lnet/minecraft/class_4565; METHOD method_22828 getPredicateManager ()Lnet/minecraft/class_4567; METHOD method_24307 getModdedStatusMessage ()Ljava/util/Optional; - METHOD method_24487 startMonitor (Lnet/minecraft/class_4758;)V - ARG 1 monitor + METHOD method_24487 startMonitor ()V METHOD method_24488 isDebugRunning ()Z METHOD method_24489 stopDebug ()Lnet/minecraft/class_3696; - METHOD method_24490 endMonitor (Lnet/minecraft/class_4758;)V - ARG 1 monitor + METHOD method_24490 endMonitor ()V METHOD method_27050 getSavePath (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; ARG 1 worldSavePath METHOD method_27051 syncChunkWrites ()Z @@ -351,8 +346,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3856 forcePlayerSampleUpdate ()V METHOD method_3857 getLootManager ()Lnet/minecraft/class_60; METHOD method_3858 getPlayerNames ()[Ljava/lang/String; - METHOD method_3859 populateCrashReport (Lnet/minecraft/class_129;)V - ARG 1 section + METHOD method_3859 populateCrashReport (Lnet/minecraft/class_6396;)Lnet/minecraft/class_6396; METHOD method_3860 isRemote ()Z METHOD method_3861 loadWorldResourcePack ()V METHOD method_3862 getPlayerIdleTimeout ()I diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 74ef6866b3..56288c51a3 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand FIELD field_13596 ALREADY_RUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13597 NOT_RUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_20283 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_20310 FILE_SYSTEM_PROVIDER Ljava/nio/file/spi/FileSystemProvider; METHOD method_13154 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13156 register (Lcom/mojang/brigadier/CommandDispatcher;)V @@ -13,14 +12,8 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand ARG 0 source METHOD method_13159 executeStart (Lnet/minecraft/class_2168;)I ARG 0 source - METHOD method_13161 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_21617 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_21618 createDebugReport (Lnet/minecraft/class_2168;)I - ARG 0 source - METHOD method_21675 (Ljava/nio/file/spi/FileSystemProvider;)Z - ARG 0 fileSystemProvider METHOD method_36353 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_36354 executeFunction (Lnet/minecraft/class_2168;Ljava/util/Collection;)I diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 1663176e2c..88566b29d8 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -117,18 +117,9 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_33559 error (Ljava/lang/String;)V ARG 0 message METHOD method_33560 pause ()V - METHOD method_33786 (Ljava/lang/Object;Ljava/util/List;)Ljava/util/List; - ARG 0 eachResult - ARG 1 collectedResults METHOD method_33787 debugRunnable (Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable; ARG 0 activeThreadName ARG 1 task - METHOD method_33788 (Ljava/util/List;Ljava/util/List;)Ljava/util/List; - ARG 0 firstResults - ARG 1 secondResults - METHOD method_33789 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; - ARG 0 firstCollected - ARG 1 secondCollected METHOD method_33791 combineSafe (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; COMMENT Combines a list of {@code futures} into one future that holds a list COMMENT of their results. @@ -140,9 +131,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT @see #combine(List) ARG 0 futures COMMENT the completable futures to combine - METHOD method_33792 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; - ARG 0 collected - ARG 1 each METHOD method_34865 memoize (Ljava/util/function/BiFunction;)Ljava/util/function/BiFunction; ARG 0 biFunction METHOD method_34866 memoize (Ljava/util/function/Function;)Ljava/util/function/Function; diff --git a/mappings/net/minecraft/util/crash/CrashReport.mapping b/mappings/net/minecraft/util/crash/CrashReport.mapping index f2063da31f..3cbfd22ce8 100644 --- a/mappings/net/minecraft/util/crash/CrashReport.mapping +++ b/mappings/net/minecraft/util/crash/CrashReport.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport FIELD field_1089 otherSections Ljava/util/List; FIELD field_1090 file Ljava/io/File; FIELD field_1091 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_1092 systemDetailsSection Lnet/minecraft/class_129; + FIELD field_1092 systemDetailsSection Lnet/minecraft/class_6396; FIELD field_1093 cause Ljava/lang/Throwable; METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message @@ -18,7 +18,6 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport ARG 1 name ARG 2 ignoredStackTraceCallCount METHOD method_557 getCauseAsString ()Ljava/lang/String; - METHOD method_559 fillSystemDetails ()V METHOD method_560 create (Ljava/lang/Throwable;Ljava/lang/String;)Lnet/minecraft/class_128; ARG 0 cause ARG 1 title @@ -26,7 +25,7 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport METHOD method_562 addElement (Ljava/lang/String;)Lnet/minecraft/class_129; ARG 1 name METHOD method_564 getCause ()Ljava/lang/Throwable; - METHOD method_567 getSystemDetailsSection ()Lnet/minecraft/class_129; + METHOD method_567 getSystemDetailsSection ()Lnet/minecraft/class_6396; METHOD method_568 asString ()Ljava/lang/String; METHOD method_569 writeToFile (Ljava/io/File;)Z ARG 1 file diff --git a/mappings/net/minecraft/util/crash/CrashReportSection.mapping b/mappings/net/minecraft/util/crash/CrashReportSection.mapping index 7513c8dcb2..71f875a86d 100644 --- a/mappings/net/minecraft/util/crash/CrashReportSection.mapping +++ b/mappings/net/minecraft/util/crash/CrashReportSection.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection FIELD field_1094 elements Ljava/util/List; - FIELD field_1095 report Lnet/minecraft/class_128; FIELD field_1096 title Ljava/lang/String; FIELD field_1097 stackTrace [Ljava/lang/StackTraceElement; - METHOD (Lnet/minecraft/class_128;Ljava/lang/String;)V - ARG 1 report - ARG 2 title METHOD method_574 addStackTrace (Ljava/lang/StringBuilder;)V ARG 1 crashReportBuilder METHOD method_575 getStackTrace ()[Ljava/lang/StackTraceElement; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 7b13b8ce00..53f3db8174 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -83,8 +83,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_15367 floorMod (DD)D ARG 0 dividend ARG 2 divisor - METHOD method_15368 sqrt (D)F - ARG 0 value METHOD method_15369 hsvToRgb (FFF)I ARG 0 hue ARG 1 saturation diff --git a/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping index 50e0363583..45596a3c83 100644 --- a/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/InterpolatedNoiseSampler.mapping @@ -9,9 +9,6 @@ CLASS net/minecraft/class_5822 net/minecraft/util/math/noise/InterpolatedNoiseSa METHOD (Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_33657 sample (IIIDDDD)D - ARG 1 x - ARG 2 y - ARG 3 z ARG 4 horizontalScale ARG 6 verticalScale ARG 8 horizontalStretch diff --git a/mappings/net/minecraft/util/profiler/MetricSuppliers.mapping b/mappings/net/minecraft/util/profiler/MetricSuppliers.mapping index 8af39f07a3..d27fafa79c 100644 --- a/mappings/net/minecraft/util/profiler/MetricSuppliers.mapping +++ b/mappings/net/minecraft/util/profiler/MetricSuppliers.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_5950 net/minecraft/util/profiler/MetricSuppliers FIELD field_29555 INSTANCE Lnet/minecraft/class_5950; FIELD field_29556 samplers Ljava/util/WeakHashMap; - METHOD method_34701 getSamplers ()Ljava/util/Map; METHOD method_34702 add (Lnet/minecraft/class_5952;)V ARG 1 supplier diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index aec7356843..1dcea29fec 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem FIELD field_21819 currentInfo Lnet/minecraft/class_3533$class_4746; FIELD field_21961 timeGetter Ljava/util/function/LongSupplier; METHOD (Ljava/util/function/LongSupplier;Ljava/util/function/IntSupplier;Z)V - ARG 1 timeGetter ARG 2 tickGetter ARG 3 checkTimeout METHOD method_24246 getCurrentInfo ()Lnet/minecraft/class_3533$class_4746; diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index 7f78c0e968..b04a61b27b 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -21,10 +21,6 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager ARG 2 spawnAnimals METHOD method_12130 getLightingProvider ()Lnet/minecraft/class_3568; METHOD method_14151 getLoadedChunkCount ()I - METHOD method_20529 shouldTickBlock (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_20591 shouldTickChunk (Lnet/minecraft/class_1923;)Z - ARG 1 pos METHOD method_21730 getWorldChunk (II)Lnet/minecraft/class_2818; ARG 1 chunkX ARG 2 chunkZ diff --git a/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping b/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping index d59fa3cfed..f233166127 100644 --- a/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/GeodeLayerConfig.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_5585 net/minecraft/world/gen/feature/GeodeLayerConfig FIELD field_27299 outerLayerProvider Lnet/minecraft/class_4651; FIELD field_27300 innerBlocks Ljava/util/List; FIELD field_27301 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Ljava/util/List;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Ljava/util/List;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V ARG 1 fillingProvider ARG 2 innerLayerProvider ARG 3 alternateInnerLayerProvider diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index 4c352edb5c..9b841c5b33 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -22,8 +22,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_16425 isReplaceablePlant (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_16426 (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_16428 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_16431 (Lnet/minecraft/class_2680;)Z @@ -31,9 +29,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_16432 canTreeReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_16433 canPlaceTreeOn (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251; METHOD method_23384 (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index c187c15d01..477e283a4e 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -9,16 +9,10 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_29279 dirtProvider Lnet/minecraft/class_4651; FIELD field_29280 foliageProvider Lnet/minecraft/class_4651; FIELD field_29281 forceDirt Z - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V ARG 1 trunkProvider ARG 2 trunkPlacer ARG 3 foliageProvider - ARG 4 foliagePlacer - ARG 5 dirtProvider - ARG 6 minimumSize - ARG 7 decorators - ARG 8 ignoreVines - ARG 9 forceDirt METHOD method_27373 setTreeDecorators (Ljava/util/List;)Lnet/minecraft/class_4643; ARG 1 decorators CLASS class_4644 Builder @@ -31,12 +25,10 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_29282 foliageProvider Lnet/minecraft/class_4651; FIELD field_29283 dirtProvider Lnet/minecraft/class_4651; FIELD field_29284 forceDirt Z - METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;)V + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;)V ARG 1 trunkProvider ARG 2 trunkPlacer ARG 3 foliageProvider - ARG 4 foliagePlacer - ARG 5 minimumSize METHOD method_23445 build ()Lnet/minecraft/class_4643; METHOD method_27374 ignoreVines ()Lnet/minecraft/class_4643$class_4644; METHOD method_27376 decorators (Ljava/util/List;)Lnet/minecraft/class_4643$class_4644;