From 268324fe32708d64e19a2080584a2af48ede82b3 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 23 Nov 2021 02:32:05 +1100 Subject: [PATCH] Mapping Bonanza Part 13: Misc stuff (#2857) * Misc stuff * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update mappings/net/minecraft/test/TestContext.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update mappings/com/mojang/blaze3d/platform/GlStateManager.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> --- .../blaze3d/platform/GlStateManager.mapping | 48 +++++++++++++++++++ .../criterion/TravelCriterion.mapping | 2 + .../s2c/play/ChunkDataS2CPacket.mapping | 3 ++ .../net/minecraft/potion/PotionUtil.mapping | 1 + .../minecraft/recipe/RecipeMatcher.mapping | 2 +- .../minecraft/scoreboard/Scoreboard.mapping | 1 + .../screen/ScreenHandlerType.mapping | 3 ++ .../net/minecraft/tag/TagGroupLoader.mapping | 2 + .../minecraft/tag/TagManagerLoader.mapping | 4 ++ .../net/minecraft/test/TestContext.mapping | 3 ++ .../minecraft/village/VillagerGossips.mapping | 19 ++++++++ .../minecraft/village/VillagerType.mapping | 2 + .../net/minecraft/village/raid/Raid.mapping | 2 + 13 files changed, 91 insertions(+), 1 deletion(-) diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index ff2faf08cd..7a24b91076 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -32,6 +32,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 3 alpha METHOD _deleteTexture (I)V ARG 0 texture + METHOD _deleteTextures ([I)V + ARG 0 textures METHOD _depthFunc (I)V ARG 0 func METHOD _depthMask (Z)V @@ -45,6 +47,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 3 indices METHOD _enableVertexAttribArray (I)V ARG 0 index + METHOD _genTextures ([I)V + ARG 0 textures METHOD _getInteger (I)I ARG 0 pname METHOD _getString (I)Ljava/lang/String; @@ -59,6 +63,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 0 target ARG 1 level ARG 2 pname + METHOD _getTextureId (I)I + ARG 0 texture METHOD _glBindAttribLocation (IILjava/lang/CharSequence;)V ARG 0 program ARG 1 index @@ -69,6 +75,9 @@ CLASS com/mojang/blaze3d/platform/GlStateManager METHOD _glBindFramebuffer (II)V ARG 0 target ARG 1 framebuffer + METHOD _glBindRenderbuffer (II)V + ARG 0 target + ARG 1 renderbuffer METHOD _glBindVertexArray (I)V ARG 0 array METHOD _glBlitFrameBuffer (IIIIIIIIII)V @@ -90,12 +99,34 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 0 target ARG 1 data ARG 2 usage + METHOD _glCopyTexSubImage2D (IIIIIIII)V + ARG 0 target + ARG 1 level + ARG 2 xOffset + ARG 3 yOffset + ARG 4 x + ARG 5 y + ARG 6 width + ARG 7 height METHOD _glDeleteBuffers (I)V ARG 0 buffer METHOD _glDeleteFramebuffers (I)V ARG 0 framebuffer + METHOD _glDeleteRenderbuffers (I)V + ARG 0 renderbuffer METHOD _glDeleteVertexArrays (I)V ARG 0 array + METHOD _glDrawPixels (IIIIJ)V + ARG 0 width + ARG 1 height + ARG 2 format + ARG 3 type + ARG 4 pixels + METHOD _glFramebufferRenderbuffer (IIII)V + ARG 0 target + ARG 1 attachment + ARG 2 renderbufferTarget + ARG 3 renderbuffer METHOD _glFramebufferTexture2D (IIIII)V ARG 0 target ARG 1 attachment @@ -111,6 +142,11 @@ CLASS com/mojang/blaze3d/platform/GlStateManager METHOD _glMapBuffer mapBuffer (II)Ljava/nio/ByteBuffer; ARG 0 target ARG 1 access + METHOD _glRenderbufferStorage (IIII)V + ARG 0 target + ARG 1 internalFormat + ARG 2 width + ARG 3 height METHOD _glUniform1 (ILjava/nio/FloatBuffer;)V ARG 0 location ARG 1 value @@ -165,6 +201,14 @@ CLASS com/mojang/blaze3d/platform/GlStateManager METHOD _polygonOffset (FF)V ARG 0 factor ARG 1 units + METHOD _readPixels (IIIIIIJ)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + ARG 4 format + ARG 5 type + ARG 6 pixels METHOD _readPixels (IIIIIILjava/nio/ByteBuffer;)V ARG 0 x ARG 1 y @@ -333,6 +377,10 @@ CLASS com/mojang/blaze3d/platform/GlStateManager METHOD method_35332 getWidth ()I METHOD method_35333 getHeight ()I CLASS class_4534 DstFactor + METHOD (Ljava/lang/String;II)V + ARG 3 value CLASS class_4535 SrcFactor + METHOD (Ljava/lang/String;II)V + ARG 3 value CLASS class_5518 ScissorTestState FIELD field_26840 capState Lcom/mojang/blaze3d/platform/GlStateManager$class_1018; diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index d849c1530b..d80163bd32 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri FIELD field_9717 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD method_22486 (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2108$class_2110;)Z + ARG 3 conditions METHOD method_9080 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;)V ARG 1 player ARG 2 startPos diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index 4c302ebd68..f0beb92bb2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -8,6 +8,9 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2 METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;Z)V ARG 1 chunk ARG 2 lightProvider + ARG 3 skyBits + ARG 4 blockBits + ARG 5 nonEdge METHOD method_11523 getX ()I METHOD method_11524 getZ ()I METHOD method_38598 getChunkData ()Lnet/minecraft/class_6603; diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index d18d2e1e96..9c6ec811da 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil METHOD method_8065 buildTooltip (Lnet/minecraft/class_1799;Ljava/util/List;F)V ARG 0 stack ARG 1 list + ARG 2 durationMultiplier METHOD method_8066 getPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; ARG 0 nbt METHOD method_8067 getPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/RecipeMatcher.mapping b/mappings/net/minecraft/recipe/RecipeMatcher.mapping index 1fddf7cc26..bc1d2b0f24 100644 --- a/mappings/net/minecraft/recipe/RecipeMatcher.mapping +++ b/mappings/net/minecraft/recipe/RecipeMatcher.mapping @@ -76,7 +76,7 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher FIELD field_7557 ingredientItemLookup Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_7558 requirementsMatrix Ljava/util/BitSet; METHOD (Lnet/minecraft/class_1662;Lnet/minecraft/class_1860;)V - ARG 1 recipe + ARG 2 recipe METHOD method_7413 addRequirement (ZI)V ARG 1 reversed ARG 2 itemId diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 7839058c72..b7db842a66 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -75,6 +75,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard METHOD method_1179 (Lnet/minecraft/class_274;)Ljava/util/List; ARG 0 criterion METHOD method_1180 getPlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; + ARG 1 playerName ARG 2 objective METHOD method_1181 containsObjective (Ljava/lang/String;)Z ARG 1 name diff --git a/mappings/net/minecraft/screen/ScreenHandlerType.mapping b/mappings/net/minecraft/screen/ScreenHandlerType.mapping index 7c68bc17ed..1174e33918 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerType.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerType.mapping @@ -8,6 +8,9 @@ CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType METHOD method_17435 register (Ljava/lang/String;Lnet/minecraft/class_3917$class_3918;)Lnet/minecraft/class_3917; ARG 0 id ARG 1 factory + METHOD method_17436 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_3916; + ARG 0 syncId + ARG 1 playerInventory CLASS class_3918 Factory METHOD create (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; ARG 1 syncId diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index 826f3418df..fadb339ef3 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader ARG 2 dataType METHOD method_18242 buildGroup (Ljava/util/Map;)Lnet/minecraft/class_5414; ARG 1 tags + METHOD method_26799 (Lnet/minecraft/class_2960;)Ljava/lang/Object; + ARG 1 id METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; ARG 1 manager METHOD method_33176 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping index c507bc5783..724658182b 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -5,10 +5,14 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader METHOD (Lnet/minecraft/class_5455;)V ARG 1 registryManager METHOD method_30223 getTagManager ()Lnet/minecraft/class_5415; + METHOD method_30224 (Lnet/minecraft/class_3505$class_5751;)Ljava/util/concurrent/CompletableFuture; + ARG 0 requiredGroup METHOD method_33178 buildRequiredGroup (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5120;)Lnet/minecraft/class_3505$class_5751; ARG 1 resourceManager ARG 2 prepareExecutor ARG 3 requirement + METHOD method_33179 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/List;Lnet/minecraft/class_5120;)V + ARG 4 requiredTagList METHOD method_33180 (Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_3505$class_5751;)V ARG 1 requiredGroup CLASS class_5751 RequiredGroup diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 399255ebc4..aae4017135 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -167,6 +167,8 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 3 errorMessageSupplier METHOD method_35993 addFinalTask (Ljava/lang/Runnable;)V ARG 1 runnable + METHOD method_35994 (Ljava/lang/Runnable;J)V + ARG 2 tick METHOD method_35995 throwGameTestException (Ljava/lang/String;)V ARG 1 message METHOD method_35996 throwPositionedException (Ljava/lang/String;Lnet/minecraft/class_1297;)V @@ -282,6 +284,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 pos METHOD method_36039 toggleLever (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_36040 forEachRemainingTick (Ljava/lang/Runnable;)V METHOD method_36041 createTimedTaskRunner ()Lnet/minecraft/class_4693; METHOD method_36042 dontExpectEntityAtEnd (Lnet/minecraft/class_1299;III)V ARG 1 type diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index 9e7a723558..440389d88f 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 1 type ARG 2 left ARG 3 right + METHOD method_19065 (Lnet/minecraft/class_4139;II)I + ARG 2 left + ARG 3 right METHOD method_19066 deserialize (Lcom/mojang/serialization/Dynamic;)V METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; METHOD method_19070 pickGossips (Ljava/util/Random;I)Ljava/util/Collection; @@ -26,10 +29,26 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 1 target ARG 2 gossipTypeFilter METHOD method_19074 entries ()Ljava/util/stream/Stream; + METHOD method_19075 (Lnet/minecraft/class_4136$class_4138;)V + ARG 1 gossip + METHOD method_19076 (Ljava/util/UUID;)Lnet/minecraft/class_4136$class_4137; + ARG 0 uuid METHOD method_20651 decay ()V METHOD method_35120 getEntityReputationAssociatedGossips ()Ljava/util/Map; + METHOD method_35121 remove (Lnet/minecraft/class_4139;)V + ARG 1 type + METHOD method_35122 getReputationCount (Lnet/minecraft/class_4139;Ljava/util/function/DoublePredicate;)J + ARG 1 type + ARG 2 predicate METHOD method_35123 (Ljava/util/Map;Ljava/util/UUID;)V ARG 2 uuid + METHOD method_35124 remove (Ljava/util/UUID;Lnet/minecraft/class_4139;)V + ARG 1 target + ARG 2 type + METHOD method_35126 removeGossip (Ljava/util/UUID;Lnet/minecraft/class_4139;I)V + ARG 1 target + ARG 2 type + ARG 3 value CLASS class_4137 Reputation FIELD field_18420 associatedGossip Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_19079 entriesFor (Ljava/util/UUID;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping index 87c0f1bd9e..da3f6b810f 100644 --- a/mappings/net/minecraft/village/VillagerType.mapping +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -16,3 +16,5 @@ CLASS net/minecraft/class_3854 net/minecraft/village/VillagerType ARG 0 id METHOD method_16932 (Ljava/util/HashMap;)V ARG 0 map + METHOD method_31080 (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 0 biomeKey diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index d61277820f..6b8abe4b13 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -122,6 +122,8 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 1 proximity METHOD method_20509 setCenter (Lnet/minecraft/class_2338;)V ARG 1 center + METHOD method_20510 (Lnet/minecraft/class_2338;)D + ARG 1 pos METHOD method_20511 moveRaidCenter ()V METHOD method_35211 setBadOmenLevel (I)V ARG 1 level