From 85ffd03d8999310439d26445a0d2318786f1fd10 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 6 May 2023 12:28:33 +0900 Subject: [PATCH] 23w18a more stuff (#3567) --- mappings/net/minecraft/client/font/FontLoader.mapping | 2 ++ mappings/net/minecraft/client/font/FontManager.mapping | 4 ++++ mappings/net/minecraft/client/gl/VertexBuffer.mapping | 7 +++++++ mappings/net/minecraft/client/gui/DrawContext.mapping | 4 ++++ .../minecraft/client/render/debug/DebugRenderer.mapping | 1 + .../net/minecraft/client/render/item/ItemRenderer.mapping | 6 ++++-- .../net/minecraft/world/chunk/light/LightStorage.mapping | 1 + 7 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index c0a3aef8e1..4970c9f5ec 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader FIELD field_44801 CODEC Lcom/mojang/serialization/Codec; METHOD method_51731 getType ()Lnet/minecraft/class_394; METHOD method_51734 build ()Lcom/mojang/datafixers/util/Either; + METHOD method_51757 (Lnet/minecraft/class_394;)Lcom/mojang/serialization/Codec; + ARG 0 fontType CLASS class_8539 Loadable METHOD load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index 7ba4f9f465..1b26125c39 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -91,3 +91,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional; ARG 1 fontRetriever METHOD method_51635 getImmediateProviders ()Ljava/util/stream/Stream; + CLASS class_8556 Providers + FIELD field_44798 CODEC Lcom/mojang/serialization/Codec; + METHOD method_51747 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/gl/VertexBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping index d3ea824e89..4535d43c17 100644 --- a/mappings/net/minecraft/client/gl/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -16,6 +16,9 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer FIELD field_29338 vertexArrayId I FIELD field_29339 vertexFormat Lnet/minecraft/class_293; FIELD field_38983 sharedSequentialIndexBuffer Lcom/mojang/blaze3d/systems/RenderSystem$class_5590; + FIELD field_44792 usage Lnet/minecraft/class_291$class_8555; + METHOD (Lnet/minecraft/class_291$class_8555;)V + ARG 1 usage METHOD method_1352 upload (Lnet/minecraft/class_287$class_7433;)V COMMENT Uploads the contents of {@code buffer} to GPU, discarding previously COMMENT uploaded data. @@ -58,3 +61,7 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer ARG 2 indexBuffer METHOD method_43444 isClosed ()Z METHOD method_43445 getIndexType ()Lnet/minecraft/class_293$class_5595; + CLASS class_8555 Usage + FIELD field_44795 id I + METHOD (Ljava/lang/String;II)V + ARG 3 id diff --git a/mappings/net/minecraft/client/gui/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping index 11332f2946..de1c9b0ca9 100644 --- a/mappings/net/minecraft/client/gui/DrawContext.mapping +++ b/mappings/net/minecraft/client/gui/DrawContext.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext FIELD field_44657 matrices Lnet/minecraft/class_4587; FIELD field_44658 vertexConsumers Lnet/minecraft/class_4597$class_4598; FIELD field_44659 scissorStack Lnet/minecraft/class_332$class_8214; + FIELD field_44797 runningDrawCallback Z METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;)V ARG 1 client ARG 2 matrices @@ -434,12 +435,15 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 6 colorStart ARG 7 colorEnd ARG 8 z + METHOD method_51741 draw (Ljava/lang/Runnable;)V + ARG 1 drawCallback METHOD method_51742 drawVerticalLine (Lnet/minecraft/class_1921;IIII)V ARG 1 layer ARG 2 x ARG 3 y1 ARG 4 y2 ARG 5 color + METHOD method_51744 tryDraw ()V CLASS class_8214 ScissorStack FIELD field_43099 stack Ljava/util/Deque; METHOD method_49699 pop ()Lnet/minecraft/class_8030; diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index 15e783b066..8c3932a47a 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer FIELD field_22408 villageSectionsDebugRenderer Lnet/minecraft/class_4841; FIELD field_28254 gameEventDebugRenderer Lnet/minecraft/class_5739; FIELD field_44674 lightDebugRenderer Lnet/minecraft/class_8520; + FIELD field_44827 supportingBlockDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4517 blockOutlineDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4523 pathfindingDebugRenderer Lnet/minecraft/class_868; FIELD field_4528 waterDebugRenderer Lnet/minecraft/class_863$class_864; diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 9291b2b1fe..e3405b06ad 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -77,11 +77,11 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 1 layer ARG 2 solid ARG 3 glint - METHOD method_30114 getCompassGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; + METHOD method_30114 getDynamicDisplayGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 entry - METHOD method_30115 getDirectCompassGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; + METHOD method_30115 getDirectDynamicDisplayGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;Lnet/minecraft/class_4587$class_4665;)Lnet/minecraft/class_4588; ARG 0 provider ARG 1 layer ARG 2 entry @@ -91,3 +91,5 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 2 world ARG 3 entity ARG 4 seed + METHOD method_51795 usesDynamicDisplay (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index a09cba7946..e64c1fea1a 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage ARG 1 sectionPos ARG 3 notReady METHOD method_15527 updateLight (Lnet/minecraft/class_3558;)V + ARG 1 lightProvider METHOD method_15528 hasLightUpdates ()Z METHOD method_15529 createSection (J)Lnet/minecraft/class_2804; ARG 1 sectionPos