From eeb1f3433e308c068c51ca0c341c7d7ee68ad1b2 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:09:06 +0900 Subject: [PATCH] 23w32a more stuff --- .../minecraft/client/MinecraftClient.mapping | 1 + .../minecraft/client/gui/hud/DebugHud.mapping | 5 +++ .../client/gui/hud/debug/DebugChart.mapping | 37 +++++++++++++++++++ .../client/gui/hud/debug/FpsChart.mapping | 3 ++ .../gui/hud/debug/PacketSizeChart.mapping | 19 ++++++++++ .../client/gui/hud/debug/PingChart.mapping | 1 + .../client/gui/hud/debug/TpsChart.mapping | 3 ++ .../client/gui/screen/Screen.mapping | 2 +- .../client/gui/widget/EntryListWidget.mapping | 1 + .../gui/widget/ScrollableWidget.mapping | 5 +++ .../client/gui/widget/TextFieldWidget.mapping | 1 + .../screen/RealmsConfigureWorldScreen.mapping | 10 ++++- .../gui/screen/RealmsMainScreen.mapping | 8 ++++ .../command/FloatRangeArgument.mapping | 4 -- ...laAdventureTabAdvancementGenerator.mapping | 1 + .../entity/AreaEffectCloudEntity.mapping | 1 + .../net/minecraft/nbt/StringNbtReader.mapping | 3 ++ .../minecraft/network/PacketByteBuf.mapping | 4 +- .../ClientPingResultPacketListener.mapping | 2 +- .../ServerQueryPingPacketListener.mapping | 2 +- .../s2c/common/CommonPingS2CPacket.mapping | 1 - .../minecraft/registry/SimpleRegistry.mapping | 5 +++ .../registry/entry/RegistryEntryList.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 2 + mappings/net/minecraft/stat/StatType.mapping | 1 + .../net/minecraft/util/JsonHelper.mapping | 1 + .../minecraft/util/math/MathHelper.mapping | 15 ++++++++ 27 files changed, 128 insertions(+), 11 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/FpsChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/debug/TpsChart.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index c18dfe12f0..5b0069c277 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -527,6 +527,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_52703 enterReconfiguration (Lnet/minecraft/class_437;)V ARG 1 screen METHOD method_53462 getGameProfile ()Lcom/mojang/authlib/GameProfile; + METHOD method_53463 getFpsLog ()Lnet/minecraft/class_8743; METHOD method_53465 onFinishedLoading ()V METHOD method_53466 isFinishedLoading ()Z CLASS class_5859 ChatRestriction diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 4094d741be..bd1fe0a391 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -9,6 +9,10 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2085 pos Lnet/minecraft/class_1923; FIELD field_32187 TEXT_COLOR I FIELD field_38985 allocationRateCalculator Lnet/minecraft/class_340$class_7412; + FIELD field_45910 fpsChart Lnet/minecraft/class_8757; + FIELD field_45911 pingChart Lnet/minecraft/class_8758; + FIELD field_45912 packetSizeChart Lnet/minecraft/class_8756; + FIELD field_45913 tpsChart Lnet/minecraft/class_8759; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1834 getChunk ()Lnet/minecraft/class_2818; @@ -55,6 +59,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 1 context ARG 2 text ARG 3 left + METHOD method_53467 getOrCreateTpsChart ()Lnet/minecraft/class_8759; CLASS class_7412 AllocationRateCalculator FIELD field_38986 INTERVAL I FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping new file mode 100644 index 0000000000..c7a95b22aa --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart + FIELD field_45915 TEXT_COLOR I + FIELD field_45918 textRenderer Lnet/minecraft/class_327; + FIELD field_45919 log Lnet/minecraft/class_8743; + METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_8743;)V + ARG 1 textRenderer + ARG 2 log + METHOD method_53468 format (D)Ljava/lang/String; + ARG 1 value + METHOD method_53469 getColor (DDIDIDI)I + ARG 1 value + ARG 3 min + ARG 5 minColor + ARG 6 median + ARG 8 medianColor + ARG 9 max + ARG 11 maxColor + METHOD method_53470 getWidth (I)I + ARG 1 centerX + METHOD method_53471 getColor (J)I + ARG 1 value + METHOD method_53472 render (Lnet/minecraft/class_332;II)V + ARG 1 context + ARG 2 x + ARG 3 width + METHOD method_53473 renderThresholds (Lnet/minecraft/class_332;III)V + ARG 1 context + ARG 2 x + ARG 3 width + ARG 4 height + METHOD method_53474 drawBorderedText (Lnet/minecraft/class_332;Ljava/lang/String;II)V + ARG 1 context + ARG 2 string + ARG 3 x + ARG 4 y + METHOD method_53475 getHeight (D)I + ARG 1 value diff --git a/mappings/net/minecraft/client/gui/hud/debug/FpsChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/FpsChart.mapping new file mode 100644 index 0000000000..a8ae9c7fc8 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/FpsChart.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8757 net/minecraft/client/gui/hud/debug/FpsChart + METHOD method_53481 toFramesPerMillisecond (D)D + ARG 0 framesPerNanosecond diff --git a/mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping new file mode 100644 index 0000000000..7e8e58aa4a --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/PacketSizeChart.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_8756 net/minecraft/client/gui/hud/debug/PacketSizeChart + METHOD method_53476 drawSizeBar (Lnet/minecraft/class_332;IIII)V + ARG 1 context + ARG 2 x + ARG 3 width + ARG 4 height + ARG 5 bytes + METHOD method_53477 drawSizeBar (Lnet/minecraft/class_332;IIILjava/lang/String;)V + ARG 1 context + ARG 2 x + ARG 3 width + ARG 4 y + ARG 5 label + METHOD method_53478 formatBytesPerSecond (D)Ljava/lang/String; + ARG 0 value + METHOD method_53479 calculateHeight (D)I + ARG 0 value + METHOD method_53480 toBytesPerSecond (D)D + ARG 0 bytesPerTick diff --git a/mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping new file mode 100644 index 0000000000..b27d4fe255 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/PingChart.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8758 net/minecraft/client/gui/hud/debug/PingChart diff --git a/mappings/net/minecraft/client/gui/hud/debug/TpsChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/TpsChart.mapping new file mode 100644 index 0000000000..78243a4117 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/debug/TpsChart.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8759 net/minecraft/client/gui/hud/debug/TpsChart + METHOD method_53482 toTicksPerMillisecond (D)D + ARG 0 ticksPerNanosecond diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index 2de1f726f3..6409442069 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25420 renderBackground (Lnet/minecraft/class_332;IIF)V COMMENT Renders the background of this screen. COMMENT - COMMENT

