From 2b3663b85f77233eb91b20e9bf248c877566c21c Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 25 Jan 2023 04:05:59 +0900 Subject: [PATCH] 23w04a stuff (#3462) --- .../entity/AbstractFurnaceBlockEntity.mapping | 8 ++++++ .../block/entity/CampfireBlockEntity.mapping | 2 ++ mappings/net/minecraft/class_8046.mapping | 2 -- .../minecraft/client/MinecraftClient.mapping | 4 +++ .../client/gui/DrawableHelper.mapping | 27 +++++++++++++++++++ .../AccessibilityOnboardingScreen.mapping | 1 + .../gui/screen/pack/PackListWidget.mapping | 3 +++ .../client/gui/screen/pack/PackScreen.mapping | 1 + .../client/texture/NativeImage.mapping | 3 +++ .../net/minecraft/entity/ItemEntity.mapping | 3 +++ mappings/net/minecraft/entity/Ownable.mapping | 2 ++ .../entity/passive/SheepEntity.mapping | 4 +++ .../minecraft/network/PacketByteBuf.mapping | 11 +++++--- .../packet/s2c/play/GameJoinS2CPacket.mapping | 1 + .../server/command/ExecuteCommand.mapping | 2 ++ .../net/minecraft/util/Identifier.mapping | 2 ++ .../minecraft/util/math/ColorHelper.mapping | 19 +++++++++++++ 17 files changed, 90 insertions(+), 5 deletions(-) delete mode 100644 mappings/net/minecraft/class_8046.mapping create mode 100644 mappings/net/minecraft/entity/Ownable.mapping diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 959eea180c..d6f64fe7d9 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -25,6 +25,10 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 3 state ARG 4 recipeType METHOD method_11192 canAcceptRecipeOutput (Lnet/minecraft/class_5455;Lnet/minecraft/class_1860;Lnet/minecraft/class_2371;I)Z + ARG 0 registryManager + ARG 1 recipe + ARG 2 slots + ARG 3 count METHOD method_11194 addFuel (Ljava/util/Map;Lnet/minecraft/class_6862;I)V ARG 0 fuelTimes ARG 1 tag @@ -40,6 +44,10 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 1 item ARG 2 fuelTime METHOD method_11203 craftRecipe (Lnet/minecraft/class_5455;Lnet/minecraft/class_1860;Lnet/minecraft/class_2371;I)Z + ARG 0 registryManager + ARG 1 recipe + ARG 2 slots + ARG 3 count METHOD method_17029 getCookTime (Lnet/minecraft/class_1937;Lnet/minecraft/class_2609;)I ARG 0 world ARG 1 furnace diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping index 6379fae865..5df6d8e03f 100644 --- a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_3924 net/minecraft/block/entity/CampfireBlockEntity ARG 1 user ARG 2 stack ARG 3 cookTime + METHOD method_17504 (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;Lnet/minecraft/class_3920;)Lnet/minecraft/class_1799; + ARG 2 recipe METHOD method_17505 getItemsBeingCooked ()Lnet/minecraft/class_2371; METHOD method_17506 spawnItemsBeingCooked ()V METHOD method_17510 updateListeners ()V diff --git a/mappings/net/minecraft/class_8046.mapping b/mappings/net/minecraft/class_8046.mapping deleted file mode 100644 index 0953fc8974..0000000000 --- a/mappings/net/minecraft/class_8046.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_8046 - METHOD method_24921 getOwner ()Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 8bdd08de1b..f118e198f3 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -271,6 +271,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1551 getInstance ()Lnet/minecraft/class_310; METHOD method_1554 getBakedModelManager ()Lnet/minecraft/class_1092; METHOD method_1555 hasReducedDebugInfo ()Z + METHOD method_1556 (Lnet/minecraft/class_516;Lnet/minecraft/class_1860;)Lnet/minecraft/class_2960; + ARG 1 recipe METHOD method_1558 getCurrentServerEntry ()Lnet/minecraft/class_642; METHOD method_1560 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_1561 getEntityRenderDispatcher ()Lnet/minecraft/class_898; @@ -301,6 +303,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1589 isConnectedToRealms ()Z METHOD method_1590 handleBlockBreaking (Z)V ARG 1 breaking + METHOD method_1591 (Lnet/minecraft/class_516;Lnet/minecraft/class_1860;)Ljava/util/stream/Stream; + ARG 1 recipe METHOD method_1592 scheduleStop ()V METHOD method_16009 getFramerateLimit ()I METHOD method_16011 getProfiler ()Lnet/minecraft/class_3695; diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 997c986b64..3ef136639d 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -250,3 +250,30 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 4 y2 ARG 5 z ARG 6 color + METHOD method_48465 drawSprite (Lnet/minecraft/class_4587;IIIIILnet/minecraft/class_1058;FFFF)V + ARG 0 matrices + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 width + ARG 5 height + ARG 6 sprite + ARG 7 red + ARG 8 green + ARG 9 blue + ARG 10 alpha + METHOD method_48466 drawTexturedQuad (Lorg/joml/Matrix4f;IIIIIFFFFFFFF)V + ARG 0 matrix + ARG 1 x0 + ARG 2 x1 + ARG 3 y0 + ARG 4 y1 + ARG 5 z + ARG 6 u0 + ARG 7 u1 + ARG 8 v0 + ARG 9 v1 + ARG 10 red + ARG 11 green + ARG 12 blue + ARG 13 alpha diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping index f2ad4e23b3..e75c5b0314 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo FIELD field_41843 narratorPrompted Z FIELD field_41844 narratorPromptTimer F FIELD field_41845 textWidget Lnet/minecraft/class_8019; + FIELD field_42038 isNarratorUsable Z METHOD (Lnet/minecraft/class_315;)V ARG 1 gameOptions METHOD method_48257 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping index 1d017ff06f..ac7a4aeb77 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping @@ -34,3 +34,6 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/pack/PackListWidge METHOD method_48280 toggle ()V METHOD method_48281 moveTowardStart ()V METHOD method_48282 moveTowardEnd ()V + METHOD method_48477 (Z)V + ARG 1 confirmed + METHOD method_48478 enable ()Z diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index 8d04137ef4..9c75618522 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -48,6 +48,7 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen ARG 2 resourcePackProfile METHOD method_30291 closeDirectoryWatcher ()V METHOD method_48277 switchFocusedList (Lnet/minecraft/class_521;)V + ARG 1 listWidget METHOD method_48278 clearSelection ()V CLASS class_5426 DirectoryWatcher FIELD field_25790 watchService Ljava/nio/file/WatchService; diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 39e23d4eec..1ff978a2a9 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -186,6 +186,9 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 7 height ARG 8 flipX ARG 9 flipY + METHOD method_48462 apply (Ljava/util/function/IntUnaryOperator;)Lnet/minecraft/class_1011; + ARG 1 operator + METHOD method_48463 copyPixelsRgba ()[I CLASS class_1012 Format FIELD field_4993 glFormat I FIELD field_4994 channelCount I diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index 621905e2e6..b1e143782b 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity FIELD field_30456 DESPAWN_AGE I FIELD field_30457 CANNOT_PICK_UP_DELAY I FIELD field_30458 NEVER_DESPAWN_AGE I + FIELD field_41893 owner Ljava/util/UUID; FIELD field_7199 STACK Lnet/minecraft/class_2940; FIELD field_7200 thrower Ljava/util/UUID; FIELD field_7201 health I @@ -53,6 +54,8 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity ARG 1 tickDelta METHOD method_29271 copy ()Lnet/minecraft/class_1542; METHOD method_35190 setNeverDespawn ()V + METHOD method_48349 setOwner (Ljava/util/UUID;)V + ARG 1 owner METHOD method_6972 tryMerge (Lnet/minecraft/class_1542;)V ARG 1 other METHOD method_6973 tryMerge ()V diff --git a/mappings/net/minecraft/entity/Ownable.mapping b/mappings/net/minecraft/entity/Ownable.mapping new file mode 100644 index 0000000000..bf7da1f0fc --- /dev/null +++ b/mappings/net/minecraft/entity/Ownable.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8046 net/minecraft/entity/Ownable + METHOD method_24921 getOwner ()Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index b246bb3885..8b1db6e11e 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity FIELD field_6868 DROPS Ljava/util/Map; FIELD field_6869 eatGrassGoal Lnet/minecraft/class_1345; FIELD field_6870 COLOR Lnet/minecraft/class_2940; + METHOD method_17689 (Lnet/minecraft/class_1715;Lnet/minecraft/class_3955;)Lnet/minecraft/class_1799; + ARG 2 recipe METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1715; ARG 0 firstColor ARG 1 secondColor @@ -27,6 +29,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity ARG 1 sheared METHOD method_6637 (Ljava/util/EnumMap;)V ARG 0 map + METHOD method_6638 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767; + ARG 0 color METHOD method_6639 getChildColor (Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;)Lnet/minecraft/class_1767; ARG 1 firstParent ARG 2 secondParent diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 0e8d96a140..8415fc1d48 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT Object Type read method write method COMMENT COMMENT - COMMENT Codec-based{@link #decode(Codec)}{@link #encode(Codec, Object)} + COMMENT Codec-based{@link #decode(DynamicOps, Codec)}{@link #encode(DynamicOps, Codec, Object)} COMMENT COMMENT COMMENT {@link net.minecraft.registry.Registry} value{@link #readRegistryValue(IndexedIterable)}{@link #writeRegistryValue(IndexedIterable, Object)} @@ -642,14 +642,19 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @return the read object COMMENT @throws io.netty.handler.codec.EncoderException if the {@code codec} fails COMMENT to decode the compound NBT - COMMENT @see #encode(Codec, Object) + COMMENT @see #encode(DynamicOps, Codec, Object) + ARG 1 ops + ARG 2 codec METHOD method_29172 encode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/lang/Object;)V COMMENT Writes an object to this buf as a compound NBT with the given codec. COMMENT COMMENT @param the encoded object's type COMMENT @throws io.netty.handler.codec.EncoderException if the {@code codec} fails COMMENT to encode the compound NBT - COMMENT @see #decode(Codec) + COMMENT @see #decode(DynamicOps, Codec) + ARG 1 ops + ARG 2 codec + ARG 3 value METHOD method_30616 readNbt (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from this buf. The binary representation of NBT is COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 0548d08b24..052ca7924e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD comp_97 maxPlayers I FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z + FIELD field_42104 REGISTRY_OPS Lnet/minecraft/class_6903; METHOD (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JIIIZZZZLjava/util/Optional;)V ARG 1 playerEntityId ARG 3 previousGameMode diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 8ad4548ed1..8be453683d 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -254,6 +254,8 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 entity METHOD method_48076 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context + METHOD method_48332 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 05f5ef8a7b..d3dfd25d8d 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -178,6 +178,8 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier ARG 1 path METHOD method_45138 withPrefixedPath (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 1 prefix + METHOD method_48331 withSuffixedPath (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 suffix CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/util/math/ColorHelper.mapping b/mappings/net/minecraft/util/math/ColorHelper.mapping index f6dfefe2ee..4b0ddda18b 100644 --- a/mappings/net/minecraft/util/math/ColorHelper.mapping +++ b/mappings/net/minecraft/util/math/ColorHelper.mapping @@ -32,3 +32,22 @@ CLASS net/minecraft/class_5253 net/minecraft/util/math/ColorHelper COMMENT COMMENT

The returned value is between {@code 0} and {@code 255} (both inclusive). ARG 0 argb + CLASS class_8045 Abgr + METHOD method_48342 getAlpha (I)I + ARG 0 abgr + METHOD method_48343 withAlpha (II)I + ARG 0 alpha + ARG 1 bgr + METHOD method_48344 getAbgr (IIII)I + ARG 0 a + ARG 1 b + ARG 2 g + ARG 3 r + METHOD method_48345 getBlue (I)I + ARG 0 abgr + METHOD method_48346 getGreen (I)I + ARG 0 abgr + METHOD method_48347 getRed (I)I + ARG 0 abgr + METHOD method_48348 getBgr (I)I + ARG 0 abgr