From 028b37f55cc971432df7ef558e99500faa21d4d5 Mon Sep 17 00:00:00 2001 From: Eli Orona Date: Wed, 9 Aug 2023 08:34:39 -0700 Subject: [PATCH] Some rendering mappings (#476) * Some rendering mappings * Update mappings/net/minecraft/client/render/model/BakedModelManager.mapping * Update BuiltChunkStorage.mapping --- .../com/mojang/blaze3d/font/SpaceFont.mapping | 7 +++++ .../blaze3d/platform/GlStateManager.mapping | 18 ++++++++++++ .../blaze3d/texture/TextureUtil.mapping | 11 ++++++++ .../vertex/OverlayVertexConsumer.mapping | 3 ++ .../client/render/BuiltChunkStorage.mapping | 13 +++++++++ .../render/model/BakedModelManager.mapping | 28 +++++++++++++++++-- .../client/render/model/ModelLoader.mapping | 4 +++ 7 files changed, 82 insertions(+), 2 deletions(-) diff --git a/mappings/com/mojang/blaze3d/font/SpaceFont.mapping b/mappings/com/mojang/blaze3d/font/SpaceFont.mapping index b858a00bc3..d6f17037d6 100644 --- a/mappings/com/mojang/blaze3d/font/SpaceFont.mapping +++ b/mappings/com/mojang/blaze3d/font/SpaceFont.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/unmapped/C_auoqqcdl com/mojang/blaze3d/font/SpaceFont FIELD f_qzendodg emptyGlyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD (Ljava/util/Map;)V + ARG 1 advances + METHOD m_wdqmreap (Ljava/lang/Integer;Ljava/lang/Float;)V + ARG 1 codepoint + ARG 2 advance CLASS C_rmisfmyo SpaceFontTypeProvider FIELD f_mqfzdjwl CODEC Lcom/mojang/serialization/MapCodec; + METHOD m_zesazefp (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index df6f02a5be..76b2bd725f 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -287,6 +287,15 @@ CLASS com/mojang/blaze3d/platform/GlStateManager com/mojang/blaze3d/platform/GlS ARG 6 format ARG 7 type ARG 8 pixels + METHOD _upload (IIIIILnet/minecraft/unmapped/C_ayikuhxa$C_pfzicqtf;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V + ARG 0 mipLevels + ARG 1 xOffset + ARG 2 yOffset + ARG 3 width + ARG 4 height + ARG 5 format + ARG 6 pixels + ARG 7 pixelConsumer METHOD _vertexAttribIPointer _vertexAttribIPointer (IIIIJ)V ARG 0 index ARG 1 size @@ -358,6 +367,15 @@ CLASS com/mojang/blaze3d/platform/GlStateManager com/mojang/blaze3d/platform/GlS ARG 0 light0 ARG 1 light1 ARG 2 modelMatrix + METHOD upload (IIIIILnet/minecraft/unmapped/C_ayikuhxa$C_pfzicqtf;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V + ARG 0 mipLevels + ARG 1 xOffset + ARG 2 yOffset + ARG 3 width + ARG 4 height + ARG 5 format + ARG 6 pixels + ARG 7 pixelConsumer CLASS C_hfcoodvl LogicOp FIELD f_yldbwizx value I METHOD (Ljava/lang/String;II)V diff --git a/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping b/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping index c2938b79d6..60385cf8e8 100644 --- a/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping +++ b/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping @@ -30,6 +30,9 @@ CLASS com/mojang/blaze3d/platform/TextureUtil com/mojang/blaze3d/texture/Texture ARG 4 height METHOD readResource readResource (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; ARG 0 inputStream + METHOD readResource (Ljava/nio/channels/ReadableByteChannel;I)Ljava/nio/ByteBuffer; + ARG 0 bytes + ARG 1 defaultSize METHOD releaseTextureId releaseTextureId (I)V ARG 0 id METHOD writeAsPNG writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIII)V @@ -39,3 +42,11 @@ CLASS com/mojang/blaze3d/platform/TextureUtil com/mojang/blaze3d/texture/Texture ARG 3 mipLevels ARG 4 width ARG 5 height + METHOD writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIIILjava/util/function/IntUnaryOperator;)V + ARG 0 path + ARG 1 imageName + ARG 2 id + ARG 3 mipLevels + ARG 4 width + ARG 5 height + ARG 6 function diff --git a/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping b/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping index 66aaca94cd..14530c8cc7 100644 --- a/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping +++ b/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping @@ -12,4 +12,7 @@ CLASS net/minecraft/unmapped/C_hfcesdco com/mojang/blaze3d/vertex/OverlayVertexC FIELD f_tpagfjwz scale F FIELD f_trigfwfe normalY F FIELD f_vpohkwow z F + METHOD (Lnet/minecraft/unmapped/C_igthdzux;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;F)V + ARG 2 cameraMatrix + ARG 3 normalMatrix METHOD m_escfrycr reset ()V diff --git a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping index f65e469599..517a4b5dc3 100644 --- a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping +++ b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping @@ -1,7 +1,15 @@ CLASS net/minecraft/unmapped/C_rqhfsngs net/minecraft/client/render/BuiltChunkStorage + FIELD f_afwynqyz viewDistance I FIELD f_gqsafriw worldRenderer Lnet/minecraft/unmapped/C_sfkkabhx; + FIELD f_jiixbeeb xGridSections I + FIELD f_mlshnjmi zGridSections I + FIELD f_ugpffsia yGridSections I FIELD f_ypmjrpkj world Lnet/minecraft/unmapped/C_cdctfzbn; + METHOD (Lnet/minecraft/unmapped/C_sjynkhfr;Lnet/minecraft/unmapped/C_cdctfzbn;ILnet/minecraft/unmapped/C_sfkkabhx;)V + ARG 3 viewDistance METHOD m_flvtwfft clear ()V + METHOD m_lzwczkxc getViewDistance ()I + METHOD m_paxdewur createSections (Lnet/minecraft/unmapped/C_sjynkhfr;)V METHOD m_rxnslrfy updateCameraPosition (DD)V ARG 1 x ARG 3 z @@ -10,5 +18,10 @@ CLASS net/minecraft/unmapped/C_rqhfsngs net/minecraft/client/render/BuiltChunkSt ARG 2 y ARG 3 z ARG 4 important + METHOD m_thmsuaoy getWorld ()Lnet/minecraft/unmapped/C_qpninoyb; METHOD m_uqgbrzua setViewDistance (I)V ARG 1 viewDistance + METHOD m_xexmfpvq index (III)I + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index a19a3c8e3f..c74a269843 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -12,8 +12,17 @@ CLASS net/minecraft/unmapped/C_wosoicga net/minecraft/client/render/model/BakedM ARG 2 colorMap ARG 3 mipmap METHOD close close ()V + METHOD m_aehsgbwe (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;Ljava/lang/Void;)Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx; + ARG 1 state + METHOD m_agtdwviq (Ljava/util/List;)Ljava/util/Map; + ARG 0 _list METHOD m_ecxafngp (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; ARG 1 resources + METHOD m_ektbikha (Lnet/minecraft/unmapped/C_djlixbky;)Ljava/lang/String; + ARG 0 material + METHOD m_elihpnce (Lnet/minecraft/unmapped/C_eslcbfsq;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/unmapped/C_gjnplkfz; + ARG 2 models + ARG 3 blockStates METHOD m_ewpgilcu loadBlockModels (Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 executor METHOD m_fdknnkhy getModel (Lnet/minecraft/unmapped/C_jcudnsmp;)Lnet/minecraft/unmapped/C_nnhmhkbv; @@ -25,6 +34,8 @@ CLASS net/minecraft/unmapped/C_wosoicga net/minecraft/client/render/model/BakedM ARG 1 mipmapLevels METHOD m_jxdqxolx loadBlockStates (Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 executor + METHOD m_lfsclgoe (I)[Ljava/util/concurrent/CompletableFuture; + ARG 0 i METHOD m_lwjqxwnu getMissingModel ()Lnet/minecraft/unmapped/C_nnhmhkbv; METHOD m_mpabbjcv getBlockModels ()Lnet/minecraft/unmapped/C_ovutgaod; METHOD m_mzfbpfdl (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; @@ -32,13 +43,26 @@ CLASS net/minecraft/unmapped/C_wosoicga net/minecraft/client/render/model/BakedM METHOD m_nrawhhyn shouldRerender (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;)Z ARG 1 from ARG 2 to + METHOD m_oppkkipg (Lnet/minecraft/unmapped/C_eslcbfsq;Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;)V + ARG 2 reloadState + METHOD m_palizatf (Ljava/util/List;)Ljava/util/Map; + ARG 0 _list METHOD m_pfipxvmw apply (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;Lnet/minecraft/unmapped/C_eslcbfsq;)V - ARG 1 reloadSTate + ARG 1 reloadState + METHOD m_qzgtnlsp (I)[Ljava/util/concurrent/CompletableFuture; + ARG 0 i + METHOD m_raqoqmgu (Lnet/minecraft/unmapped/C_eslcbfsq;Ljava/util/Map;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx; + ARG 4 reloadState + METHOD m_ruwcwoip (Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_pzkdqusv$C_hddnhiwp; + ARG 0 entry + METHOD m_uozkvopc (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;)Ljava/util/concurrent/CompletionStage; + ARG 0 reloadState METHOD m_vfuorvoi (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Collection;)V ARG 0 modelId - ARG 1 textures + ARG 1 materials METHOD m_xvhnauan (Ljava/util/Map;Lcom/google/common/collect/Multimap;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_djlixbky;)Lnet/minecraft/unmapped/C_uflrwbwt; ARG 2 modelId + ARG 3 material METHOD m_xzgzhjbz getAtlas (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_qwirmgcf; ARG 1 id CLASS C_mogtdkcx ReloadState diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index c21d26cd67..83131715fd 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/unmapped/C_gjnplkfz net/minecraft/client/render/model/ModelL ARG 3 modelResources ARG 4 blockStateResources METHOD m_bcuamafh (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ezfeikaq;)V + ARG 1 id ARG 2 stateManager METHOD m_cfqidkii (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map @@ -129,6 +130,9 @@ CLASS net/minecraft/unmapped/C_gjnplkfz net/minecraft/client/render/model/ModelL FIELD f_cjvdgfpd spriteGetter Ljava/util/function/Function; METHOD (Lnet/minecraft/unmapped/C_gjnplkfz;Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 2 spriteGenerator + ARG 3 id + METHOD m_rlqcwykb (Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_djlixbky;)Lnet/minecraft/unmapped/C_uflrwbwt; + ARG 2 material CLASS C_uyeglnzd ModelLoaderException METHOD (Ljava/lang/String;)V ARG 1 message