If the client is in a world, {@linkplain #renderIngameBackground + COMMENT

If the client is in a world, {@linkplain #renderInGameBackground COMMENT renders the translucent background gradient}. COMMENT Otherwise {@linkplain #renderBackgroundTexture renders the background texture}. ARG 1 context diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 99b8993656..38697e389b 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget FIELD field_22751 selected Lnet/minecraft/class_350$class_351; FIELD field_26846 renderBackground Z FIELD field_33780 hoveredEntry Lnet/minecraft/class_350$class_351; + FIELD field_45908 SCROLLER_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;IIIII)V ARG 1 client ARG 2 width diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index d5198e6d33..1f61b93767 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget FIELD field_39496 PADDING I FIELD field_39497 scrollY D FIELD field_39498 scrollbarDragged Z + FIELD field_45905 TEXT_FIELD_TEXTURES Lnet/minecraft/class_8666; + FIELD field_45906 SCROLLER_TEXTURE Lnet/minecraft/class_2960; METHOD method_44381 getPadding ()I METHOD method_44382 setScrollY (D)V ARG 1 scrollY @@ -43,5 +45,8 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44396 drawScrollbar (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_52233 drawBox (Lnet/minecraft/class_332;IIII)V + ARG 1 context + ARG 2 x + ARG 3 y ARG 4 width ARG 5 height diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index d35dae86c5..c185ba664c 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget FIELD field_32199 HORIZONTAL_CURSOR Ljava/lang/String; FIELD field_41100 placeholder Lnet/minecraft/class_2561; FIELD field_45352 lastSwitchFocusTime J + FIELD field_45914 TEXTURES Lnet/minecraft/class_8666; METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;)V ARG 1 textRenderer ARG 2 x diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index 0cfac11c19..107a7f9142 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21200 buttonCenter (II)I ARG 1 i ARG 2 total - METHOD method_21201 drawServerStatus (Lnet/minecraft/class_332;IIII)V + METHOD method_21201 drawServerState (Lnet/minecraft/class_332;IIII)V ARG 1 context ARG 2 x ARG 3 y @@ -103,3 +103,11 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 tooltip METHOD method_32484 switchMinigame (Lnet/minecraft/class_4890;)V ARG 1 template + METHOD method_53460 drawServerState (Lnet/minecraft/class_332;IIIILnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 mouseX + ARG 5 mouseY + ARG 6 texture + ARG 7 tooltipGetter diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 482f17fafc..d854762c26 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -194,6 +194,14 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 8 yOffset METHOD method_52653 play ()V METHOD method_52654 createRealm ()V + METHOD method_53452 drawServerState (Lnet/minecraft/class_332;IIIILnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 mouseX + ARG 5 mouseY + ARG 6 texture + ARG 7 tooltipGetter CLASS class_4866 Entry METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877; CLASS class_8200 VisitButtonEntry diff --git a/mappings/net/minecraft/command/FloatRangeArgument.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping index 7b78dea6b1..1a12a1ac5d 100644 --- a/mappings/net/minecraft/command/FloatRangeArgument.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument - FIELD comp_1840 min Ljava/lang/Float; - FIELD comp_1841 max Ljava/lang/Float; FIELD field_9780 ANY Lnet/minecraft/class_2152; FIELD field_9781 ONLY_INTS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD (Ljava/lang/Float;Ljava/lang/Float;)V ARG 1 min ARG 2 max - METHOD comp_1840 min ()Ljava/lang/Float; - METHOD comp_1841 max ()Ljava/lang/Float; METHOD method_35400 isInSquaredRange (D)Z ARG 1 value METHOD method_35401 exactly (F)Lnet/minecraft/class_2152; diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index 6db5e88ffa..2f2390188a 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van ARG 1 item METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)Lnet/minecraft/class_6405$class_6406; ARG 0 range + ARG 1 entity METHOD method_49356 buildAdventuringTime (Ljava/util/function/Consumer;Lnet/minecraft/class_161;Lnet/minecraft/class_8197$class_5305;)V ARG 0 exporter ARG 1 parent diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index 90d1d8d45b..fa117895c9 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity FIELD field_29971 MAX_RADIUS F + FIELD field_45738 EFFECTS_NBT_KEY Ljava/lang/String; FIELD field_5928 customColor Z FIELD field_5929 radiusOnUse F FIELD field_5930 radiusGrowth F diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping index 6233c07b5e..93ea018594 100644 --- a/mappings/net/minecraft/nbt/StringNbtReader.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader FIELD field_33268 SQUARE_CLOSE_BRACKET C FIELD field_33269 RIGHT_CURLY_BRACKET C FIELD field_33270 LEFT_CURLY_BRACKET C + FIELD field_45952 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/brigadier/StringReader;)V ARG 1 reader METHOD method_10716 readComma ()Z @@ -61,3 +62,5 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader ARG 1 expectedType METHOD method_10731 parsePrimitive (Ljava/lang/String;)Lnet/minecraft/class_2520; ARG 1 input + METHOD method_53502 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 nbt diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 9b96ed3214..4e4ab9ddb1 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -102,7 +102,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link RegistryKey}{@link #readRegistryKey(RegistryKey)}{@link #writeRegistryKey(RegistryKey)} COMMENT COMMENT - COMMENT {@link RegistryKey} of a registry{@link #readRegistryRef()}{@link #writeRegistryKey(RegistryKey)} + COMMENT {@link RegistryKey} of a registry{@link #readRegistryRefKey()}{@link #writeRegistryKey(RegistryKey)} COMMENT COMMENT COMMENT {@link Date}{@link #readDate()}{@link #writeDate(Date)} @@ -324,7 +324,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return this buf, for chaining COMMENT @see #readVarLong() - COMMENT @see net.minecraft.network.encoding.VarLong + COMMENT @see net.minecraft.network.encoding.VarLongs ARG 1 value COMMENT the value to write METHOD method_10792 readVarLong ()J diff --git a/mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping index 78582e4e9a..900ca2af03 100644 --- a/mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPingResultPacketListener.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8763 net/minecraft/network/listener/ClientPingResultPacketListener METHOD method_12666 onPingResult (Lnet/minecraft/class_2923;)V COMMENT Handles a packet from the server that includes the "ping" (connection latency). - COMMENT This is different from {@link net.minecraft.network.c2s.common.CommonPongS2CPacket}, + COMMENT This is different from {@link net.minecraft.network.packet.c2s.common.CommonPongC2SPacket}, COMMENT which is sent by the client to acknowledgment a ping packet from the server. ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping index 6bf4101fb0..1b32d7e1bf 100644 --- a/mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerQueryPingPacketListener.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8740 net/minecraft/network/listener/ServerQueryPingPacketListener METHOD method_12697 onQueryPing (Lnet/minecraft/class_2935;)V COMMENT Handles a packet from client to query the "ping" (connection latency). - COMMENT This is different from {@link net.minecraft.network.s2c.common.CommonPingS2CPacket}, + COMMENT This is different from {@link net.minecraft.network.packet.s2c.common.CommonPingS2CPacket}, COMMENT which can be sent by the server to request acknowledgment. ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping index 888fd562f5..a869ccf7ed 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/common/CommonPin COMMENT COMMENT @see net.minecraft.network.packet.c2s.common.CommonPongC2SPacket COMMENT @see net.minecraft.network.packet.s2c.common.KeepAliveS2CPacket - COMMENT @see net.minecraft.network.packet.s2c.query.QueryPongS2CPacket FIELD field_33751 parameter I COMMENT The parameter of this ping packet. COMMENT diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index 8fea2084d8..0cf447160b 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -64,4 +64,9 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry ARG 0 value ARG 1 entry METHOD method_45939 assertNotFrozen ()V + METHOD method_46744 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883; + ARG 1 rawId + ARG 2 key + ARG 3 value + ARG 4 lifecycle CLASS 1 diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping index ec84ac96ed..efd83152eb 100644 --- a/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_6885 net/minecraft/registry/entry/RegistryEntryList METHOD method_40244 of (Ljava/util/function/Function;Ljava/util/Collection;)Lnet/minecraft/class_6885$class_6886; COMMENT {@return a new direct list of {@code values} converted to a registry entry with {@code mapper}} ARG 0 mapper + ARG 1 values METHOD method_40245 of (Ljava/util/function/Function;[Ljava/lang/Object;)Lnet/minecraft/class_6885$class_6886; COMMENT {@return a new direct list of {@code values} converted to a registry entry with {@code mapper}} ARG 0 mapper diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 893ecd48ff..fd76847b7f 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -75,6 +75,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4591 commandFunctionManager Lnet/minecraft/class_2991; FIELD field_4592 tickTime F FIELD field_4593 metadata Lnet/minecraft/class_2926; + FIELD field_45951 tpsLog Lnet/minecraft/class_8743; FIELD field_4595 dataPackManager Lnet/minecraft/class_3283; FIELD field_4596 playerIdleTimeout I FIELD field_4599 proxy Ljava/net/Proxy; @@ -436,6 +437,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_49750 sendTimeUpdatePackets (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_52344 shouldLogIps ()Z + METHOD method_53500 getTpsLog ()Lnet/minecraft/class_8743; METHOD method_5387 isMainThread ()Z CLASS class_6414 DebugStart FIELD field_33980 time J diff --git a/mappings/net/minecraft/stat/StatType.mapping b/mappings/net/minecraft/stat/StatType.mapping index 32c791416b..8b742f1ff7 100644 --- a/mappings/net/minecraft/stat/StatType.mapping +++ b/mappings/net/minecraft/stat/StatType.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3448 net/minecraft/stat/StatType FIELD field_26382 name Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2561;)V ARG 1 registry + ARG 2 name METHOD method_14955 getOrCreateStat (Ljava/lang/Object;Lnet/minecraft/class_3446;)Lnet/minecraft/class_3445; ARG 1 key ARG 2 formatter diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index e9ecb32b7d..1f998a8531 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -178,6 +178,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_34916 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; ARG 0 object ARG 1 key + ARG 2 defaultValue METHOD method_34917 getBigDecimal (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/math/BigDecimal;)Ljava/math/BigDecimal; ARG 0 object ARG 1 element diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 04558efab9..036ef73766 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -503,3 +503,18 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 value ARG 2 min ARG 4 max + METHOD method_53063 lerpPositive (FII)I + COMMENT {@return linear interpolation of {@code delta} between {@code start} and {@code end}, + COMMENT except that for any positive {@code delta} the value is positive} + COMMENT + COMMENT

Like {@link #lerp(int, int, int)}, {@code lerpPositive(0, 0, 10)} returns {@code 0}. + COMMENT However, if the delta is {@code 0.01f}, the {@code lerp} method would return {@code 0} + COMMENT since {@code 0.01 * 10} floored is {@code 0}. This method returns {@code 1} in this + COMMENT situation. + COMMENT + COMMENT @apiNote This is used to calculate redstone comparator output and boss bar percentage. + COMMENT + COMMENT @see #lerp(float, int, int) + ARG 0 delta + ARG 1 start + ARG 2 end