From fcc786466a67b0c2736b3f1ec7f9bb3b93f2e1d6 Mon Sep 17 00:00:00 2001 From: asie Date: Fri, 9 Nov 2018 12:34:44 +0100 Subject: [PATCH] minor update --- mappings/awz.mapping | 4 ---- mappings/cmp.mapping | 5 ----- mappings/cmq.mapping | 5 +++++ mappings/cnq.mapping | 2 ++ .../net/minecraft/client/font/FontRenderer.mapping | 1 + mappings/net/minecraft/client/gui/Drawable.mapping | 2 +- .../minecraft/client/gui/hud/HudChatListener.mapping | 5 +++++ .../net/minecraft/client/gui/hud/HudInGame.mapping | 10 ++++++++++ .../net/minecraft/client/gui/ingame/GuiChat.mapping | 1 + .../net/minecraft/client/gui/menu/GuiRealms.mapping | 8 +++++++- ...andler.mapping => ClientPlayNetworkHandler.mapping} | 6 +++++- .../minecraft/client/player/EntityPlayerClient.mapping | 3 ++- .../minecraft/client/sortme/ClientChatListener.mapping | 4 ++++ .../net/minecraft/client/texture/NativeImage.mapping | 8 ++++++++ .../client/texture/NativeImageBackedTexture.mapping | 2 ++ .../net/minecraft/client/util/NarratorManager.mapping | 10 ++++++++++ .../net/minecraft/entity/player/EntityPlayer.mapping | 1 + .../minecraft/entity/player/EntityPlayerServer.mapping | 2 ++ .../network/handler/ClientPlayPacketListener.mapping | 1 + .../network/handler/ServerPlayNetworkHandler.mapping | 1 + .../network/handler/ServerPlayPacketListener.mapping | 1 + .../network/packet/server/SPacketGuiClose.mapping | 8 ++++++++ mappings/net/minecraft/recipe/AbstractRecipe.mapping | 7 +++++++ .../net/minecraft/recipe/RecipeSerializers.mapping | 4 ++++ .../minecraft/recipe/crafting/RecipeArmorDye.mapping | 2 ++ .../recipe/crafting/RecipeBannerDuplicate.mapping | 2 ++ .../recipe/crafting/RecipeBookCloning.mapping | 2 ++ .../recipe/crafting/RecipeFireworkRocket.mapping | 2 ++ .../recipe/crafting/RecipeFireworkStar.mapping | 2 ++ .../recipe/crafting/RecipeFireworkStarFade.mapping | 2 ++ .../minecraft/recipe/crafting/RecipeMapCloning.mapping | 2 ++ .../minecraft/recipe/crafting/RecipeRepairItem.mapping | 2 ++ .../recipe/crafting/RecipeShieldDecoration.mapping | 2 ++ .../recipe/crafting/RecipeShulkerBoxColoring.mapping | 2 ++ .../recipe/crafting/RecipeSuspiciousStew.mapping | 2 ++ .../recipe/crafting/RecipeTippedArrow.mapping | 2 ++ .../minecraft/recipe/smelting/RecipeSmelting.mapping | 1 + .../net/minecraft/server/rcon/BufferHelper.mapping | 5 ++++- mappings/net/minecraft/server/rcon/RconServer.mapping | 2 ++ mappings/net/minecraft/sortme/Painting.mapping | 10 ---------- mappings/net/minecraft/sortme/PaintingMotive.mapping | 10 ++++++++++ mappings/net/minecraft/util/math/BlockPos.mapping | 1 + mappings/net/minecraft/util/registry/Registry.mapping | 2 +- mappings/ni.mapping | 5 ----- 44 files changed, 131 insertions(+), 30 deletions(-) delete mode 100644 mappings/awz.mapping delete mode 100644 mappings/cmp.mapping create mode 100644 mappings/cmq.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/HudChatListener.mapping rename mappings/net/minecraft/client/network/handler/{ClientGameNetworkHandler.mapping => ClientPlayNetworkHandler.mapping} (93%) create mode 100644 mappings/net/minecraft/client/sortme/ClientChatListener.mapping create mode 100644 mappings/net/minecraft/client/util/NarratorManager.mapping create mode 100644 mappings/net/minecraft/network/packet/server/SPacketGuiClose.mapping create mode 100644 mappings/net/minecraft/recipe/AbstractRecipe.mapping delete mode 100644 mappings/net/minecraft/sortme/Painting.mapping create mode 100644 mappings/net/minecraft/sortme/PaintingMotive.mapping delete mode 100644 mappings/ni.mapping diff --git a/mappings/awz.mapping b/mappings/awz.mapping deleted file mode 100644 index 0db7611fef..0000000000 --- a/mappings/awz.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS awz - METHOD b getId ()Lpw; - METHOD c isIgnoredInRecipeBook ()Z - METHOD d getOutput ()Lava; diff --git a/mappings/cmp.mapping b/mappings/cmp.mapping deleted file mode 100644 index 5820bbac05..0000000000 --- a/mappings/cmp.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS cmp - FIELD a INSTANCE Lcmp; - FIELD b narrator Lcom/mojang/text2speech/Narrator; - METHOD a isNarratorActive ()Z - METHOD b clearNarrator ()V diff --git a/mappings/cmq.mapping b/mappings/cmq.mapping new file mode 100644 index 0000000000..89490b0bf1 --- /dev/null +++ b/mappings/cmq.mapping @@ -0,0 +1,5 @@ +CLASS cmq + FIELD a game Lclx; + METHOD a onChatMessage (Lix;Liz;)V + ARG 2 message + ARG 3 gameSetting diff --git a/mappings/cnq.mapping b/mappings/cnq.mapping index 3810909c17..b7a4f4f8b5 100644 --- a/mappings/cnq.mapping +++ b/mappings/cnq.mapping @@ -1,5 +1,6 @@ CLASS cnq METHOD b getListeners ()Ljava/util/List; + METHOD b focusOn (Lcnr;)V METHOD keyPressed (III)Z ARG 1 keyCode ARG 2 scanCode @@ -7,3 +8,4 @@ CLASS cnq ARG 1 mouseX METHOD mouseReleased (DDI)Z ARG 1 mouseX + METHOD t focusNext ()V diff --git a/mappings/net/minecraft/client/font/FontRenderer.mapping b/mappings/net/minecraft/client/font/FontRenderer.mapping index 7d5e93aebf..cf3ba9109b 100644 --- a/mappings/net/minecraft/client/font/FontRenderer.mapping +++ b/mappings/net/minecraft/client/font/FontRenderer.mapping @@ -45,6 +45,7 @@ CLASS cmk net/minecraft/client/font/FontRenderer METHOD a (Ljava/lang/String;IZ)Ljava/lang/String; ARG 2 width METHOD a setRightToLeft (Z)V + METHOD b getStringWidth (Ljava/lang/String;)I METHOD b drawWithShadow (Ljava/lang/String;FFI)I ARG 1 str ARG 2 x diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping index ac0bd5e26d..cf6c5072df 100644 --- a/mappings/net/minecraft/client/gui/Drawable.mapping +++ b/mappings/net/minecraft/client/gui/Drawable.mapping @@ -2,7 +2,7 @@ CLASS cmm net/minecraft/client/gui/Drawable FIELD b OPTIONS_BG Lpw; FIELD c STAT_ICONS Lpw; FIELD d ICONS Lpw; - FIELD e z F + FIELD e zOffset F METHOD a drawTexturedRect (FFIIII)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/hud/HudChatListener.mapping b/mappings/net/minecraft/client/gui/hud/HudChatListener.mapping new file mode 100644 index 0000000000..6851fd2b51 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/HudChatListener.mapping @@ -0,0 +1,5 @@ +CLASS cmr net/minecraft/client/gui/hud/HudChatListener + FIELD a game Lclx; + METHOD a onChatMessage (Lix;Liz;)V + ARG 2 message + ARG 3 gameSetting diff --git a/mappings/net/minecraft/client/gui/hud/HudInGame.mapping b/mappings/net/minecraft/client/gui/hud/HudInGame.mapping index 21e99d17dd..cd86261df1 100644 --- a/mappings/net/minecraft/client/gui/hud/HudInGame.mapping +++ b/mappings/net/minecraft/client/gui/hud/HudInGame.mapping @@ -1,4 +1,7 @@ CLASS cml net/minecraft/client/gui/hud/HudInGame + FIELD H scaledWidth I + FIELD I scaledHeight I + FIELD J listeners Ljava/util/Map; FIELD f VIGNETTE_TEX Lpw; FIELD g WIDGETS_TEX Lpw; FIELD h PUMPKIN_BLUR Lpw; @@ -12,10 +15,17 @@ CLASS cml net/minecraft/client/gui/hud/HudInGame FIELD u hudSpectator Lcnv; FIELD v hudScoreboard Lcnk; FIELD w hudBossBar Lcmt; + METHOD (Lclx;)V + ARG 2 narrator METHOD a draw (F)V + METHOD a addChatMessage (Lix;Liz;)V + ARG 2 message + METHOD d renderDemoTimer ()V + ARG 1 text METHOD f getHudChat ()Lcmv; METHOD h getFontRenderer ()Lcmk; METHOD i getSpectatorWidget ()Lcnv; METHOD j getScoreboardWidget ()Lcnk; + METHOD k clear ()V METHOD l getHudBossBar ()Lcmt; METHOD n getCameraPlayer ()Lapv; diff --git a/mappings/net/minecraft/client/gui/ingame/GuiChat.mapping b/mappings/net/minecraft/client/gui/ingame/GuiChat.mapping index 6b4e229a5c..6baf52a7b1 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiChat.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiChat.mapping @@ -1,4 +1,5 @@ CLASS cpf net/minecraft/client/gui/ingame/GuiChat + FIELD a chatField Lcmy; METHOD a draw (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping index a4a8798348..0218c4d8e4 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping @@ -1,5 +1,6 @@ CLASS coy net/minecraft/client/gui/menu/GuiRealms FIELD a realmsScreen Lnet/minecraft/realms/RealmsScreen; + FIELD f LOGGER_REALMS Lorg/apache/logging/log4j/Logger; METHOD a getRealmsScreen ()Lnet/minecraft/realms/RealmsScreen; METHOD a draw (IIF)V ARG 1 mouseX @@ -32,6 +33,8 @@ CLASS coy net/minecraft/client/gui/menu/GuiRealms METHOD a drawTooltip (Ljava/util/List;II)V ARG 1 text ARG 2 x + METHOD a addButton (Lnet/minecraft/realms/RealmsButton;)V + METHOD a addWidget (Lnet/minecraft/realms/RealmsGuiEventListener;)V METHOD b drawTexturedRect (IIIIII)V ARG 1 x ARG 2 y @@ -44,8 +47,10 @@ CLASS coy net/minecraft/client/gui/menu/GuiRealms ARG 3 y METHOD b draw (Ljava/lang/String;IIIZ)I METHOD b removeButton (Lnet/minecraft/realms/RealmsButton;)V + METHOD b removeWidget (Lnet/minecraft/realms/RealmsGuiEventListener;)V METHOD c onInitialized ()V METHOD c getStringWidth (Ljava/lang/String;)I + METHOD c containsWidget (Lnet/minecraft/realms/RealmsGuiEventListener;)Z METHOD c_ drawBackground (I)V METHOD confirmResult handle (ZI)V ARG 1 result @@ -53,11 +58,12 @@ CLASS coy net/minecraft/client/gui/menu/GuiRealms METHOD e isPauseScreen ()Z METHOD f update ()V METHOD i getFontHeight ()I - METHOD j clearWidgets ()V + METHOD j clearListeners ()V METHOD k getButtons ()Ljava/util/List; METHOD keyPressed (III)Z ARG 1 keyCode ARG 2 scanCode + METHOD m clearWidgets ()V METHOD mouseClicked (DDI)Z ARG 1 mouseX METHOD mouseReleased (DDI)Z diff --git a/mappings/net/minecraft/client/network/handler/ClientGameNetworkHandler.mapping b/mappings/net/minecraft/client/network/handler/ClientPlayNetworkHandler.mapping similarity index 93% rename from mappings/net/minecraft/client/network/handler/ClientGameNetworkHandler.mapping rename to mappings/net/minecraft/client/network/handler/ClientPlayNetworkHandler.mapping index 01cb526be6..381bdfe023 100644 --- a/mappings/net/minecraft/client/network/handler/ClientGameNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/handler/ClientPlayNetworkHandler.mapping @@ -1,16 +1,19 @@ -CLASS cxg net/minecraft/client/network/handler/ClientGameNetworkHandler +CLASS cxg net/minecraft/client/network/handler/ClientPlayNetworkHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b connection Lin; FIELD e game Lclx; FIELD f world Lcxj; FIELD i advancementHandler Lcxd; + FIELD j commandSource Lcxh; FIELD k tagManager Lxt; FIELD m rand Ljava/util/Random; + FIELD n commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD o recipeManager Laxh; METHOD a getClientConnection ()Lin; METHOD a onConnectionLost (Liz;)V METHOD a sendPacket (Ljn;)V METHOD a onEntitySpawn (Ljr;)V + ARG 1 packet METHOD a onExperienceOrbSpawn (Ljs;)V METHOD a onEntitySpawnGlobal (Ljt;)V METHOD a onMobSpawn (Lju;)V @@ -84,6 +87,7 @@ CLASS cxg net/minecraft/client/network/handler/ClientGameNetworkHandler METHOD a onAdvancements (Lmt;)V METHOD a onEntityAttributes (Lmu;)V METHOD a onEntityPotionEffect (Lmv;)V + METHOD b getCommandSource ()Lcxh; METHOD b validateResourcePackUrl (Ljava/lang/String;)Z METHOD d getRecipeManager ()Laxh; METHOD g getAdvancementHandler ()Lcxd; diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index 8305ae4872..1179793fe0 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -47,10 +47,11 @@ CLASS czm net/minecraft/client/player/EntityPlayerClient METHOD g setServerBrand (Ljava/lang/String;)V METHOD h getYaw (F)F METHOD k updateMovement ()V - METHOD p closeGui ()V + METHOD p closeGuiClient ()V METHOD s updateHealth (F)V METHOD v openRidingInventory ()V METHOD w getServerBrand ()Ljava/lang/String; METHOD x getStats ()Lxk; + METHOD x_ closeGui ()V METHOD y getPermissionLevel ()I METHOD z getRecipeBook ()Lclr; diff --git a/mappings/net/minecraft/client/sortme/ClientChatListener.mapping b/mappings/net/minecraft/client/sortme/ClientChatListener.mapping new file mode 100644 index 0000000000..153a4e1a19 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/ClientChatListener.mapping @@ -0,0 +1,4 @@ +CLASS cmo net/minecraft/client/sortme/ClientChatListener + METHOD a onChatMessage (Lix;Liz;)V + ARG 2 message + ARG 3 gameSetting diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index fdf1904614..2a91f9e605 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -15,6 +15,12 @@ CLASS ckq net/minecraft/client/texture/NativeImage METHOD a setPixelRGBA (III)V ARG 1 x ARG 2 y + METHOD a fillRGBA (IIIII)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 color METHOD a resizeSubRectTo (IIIILckq;)V METHOD a fromInputStream (Lckq$a;Ljava/io/InputStream;)Lckq; METHOD a fromByteBuffer (Lckq$a;Ljava/nio/ByteBuffer;)Lckq; @@ -25,6 +31,8 @@ CLASS ckq net/minecraft/client/texture/NativeImage METHOD a writeFile (Ljava/nio/file/Path;)V METHOD b getHeight ()I METHOD b blendPixel (III)V + METHOD b fromBase64 (Ljava/lang/String;)Lckq; + ARG 0 string METHOD c getFormat ()Lckq$a; METHOD d makePixelArray ()[I METHOD g checkAllocated ()V diff --git a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping index 2d6fc5692a..3cd9584f57 100644 --- a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping +++ b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping @@ -1,4 +1,6 @@ CLASS djc net/minecraft/client/texture/NativeImageBackedTexture FIELD f image Lckq; + METHOD a setImage (Lckq;)V + ARG 1 image METHOD a load (Lvw;)V METHOD e getImage ()Lckq; diff --git a/mappings/net/minecraft/client/util/NarratorManager.mapping b/mappings/net/minecraft/client/util/NarratorManager.mapping new file mode 100644 index 0000000000..b3c5990684 --- /dev/null +++ b/mappings/net/minecraft/client/util/NarratorManager.mapping @@ -0,0 +1,10 @@ +CLASS cmp net/minecraft/client/util/NarratorManager + FIELD a INSTANCE Lcmp; + FIELD b narrator Lcom/mojang/text2speech/Narrator; + METHOD a isActive ()Z + METHOD a addToast (I)V + ARG 1 gameSetting + METHOD a onChatMessage (Lix;Liz;)V + ARG 2 message + ARG 3 gameSetting + METHOD b clear ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index ee23013660..5057727cfc 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -160,4 +160,5 @@ CLASS apv net/minecraft/entity/player/EntityPlayer METHOD r setReducedDebugInfo (Z)V METHOD t isSpectator ()Z METHOD u isCreative ()Z + METHOD x_ closeGui ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 6a5a261c4f..2c9fabad45 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -52,8 +52,10 @@ CLASS uf net/minecraft/entity/player/EntityPlayerServer METHOD d addExperience (I)V METHOD f attack (Lafy;)V METHOD g createCooldownManager ()Lauv; + METHOD m closeContainer ()V METHOD n initAi ()V METHOD s getServerWorld ()Lud; METHOD t isSpectator ()Z METHOD u isCreative ()Z + METHOD x_ closeGui ()V METHOD y getPermissionLevel ()I diff --git a/mappings/net/minecraft/network/handler/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/handler/ClientPlayPacketListener.mapping index 3ec53aa262..d7503b10d3 100644 --- a/mappings/net/minecraft/network/handler/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/handler/ClientPlayPacketListener.mapping @@ -1,5 +1,6 @@ CLASS jq net/minecraft/network/handler/ClientPlayPacketListener METHOD a onEntitySpawn (Ljr;)V + ARG 1 packet METHOD a onExperienceOrbSpawn (Ljs;)V METHOD a onEntitySpawnGlobal (Ljt;)V METHOD a onMobSpawn (Lju;)V diff --git a/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping index 662c13b69a..a9dce663a2 100644 --- a/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/network/handler/ServerPlayNetworkHandler.mapping @@ -8,5 +8,6 @@ CLASS ut net/minecraft/network/handler/ServerPlayNetworkHandler METHOD a onConnectionLost (Liz;)V METHOD a sendPacket (Ljn;)V METHOD a sendPacket (Ljn;Lio/netty/util/concurrent/GenericFutureListener;)V + METHOD a onGuiClose (Lni;)V METHOD a onCustomPayload (Lnj;)V METHOD a onBookUpdate (Lnk;)V diff --git a/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping index 955fb1b691..a930d4e5f2 100644 --- a/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/handler/ServerPlayPacketListener.mapping @@ -1,3 +1,4 @@ CLASS my net/minecraft/network/handler/ServerPlayPacketListener + METHOD a onGuiClose (Lni;)V METHOD a onCustomPayload (Lnj;)V METHOD a onBookUpdate (Lnk;)V diff --git a/mappings/net/minecraft/network/packet/server/SPacketGuiClose.mapping b/mappings/net/minecraft/network/packet/server/SPacketGuiClose.mapping new file mode 100644 index 0000000000..5ce0e4522a --- /dev/null +++ b/mappings/net/minecraft/network/packet/server/SPacketGuiClose.mapping @@ -0,0 +1,8 @@ +CLASS ni net/minecraft/network/packet/server/SPacketGuiClose + FIELD a id I + METHOD (I)V + ARG 1 id + METHOD a read (Lip;)V + METHOD a apply (Lis;)V + METHOD a apply (Lmy;)V + METHOD b write (Lip;)V diff --git a/mappings/net/minecraft/recipe/AbstractRecipe.mapping b/mappings/net/minecraft/recipe/AbstractRecipe.mapping new file mode 100644 index 0000000000..1553a5aa13 --- /dev/null +++ b/mappings/net/minecraft/recipe/AbstractRecipe.mapping @@ -0,0 +1,7 @@ +CLASS awz net/minecraft/recipe/AbstractRecipe + FIELD a id Lpw; + METHOD (Lpw;)V + ARG 1 id + METHOD b getId ()Lpw; + METHOD c isIgnoredInRecipeBook ()Z + METHOD d getOutput ()Lava; diff --git a/mappings/net/minecraft/recipe/RecipeSerializers.mapping b/mappings/net/minecraft/recipe/RecipeSerializers.mapping index 9c976ee7ba..1389f71385 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializers.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializers.mapping @@ -15,3 +15,7 @@ CLASS axj net/minecraft/recipe/RecipeSerializers METHOD a read (Lpw;Lip;)Laxg; ARG 0 id ARG 1 buf + METHOD a toPacket (Laxg;Lip;)V + METHOD a register (Laxi;)Laxi; + METHOD a fromPacket (Lip;)Laxg; + METHOD a fromJson (Lpw;Lcom/google/gson/JsonObject;)Laxg; diff --git a/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping b/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping index b9fcc9d6fe..f0889e50f7 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeArmorDye.mapping @@ -1,4 +1,6 @@ CLASS aww net/minecraft/recipe/crafting/RecipeArmorDye + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping b/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping index 690dc65ef7..3b2bfa1ca8 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeBannerDuplicate.mapping @@ -1,4 +1,6 @@ CLASS awx net/minecraft/recipe/crafting/RecipeBannerDuplicate + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping b/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping index b2516cd015..5f2992b0ac 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeBookCloning.mapping @@ -1,4 +1,6 @@ CLASS awy net/minecraft/recipe/crafting/RecipeBookCloning + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping index e00d9b7da8..4d3bcd0f5f 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkRocket.mapping @@ -1,4 +1,6 @@ CLASS axa net/minecraft/recipe/crafting/RecipeFireworkRocket + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping index 723b753686..95d85eeed2 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStar.mapping @@ -1,4 +1,6 @@ CLASS axc net/minecraft/recipe/crafting/RecipeFireworkStar + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping index 2446f9cc03..f13fd185f5 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeFireworkStarFade.mapping @@ -1,4 +1,6 @@ CLASS axb net/minecraft/recipe/crafting/RecipeFireworkStarFade + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping b/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping index 775ac61aac..6267b3115e 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeMapCloning.mapping @@ -1,4 +1,6 @@ CLASS axe net/minecraft/recipe/crafting/RecipeMapCloning + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping b/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping index 2ba06a84e4..2baf361c9a 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeRepairItem.mapping @@ -1,4 +1,6 @@ CLASS axk net/minecraft/recipe/crafting/RecipeRepairItem + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping index aa7c8530a0..73ccedb80e 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeShieldDecoration.mapping @@ -1,4 +1,6 @@ CLASS axn net/minecraft/recipe/crafting/RecipeShieldDecoration + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping b/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping index 05531ba8e5..f0f3fdba19 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeShulkerBoxColoring.mapping @@ -1,4 +1,6 @@ CLASS axo net/minecraft/recipe/crafting/RecipeShulkerBoxColoring + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping b/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping index e0c38c0ffe..83071229f5 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeSuspiciousStew.mapping @@ -1,4 +1,6 @@ CLASS axq net/minecraft/recipe/crafting/RecipeSuspiciousStew + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping b/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping index 4d6d939c11..898eb4400d 100644 --- a/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping +++ b/mappings/net/minecraft/recipe/crafting/RecipeTippedArrow.mapping @@ -1,4 +1,6 @@ CLASS axr net/minecraft/recipe/crafting/RecipeTippedArrow + METHOD (Lpw;)V + ARG 1 id METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping b/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping index 7cd2f4295e..7f3509ec47 100644 --- a/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping +++ b/mappings/net/minecraft/recipe/smelting/RecipeSmelting.mapping @@ -15,6 +15,7 @@ CLASS axp net/minecraft/recipe/smelting/RecipeSmelting FIELD c input Laxd; FIELD d output Lava; FIELD e experience F + FIELD f cookTime I METHOD a getSerializer ()Laxi; METHOD a fits (II)Z ARG 1 width diff --git a/mappings/net/minecraft/server/rcon/BufferHelper.mapping b/mappings/net/minecraft/server/rcon/BufferHelper.mapping index f6af4b7c42..e4634bd00d 100644 --- a/mappings/net/minecraft/server/rcon/BufferHelper.mapping +++ b/mappings/net/minecraft/server/rcon/BufferHelper.mapping @@ -2,9 +2,12 @@ CLASS wr net/minecraft/server/rcon/BufferHelper FIELD a HEX_CHARS_LOOKUP [C METHOD a toHex (B)Ljava/lang/String; ARG 0 b + METHOD a getIntLE ([BI)I + ARG 0 buf + ARG 1 start METHOD a getString ([BII)Ljava/lang/String; ARG 0 buf - METHOD b gutIntLE ([BII)I + METHOD b getIntLE ([BII)I ARG 0 buf ARG 1 start ARG 2 limit diff --git a/mappings/net/minecraft/server/rcon/RconServer.mapping b/mappings/net/minecraft/server/rcon/RconServer.mapping index 244eecc2be..8b9b3bdcaf 100644 --- a/mappings/net/minecraft/server/rcon/RconServer.mapping +++ b/mappings/net/minecraft/server/rcon/RconServer.mapping @@ -1,7 +1,9 @@ CLASS wx net/minecraft/server/rcon/RconServer FIELD h port I FIELD i serverPort I + FIELD j hostname Ljava/lang/String; FIELD k listener Ljava/net/ServerSocket; + FIELD l password Ljava/lang/String; FIELD m clients Ljava/util/Map; METHOD a start ()V METHOD f cleanClientList ()V diff --git a/mappings/net/minecraft/sortme/Painting.mapping b/mappings/net/minecraft/sortme/Painting.mapping deleted file mode 100644 index a93a9a1809..0000000000 --- a/mappings/net/minecraft/sortme/Painting.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS anp net/minecraft/sortme/Painting - FIELD A width I - FIELD B height I - FIELD C x I - FIELD D y I - METHOD a getWidth ()I - METHOD a register (Ljava/lang/String;IIII)Lanp; - METHOD b getHeight ()I - METHOD c getX ()I - METHOD d getY ()I diff --git a/mappings/net/minecraft/sortme/PaintingMotive.mapping b/mappings/net/minecraft/sortme/PaintingMotive.mapping new file mode 100644 index 0000000000..e37e7e41e4 --- /dev/null +++ b/mappings/net/minecraft/sortme/PaintingMotive.mapping @@ -0,0 +1,10 @@ +CLASS anp net/minecraft/sortme/PaintingMotive + FIELD A width I + FIELD B height I + FIELD C textureX I + FIELD D textureY I + METHOD a getWidth ()I + METHOD a register (Ljava/lang/String;IIII)Lanp; + METHOD b getHeight ()I + METHOD c getTextureX ()I + METHOD d getTextureY ()I diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index 3bce73f76f..07e41981ff 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -108,6 +108,7 @@ CLASS es net/minecraft/util/math/BlockPos METHOD b add (III)Les; ARG 1 x ARG 2 y + METHOD b isHeightInvalid (J)Z METHOD b iterateBoxPositionsMutable (Les;Les;)Ljava/lang/Iterable; ARG 0 pos1 ARG 1 pos2 diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 289796a364..292204b338 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -20,7 +20,7 @@ CLASS fj net/minecraft/util/registry/Registry FIELD v BLOCK_ENTITIES Lfj; FIELD w CHUNK_GENERATOR_TYPES Lfj; FIELD x DIMENSIONS Lfj; - FIELD y PAINTINGS Lew; + FIELD y MOTIVES Lew; FIELD z CUSTOM_STATS Lfj; METHOD a getDefaultId ()Lpw; METHOD a set (Lfj;ILjava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/ni.mapping b/mappings/ni.mapping deleted file mode 100644 index ce83165cf3..0000000000 --- a/mappings/ni.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS ni - METHOD a read (Lip;)V - METHOD a apply (Lis;)V - METHOD a apply (Lmy;)V - METHOD b write (Lip;)V