From 0a619ac3ca6a21656682219715ed0b189b52f78c Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 25 May 2024 18:48:03 -0400 Subject: [PATCH 01/12] Add some screen mappings --- mappings/net/minecraft/client/gui/screen/Screen.mapping | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index 77cde64b02..b5e790a5b2 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -12,6 +12,9 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_22791 buttons Ljava/util/List; FIELD field_22792 passEvents Z FIELD field_22793 textRenderer Lnet/minecraft/class_327; + FIELD field_2559 height I + FIELD field_2561 width I + FIELD field_2563 client Lnet/minecraft/class_310; FIELD field_33813 selected Lnet/minecraft/class_6379; FIELD field_33814 SCREEN_USAGE_TEXT Lnet/minecraft/class_2561; FIELD field_33815 selectables Ljava/util/List; From 65b9af0fb7a5feee910c1d239f828fee77ee2659 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 25 May 2024 21:33:27 -0400 Subject: [PATCH 02/12] Add some profiler mappings --- mappings/net/minecraft/client/MinecraftClient.mapping | 2 ++ mappings/net/minecraft/util/profiler/ProfilerSystem.mapping | 3 +++ 2 files changed, 5 insertions(+) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 2ad9d35bfb..947ca16abd 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT COMMENT @see net.minecraft.server.integrated.IntegratedServer COMMENT @see net.minecraft.client.render.GameRenderer + FIELD field_0_2522 resourcePackDir Ljava/io/File; FIELD field_16240 profiler Lnet/minecraft/class_3689; FIELD field_16240 profiler Lnet/minecraft/class_3695; FIELD field_16762 game Lnet/minecraft/class_3799; @@ -75,6 +76,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1713 particleManager Lnet/minecraft/class_702; FIELD field_1714 musicTracker Lnet/minecraft/class_1142; FIELD field_1715 resourcePackManager Lnet/minecraft/class_3283; + FIELD field_1716 tickProfilerResult Lnet/minecraft/class_3533; FIELD field_1717 languageManager Lnet/minecraft/class_1076; FIELD field_1718 memoryReservedForCrash [B FIELD field_1719 cameraEntity Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index dbbd9f2608..4bf5b3806f 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -19,9 +19,12 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem ARG 1 timeGetter ARG 2 tickGetter ARG 3 checkTimeout + METHOD method_15401 getTimings (Ljava/lang/String;)Ljava/util/List; METHOD method_24245 (Ljava/lang/String;)Lnet/minecraft/class_3533$class_4746; ARG 0 k METHOD method_24246 getCurrentInfo ()Lnet/minecraft/class_3533$class_4746; + CLASS class_3534 ProfilerTiming + FIELD field_15738 name Ljava/lang/String; CLASS class_4746 LocatedInfo FIELD field_21820 totalTime J FIELD field_21821 visits J From a466897642d6f1b72389163c34152cddb9dd4e0a Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 25 May 2024 21:33:41 -0400 Subject: [PATCH 03/12] Add screen related mappings --- .../client/gui/DrawableHelper.mapping | 32 +++++++++++++++++++ .../client/gui/screen/ChatScreen.mapping | 1 + .../client/gui/screen/Screen.mapping | 17 ++++++++++ .../client/render/BufferBuilder.mapping | 1 + 4 files changed, 51 insertions(+) diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index c2d3e73ec4..626b468f36 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper + FIELD field_2051 optionsBackground Lnet/minecraft/class_2960; + FIELD field_2052 statsIcons Lnet/minecraft/class_2960; + FIELD field_2053 icons Lnet/minecraft/class_2960; FIELD field_22734 zOffset I COMMENT The z offset used by {@link DrawableHelper}. FIELD field_22735 OPTIONS_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; @@ -112,6 +115,35 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 8 v ARG 9 texWidth ARG 10 texHeight + METHOD method_1780 drawText (Lnet/minecraft/class_0_681;Ljava/lang/String;III)V + ARG 1 textRenderer + ARG 2 text + ARG 3 x + ARG 4 y + ARG 5 color + METHOD method_1782 fillGradient (IIIIII)V + ARG 1 startX + ARG 2 startY + ARG 3 endX + ARG 4 endY + ARG 5 colorStart + ARG 6 colorEnd + METHOD method_1783 drawHorizontalLine (IIII)V + ARG 1 x1 + ARG 2 x2 + ARG 3 y + ARG 4 color + METHOD method_1785 fill (IIIII)V + ARG 0 x1 + ARG 1 y1 + ARG 2 x2 + ARG 3 y2 + ARG 4 color + METHOD method_1787 drawVerticalLine (IIII)V + ARG 1 x + ARG 2 y1 + ARG 3 y2 + ARG 4 color METHOD method_25290 drawTexture (Lnet/minecraft/class_4587;IIFFIIII)V COMMENT Draws a textured rectangle from a region in a texture. COMMENT diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index 58eabd5370..816b59e22a 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen FIELD field_2379 commandExceptionsWidth I FIELD field_2381 commandExceptionsX I FIELD field_2382 chatField Lnet/minecraft/class_342; + FIELD field_2384 originalChatText Ljava/lang/String; FIELD field_2385 suggestionsWindow Lnet/minecraft/class_408$class_409; FIELD field_2386 suggestionsFuture Ljava/util/concurrent/CompletableFuture; FIELD field_2387 messageHistorySize I diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index b5e790a5b2..1b7357428d 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -12,9 +12,15 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_22791 buttons Ljava/util/List; FIELD field_22792 passEvents Z FIELD field_22793 textRenderer Lnet/minecraft/class_327; + FIELD field_2554 textRenderer Lnet/minecraft/class_0_681; + FIELD field_2556 ALLOWED_PROTOCOLS Ljava/util/Set; FIELD field_2559 height I + FIELD field_2560 itemRenderer Lnet/minecraft/class_918; FIELD field_2561 width I + FIELD field_2562 clickedLink Ljava/net/URI; FIELD field_2563 client Lnet/minecraft/class_310; + FIELD field_2564 widgetList Ljava/util/List; + FIELD field_2565 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_33813 selected Lnet/minecraft/class_6379; FIELD field_33814 SCREEN_USAGE_TEXT Lnet/minecraft/class_2561; FIELD field_33815 selectables Ljava/util/List; @@ -63,6 +69,17 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 keyCode ARG 2 scanCode ARG 3 modifiers + METHOD method_2214 render (IIF)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 delta + METHOD method_2221 openLink (Ljava/net/URI;)V + ARG 1 link + METHOD method_2224 init ()V + METHOD method_2233 init (Lnet/minecraft/class_310;II)V + ARG 2 width + ARG 3 height + METHOD method_2234 removed ()V METHOD method_25393 tick ()V METHOD method_25408 getTooltipFromItem (Lnet/minecraft/class_1799;)Ljava/util/List; ARG 1 stack diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index 7ff28f40d3..a1e4847712 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -153,6 +153,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder ARG 3 cameraZ METHOD method_1342 getByteBuffer ()Ljava/nio/ByteBuffer; METHOD method_1343 clear ()V + METHOD method_1344 next ()V METHOD method_16005 roundBufferSize (I)I ARG 0 amount METHOD method_16006 clamp (III)I From 91c09c2e40383fb63d55e22bdc16d446956fe0fa Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 25 May 2024 21:34:02 -0400 Subject: [PATCH 04/12] Add rendering related mappings --- mappings/net/minecraft/GlStateManager.mapping | 104 ++++++++++++++++++ mappings/net/minecraft/TextRenderer.mapping | 1 + 2 files changed, 105 insertions(+) create mode 100644 mappings/net/minecraft/GlStateManager.mapping create mode 100644 mappings/net/minecraft/TextRenderer.mapping diff --git a/mappings/net/minecraft/GlStateManager.mapping b/mappings/net/minecraft/GlStateManager.mapping new file mode 100644 index 0000000000..68eb23cb1e --- /dev/null +++ b/mappings/net/minecraft/GlStateManager.mapping @@ -0,0 +1,104 @@ +CLASS net/minecraft/class_1015 net/minecraft/GlStateManager + FIELD field_5020 COLOR_MASK Lnet/minecraft/class_1015$class_1022; + FIELD field_5021 DEPTH Lnet/minecraft/class_1015$class_1026; + FIELD field_5024 COLOR_LOGIC Lnet/minecraft/class_1015$class_1021; + FIELD field_5025 BLEND Lnet/minecraft/class_1015$class_1017; + FIELD field_5034 POLY_OFFSET Lnet/minecraft/class_1015$class_1031; + FIELD field_5037 CULL Lnet/minecraft/class_1015$class_1025; + FIELD field_5038 activeTexture I + FIELD field_5040 STENCIL Lnet/minecraft/class_1015$class_1035; + FIELD field_5041 TEXTURES [Lnet/minecraft/class_1015$class_1039; + METHOD method_4346 cullMode (I)V + ARG 0 mode + METHOD method_4353 enablePolygonOffset ()V + METHOD method_4355 enableDepthTest ()V + METHOD method_4357 clearDepth (D)V + ARG 0 depth + METHOD method_4360 logicOp (I)V + ARG 0 op + METHOD method_4367 blendFuncSeparate (IIII)V + ARG 0 srcFactorRGB + ARG 1 dstFactorRGB + ARG 2 srcFactorAlpha + ARG 3 dstFactorAlpha + METHOD method_4389 enableCull ()V + METHOD method_4392 deleteTexture (I)V + ARG 0 texture + METHOD method_4411 colorMask (ZZZZ)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha + METHOD method_4413 depthMask (Z)V + ARG 0 mask + METHOD method_4419 depthFunc (I)V + ARG 0 func + METHOD method_4430 enableColorLogicOp ()V + METHOD method_4431 activeTexture (I)V + ARG 0 texture + METHOD method_4433 polygonOffset (FF)V + ARG 0 factor + ARG 1 units + METHOD method_4436 disablePolygonOffset ()V + METHOD method_4439 disableBlend ()V + METHOD method_4446 disableColorLogicOp ()V + METHOD method_4448 bindTexture (I)V + ARG 0 texture + METHOD method_4454 enableBlend ()V + METHOD method_4458 blendFunc (II)V + ARG 0 srcFactor + ARG 1 dstFactor + METHOD method_4462 viewport (IIII)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + METHOD method_4463 disableCull ()V + METHOD method_4466 disableDepthTest ()V + CLASS class_1017 BlendFuncState + FIELD field_5045 capState Lnet/minecraft/class_1015$class_1018; + FIELD field_5046 dstFactorAlpha I + FIELD field_5047 srcFactorAlpha I + FIELD field_5048 dstFactorRGB I + FIELD field_5049 srcFactorRGB I + CLASS class_1018 CapabilityTracker + FIELD field_5050 cap I + FIELD field_5051 state Z + METHOD (I)V + ARG 1 cap + METHOD method_4469 disable ()V + METHOD method_4470 setState (Z)V + ARG 1 state + METHOD method_4471 enable ()V + CLASS class_1021 LogicOpState + FIELD field_5058 capState Lnet/minecraft/class_1015$class_1018; + FIELD field_5059 op I + CLASS class_1022 ColorMask + FIELD field_5060 alpha Z + FIELD field_5061 blue Z + FIELD field_5062 green Z + FIELD field_5063 red Z + CLASS class_1025 CullFaceState + FIELD field_5072 capState Lnet/minecraft/class_1015$class_1018; + FIELD field_5073 mode I + CLASS class_1026 DepthTestState + FIELD field_5074 capState Lnet/minecraft/class_1015$class_1018; + FIELD field_5075 func I + FIELD field_5076 mask Z + CLASS class_1031 PolygonOffsetState + FIELD field_5121 capLine Lnet/minecraft/class_1015$class_1018; + FIELD field_5122 units F + FIELD field_5123 capFill Lnet/minecraft/class_1015$class_1018; + FIELD field_5124 factor F + CLASS class_1034 StencilSubState + FIELD field_0_4363 ref I + FIELD field_5147 mask I + FIELD field_5148 func I + CLASS class_1035 StencilState + FIELD field_5149 subState Lnet/minecraft/class_1015$class_1034; + FIELD field_5150 dppass I + FIELD field_5151 dpfail I + FIELD field_5152 sfail I + FIELD field_5153 mask I + CLASS class_1039 Texture2DState + FIELD field_5167 boundTexture I diff --git a/mappings/net/minecraft/TextRenderer.mapping b/mappings/net/minecraft/TextRenderer.mapping new file mode 100644 index 0000000000..a46c39bc75 --- /dev/null +++ b/mappings/net/minecraft/TextRenderer.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_0_681 net/minecraft/TextRenderer From 16cb75f13c80fbdb1410ae208a4e58aa08cb9acc Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 25 May 2024 22:23:57 -0400 Subject: [PATCH 05/12] Add some mappings to ClickableWidget --- .../client/gui/widget/ClickableWidget.mapping | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 7f3c761304..f139a529e5 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -2,6 +2,14 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget COMMENT A clickable widget is a GUI element that has many methods to handle different COMMENT mouse actions. In addition, it allows a message to be rendered on the widget COMMENT and narrated when the widget is selected. + FIELD field_2068 y I + FIELD field_2069 x I + FIELD field_2070 height I + FIELD field_2071 width I + FIELD field_2074 message Ljava/lang/String; + FIELD field_2075 hovered Z + FIELD field_2076 visible Z + FIELD field_2078 active Z FIELD field_22754 message Lnet/minecraft/class_2561; FIELD field_22755 wasHovered Z FIELD field_22756 focused Z @@ -21,12 +29,22 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget FIELD field_41098 wasHovered Z FIELD field_42116 navigationOrder I FIELD field_42117 ACCESSIBILITY_TEXTURE Lnet/minecraft/class_2960; + METHOD (IIIIILjava/lang/String;)V + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 message METHOD (IIIILnet/minecraft/class_2561;)V ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 message + METHOD (IIILjava/lang/String;)V + ARG 2 x + ARG 3 y + ARG 4 message METHOD clicked (DD)Z ARG 1 mouseX ARG 3 mouseY @@ -35,6 +53,19 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD isMouseOver (DD)Z ARG 1 mouseX ARG 3 mouseY + METHOD method_1821 setWidth (I)V + ARG 1 width + METHOD method_1824 render (Lnet/minecraft/class_310;II)V + ARG 1 client + ARG 2 mouseX + ARG 3 mouseY + METHOD method_1825 getWidth ()I + METHOD method_1828 isHovered ()Z + METHOD method_1829 clicked (Lnet/minecraft/class_310;II)Z + ARG 2 x + ARG 3 y + METHOD method_1832 playDownSound (Lnet/minecraft/class_1144;)V + ARG 1 soundManager METHOD method_1893 setPos (II)V ARG 1 x ARG 2 y From c7ae8ae35c3aea9c587bda2bf46ca6a0afd0c1d7 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Mon, 27 May 2024 14:22:25 -0400 Subject: [PATCH 06/12] Map type field --- .../packet/s2c/play/GameMessageS2CPacket.mapping | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index db0ba5806d..e15074f3a7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -4,16 +4,30 @@ CLASS net/minecraft/class_2635 net/minecraft/network/packet/s2c/play/GameMessage COMMENT @see net.minecraft.server.network.ServerPlayerEntity#sendMessage(Text, MessageType, UUID) COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onGameMessage FIELD field_12112 message Lnet/minecraft/class_2561; + FIELD field_12113 type B + COMMENT This field indicates the chat message type and where it should be displayed + COMMENT 0 - Chat (chat box) + COMMENT 1 - System Message (chat box) + COMMENT 2 - Game Info (above hotbar) + COMMENT + COMMENT @see https://wiki.vg/index.php?title=Protocol&oldid=15346#Chat_Message_.28clientbound.29 + COMMENT @see https://wiki.vg/index.php?title=Chat&oldid=18730 FIELD field_12113 type Lnet/minecraft/class_2556; FIELD field_25133 sender Ljava/util/UUID; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD (Lnet/minecraft/class_2561;)V + ARG 1 message + METHOD (Lnet/minecraft/class_2561;B)V + ARG 1 message + ARG 2 position METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 type ARG 3 sender METHOD method_11387 isNonChat ()Z METHOD method_11388 getMessage ()Lnet/minecraft/class_2561; + METHOD method_11389 getType ()B METHOD method_11389 getType ()Lnet/minecraft/class_2556; METHOD method_29175 getSender ()Ljava/util/UUID; COMMENT {@return {@linkplain net.minecraft.entity.Entity#getUuid the UUID of the From 94cc72e65ee0946bf4b191809b1a00da49778f5c Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Fri, 31 May 2024 00:55:31 -0400 Subject: [PATCH 07/12] Bunch of mappings related to InGameHud --- mappings/net/minecraft/TextRenderer.mapping | 1 + mappings/net/minecraft/block/Block.mapping | 9 ++++++++ .../minecraft/client/MinecraftClient.mapping | 1 + .../minecraft/client/gui/hud/DebugHud.mapping | 1 + .../client/gui/hud/InGameHud.mapping | 21 ++++++++++++++++++ .../client/gui/hud/SpectatorHud.mapping | 2 ++ .../ClientPlayerInteractionManager.mapping | 22 +++++++++++++++++++ mappings/net/minecraft/entity/Entity.mapping | 2 ++ .../entity/player/PlayerEntity.mapping | 2 ++ .../c2s/play/ClickSlotC2SPacket.mapping | 6 +++++ .../minecraft/screen/ScreenHandler.mapping | 1 + .../util/profiler/ProfilerSystem.mapping | 3 +++ mappings/net/minecraft/world/World.mapping | 1 + .../minecraft/world/level/LevelInfo.mapping | 4 ++++ 14 files changed, 76 insertions(+) diff --git a/mappings/net/minecraft/TextRenderer.mapping b/mappings/net/minecraft/TextRenderer.mapping index a46c39bc75..4ccb84d30a 100644 --- a/mappings/net/minecraft/TextRenderer.mapping +++ b/mappings/net/minecraft/TextRenderer.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_0_681 net/minecraft/TextRenderer + METHOD method_0_2381 getWidth (Ljava/lang/String;)I diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 704198e56e..9c3d54e886 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block FIELD field_10643 soundGroup Lnet/minecraft/class_2498; FIELD field_10644 FACINGS [Lnet/minecraft/class_2350; FIELD field_10645 dynamicBounds Z + FIELD field_10646 defaultState Lnet/minecraft/class_0_378; FIELD field_10646 defaultState Lnet/minecraft/class_2680; FIELD field_10647 stateManager Lnet/minecraft/class_2689; FIELD field_10648 resistance F @@ -376,6 +377,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_9563 getTickRate (Lnet/minecraft/class_1941;)I ARG 1 world METHOD method_9563 getTickRate (Lnet/minecraft/class_4538;)I + METHOD method_9564 getDefaultState ()Lnet/minecraft/class_0_378; METHOD method_9564 getDefaultState ()Lnet/minecraft/class_2680; METHOD method_9566 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_47$class_48;)V ARG 0 state @@ -527,6 +529,11 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 4 random METHOD method_9589 hasBlockEntityBreakingRender (Lnet/minecraft/class_2680;)Z ARG 1 state + METHOD method_9590 setDefaultState (Lnet/minecraft/class_0_378;)V + COMMENT Sets the default state of the block. This should be called inside + COMMENT the block's constructor to override the default state chosen by the + COMMENT state manager. + ARG 1 state METHOD method_9590 setDefaultState (Lnet/minecraft/class_2680;)V COMMENT Sets the default state of the block. This should be called inside COMMENT the block's constructor to override the default state chosen by the @@ -549,11 +556,13 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 4 entity METHOD method_9593 getLuminance (Lnet/minecraft/class_2680;)I ARG 1 state + METHOD method_9594 calcBlockBreakingDelta (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)F METHOD method_9595 getStateManager ()Lnet/minecraft/class_2689; METHOD method_9596 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 2 stack METHOD method_9596 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 2 stack + METHOD method_9597 getMaterial ()Lnet/minecraft/class_3614; METHOD method_9597 getMaterial (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3614; ARG 1 state METHOD method_9601 isOpaque (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 947ca16abd..681853394b 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -149,6 +149,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1769 worldRenderer Lnet/minecraft/class_761; FIELD field_1770 fpsDebugString Ljava/lang/String; FIELD field_1771 attackCooldown I + FIELD field_1772 textRenderer Lnet/minecraft/class_0_681; FIELD field_1772 textRenderer Lnet/minecraft/class_327; FIELD field_1773 gameRenderer Lnet/minecraft/class_757; FIELD field_1774 keyboard Lnet/minecraft/class_309; diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index ca0a3169a8..36be586f3c 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry METHOD method_1846 render ()V + METHOD method_1846 render (Lnet/minecraft/class_0_686;)V METHOD method_1846 render (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1847 renderLeftText ()V diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 7b9fb68fe6..86f1da5f05 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -50,17 +50,21 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_35429 lastAutosaveIndicatorAlpha F FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561; FIELD field_39458 canShowChatDisabledScreen Z + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_918;)V ARG 1 client ARG 2 itemRenderer METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_1732 setRecordPlayingOverlay (Ljava/lang/String;)V + ARG 1 description METHOD method_1732 setRecordPlayingOverlay (Lnet/minecraft/class_2561;)V ARG 1 description METHOD method_1733 getHeartRows (I)I ARG 1 heartCount METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309; + METHOD method_1735 renderVignetteOverlay (FLnet/minecraft/class_0_686;)V METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_1297;)V @@ -89,12 +93,14 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1747 clear ()V METHOD method_1748 tick ()V METHOD method_1749 renderHeldItemTooltip ()V + METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_0_686;)V METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1750 getPlayerListHud ()Lnet/minecraft/class_355; METHOD method_1751 (Lnet/minecraft/class_267;)Z ARG 0 score METHOD method_1752 renderMountJumpBar (I)V + METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_0_686;I)V METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_1316;Lnet/minecraft/class_4587;I)V ARG 1 mount ARG 2 matrices @@ -110,6 +116,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z ARG 1 hitResult METHOD method_1754 renderExperienceBar (I)V + METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_0_686;I)V METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V ARG 1 matrices ARG 2 x @@ -118,8 +125,10 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 type ARG 2 message ARG 3 sender + METHOD method_1756 getTextRenderer ()Lnet/minecraft/class_0_681; METHOD method_1756 getTextRenderer ()Lnet/minecraft/class_327; METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_266;)V + METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_266;Lnet/minecraft/class_0_686;)V METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V ARG 1 matrices ARG 2 objective @@ -130,11 +139,15 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1759 renderHotbar (FLnet/minecraft/class_4587;)V ARG 1 tickDelta ARG 2 matrices + METHOD method_1759 renderHotbar (Lnet/minecraft/class_0_686;F)V + ARG 2 tickDelta METHOD method_1760 renderStatusBars ()V + METHOD method_1760 renderStatusBars (Lnet/minecraft/class_0_686;)V METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V COMMENT Renders the armor, health, air, and hunger bars. ARG 1 matrices METHOD method_1761 renderPumpkinOverlay ()V + METHOD method_1761 renderPumpkinOverlay (Lnet/minecraft/class_0_686;)V METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 x ARG 2 y @@ -148,6 +161,11 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 4 player ARG 5 stack ARG 6 seed + METHOD method_1762 renderHotbarItem (IIIFLnet/minecraft/class_1657;)V + ARG 2 x + ARG 3 y + ARG 4 tickDelta + ARG 5 player METHOD method_1762 renderHotbarItem (Lnet/minecraft/class_4587;IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;I)V METHOD method_1763 setTitles (Ljava/lang/String;Ljava/lang/String;III)V METHOD method_1763 setTitles (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;III)V @@ -157,10 +175,13 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 4 titleRemainTicks ARG 5 titleFadeOutTicks METHOD method_1764 setOverlayMessage (Ljava/lang/String;Z)V + ARG 1 message + ARG 2 tinted METHOD method_1765 renderStatusEffectOverlay ()V METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1766 renderDemoTimer ()V + METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_0_686;)V METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_19346 drawTextBackground (Lnet/minecraft/class_327;II)V diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index 3bb2728b4a..f5f63a8025 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -25,11 +25,13 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud ARG 1 slot METHOD method_1978 render (F)V ARG 1 tickDelta + METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_0_686;F)V METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1978 render (Lnet/minecraft/class_4587;F)V ARG 1 matrices METHOD method_1979 render ()V + METHOD method_1979 render (Lnet/minecraft/class_0_686;)V METHOD method_1979 render (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1980 isOpen ()Z diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index b0091bf90c..a087522166 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -12,11 +12,13 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti FIELD field_3717 breakingBlock Z FIELD field_3718 selectedStack Lnet/minecraft/class_1799; FIELD field_3719 gameMode Lnet/minecraft/class_1934; + FIELD field_3719 gameMode Lnet/minecraft/class_1940$class_1934; FIELD field_3720 networkHandler Lnet/minecraft/class_634; FIELD field_3721 lastSelectedSlot I METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_634;)V ARG 1 client ARG 2 networkHandler + METHOD method_0_3114 isSpectator ()Z METHOD method_21705 processPlayerActionResponse (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2846$class_2847;Z)V ARG 1 world ARG 2 pos @@ -38,6 +40,8 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 2 world ARG 3 hand ARG 4 hitResult + METHOD method_2896 (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_243;)Z + ARG 1 player METHOD method_2897 stopUsingItem (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_2899 breakBlock (Lnet/minecraft/class_2338;)Z @@ -45,6 +49,9 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_2900 clickButton (II)V ARG 1 syncId ARG 2 buttonId + METHOD method_2901 createPlayer (Lnet/minecraft/class_1937;Lnet/minecraft/class_3469;)Lnet/minecraft/class_746; + ARG 1 world + ARG 2 statHandler METHOD method_2901 createPlayer (Lnet/minecraft/class_638;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;)Lnet/minecraft/class_746; ARG 1 world ARG 2 stateHandler @@ -61,10 +68,18 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_2903 copyAbilities (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_2904 getReachDistance ()F + METHOD method_2905 interactEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)Z + ARG 1 player + ARG 2 target METHOD method_2905 interactEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 entity ARG 3 hand + METHOD method_2906 clickSlot (IIIILnet/minecraft/class_1657;)Lnet/minecraft/class_1799; + ARG 1 syncId + ARG 2 slotId + ARG 3 button + ARG 5 player METHOD method_2906 clickSlot (IIILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; COMMENT @see net.minecraft.screen.ScreenHandler#onSlotClick(int, int, net.minecraft.screen.slot.SlotActionType, net.minecraft.entity.player.PlayerEntity) ARG 1 syncId @@ -81,6 +96,8 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 5 player METHOD method_2907 setGameMode (Lnet/minecraft/class_1934;)V ARG 1 gameMode + METHOD method_2907 setGameMode (Lnet/minecraft/class_1940$class_1934;)V + ARG 1 gameMode METHOD method_2908 hasStatusBars ()Z METHOD method_2909 clickCreativeStack (Lnet/minecraft/class_1799;I)V ARG 1 stack @@ -99,6 +116,10 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 1 stack METHOD method_2916 pickFromInventory (I)V ARG 1 slot + METHOD method_2917 interactEntityAtLocation (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_239;)Z + ARG 1 player + ARG 2 entity + ARG 3 hitResult METHOD method_2917 interactEntityAtLocation (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3966;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 entity @@ -115,6 +136,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 2 world ARG 3 hand METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1934; + METHOD method_2920 getCurrentGameMode ()Lnet/minecraft/class_1940$class_1934; METHOD method_2921 breakBlockOrFire (Lnet/minecraft/class_310;Lnet/minecraft/class_636;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V ARG 0 client ARG 1 interactionManager diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 9ff2dfb2df..3efe51f5e5 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -250,6 +250,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 world METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_0_6922 interactAt (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;)Z METHOD method_17681 getWidth ()F COMMENT {@return the width of the entity's current dimension} METHOD method_17682 getHeight ()F @@ -1097,6 +1098,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @throws IllegalStateException when the method is called directly ARG 1 passenger + METHOD method_5628 getId ()I METHOD method_5629 doesNotCollide (Lnet/minecraft/class_238;)Z ARG 1 box METHOD method_5630 updateSubmergedInWaterState ()V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index b7612f7981..c81af8041e 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -50,6 +50,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 pos ARG 3 yaw ARG 4 gameProfile + METHOD method_0_7993 stopUsingItem ()V METHOD method_14247 onHandledScreenClosed ()V COMMENT Runs closing tasks for the current screen handler and COMMENT sets it to the {@link #playerScreenHandler}. @@ -203,6 +204,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7286 applyEnchantmentCosts (Lnet/minecraft/class_1799;I)V ARG 1 enchantedItem ARG 2 experienceLevels + METHOD method_7287 interact (Lnet/minecraft/class_1297;)Z METHOD method_7287 interact (Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 entity ARG 2 hand diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index 72c7ddd2be..0a9f60d8ab 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -16,6 +16,12 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 ARG 5 actionType ARG 6 stack ARG 7 modifiedStacks + METHOD (IIIILnet/minecraft/class_1799;S)V + ARG 1 syncId + ARG 2 slot + ARG 3 button + ARG 5 stack + ARG 6 actionId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12189 getActionId ()S diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index 4d77dcb0dd..e018073709 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -275,6 +275,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 0 slot ARG 1 stack ARG 2 allowOverflow + METHOD method_7593 onSlotClick (IIILnet/minecraft/class_1657;)Lnet/minecraft/class_1799; METHOD method_7593 onSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; COMMENT Performs a slot click. This can behave in many different ways depending mainly on the action type. COMMENT @return The stack that was clicked on before anything changed, used mostly for verifying that the client and server are in sync diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index 4bf5b3806f..3ff7f729ad 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -19,7 +19,10 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem ARG 1 timeGetter ARG 2 tickGetter ARG 3 checkTimeout + METHOD method_15396 push (Ljava/lang/String;)V METHOD method_15401 getTimings (Ljava/lang/String;)Ljava/util/List; + METHOD method_15405 swap (Ljava/lang/String;)V + METHOD method_15407 pop ()V METHOD method_24245 (Ljava/lang/String;)Lnet/minecraft/class_3533$class_4746; ARG 0 k METHOD method_24246 getCurrentInfo ()Lnet/minecraft/class_3533$class_4746; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index d7c2143617..a90426df30 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -660,4 +660,5 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8558 isValidHorizontally (Lnet/minecraft/class_2338;)Z ARG 0 pos METHOD method_8560 tickTime ()V + METHOD method_8621 getWorldBorder ()Lnet/minecraft/class_2784; CLASS class_7867 ExplosionSourceType diff --git a/mappings/net/minecraft/world/level/LevelInfo.mapping b/mappings/net/minecraft/world/level/LevelInfo.mapping index 536182c7bb..b22a526a74 100644 --- a/mappings/net/minecraft/world/level/LevelInfo.mapping +++ b/mappings/net/minecraft/world/level/LevelInfo.mapping @@ -54,3 +54,7 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo METHOD method_8582 areCommandsAllowed ()Z METHOD method_8583 isHardcore ()Z METHOD method_8584 getGeneratorOptions ()Lcom/google/gson/JsonElement; + CLASS class_1934 GameMode + METHOD method_8382 setAbilities (Lnet/minecraft/class_1656;)V + METHOD method_8386 isCreative ()Z + METHOD method_8388 isSurvivalLike ()Z From 9641c0d9918654cf7cb269e7c087e3b00900372d Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 1 Jun 2024 16:16:42 -0400 Subject: [PATCH 08/12] Rendering related mappings --- mappings/net/minecraft/GlStateManager.mapping | 2 ++ .../net/minecraft/client/gl/PostEffectProcessor.mapping | 1 + mappings/net/minecraft/client/render/GameRenderer.mapping | 6 ++++++ mappings/net/minecraft/client/render/WorldRenderer.mapping | 3 +++ mappings/net/minecraft/entity/Entity.mapping | 3 +++ mappings/net/minecraft/world/World.mapping | 1 + 6 files changed, 16 insertions(+) diff --git a/mappings/net/minecraft/GlStateManager.mapping b/mappings/net/minecraft/GlStateManager.mapping index 68eb23cb1e..ef88bef05c 100644 --- a/mappings/net/minecraft/GlStateManager.mapping +++ b/mappings/net/minecraft/GlStateManager.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_1015 net/minecraft/GlStateManager FIELD field_5041 TEXTURES [Lnet/minecraft/class_1015$class_1039; METHOD method_4346 cullMode (I)V ARG 0 mode + METHOD method_4347 clear (I)V + ARG 0 mask METHOD method_4353 enablePolygonOffset ()V METHOD method_4355 enableDepthTest ()V METHOD method_4357 clearDepth (D)V diff --git a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping index 5ee33574ca..1e48c06ae0 100644 --- a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor ARG 2 resourceManager ARG 3 framebuffer ARG 4 id + METHOD method_0_4134 close ()V METHOD method_1256 parseEffect (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V ARG 1 textureManager ARG 2 id diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 4027428e57..dbe9d6f3bd 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -108,6 +108,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 2 heldItemRenderer ARG 3 resourceManager ARG 4 buffers + METHOD method_0_3364 cycleSuperSecretSetting ()V METHOD method_18144 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; @@ -154,6 +155,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3178 renderCenter (FJ)V ARG 1 tickDelta ARG 2 endTime + METHOD method_3178 renderWorldInternal (IFJ)V + ARG 2 tickDelta METHOD method_3179 renderFloatingText (Lnet/minecraft/class_327;Ljava/lang/String;FFFIFFZ)V ARG 0 textRenderer ARG 1 text @@ -195,6 +198,9 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3194 getMapRenderer ()Lnet/minecraft/class_330; METHOD method_3195 getSkyDarkness (F)F ARG 1 tickDelta + METHOD method_3196 getFov (FZ)F + ARG 1 tickDelta + ARG 2 changingFov METHOD method_3196 getFov (Lnet/minecraft/class_4184;FZ)D ARG 1 camera ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 8d2f6c0698..12311a1e81 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -299,6 +299,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3250 renderEndSky ()V METHOD method_3250 renderEndSky (Lnet/minecraft/class_4587;)V ARG 1 matrices + METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;DILnet/minecraft/class_1297;)I + ARG 1 renderLayer + ARG 5 camera METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4184;)I ARG 1 layer METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDD)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 3efe51f5e5..9ca1f6e613 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1707,6 +1707,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5744 isSubmergedIn (Lnet/minecraft/class_3494;Z)Z ARG 1 fluidTag ARG 2 requireLoadedChunk + METHOD method_5745 raycast (DF)Lnet/minecraft/class_239; + ARG 1 maxDistance + ARG 3 tickDelta METHOD method_5745 raycast (DFZ)Lnet/minecraft/class_239; ARG 1 maxDistance ARG 3 tickDelta diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index a90426df30..3316db400c 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -600,6 +600,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8527 getGeneratorType ()Lnet/minecraft/class_1942; METHOD method_8529 getTicksSinceLightning ()I METHOD method_8530 isDay ()Z + METHOD method_8531 raycast (Lnet/minecraft/class_243;Lnet/minecraft/class_243;ZZZ)Lnet/minecraft/class_239; METHOD method_8532 getTimeOfDay ()J COMMENT {@return the time of day} COMMENT From 3c97bcb18c361d435189525ed6f2f44a640ca67c Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:40:24 -0400 Subject: [PATCH 09/12] World Renderer related mappings --- mappings/net/minecraft/GlStateManager.mapping | 4 ++++ mappings/net/minecraft/client/option/GameOptions.mapping | 2 ++ .../minecraft/client/particle/ParticleManager.mapping | 1 + .../net/minecraft/client/render/WorldRenderer.mapping | 9 +++++++++ .../client/sound/PositionedSoundInstance.mapping | 1 + mappings/net/minecraft/client/world/ClientWorld.mapping | 1 + mappings/net/minecraft/item/DyeItem.mapping | 1 + mappings/net/minecraft/item/MusicDiscItem.mapping | 2 ++ .../net/minecraft/util/crash/CrashReportSection.mapping | 2 ++ mappings/net/minecraft/world/World.mapping | 6 ++++++ 10 files changed, 29 insertions(+) diff --git a/mappings/net/minecraft/GlStateManager.mapping b/mappings/net/minecraft/GlStateManager.mapping index ef88bef05c..83fc9686fd 100644 --- a/mappings/net/minecraft/GlStateManager.mapping +++ b/mappings/net/minecraft/GlStateManager.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_1015 net/minecraft/GlStateManager ARG 0 mode METHOD method_4347 clear (I)V ARG 0 mask + METHOD method_4350 popMatrix ()V METHOD method_4353 enablePolygonOffset ()V METHOD method_4355 enableDepthTest ()V METHOD method_4357 clearDepth (D)V @@ -23,6 +24,8 @@ CLASS net/minecraft/class_1015 net/minecraft/GlStateManager ARG 1 dstFactorRGB ARG 2 srcFactorAlpha ARG 3 dstFactorAlpha + METHOD method_4381 setShaderColor (FFFF)V + METHOD method_4382 loadIdentitiy ()V METHOD method_4389 enableCull ()V METHOD method_4392 deleteTexture (I)V ARG 0 texture @@ -50,6 +53,7 @@ CLASS net/minecraft/class_1015 net/minecraft/GlStateManager METHOD method_4458 blendFunc (II)V ARG 0 srcFactor ARG 1 dstFactor + METHOD method_4461 pushMatrix ()V METHOD method_4462 viewport (IIII)V ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 8de7b3d0e1..16e69c8d39 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions + FIELD field_1814 cloudRenderMode I FIELD field_1814 cloudRenderMode Lnet/minecraft/class_4063; FIELD field_1814 cloudRenderMode Lnet/minecraft/class_7172; FIELD field_1815 hideServerAddress Z @@ -308,6 +309,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_1631 togglePlayerModelPart (Lnet/minecraft/class_1664;Z)V ARG 1 part ARG 2 enabled + METHOD method_1632 getCloudRenderMode ()I METHOD method_1632 getCloudRenderModeValue ()Lnet/minecraft/class_4063; METHOD method_1633 getEnabledPlayerModelParts ()Ljava/util/Set; METHOD method_1634 parseFloat (Ljava/lang/String;)F diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 0cc79fb7e0..67304c4ba7 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -77,6 +77,7 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ + METHOD method_3056 addParticle (IDDDDDD[I)Lnet/minecraft/class_703; METHOD method_3056 addParticle (Lnet/minecraft/class_2394;DDDDDD)Lnet/minecraft/class_703; ARG 1 parameters ARG 2 x diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 12311a1e81..416897cec6 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -281,6 +281,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3242 onResized (II)V ARG 1 width ARG 2 height + METHOD method_3243 renderWorldBorder (Lnet/minecraft/class_1297;F)V + ARG 1 camera METHOD method_3243 renderWorldBorder (Lnet/minecraft/class_4184;)V ARG 1 camera METHOD method_3243 renderWorldBorder (Lnet/minecraft/class_4184;F)V @@ -342,6 +344,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 builder METHOD method_3257 renderSky (F)V ARG 1 tickDelta + METHOD method_3257 renderSky (FI)V + ARG 1 tickDelta METHOD method_3257 renderSky (Lnet/minecraft/class_4587;F)V ARG 1 matrices ARG 2 tickDelta @@ -371,6 +375,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 16 alpha METHOD method_3259 renderClouds (FDDD)V ARG 1 tickDelta + METHOD method_3259 (FI)V + ARG 1 tickDelta METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;FDDD)V ARG 1 matrices ARG 2 tickDelta @@ -449,6 +455,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ + METHOD method_3276 spawnParticle (Lnet/minecraft/class_2396;DDDDDD[I)V METHOD method_3277 renderLightSky ()V METHOD method_3278 (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;DDDFFFFDDDDDD)V ARG 12 minX @@ -477,6 +484,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 pos METHOD method_3287 renderLayer (Lnet/minecraft/class_1921;)V ARG 1 layer + METHOD method_3288 spawnParticle (IZDDDDDD[I)Lnet/minecraft/class_703; + ARG 2 alwaysSpawn METHOD method_3288 spawnParticle (Lnet/minecraft/class_2394;ZZDDDDDD)Lnet/minecraft/class_703; ARG 1 parameters ARG 2 alwaysSpawn diff --git a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index 42a6e506b6..dab1b11602 100644 --- a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -66,6 +66,7 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 1 pitch METHOD method_4759 music (Lnet/minecraft/class_3414;)Lnet/minecraft/class_1109; ARG 0 sound + METHOD method_4760 record (Lnet/minecraft/class_2960;FFF)Lnet/minecraft/class_1109; METHOD method_4760 record (Lnet/minecraft/class_3414;DDD)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 x diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index f4c699d1d0..025869e59c 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -163,6 +163,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_2945 removeEntity (ILnet/minecraft/class_1297$class_5529;)V ARG 1 entityId ARG 2 removalReason + METHOD method_2947 playSoundAtBlockCenter (Lnet/minecraft/class_2338;Ljava/lang/String;FFZ)V METHOD method_2947 playSound (Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZ)V ARG 1 pos ARG 2 sound diff --git a/mappings/net/minecraft/item/DyeItem.mapping b/mappings/net/minecraft/item/DyeItem.mapping index e9f2362cd2..f630f0fd9f 100644 --- a/mappings/net/minecraft/item/DyeItem.mapping +++ b/mappings/net/minecraft/item/DyeItem.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1769 net/minecraft/item/DyeItem METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_1792$class_1793;)V ARG 1 color ARG 2 settings + METHOD method_0_8198 createParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V METHOD method_7802 getColor ()Lnet/minecraft/class_1767; METHOD method_7803 byColor (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1769; ARG 0 color diff --git a/mappings/net/minecraft/item/MusicDiscItem.mapping b/mappings/net/minecraft/item/MusicDiscItem.mapping index 54651db54a..a868bac8dc 100644 --- a/mappings/net/minecraft/item/MusicDiscItem.mapping +++ b/mappings/net/minecraft/item/MusicDiscItem.mapping @@ -11,7 +11,9 @@ CLASS net/minecraft/class_1813 net/minecraft/item/MusicDiscItem METHOD method_44369 getSongLengthInTicks ()I METHOD method_8009 getSound ()Lnet/minecraft/class_3414; METHOD method_8010 getComparatorOutput ()I + METHOD method_8011 getDescription ()Ljava/lang/String; METHOD method_8011 getDescription ()Lnet/minecraft/class_2561; METHOD method_8011 getDescription ()Lnet/minecraft/class_5250; + METHOD method_8012 bySound (Ljava/lang/String;)Lnet/minecraft/class_1813; METHOD method_8012 bySound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_1813; ARG 0 sound diff --git a/mappings/net/minecraft/util/crash/CrashReportSection.mapping b/mappings/net/minecraft/util/crash/CrashReportSection.mapping index da366220d9..f7689efcdd 100644 --- a/mappings/net/minecraft/util/crash/CrashReportSection.mapping +++ b/mappings/net/minecraft/util/crash/CrashReportSection.mapping @@ -8,12 +8,14 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection METHOD method_574 addStackTrace (Ljava/lang/StringBuilder;)V ARG 1 crashReportBuilder METHOD method_575 getStackTrace ()[Ljava/lang/StackTraceElement; + METHOD method_577 add (Ljava/lang/String;Ljava/util/concurrent/Callable;)V METHOD method_577 add (Ljava/lang/String;Lnet/minecraft/class_133;)Lnet/minecraft/class_129; ARG 1 name ARG 2 callable METHOD method_578 add (Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_129; ARG 1 name ARG 2 detail + METHOD method_578 add (Ljava/lang/String;Ljava/lang/Object;)V METHOD method_579 initStackTrace (I)I ARG 1 ignoredCallCount METHOD method_580 trimStackTraceEnd (I)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 3316db400c..78f62e2aee 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -58,6 +58,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 7 debugWorld ARG 8 biomeAccess ARG 10 maxChainedNeighborUpdates + METHOD method_0_316 addParticle (Lnet/minecraft/class_2396;DDDDDD[I)V + METHOD method_0_377 getSkyAngle (F)F + ARG 1 tickDelta + METHOD method_0_436 getMoonPhase ()I METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16109 scheduleBlockRerenderIfNeeded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 pos @@ -497,6 +501,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 pos METHOD method_8482 getReceivedRedstonePower (Lnet/minecraft/class_2338;)I ARG 1 pos + METHOD method_8486 playSound (DDDLjava/lang/String;FFZ)V METHOD method_8486 playSound (DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZ)V ARG 1 x ARG 3 y @@ -656,6 +661,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 9 velocityY ARG 11 velocityZ ARG 13 nbt + METHOD method_8548 getSkyColor (Lnet/minecraft/class_1297;F)Lnet/minecraft/class_243; METHOD method_8548 getSkyColor (Lnet/minecraft/class_2338;F)Lnet/minecraft/class_243; METHOD method_8550 getStarsBrightness (F)F METHOD method_8558 isValidHorizontally (Lnet/minecraft/class_2338;)Z From 514c7a382ff82996536980402a46729a69438f87 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:30:28 -0700 Subject: [PATCH 10/12] Add block state related mappings --- mappings/net/minecraft/block/BlockState.mapping | 3 +++ .../net/minecraft/predicate/block/BlockPredicate.mapping | 2 ++ .../minecraft/predicate/block/BlockStatePredicate.mapping | 7 ++++++- mappings/net/minecraft/state/StateManager.mapping | 7 +++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 87b15bab08..fadbe8c6b0 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -1,3 +1,6 @@ +CLASS net/minecraft/class_0_378 net/minecraft/block/BlockState + METHOD method_0_1224 testProperty (Lnet/minecraft/class_2769;)Ljava/lang/Comparable; + METHOD method_0_1225 getBlock ()Lnet/minecraft/class_2248; CLASS net/minecraft/class_2680 net/minecraft/block/BlockState FIELD field_12290 shapeCache Lnet/minecraft/class_2680$class_3752; FIELD field_16553 luminance I diff --git a/mappings/net/minecraft/predicate/block/BlockPredicate.mapping b/mappings/net/minecraft/predicate/block/BlockPredicate.mapping index 63cee1fddd..6e22f50596 100644 --- a/mappings/net/minecraft/predicate/block/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/block/BlockPredicate.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2717 net/minecraft/predicate/block/BlockPredicate FIELD field_12423 block Lnet/minecraft/class_2248; METHOD (Lnet/minecraft/class_2248;)V ARG 1 block + METHOD apply (Ljava/lang/Object;)Z + ARG 1 state METHOD method_11766 make (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2717; ARG 0 block METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping index 69a3c3b9ba..d9e7f8eb12 100644 --- a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping +++ b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_2715 net/minecraft/predicate/block/BlockStatePredicate FIELD field_12420 manager Lnet/minecraft/class_2689; FIELD field_12421 propertyTests Ljava/util/Map; METHOD (Lnet/minecraft/class_2689;)V - ARG 1 manager + ARG 1 stateManager + METHOD apply test (Ljava/lang/Object;)Z + ARG 1 state METHOD method_11758 forBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2715; ARG 0 block METHOD method_11759 (Lnet/minecraft/class_2680;)Z @@ -12,6 +14,9 @@ CLASS net/minecraft/class_2715 net/minecraft/predicate/block/BlockStatePredicate ARG 1 blockState ARG 2 property ARG 3 predicate + METHOD method_11762 with (Lnet/minecraft/class_2769;Lcom/google/common/base/Predicate;)Lnet/minecraft/class_2715; + ARG 1 property + ARG 2 predicate METHOD method_11762 with (Lnet/minecraft/class_2769;Ljava/util/function/Predicate;)Lnet/minecraft/class_2715; ARG 1 property ARG 2 predicate diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping index 0c3c2907d9..e587d5a344 100644 --- a/mappings/net/minecraft/state/StateManager.mapping +++ b/mappings/net/minecraft/state/StateManager.mapping @@ -1,18 +1,25 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager FIELD field_12314 VALID_NAME_PATTERN Ljava/util/regex/Pattern; FIELD field_12315 states Lcom/google/common/collect/ImmutableList; + FIELD field_12316 properties Lcom/google/common/collect/ImmutableList; FIELD field_12316 properties Lcom/google/common/collect/ImmutableSortedMap; FIELD field_12317 owner Ljava/lang/Object; + FIELD field_12317 block Lnet/minecraft/class_2248; METHOD (Ljava/util/function/Function;Ljava/lang/Object;Lnet/minecraft/class_2689$class_2691;Ljava/util/Map;)V ARG 1 defaultStateGetter ARG 2 owner ARG 3 factory ARG 4 propertiesMap + METHOD (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2769;)V + ARG 1 block + ARG 2 properties METHOD method_11659 getProperties ()Ljava/util/Collection; METHOD method_11660 getOwner ()Ljava/lang/Object; + METHOD method_11660 getBlock ()Lnet/minecraft/class_2248; METHOD method_11662 getStates ()Lcom/google/common/collect/ImmutableList; METHOD method_11663 getProperty (Ljava/lang/String;)Lnet/minecraft/class_2769; ARG 1 name + METHOD method_11664 getDefaultState ()Lnet/minecraft/class_0_378; METHOD method_11664 getDefaultState ()Lnet/minecraft/class_2688; METHOD method_30040 addFieldToMapCodec (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/class_2769;)Lcom/mojang/serialization/MapCodec; ARG 0 mapCodec From fb226b1bb9a187adc47056bc12a03e313ace58b7 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Sat, 3 Aug 2024 12:46:37 -0700 Subject: [PATCH 11/12] Move mappings to correct package --- mappings/net/minecraft/TextRenderer.mapping | 2 -- mappings/net/minecraft/{ => client}/GlStateManager.mapping | 2 +- mappings/net/minecraft/client/TextRenderer.mapping | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 mappings/net/minecraft/TextRenderer.mapping rename mappings/net/minecraft/{ => client}/GlStateManager.mapping (98%) create mode 100644 mappings/net/minecraft/client/TextRenderer.mapping diff --git a/mappings/net/minecraft/TextRenderer.mapping b/mappings/net/minecraft/TextRenderer.mapping deleted file mode 100644 index 4ccb84d30a..0000000000 --- a/mappings/net/minecraft/TextRenderer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_0_681 net/minecraft/TextRenderer - METHOD method_0_2381 getWidth (Ljava/lang/String;)I diff --git a/mappings/net/minecraft/GlStateManager.mapping b/mappings/net/minecraft/client/GlStateManager.mapping similarity index 98% rename from mappings/net/minecraft/GlStateManager.mapping rename to mappings/net/minecraft/client/GlStateManager.mapping index 83fc9686fd..63895d1fb0 100644 --- a/mappings/net/minecraft/GlStateManager.mapping +++ b/mappings/net/minecraft/client/GlStateManager.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1015 net/minecraft/GlStateManager +CLASS net/minecraft/class_1015 net/minecraft/client/GlStateManager FIELD field_5020 COLOR_MASK Lnet/minecraft/class_1015$class_1022; FIELD field_5021 DEPTH Lnet/minecraft/class_1015$class_1026; FIELD field_5024 COLOR_LOGIC Lnet/minecraft/class_1015$class_1021; diff --git a/mappings/net/minecraft/client/TextRenderer.mapping b/mappings/net/minecraft/client/TextRenderer.mapping new file mode 100644 index 0000000000..051db6e6fb --- /dev/null +++ b/mappings/net/minecraft/client/TextRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_0_681 net/minecraft/client/TextRenderer + METHOD method_0_2381 getWidth (Ljava/lang/String;)I From ede93e28d06ba8f232d47788e0d5246b07e79005 Mon Sep 17 00:00:00 2001 From: Sychic <47618543+Sychic@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:26:09 -0400 Subject: [PATCH 12/12] Update BlockStatePredicate mapping Co-authored-by: Cat Core <34719527+thecatcore@users.noreply.github.com> --- .../net/minecraft/predicate/block/BlockStatePredicate.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping index d9e7f8eb12..2831033a3e 100644 --- a/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping +++ b/mappings/net/minecraft/predicate/block/BlockStatePredicate.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2715 net/minecraft/predicate/block/BlockStatePredicate FIELD field_12421 propertyTests Ljava/util/Map; METHOD (Lnet/minecraft/class_2689;)V ARG 1 stateManager - METHOD apply test (Ljava/lang/Object;)Z + METHOD apply apply (Ljava/lang/Object;)Z ARG 1 state METHOD method_11758 forBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2715; ARG 0 block