From ca1cbec5b8373c9f188295bf8d6cad91895a77b2 Mon Sep 17 00:00:00 2001 From: copygirl Date: Sun, 28 Aug 2016 13:20:58 +0200 Subject: [PATCH] Gui > Drawable and lots of connected changes (#51) * Gui > Drawable and lots of connected changes * Merge drawable package into gui --- .../block/tile/impl/TileEntityFurnace.mapping | 2 + .../net/minecraft/client/GameSettings.mapping | 3 + .../net/minecraft/client/Minecraft.mapping | 15 +- mappings/net/minecraft/client/RunArgs.mapping | 18 +++ .../net/minecraft/client/gui/Drawable.mapping | 60 ++++++++ mappings/net/minecraft/client/gui/Gui.mapping | 129 ++++++++++-------- .../minecraft/client/gui/GuiContainer.mapping | 8 +- .../minecraft/client/gui/GuiScreen.mapping | 67 --------- .../net/minecraft/client/gui/GuiYesNo.mapping | 3 +- .../client/gui/container/GuiAnvil.mapping | 16 +++ .../client/gui/container/GuiBeacon.mapping | 35 +++++ .../gui/container/GuiCraftingTable.mapping | 13 ++ .../client/gui/container/GuiDispenser.mapping | 11 ++ .../gui/container/GuiEnchanting.mapping | 15 ++ .../client/gui/container/GuiFurnace.mapping | 11 ++ .../client/gui/container/GuiGeneric54.mapping | 12 ++ .../client/gui/container/GuiHopper.mapping | 11 ++ .../client/gui/container/GuiHorse.mapping | 16 +++ .../client/gui/container/GuiVillager.mapping | 24 ++++ .../client/gui/hud/BossBarClient.mapping | 2 + .../gui/hud/GuiAchievementPopup.mapping | 3 - .../client/gui/hud/GuiBossBar.mapping | 7 - .../client/gui/hud/GuiChatOverlay.mapping | 7 - .../client/gui/hud/GuiDebugPie.mapping | 5 - .../client/gui/hud/GuiInGame.mapping | 19 --- .../client/gui/hud/GuiScoreboard.mapping | 6 - .../client/gui/hud/HudAchievements.mapping | 20 +++ .../client/gui/hud/HudBossBar.mapping | 17 +++ .../minecraft/client/gui/hud/HudChat.mapping | 16 +++ .../minecraft/client/gui/hud/HudDebug.mapping | 13 ++ .../client/gui/hud/HudInGame.mapping | 25 ++++ .../client/gui/hud/HudScoreboard.mapping | 6 + ...Spectator.mapping => HudSpectator.mapping} | 4 +- ...Subtitles.mapping => HudSubtitles.mapping} | 4 +- .../client/gui/hud/ScoreboardEntry.mapping | 23 ++++ .../spectator/ISpectatorMenu.mapping | 2 +- .../spectator/ISpectatorMenuElement.mapping | 2 +- .../{ => hud}/spectator/SpectatorMenu.mapping | 2 +- .../spectator/SpectatorTeleportMenu.mapping | 4 +- .../client/gui/ingame/GuiBrewingStand.mapping | 11 ++ .../gui/{screen => }/ingame/GuiChat.mapping | 5 +- .../ingame/GuiChatSleeping.mapping | 2 +- .../ingame/GuiCommandBlock.mapping | 5 +- .../ingame/GuiCommandBlockMinecart.mapping | 5 +- .../ingame/GuiConfirmChatLink.mapping | 4 +- .../gui/{screen => }/ingame/GuiDeath.mapping | 6 +- .../{screen => }/ingame/GuiEditBook.mapping | 5 +- .../{screen => }/ingame/GuiEditSign.mapping | 5 +- .../ingame/GuiStructureBlock.mapping | 5 +- .../{screen => }/menu/GuiAchievements.mapping | 5 +- .../gui/{screen => }/menu/GuiDemo.mapping | 5 +- .../{screen => }/menu/GuiDisconnected.mapping | 4 +- .../{screen => }/menu/GuiEndCredits.mapping | 5 +- .../gui/{screen => }/menu/GuiError.mapping | 4 +- .../client/gui/menu/GuiInGameMenu.mapping | 5 + .../gui/{screen => }/menu/GuiMainMenu.mapping | 5 +- .../{screen => }/menu/GuiMultiplayer.mapping | 5 +- .../gui/{screen => }/menu/GuiNewWorld.mapping | 5 +- .../menu/GuiNewWorldCustomize.mapping | 4 +- .../menu/GuiNewWorldCustomizeFlat.mapping | 4 +- .../menu/GuiNewWorldCustomizePresets.mapping | 5 +- .../menu/GuiNewWorldPresets.mapping | 5 +- .../{screen => }/menu/GuiOpenToLAN.mapping | 4 +- .../client/gui/menu/GuiOutOfMemory.mapping | 5 + .../gui/{screen => }/menu/GuiRealms.mapping | 5 +- .../{screen => }/menu/GuiServerAdd.mapping | 5 +- .../menu/GuiServerConnect.mapping | 5 +- .../menu/GuiServerConnecting.mapping | 5 +- .../gui/{screen => }/menu/GuiSettings.mapping | 4 +- .../menu/GuiSettingsAudio.mapping | 4 +- .../{screen => }/menu/GuiSettingsChat.mapping | 4 +- .../menu/GuiSettingsControls.mapping | 4 +- .../menu/GuiSettingsLanguage.mapping | 4 +- .../menu/GuiSettingsResourcePacks.mapping | 4 +- .../{screen => }/menu/GuiSettingsSkin.mapping | 4 +- .../menu/GuiSettingsSnooper.mapping | 4 +- .../menu/GuiSettingsVideo.mapping | 4 +- .../gui/{screen => }/menu/GuiStats.mapping | 4 +- .../client/gui/menu/GuiWorking.mapping | 5 + .../{screen => }/menu/GuiWorldEdit.mapping | 5 +- .../client/gui/menu/GuiWorldLoading.mapping | 5 + .../{screen => }/menu/GuiWorldSelect.mapping | 4 +- .../gui/screen/container/GuiAnvil.mapping | 8 -- .../gui/screen/container/GuiBeacon.mapping | 6 - .../screen/container/GuiCraftingTable.mapping | 3 - .../gui/screen/container/GuiDispenser.mapping | 3 - .../screen/container/GuiEnchanting.mapping | 6 - .../gui/screen/container/GuiFurnace.mapping | 3 - .../gui/screen/container/GuiGeneric54.mapping | 3 - .../gui/screen/container/GuiHopper.mapping | 3 - .../gui/screen/container/GuiHorse.mapping | 4 - .../gui/screen/container/GuiVillager.mapping | 9 -- .../gui/screen/ingame/GuiBrewingStand.mapping | 3 - .../gui/screen/menu/GuiInGameMenu.mapping | 4 - .../gui/screen/menu/GuiOutOfMemory.mapping | 5 - .../client/gui/screen/menu/GuiWorking.mapping | 5 - .../gui/screen/menu/GuiWorldLoading.mapping | 4 - .../gui/widget/GuiButtonLanguage.mapping | 2 - ...GuiButton.mapping => WidgetButton.mapping} | 4 +- .../gui/widget/WidgetButtonLanguage.mapping | 6 + .../client/render/WorldRenderer.mapping | 6 + .../client/world/WorldClient.mapping | 3 + .../container/impl/ContainerAnvil.mapping | 2 + .../container/impl/ContainerBeacon.mapping | 12 +- .../impl/ContainerBrewingStand.mapping | 24 +++- .../impl/ContainerCraftingTable.mapping | 6 +- .../container/impl/ContainerDispenser.mapping | 4 +- .../impl/ContainerEnchantingTable.mapping | 11 ++ .../container/impl/ContainerFurnace.mapping | 4 + ...Chest.mapping => ContainerGeneric.mapping} | 6 +- .../container/impl/ContainerHopper.mapping | 4 +- .../container/impl/ContainerHorse.mapping | 7 + .../container/impl/ContainerVillager.mapping | 4 + .../slot/impl/SlotCraftingResult.mapping | 9 +- .../slot/impl/SlotFurnaceFuel.mapping | 8 ++ .../slot/impl/SlotFurnaceOutput.mapping | 10 ++ mappings/net/minecraft/entity/Entity.mapping | 2 + .../entity/{unsorted => }/EntityType.mapping | 2 +- .../net/minecraft/entity/boss/BossBar.mapping | 9 +- .../entity/mob/EntityAquaticBase.mapping | 1 + ...ntityMob.mapping => EntityMobBase.mapping} | 2 +- .../EntityAnimalBase.mapping} | 2 +- .../EntityHorseBase.mapping | 2 +- .../{horse => passive}/HorseArmorType.mapping | 2 +- .../entity/player/EntityPlayer.mapping | 4 + .../entity/unsorted/EntityAquatic.mapping | 1 - mappings/net/minecraft/item/ItemStack.mapping | 2 + .../packet/client/CPacketBossBar.mapping | 4 + .../packet/client/CPacketGameJoin.mapping | 2 +- .../packet/client/CPacketPlayerList.mapping | 4 + .../stat/achievement/Achievement.mapping | 1 + .../minecraft/util/math/BlockRegion.mapping | 54 ++++++++ .../minecraft/world/LocalDifficulty.mapping | 1 + mappings/net/minecraft/world/World.mapping | 35 ++++- .../net/minecraft/world/WorldServer.mapping | 3 + .../net/minecraft/world/chunk/Chunk.mapping | 3 +- .../minecraft/world/chunk/EmptyChunk.mapping | 1 + mappings/none/acg.mapping | 5 - mappings/none/aci.mapping | 3 - mappings/none/ajd.mapping | 2 + mappings/none/bhl.mapping | 6 +- mappings/none/bhn.mapping | 2 +- mappings/none/bht.mapping | 6 +- mappings/none/bjk.mapping | 11 -- mappings/none/ls.mapping | 4 + 145 files changed, 852 insertions(+), 383 deletions(-) create mode 100644 mappings/net/minecraft/client/RunArgs.mapping create mode 100644 mappings/net/minecraft/client/gui/Drawable.mapping delete mode 100644 mappings/net/minecraft/client/gui/GuiScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiAnvil.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiBeacon.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiCraftingTable.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiDispenser.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiFurnace.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiGeneric54.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiHopper.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiHorse.mapping create mode 100644 mappings/net/minecraft/client/gui/container/GuiVillager.mapping delete mode 100644 mappings/net/minecraft/client/gui/hud/GuiAchievementPopup.mapping delete mode 100644 mappings/net/minecraft/client/gui/hud/GuiBossBar.mapping delete mode 100644 mappings/net/minecraft/client/gui/hud/GuiChatOverlay.mapping delete mode 100644 mappings/net/minecraft/client/gui/hud/GuiDebugPie.mapping delete mode 100644 mappings/net/minecraft/client/gui/hud/GuiInGame.mapping delete mode 100644 mappings/net/minecraft/client/gui/hud/GuiScoreboard.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/HudAchievements.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/HudBossBar.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/HudChat.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/HudDebug.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/HudInGame.mapping create mode 100644 mappings/net/minecraft/client/gui/hud/HudScoreboard.mapping rename mappings/net/minecraft/client/gui/hud/{GuiSpectator.mapping => HudSpectator.mapping} (51%) rename mappings/net/minecraft/client/gui/hud/{GuiSubtitles.mapping => HudSubtitles.mapping} (82%) create mode 100644 mappings/net/minecraft/client/gui/hud/ScoreboardEntry.mapping rename mappings/net/minecraft/client/gui/{ => hud}/spectator/ISpectatorMenu.mapping (51%) rename mappings/net/minecraft/client/gui/{ => hud}/spectator/ISpectatorMenuElement.mapping (57%) rename mappings/net/minecraft/client/gui/{ => hud}/spectator/SpectatorMenu.mapping (85%) rename mappings/net/minecraft/client/gui/{ => hud}/spectator/SpectatorTeleportMenu.mapping (67%) create mode 100644 mappings/net/minecraft/client/gui/ingame/GuiBrewingStand.mapping rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiChat.mapping (79%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiChatSleeping.mapping (62%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiCommandBlock.mapping (83%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiCommandBlockMinecart.mapping (73%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiConfirmChatLink.mapping (75%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiDeath.mapping (58%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiEditBook.mapping (81%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiEditSign.mapping (64%) rename mappings/net/minecraft/client/gui/{screen => }/ingame/GuiStructureBlock.mapping (70%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiAchievements.mapping (69%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiDemo.mapping (63%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiDisconnected.mapping (78%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiEndCredits.mapping (61%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiError.mapping (73%) create mode 100644 mappings/net/minecraft/client/gui/menu/GuiInGameMenu.mapping rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiMainMenu.mapping (79%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiMultiplayer.mapping (75%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiNewWorld.mapping (68%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiNewWorldCustomize.mapping (61%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiNewWorldCustomizeFlat.mapping (63%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiNewWorldCustomizePresets.mapping (61%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiNewWorldPresets.mapping (62%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiOpenToLAN.mapping (76%) create mode 100644 mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiRealms.mapping (83%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiServerAdd.mapping (72%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiServerConnect.mapping (58%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiServerConnecting.mapping (76%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettings.mapping (72%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsAudio.mapping (74%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsChat.mapping (69%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsControls.mapping (79%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsLanguage.mapping (69%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsResourcePacks.mapping (65%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsSkin.mapping (63%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsSnooper.mapping (69%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiSettingsVideo.mapping (74%) rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiStats.mapping (69%) create mode 100644 mappings/net/minecraft/client/gui/menu/GuiWorking.mapping rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiWorldEdit.mapping (70%) create mode 100644 mappings/net/minecraft/client/gui/menu/GuiWorldLoading.mapping rename mappings/net/minecraft/client/gui/{screen => }/menu/GuiWorldSelect.mapping (74%) delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiAnvil.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiBeacon.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiCraftingTable.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiDispenser.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiEnchanting.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiFurnace.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiGeneric54.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiHopper.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiHorse.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/container/GuiVillager.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/ingame/GuiBrewingStand.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/menu/GuiInGameMenu.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/menu/GuiOutOfMemory.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/menu/GuiWorking.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/menu/GuiWorldLoading.mapping delete mode 100644 mappings/net/minecraft/client/gui/widget/GuiButtonLanguage.mapping rename mappings/net/minecraft/client/gui/widget/{GuiButton.mapping => WidgetButton.mapping} (85%) create mode 100644 mappings/net/minecraft/client/gui/widget/WidgetButtonLanguage.mapping rename mappings/net/minecraft/container/impl/{ContainerChest.mapping => ContainerGeneric.mapping} (75%) create mode 100644 mappings/net/minecraft/container/slot/impl/SlotFurnaceFuel.mapping create mode 100644 mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping rename mappings/net/minecraft/entity/{unsorted => }/EntityType.mapping (86%) create mode 100644 mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping rename mappings/net/minecraft/entity/mob/{EntityMob.mapping => EntityMobBase.mapping} (94%) rename mappings/net/minecraft/entity/{unsorted/EntityAnimal.mapping => passive/EntityAnimalBase.mapping} (58%) rename mappings/net/minecraft/entity/{unsorted => passive}/EntityHorseBase.mapping (70%) rename mappings/net/minecraft/entity/{horse => passive}/HorseArmorType.mapping (92%) delete mode 100644 mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping create mode 100644 mappings/net/minecraft/util/math/BlockRegion.mapping create mode 100644 mappings/net/minecraft/world/LocalDifficulty.mapping delete mode 100644 mappings/none/acg.mapping delete mode 100644 mappings/none/aci.mapping delete mode 100644 mappings/none/bjk.mapping diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping index 96dd8524ed..e8826eee88 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping @@ -41,6 +41,8 @@ CLASS none/arm net/minecraft/block/tile/impl/TileEntityFurnace METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD c onInvClose (Lnone/aak;)V ARG 0 player + METHOD c canUseAsFuel (Lnone/aeq;)Z + ARG 0 stack METHOD c_ getInvField (I)I ARG 0 pos METHOD g getInvFieldCount ()I diff --git a/mappings/net/minecraft/client/GameSettings.mapping b/mappings/net/minecraft/client/GameSettings.mapping index 6d97ff407a..ce0e7eb198 100644 --- a/mappings/net/minecraft/client/GameSettings.mapping +++ b/mappings/net/minecraft/client/GameSettings.mapping @@ -98,6 +98,9 @@ CLASS none/bdq net/minecraft/client/GameSettings FIELD an keysHotbar [Lnone/bdl; FIELD ao keysAll [Lnone/bdl; FIELD aq difficulty Lnone/qx; + FIELD at debugEnabled Z + FIELD au debugPieEnabled Z + FIELD av debugGraphEnabled Z FIELD aw lastServer Ljava/lang/String; FIELD az fov F FIELD b mouseSensetivity F diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 5c2d6396bc..dbb4fc52ab 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -20,9 +20,12 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD aQ blockModelManager Lnone/bzn; FIELD aa entityRenderManager Lnone/bta; FIELD ab itemRenderer Lnone/bto; + FIELD ad cameraEntity Lnone/se; FIELD aj server Lnone/caj; FIELD an netProxy Ljava/net/Proxy; FIELD ap fps I + FIELD ar autoConnectServerIp Ljava/lang/String; + FIELD as autoConnectServerPort I FIELD au is64Bit Z FIELD av isDemo Z FIELD az resourceManager Lnone/bxy; @@ -32,8 +35,10 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD h player Lnone/boe; FIELD k fontRenderer Lnone/bec; FIELD l fontRendererSGA Lnone/bec; - FIELD m currentGuiScreen Lnone/bgk; - FIELD r guiInGame Lnone/bed; + FIELD m currentGui Lnone/bgk; + FIELD o worldRenderer Lnone/boq; + FIELD q hudAchievements Lnone/bgu; + FIELD r hudInGame Lnone/bed; FIELD t hitResult Lnone/bcq; FIELD u settings Lnone/bdq; FIELD w runDirectory Ljava/io/File; @@ -57,18 +62,22 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; METHOD a checkGlError (Ljava/lang/String;)V ARG 0 title - METHOD a setGuiScreen (Lnone/bgk;)V + METHOD a setGui (Lnone/bgk;)V ARG 0 screen METHOD a drawLogo (Lnone/bxc;)V ARG 0 tm METHOD a addSnooperInfo (Lnone/rj;)V ARG 0 snooper + METHOD a setCameraEntity (Lnone/se;)V + ARG 0 entity METHOD aB handleMouseEvents ()V METHOD aC doItemPick ()V METHOD aE isMainThread ()Z + METHOD aa getCameraEntity ()Lnone/se; METHOD ac getEntityRenderManager ()Lnone/bta; METHOD ad getItemRenderer ()Lnone/bto; METHOD ak getBlockColorMap ()Lnone/bdx; + METHOD am hasReducedDebugInfo ()Z METHOD an init ()V METHOD ap createDisplay ()V METHOD aq setDisplayMode ()V diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping new file mode 100644 index 0000000000..a2b7bd8ed1 --- /dev/null +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -0,0 +1,18 @@ +CLASS none/bjk net/minecraft/client/RunArgs + CLASS none/bjk$a + FIELD a displayWidth I + FIELD b displayHeight I + FIELD c fullscreen Z + CLASS none/bjk$b + FIELD a runDirectory Ljava/io/File; + CLASS none/bjk$c + FIELD a isDemo Z + CLASS none/bjk$d AutoConnect + FIELD a serverIp Ljava/lang/String; + FIELD b serverPort I + METHOD (Ljava/lang/String;I)V + ARG 0 serverIp + ARG 1 serverPort + CLASS none/bjk$e + FIELD d netProxy Ljava/net/Proxy; + FIELD e autoConnect Lnone/bjk$d; diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping new file mode 100644 index 0000000000..887bbef649 --- /dev/null +++ b/mappings/net/minecraft/client/gui/Drawable.mapping @@ -0,0 +1,60 @@ +CLASS none/bee net/minecraft/client/gui/Drawable + FIELD b OPTIONS_BG Lnone/kp; + FIELD c STAT_ICONS Lnone/kp; + FIELD d ICONS Lnone/kp; + FIELD e z F + METHOD a drawTexturedRect (FFIIII)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + ARG 4 u + ARG 5 v + METHOD a drawHorizontalLine (IIII)V + ARG 0 left + ARG 1 right + ARG 2 top + ARG 3 color + METHOD a drawRect (IIIII)V + ARG 0 top + ARG 1 left + ARG 2 bottom + ARG 3 right + ARG 4 color + METHOD a drawGradientRect (IIIIII)V + ARG 0 top + ARG 1 left + ARG 2 right + ARG 3 bottom + ARG 4 color1 + ARG 5 color2 + METHOD a drawTexturedRect (IILnone/bxb;II)V + ARG 0 x + ARG 1 y + ARG 2 sprite + ARG 3 width + ARG 4 height + METHOD a drawStringCentered (Lnone/bec;Ljava/lang/String;III)V + ARG 0 fontRenderer + ARG 1 str + ARG 2 x + ARG 3 y + ARG 4 color + METHOD b drawVerticalLine (IIII)V + ARG 0 left + ARG 1 top + ARG 2 bottom + ARG 3 color + METHOD b drawTexturedRect (IIIIII)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + ARG 4 u + ARG 5 v + METHOD c drawString (Lnone/bec;Ljava/lang/String;III)V + ARG 0 fontRenderer + ARG 1 str + ARG 2 x + ARG 3 y + ARG 4 color diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Gui.mapping index e57c581711..bb46abb9e3 100644 --- a/mappings/net/minecraft/client/gui/Gui.mapping +++ b/mappings/net/minecraft/client/gui/Gui.mapping @@ -1,60 +1,69 @@ -CLASS none/bee net/minecraft/client/gui/Gui - FIELD b OPTIONS_BG Lnone/kp; - FIELD c STAT_ICONS Lnone/kp; - FIELD d ICONS Lnone/kp; - FIELD e z F - METHOD a drawTexturedRect (FFIIII)V - ARG 0 x - ARG 1 y - ARG 2 width - ARG 3 height - ARG 4 u - ARG 5 v - METHOD a drawHorizontalLine (IIII)V - ARG 0 left - ARG 1 right - ARG 2 top - ARG 3 color - METHOD a drawRect (IIIII)V - ARG 0 top - ARG 1 left - ARG 2 bottom - ARG 3 right - ARG 4 color - METHOD a drawGradientRect (IIIIII)V - ARG 0 top - ARG 1 left - ARG 2 right - ARG 3 bottom - ARG 4 color1 - ARG 5 color2 - METHOD a drawTexturedRect (IILnone/bxb;II)V - ARG 0 x - ARG 1 y - ARG 2 sprite - ARG 3 width - ARG 4 height - METHOD a drawStringCentered (Lnone/bec;Ljava/lang/String;III)V - ARG 0 fontRenderer - ARG 1 str - ARG 2 x - ARG 3 y - ARG 4 color - METHOD b drawVerticalLine (IIII)V - ARG 0 left - ARG 1 top - ARG 2 bottom - ARG 3 color - METHOD b drawTexturedRect (IIIIII)V - ARG 0 x - ARG 1 y - ARG 2 width - ARG 3 height - ARG 4 u - ARG 5 v - METHOD c drawString (Lnone/bec;Ljava/lang/String;III)V - ARG 0 fontRenderer - ARG 1 str - ARG 2 x - ARG 3 y - ARG 4 color +CLASS none/bgk net/minecraft/client/gui/Gui + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD f PROTOCOLS Ljava/util/Set; + FIELD g LINE_SPLITTER Lcom/google/common/base/Splitter; + FIELD j mc Lnone/bdo; + FIELD k itemRenderer Lnone/bto; + FIELD l width I + FIELD m height I + FIELD n widgets Ljava/util/List; + FIELD q fontRenderer Lnone/bec; + METHOD a handleKeyPress (CI)V + ARG 0 keyChar + ARG 1 keyCode + METHOD a draw (IIF)V + ARG 0 mouseX + ARG 1 mouseY + ARG 2 delta + METHOD a handleMouseClick (III)V + ARG 0 mouseX + ARG 1 mouseY + ARG 2 mouseButton + METHOD a drawTooltip (Ljava/lang/String;II)V + ARG 0 text + ARG 1 x + ARG 2 y + METHOD a openURI (Ljava/net/URI;)V + ARG 0 uri + METHOD a drawTooltip (Ljava/util/List;II)V + ARG 0 text + ARG 1 x + ARG 2 y + METHOD a drawStackTooltip (Lnone/aeq;II)V + ARG 0 stack + ARG 1 x + ARG 2 y + METHOD a init (Lnone/bdo;II)V + ARG 0 mc + ARG 1 width + ARG 2 height + METHOD a handleButtonPressed (Lnone/bei;)V + ARG 0 button + METHOD a handleTextComponentClick (Lnone/fa;)Z + ARG 0 component + METHOD a drawTextComponentHover (Lnone/fa;II)V + ARG 0 component + ARG 1 x + ARG 2 y + METHOD a handle (ZI)V + ARG 0 result + METHOD b init ()V + METHOD b init0 (Lnone/bdo;II)V + ARG 0 mc + ARG 1 width + ARG 2 height + METHOD b addButton (Lnone/bei;)Lnone/bei; + ARG 0 button + METHOD c drawBackground ()V + METHOD c drawTextureBackground (I)V + ARG 0 i + METHOD d_ drawBackground (I)V + ARG 0 id + METHOD e update ()V + METHOD e setClipboardContents (Ljava/lang/String;)V + ARG 0 str + METHOD k handleMouseEvent ()V + METHOD l handleKeyboardEvent ()V + METHOD m onClosed ()V + METHOD o getClipboardContents ()Ljava/lang/String; + METHOD p pollInputs ()V diff --git a/mappings/net/minecraft/client/gui/GuiContainer.mapping b/mappings/net/minecraft/client/gui/GuiContainer.mapping index 86985bf344..6e345539d6 100644 --- a/mappings/net/minecraft/client/gui/GuiContainer.mapping +++ b/mappings/net/minecraft/client/gui/GuiContainer.mapping @@ -1,5 +1,5 @@ CLASS none/bhc net/minecraft/client/gui/GuiContainer - FIELD a BG Lnone/kp; + FIELD a BG_TEX Lnone/kp; FIELD f containerWidth I FIELD g containerHeight I FIELD h container Lnone/abv; @@ -13,7 +13,11 @@ CLASS none/bhc net/minecraft/client/gui/GuiContainer ARG 0 delta ARG 1 mouseX ARG 2 mouseY - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD b init ()V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/GuiScreen.mapping b/mappings/net/minecraft/client/gui/GuiScreen.mapping deleted file mode 100644 index d77e35472d..0000000000 --- a/mappings/net/minecraft/client/gui/GuiScreen.mapping +++ /dev/null @@ -1,67 +0,0 @@ -CLASS none/bgk net/minecraft/client/gui/GuiScreen - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD f PROTOCOLS Ljava/util/Set; - FIELD g LINE_SPLITTER Lcom/google/common/base/Splitter; - FIELD j mc Lnone/bdo; - FIELD l width I - FIELD m height I - FIELD n buttons Ljava/util/List; - FIELD q fontRenderer Lnone/bec; - METHOD a handleKeyPress (CI)V - ARG 0 keyChar - ARG 1 keyCode - METHOD a drawScreen (IIF)V - ARG 0 mouseX - ARG 1 mouseY - ARG 2 delta - METHOD a handleMouseClick (III)V - ARG 0 mouseX - ARG 1 mouseY - ARG 2 mouseButton - METHOD a drawTooltip (Ljava/lang/String;II)V - ARG 0 text - ARG 1 x - ARG 2 y - METHOD a openURI (Ljava/net/URI;)V - ARG 0 uri - METHOD a drawTooltip (Ljava/util/List;II)V - ARG 0 text - ARG 1 x - ARG 2 y - METHOD a drawStackTooltip (Lnone/aeq;II)V - ARG 0 stack - ARG 1 x - ARG 2 y - METHOD a init (Lnone/bdo;II)V - ARG 0 mc - ARG 1 width - ARG 2 height - METHOD a handleButtonPressed (Lnone/bei;)V - ARG 0 button - METHOD a handleTextComponentClick (Lnone/fa;)Z - ARG 0 component - METHOD a drawTextComponentHover (Lnone/fa;II)V - ARG 0 component - ARG 1 x - ARG 2 y - METHOD a handle (ZI)V - ARG 0 result - METHOD b init ()V - METHOD b init0 (Lnone/bdo;II)V - ARG 0 mc - ARG 1 width - ARG 2 height - METHOD b addButton (Lnone/bei;)Lnone/bei; - ARG 0 button - METHOD c drawBackground ()V - METHOD c drawTextureBackground (I)V - ARG 0 i - METHOD d_ drawBackground (I)V - ARG 0 id - METHOD e setClipboardContents (Ljava/lang/String;)V - ARG 0 str - METHOD k handleMouseEvent ()V - METHOD l handleKeyboardEvent ()V - METHOD m onClosed ()V - METHOD o getClipboardContents ()Ljava/lang/String; - METHOD p pollInputs ()V diff --git a/mappings/net/minecraft/client/gui/GuiYesNo.mapping b/mappings/net/minecraft/client/gui/GuiYesNo.mapping index 7ba599cd69..fee2d2ecbe 100644 --- a/mappings/net/minecraft/client/gui/GuiYesNo.mapping +++ b/mappings/net/minecraft/client/gui/GuiYesNo.mapping @@ -6,6 +6,7 @@ CLASS none/bfq net/minecraft/client/gui/GuiYesNo ARG 0 callback METHOD (Lnone/bfp;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V ARG 0 callback - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping b/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping new file mode 100644 index 0000000000..e421a30248 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping @@ -0,0 +1,16 @@ +CLASS none/bhd net/minecraft/client/gui/container/GuiAnvil + FIELD u BG_TEX Lnone/kp; + FIELD v anvilContainer Lnone/abw; + FIELD x playerInv Lnone/aaj; + METHOD (Lnone/aaj;Lnone/aiu;)V + ARG 0 playerInv + ARG 1 world + METHOD a handleKeyPress (CI)V + METHOD a drawBackground (FII)V + METHOD a draw (IIF)V + METHOD a handleMouseClick (III)V + METHOD b init ()V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping b/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping new file mode 100644 index 0000000000..9a3232bef0 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiBeacon.mapping @@ -0,0 +1,35 @@ +CLASS none/bhe net/minecraft/client/gui/container/GuiBeacon + CLASS none/bhe$a + METHOD (Lnone/bhe;III)V + ARG 0 invSlot + ARG 1 x + ARG 2 y + CLASS none/bhe$b + METHOD (Lnone/bhe;III)V + ARG 0 invSlot + ARG 1 x + ARG 2 y + CLASS none/bhe$c + METHOD (Lnone/bhe;IIILnone/rx;I)V + ARG 0 invSlot + ARG 1 x + ARG 2 y + CLASS none/bhe$d + METHOD (IIILnone/kp;II)V + ARG 0 invSlot + ARG 1 x + ARG 2 y + METHOD a draw (Lnone/bdo;II)V + FIELD u LOGGER Lorg/apache/logging/log4j/Logger; + FIELD v BG_TEX Lnone/kp; + FIELD w inventory Lnone/qt; + METHOD (Lnone/aaj;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory + METHOD a drawBackground (FII)V + METHOD a handleButtonPressed (Lnone/bei;)V + METHOD b init ()V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/container/GuiCraftingTable.mapping b/mappings/net/minecraft/client/gui/container/GuiCraftingTable.mapping new file mode 100644 index 0000000000..89c652ac8d --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiCraftingTable.mapping @@ -0,0 +1,13 @@ +CLASS none/bhj net/minecraft/client/gui/container/GuiCraftingTable + FIELD u BG_TEX Lnone/kp; + METHOD (Lnone/aaj;Lnone/aiu;)V + ARG 0 playerInv + ARG 1 world + METHOD (Lnone/aaj;Lnone/aiu;Lnone/cn;)V + ARG 0 playerInv + ARG 1 world + ARG 2 craftingTablePos + METHOD a drawBackground (FII)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY diff --git a/mappings/net/minecraft/client/gui/container/GuiDispenser.mapping b/mappings/net/minecraft/client/gui/container/GuiDispenser.mapping new file mode 100644 index 0000000000..d52d9e4676 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiDispenser.mapping @@ -0,0 +1,11 @@ +CLASS none/bhm net/minecraft/client/gui/container/GuiDispenser + FIELD u inventory Lnone/qt; + FIELD v BG_TEX Lnone/kp; + FIELD w playerInv Lnone/aaj; + METHOD (Lnone/aaj;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory + METHOD a drawBackground (FII)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY diff --git a/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping b/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping new file mode 100644 index 0000000000..9012718afb --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiEnchanting.mapping @@ -0,0 +1,15 @@ +CLASS none/bhp net/minecraft/client/gui/container/GuiEnchanting + FIELD B BG_TEX Lnone/kp; + FIELD C BOOK_TEX Lnone/kp; + FIELD E playerInv Lnone/aaj; + FIELD F rand Ljava/util/Random; + METHOD (Lnone/aaj;Lnone/aiu;Lnone/rg;)V + ARG 0 playerInv + ARG 1 world + METHOD a drawBackground (FII)V + METHOD a draw (IIF)V + METHOD a handleMouseClick (III)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/container/GuiFurnace.mapping b/mappings/net/minecraft/client/gui/container/GuiFurnace.mapping new file mode 100644 index 0000000000..5a45eb4275 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiFurnace.mapping @@ -0,0 +1,11 @@ +CLASS none/bhq net/minecraft/client/gui/container/GuiFurnace + FIELD u BG_TEX Lnone/kp; + FIELD v playerInv Lnone/aaj; + FIELD w inventory Lnone/qt; + METHOD (Lnone/aaj;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory + METHOD a drawBackground (FII)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY diff --git a/mappings/net/minecraft/client/gui/container/GuiGeneric54.mapping b/mappings/net/minecraft/client/gui/container/GuiGeneric54.mapping new file mode 100644 index 0000000000..abb7e7e155 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiGeneric54.mapping @@ -0,0 +1,12 @@ +CLASS none/bhi net/minecraft/client/gui/container/GuiGeneric54 + FIELD u BG_TEX Lnone/kp; + FIELD v playerInv Lnone/qt; + FIELD w inventory Lnone/qt; + FIELD x rows I + METHOD (Lnone/qt;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory + METHOD a drawBackground (FII)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY diff --git a/mappings/net/minecraft/client/gui/container/GuiHopper.mapping b/mappings/net/minecraft/client/gui/container/GuiHopper.mapping new file mode 100644 index 0000000000..a2ba1e0892 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiHopper.mapping @@ -0,0 +1,11 @@ +CLASS none/bhr net/minecraft/client/gui/container/GuiHopper + FIELD u BG_TEX Lnone/kp; + FIELD v playerInv Lnone/qt; + FIELD w inventory Lnone/qt; + METHOD (Lnone/aaj;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory + METHOD a drawBackground (FII)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY diff --git a/mappings/net/minecraft/client/gui/container/GuiHorse.mapping b/mappings/net/minecraft/client/gui/container/GuiHorse.mapping new file mode 100644 index 0000000000..d6a459b7fb --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiHorse.mapping @@ -0,0 +1,16 @@ +CLASS none/bhs net/minecraft/client/gui/container/GuiHorse + FIELD u BG_TEX Lnone/kp; + FIELD v playerInv Lnone/qt; + FIELD w inventory Lnone/qt; + FIELD x entity Lnone/xb; + FIELD y mouseX F + FIELD z mouseY F + METHOD (Lnone/qt;Lnone/qt;Lnone/xb;)V + ARG 0 playerInv + ARG 1 inventory + ARG 2 entity + METHOD a drawBackground (FII)V + METHOD a draw (IIF)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY diff --git a/mappings/net/minecraft/client/gui/container/GuiVillager.mapping b/mappings/net/minecraft/client/gui/container/GuiVillager.mapping new file mode 100644 index 0000000000..d05713cc17 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GuiVillager.mapping @@ -0,0 +1,24 @@ +CLASS none/bhu net/minecraft/client/gui/container/GuiVillager + CLASS none/bhu$a WidgetButtonPage + FIELD o next Z + METHOD (IIIZ)V + ARG 0 invSlot + ARG 1 x + ARG 2 y + ARG 3 next + METHOD a draw (Lnone/bdo;II)V + FIELD u LOGGER Lorg/apache/logging/log4j/Logger; + FIELD v BG_TEX Lnone/kp; + FIELD x buttonPageNext Lnone/bhu$a; + FIELD y buttonPagePrevious Lnone/bhu$a; + METHOD (Lnone/aaj;Lnone/aif;Lnone/aiu;)V + ARG 0 playerInv + ARG 2 world + METHOD a drawBackground (FII)V + METHOD a draw (IIF)V + METHOD a handleButtonPressed (Lnone/bei;)V + METHOD b init ()V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping b/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping index 6528b28f6b..7ede0ba86e 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarClient.mapping @@ -5,4 +5,6 @@ CLASS none/beq net/minecraft/client/gui/hud/BossBarClient ARG 0 packet METHOD a setHealth (F)V ARG 0 health + METHOD a handlePacket (Lnone/gb;)V + ARG 0 packet METHOD f getHealth ()F diff --git a/mappings/net/minecraft/client/gui/hud/GuiAchievementPopup.mapping b/mappings/net/minecraft/client/gui/hud/GuiAchievementPopup.mapping deleted file mode 100644 index 9d5e438567..0000000000 --- a/mappings/net/minecraft/client/gui/hud/GuiAchievementPopup.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bgu net/minecraft/client/gui/hud/GuiAchievementPopup - FIELD a BG_TEX Lnone/kp; - FIELD f mc Lnone/bdo; diff --git a/mappings/net/minecraft/client/gui/hud/GuiBossBar.mapping b/mappings/net/minecraft/client/gui/hud/GuiBossBar.mapping deleted file mode 100644 index f4bed1c5bc..0000000000 --- a/mappings/net/minecraft/client/gui/hud/GuiBossBar.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS none/beh net/minecraft/client/gui/hud/GuiBossBar - FIELD a BAR_TEX Lnone/kp; - FIELD f mc Lnone/bdo; - FIELD g bossBars Ljava/util/Map; - METHOD (Lnone/bdo;)V - ARG 0 mc - METHOD e shouldDarkenSky ()Z diff --git a/mappings/net/minecraft/client/gui/hud/GuiChatOverlay.mapping b/mappings/net/minecraft/client/gui/hud/GuiChatOverlay.mapping deleted file mode 100644 index fa6d10a642..0000000000 --- a/mappings/net/minecraft/client/gui/hud/GuiChatOverlay.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS none/bej net/minecraft/client/gui/hud/GuiChatOverlay - FIELD a LINE_SPLITTER Lcom/google/common/base/Splitter; - FIELD f NEWLINE_JOINER Lcom/google/common/base/Joiner; - FIELD g LOGGER Lorg/apache/logging/log4j/Logger; - FIELD h mc Lnone/bdo; - METHOD (Lnone/bdo;)V - ARG 0 mc diff --git a/mappings/net/minecraft/client/gui/hud/GuiDebugPie.mapping b/mappings/net/minecraft/client/gui/hud/GuiDebugPie.mapping deleted file mode 100644 index ff4aeb55cc..0000000000 --- a/mappings/net/minecraft/client/gui/hud/GuiDebugPie.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/bel net/minecraft/client/gui/hud/GuiDebugPie - FIELD a mc Lnone/bdo; - FIELD f fontRenderer Lnone/bec; - METHOD (Lnone/bdo;)V - ARG 0 mc diff --git a/mappings/net/minecraft/client/gui/hud/GuiInGame.mapping b/mappings/net/minecraft/client/gui/hud/GuiInGame.mapping deleted file mode 100644 index be04ffd85e..0000000000 --- a/mappings/net/minecraft/client/gui/hud/GuiInGame.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS none/bed net/minecraft/client/gui/hud/GuiInGame - FIELD f VIGNETTE_TEX Lnone/kp; - FIELD g WIDGETS_TEX Lnone/kp; - FIELD h PUMPKIN_BLUR Lnone/kp; - FIELD i random Ljava/util/Random; - FIELD j mc Lnone/bdo; - FIELD l guiChat Lnone/bej; - FIELD r currentStack Lnone/aeq; - FIELD s guiDebugPie Lnone/bel; - FIELD t guiSubtitles Lnone/bfb; - FIELD u guiSpectator Lnone/bfd; - FIELD v guiScoreboard Lnone/bey; - FIELD w guiBossBar Lnone/beh; - METHOD (Lnone/bdo;)V - ARG 0 mc - METHOD d getChatWidget ()Lnone/bej; - METHOD g getSpectatorWidget ()Lnone/bfd; - METHOD h getScoreboardWidget ()Lnone/bey; - METHOD j getBossBarWidget ()Lnone/beh; diff --git a/mappings/net/minecraft/client/gui/hud/GuiScoreboard.mapping b/mappings/net/minecraft/client/gui/hud/GuiScoreboard.mapping deleted file mode 100644 index 1f335f6076..0000000000 --- a/mappings/net/minecraft/client/gui/hud/GuiScoreboard.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/bey net/minecraft/client/gui/hud/GuiScoreboard - FIELD f mc Lnone/bdo; - FIELD g guiInGame Lnone/bed; - METHOD (Lnone/bdo;Lnone/bed;)V - ARG 0 mc - ARG 1 guiInGame diff --git a/mappings/net/minecraft/client/gui/hud/HudAchievements.mapping b/mappings/net/minecraft/client/gui/hud/HudAchievements.mapping new file mode 100644 index 0000000000..a7ace8cf64 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/HudAchievements.mapping @@ -0,0 +1,20 @@ +CLASS none/bgu net/minecraft/client/gui/hud/HudAchievements + FIELD a BG_TEX Lnone/kp; + FIELD f mc Lnone/bdo; + FIELD g scaledWidth I + FIELD h scaledHeight I + FIELD i title Ljava/lang/String; + FIELD j text Ljava/lang/String; + FIELD k currentAchievement Lnone/no; + FIELD l timeShown J + FIELD m itemRenderer Lnone/bto; + FIELD n hint Z + METHOD (Lnone/bdo;)V + ARG 0 mc + METHOD a draw ()V + METHOD a show (Lnone/no;)V + ARG 0 achievement + METHOD b clear ()V + METHOD b showHint (Lnone/no;)V + ARG 0 achievement + METHOD c setup ()V diff --git a/mappings/net/minecraft/client/gui/hud/HudBossBar.mapping b/mappings/net/minecraft/client/gui/hud/HudBossBar.mapping new file mode 100644 index 0000000000..2c41640306 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/HudBossBar.mapping @@ -0,0 +1,17 @@ +CLASS none/beh net/minecraft/client/gui/hud/HudBossBar + FIELD a BAR_TEX Lnone/kp; + FIELD f mc Lnone/bdo; + FIELD g bossBars Ljava/util/Map; + METHOD (Lnone/bdo;)V + ARG 0 mc + METHOD a draw ()V + METHOD a drawBossBar (IILnone/qr;)V + ARG 0 x + ARG 1 y + ARG 2 bossBar + METHOD a handlePacket (Lnone/gb;)V + ARG 0 packet + METHOD b clear ()V + METHOD d shouldPlayDragonMusic ()Z + METHOD e shouldDarkenSky ()Z + METHOD f shouldThickenFog ()Z diff --git a/mappings/net/minecraft/client/gui/hud/HudChat.mapping b/mappings/net/minecraft/client/gui/hud/HudChat.mapping new file mode 100644 index 0000000000..49d64d9752 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/HudChat.mapping @@ -0,0 +1,16 @@ +CLASS none/bej net/minecraft/client/gui/hud/HudChat + FIELD a LINE_SPLITTER Lcom/google/common/base/Splitter; + FIELD f NEWLINE_JOINER Lcom/google/common/base/Joiner; + FIELD g LOGGER Lorg/apache/logging/log4j/Logger; + FIELD h mc Lnone/bdo; + METHOD (Lnone/bdo;)V + ARG 0 mc + METHOD a clear ()V + METHOD a clampWidth (F)I + ARG 0 width + METHOD b clampHeight (F)I + ARG 0 height + METHOD e isChatFocused ()Z + METHOD f getWidth ()I + METHOD g getHeight ()I + METHOD h getScale ()F diff --git a/mappings/net/minecraft/client/gui/hud/HudDebug.mapping b/mappings/net/minecraft/client/gui/hud/HudDebug.mapping new file mode 100644 index 0000000000..0c0ee12da8 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/HudDebug.mapping @@ -0,0 +1,13 @@ +CLASS none/bel net/minecraft/client/gui/hud/HudDebug + FIELD a mc Lnone/bdo; + FIELD f fontRenderer Lnone/bec; + METHOD (Lnone/bdo;)V + ARG 0 mc + METHOD a drawLeftInfoText ()V + METHOD a draw (Lnone/beg;)V + ARG 0 displayScale + METHOD b getLeftInfoText ()Ljava/util/List; + METHOD b drawRightInfoText (Lnone/beg;)V + ARG 0 displayScale + METHOD c getRightInfoText ()Ljava/util/List; + METHOD d drawDebugGraph ()V diff --git a/mappings/net/minecraft/client/gui/hud/HudInGame.mapping b/mappings/net/minecraft/client/gui/hud/HudInGame.mapping new file mode 100644 index 0000000000..352a0264d4 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/HudInGame.mapping @@ -0,0 +1,25 @@ +CLASS none/bed net/minecraft/client/gui/hud/HudInGame + FIELD f VIGNETTE_TEX Lnone/kp; + FIELD g WIDGETS_TEX Lnone/kp; + FIELD h PUMPKIN_BLUR Lnone/kp; + FIELD i rand Ljava/util/Random; + FIELD j mc Lnone/bdo; + FIELD l hudChat Lnone/bej; + FIELD r currentStack Lnone/aeq; + FIELD s hudDebug Lnone/bel; + FIELD t hudSubtitles Lnone/bfb; + FIELD u hudSpectator Lnone/bfd; + FIELD v hudScoreboard Lnone/bey; + FIELD w hudBossBar Lnone/beh; + METHOD (Lnone/bdo;)V + ARG 0 mc + METHOD a draw (F)V + ARG 0 deltaTicks + METHOD a (Lnone/beg;F)V + ARG 0 displayScale + ARG 1 deltaTicks + METHOD d getHudChat ()Lnone/bej; + METHOD f getFontRenderer ()Lnone/bec; + METHOD g getSpectatorWidget ()Lnone/bfd; + METHOD h getScoreboardWidget ()Lnone/bey; + METHOD j getHudBossBar ()Lnone/beh; diff --git a/mappings/net/minecraft/client/gui/hud/HudScoreboard.mapping b/mappings/net/minecraft/client/gui/hud/HudScoreboard.mapping new file mode 100644 index 0000000000..a435ba4018 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/HudScoreboard.mapping @@ -0,0 +1,6 @@ +CLASS none/bey net/minecraft/client/gui/hud/HudScoreboard + FIELD f mc Lnone/bdo; + FIELD g hudInGame Lnone/bed; + METHOD (Lnone/bdo;Lnone/bed;)V + ARG 0 mc + ARG 1 hudInGame diff --git a/mappings/net/minecraft/client/gui/hud/GuiSpectator.mapping b/mappings/net/minecraft/client/gui/hud/HudSpectator.mapping similarity index 51% rename from mappings/net/minecraft/client/gui/hud/GuiSpectator.mapping rename to mappings/net/minecraft/client/gui/hud/HudSpectator.mapping index 6af815f204..28b0285e11 100644 --- a/mappings/net/minecraft/client/gui/hud/GuiSpectator.mapping +++ b/mappings/net/minecraft/client/gui/hud/HudSpectator.mapping @@ -1,6 +1,8 @@ -CLASS none/bfd net/minecraft/client/gui/hud/GuiSpectator +CLASS none/bfd net/minecraft/client/gui/hud/HudSpectator FIELD a SPECTATOR_TEX Lnone/kp; FIELD f WIDGETS_TEX Lnone/kp; FIELD g mc Lnone/bdo; + FIELD i spectatorMenu Lnone/bjb; METHOD (Lnone/bdo;)V ARG 0 mc + METHOD a draw (Lnone/beg;F)V diff --git a/mappings/net/minecraft/client/gui/hud/GuiSubtitles.mapping b/mappings/net/minecraft/client/gui/hud/HudSubtitles.mapping similarity index 82% rename from mappings/net/minecraft/client/gui/hud/GuiSubtitles.mapping rename to mappings/net/minecraft/client/gui/hud/HudSubtitles.mapping index 2750b40c3a..3b9a7fae1f 100644 --- a/mappings/net/minecraft/client/gui/hud/GuiSubtitles.mapping +++ b/mappings/net/minecraft/client/gui/hud/HudSubtitles.mapping @@ -1,4 +1,4 @@ -CLASS none/bfb net/minecraft/client/gui/hud/GuiSubtitles +CLASS none/bfb net/minecraft/client/gui/hud/HudSubtitles CLASS none/bfb$a SubtitleEntry FIELD b text Ljava/lang/String; FIELD c time J @@ -15,6 +15,8 @@ CLASS none/bfb net/minecraft/client/gui/hud/GuiSubtitles FIELD f entries Ljava/util/List; METHOD (Lnone/bdo;)V ARG 0 mc + METHOD a draw (Lnone/beg;)V + ARG 0 displayScale METHOD a onSoundPlayed (Lnone/cae;Lnone/caw;)V ARG 0 sound ARG 1 accessor diff --git a/mappings/net/minecraft/client/gui/hud/ScoreboardEntry.mapping b/mappings/net/minecraft/client/gui/hud/ScoreboardEntry.mapping new file mode 100644 index 0000000000..df99abfb3b --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/ScoreboardEntry.mapping @@ -0,0 +1,23 @@ +CLASS none/bmf net/minecraft/client/gui/hud/ScoreboardEntry + FIELD b profile Lcom/mojang/authlib/GameProfile; + FIELD c gameMode Lnone/ais; + FIELD d latency I + FIELD g displayName Lnone/fa; + METHOD (Lcom/mojang/authlib/GameProfile;)V + ARG 0 profile + METHOD (Lnone/hf$b;)V + ARG 0 packet + METHOD a getProfile ()Lcom/mojang/authlib/GameProfile; + METHOD a setLatency (I)V + ARG 0 value + METHOD a setGameMode (Lnone/ais;)V + ARG 0 value + METHOD a setDisplayName (Lnone/fa;)V + ARG 0 value + METHOD b getGameMode ()Lnone/ais; + METHOD c getLatency ()I + METHOD e isSkinTextureLoaded ()Z + METHOD g getSkinTexture ()Lnone/kp; + METHOD h getCapeTexture ()Lnone/kp; + METHOD i getElytraTexture ()Lnone/kp; + METHOD l getDisplayName ()Lnone/fa; diff --git a/mappings/net/minecraft/client/gui/spectator/ISpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenu.mapping similarity index 51% rename from mappings/net/minecraft/client/gui/spectator/ISpectatorMenu.mapping rename to mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenu.mapping index 883a74945b..9ad4bc6df7 100644 --- a/mappings/net/minecraft/client/gui/spectator/ISpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenu.mapping @@ -1,3 +1,3 @@ -CLASS none/bjc net/minecraft/client/gui/spectator/ISpectatorMenu +CLASS none/bjc net/minecraft/client/gui/hud/spectator/ISpectatorMenu METHOD a getElements ()Ljava/util/List; METHOD b getMessage ()Lnone/fa; diff --git a/mappings/net/minecraft/client/gui/spectator/ISpectatorMenuElement.mapping b/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement.mapping similarity index 57% rename from mappings/net/minecraft/client/gui/spectator/ISpectatorMenuElement.mapping rename to mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement.mapping index 1f0832622a..472fe8b306 100644 --- a/mappings/net/minecraft/client/gui/spectator/ISpectatorMenuElement.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement.mapping @@ -1,4 +1,4 @@ -CLASS none/bjd net/minecraft/client/gui/spectator/ISpectatorMenuElement +CLASS none/bjd net/minecraft/client/gui/hud/spectator/ISpectatorMenuElement METHOD H_ enabled ()Z METHOD a renderIcon (FI)V METHOD a selectElement (Lnone/bjb;)V diff --git a/mappings/net/minecraft/client/gui/spectator/SpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping similarity index 85% rename from mappings/net/minecraft/client/gui/spectator/SpectatorMenu.mapping rename to mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping index 206534fb0f..5b9cdec43e 100644 --- a/mappings/net/minecraft/client/gui/spectator/SpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping @@ -1,4 +1,4 @@ -CLASS none/bjb net/minecraft/client/gui/spectator/SpectatorMenu +CLASS none/bjb net/minecraft/client/gui/hud/spectator/SpectatorMenu CLASS none/bjb$1 METHOD H_ enabled ()Z METHOD a renderIcon (FI)V diff --git a/mappings/net/minecraft/client/gui/spectator/SpectatorTeleportMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorTeleportMenu.mapping similarity index 67% rename from mappings/net/minecraft/client/gui/spectator/SpectatorTeleportMenu.mapping rename to mappings/net/minecraft/client/gui/hud/spectator/SpectatorTeleportMenu.mapping index 8dbfede3a9..cc0441f9cc 100644 --- a/mappings/net/minecraft/client/gui/spectator/SpectatorTeleportMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorTeleportMenu.mapping @@ -1,6 +1,6 @@ -CLASS none/bjg net/minecraft/client/gui/spectator/SpectatorTeleportMenu +CLASS none/bjg net/minecraft/client/gui/hud/spectator/SpectatorTeleportMenu FIELD a PLAYER_ORDER Lcom/google/common/collect/Ordering; - FIELD b ELEMENTS Ljava/util/List; + FIELD b elements Ljava/util/List; METHOD H_ enabled ()Z METHOD a getElements ()Ljava/util/List; METHOD a renderIcon (FI)V diff --git a/mappings/net/minecraft/client/gui/ingame/GuiBrewingStand.mapping b/mappings/net/minecraft/client/gui/ingame/GuiBrewingStand.mapping new file mode 100644 index 0000000000..eaf7f60ba2 --- /dev/null +++ b/mappings/net/minecraft/client/gui/ingame/GuiBrewingStand.mapping @@ -0,0 +1,11 @@ +CLASS none/bhg net/minecraft/client/gui/ingame/GuiBrewingStand + FIELD u BG_TEX Lnone/kp; + FIELD w playerInv Lnone/aaj; + FIELD x inventory Lnone/qt; + METHOD (Lnone/aaj;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory + METHOD a drawBackground (FII)V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiChat.mapping b/mappings/net/minecraft/client/gui/ingame/GuiChat.mapping similarity index 79% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiChat.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiChat.mapping index 12a66f60d1..f0b2e69305 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiChat.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiChat.mapping @@ -1,4 +1,4 @@ -CLASS none/bfn net/minecraft/client/gui/screen/ingame/GuiChat +CLASS none/bfn net/minecraft/client/gui/ingame/GuiChat CLASS none/bfn$a FIELD g mc Lnone/bdo; FIELD f LOGGER Lorg/apache/logging/log4j/Logger; @@ -6,10 +6,11 @@ CLASS none/bfn net/minecraft/client/gui/screen/ingame/GuiChat METHOD (Ljava/lang/String;)V ARG 0 inputText METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a completeString ([Ljava/lang/String;)V ARG 0 completions METHOD b init ()V + METHOD e update ()V METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiChatSleeping.mapping b/mappings/net/minecraft/client/gui/ingame/GuiChatSleeping.mapping similarity index 62% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiChatSleeping.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiChatSleeping.mapping index 0c89b2c9aa..0fa6962a8d 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiChatSleeping.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiChatSleeping.mapping @@ -1,4 +1,4 @@ -CLASS none/bgb net/minecraft/client/gui/screen/ingame/GuiChatSleeping +CLASS none/bgb net/minecraft/client/gui/ingame/GuiChatSleeping METHOD a leaveBed ()V METHOD a handleKeyPress (CI)V METHOD a handleButtonPressed (Lnone/bei;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiCommandBlock.mapping b/mappings/net/minecraft/client/gui/ingame/GuiCommandBlock.mapping similarity index 83% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiCommandBlock.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiCommandBlock.mapping index 33b0abed3d..251a2685ae 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiCommandBlock.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiCommandBlock.mapping @@ -1,4 +1,4 @@ -CLASS none/bhh net/minecraft/client/gui/screen/ingame/GuiCommandBlock +CLASS none/bhh net/minecraft/client/gui/ingame/GuiCommandBlock FIELD g tileEntity Lnone/are; FIELD h buttonDone Lnone/bei; FIELD i buttonCancel Lnone/bei; @@ -10,10 +10,11 @@ CLASS none/bhh net/minecraft/client/gui/screen/ingame/GuiCommandBlock METHOD (Lnone/are;)V ARG 0 tileEntity METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD a completeString ([Ljava/lang/String;)V ARG 0 completions METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiCommandBlockMinecart.mapping b/mappings/net/minecraft/client/gui/ingame/GuiCommandBlockMinecart.mapping similarity index 73% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiCommandBlockMinecart.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiCommandBlockMinecart.mapping index 60a801d19f..81aadbaa25 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiCommandBlockMinecart.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiCommandBlockMinecart.mapping @@ -1,12 +1,13 @@ -CLASS none/bhv net/minecraft/client/gui/screen/ingame/GuiCommandBlockMinecart +CLASS none/bhv net/minecraft/client/gui/ingame/GuiCommandBlockMinecart FIELD h buttonDone Lnone/bei; FIELD i buttonCancel Lnone/bei; FIELD r buttonToggleOutput Lnone/bei; METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD a completeString ([Ljava/lang/String;)V ARG 0 completions METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiConfirmChatLink.mapping b/mappings/net/minecraft/client/gui/ingame/GuiConfirmChatLink.mapping similarity index 75% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiConfirmChatLink.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiConfirmChatLink.mapping index b659730977..49d1601d65 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiConfirmChatLink.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiConfirmChatLink.mapping @@ -1,4 +1,4 @@ -CLASS none/bfo net/minecraft/client/gui/screen/ingame/GuiConfirmChatLink +CLASS none/bfo net/minecraft/client/gui/ingame/GuiConfirmChatLink FIELD r warning Ljava/lang/String; FIELD s copy Ljava/lang/String; FIELD t link Ljava/lang/String; @@ -7,7 +7,7 @@ CLASS none/bfo net/minecraft/client/gui/screen/ingame/GuiConfirmChatLink ARG 0 callback ARG 1 link METHOD a copy ()V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD f disableWarning ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiDeath.mapping b/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping similarity index 58% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiDeath.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping index 082a0cf550..75e197e198 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiDeath.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping @@ -1,9 +1,11 @@ -CLASS none/bfv net/minecraft/client/gui/screen/ingame/GuiDeath +CLASS none/bfv net/minecraft/client/gui/ingame/GuiDeath + FIELD a ticksSinceDeath I FIELD f msg Lnone/fa; METHOD (Lnone/fa;)V ARG 0 msg METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD a handle (ZI)V METHOD b init ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiEditBook.mapping b/mappings/net/minecraft/client/gui/ingame/GuiEditBook.mapping similarity index 81% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiEditBook.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiEditBook.mapping index 4e35b16c44..5903a1225e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiEditBook.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiEditBook.mapping @@ -1,4 +1,4 @@ -CLASS none/bhf net/minecraft/client/gui/screen/ingame/GuiEditBook +CLASS none/bhf net/minecraft/client/gui/ingame/GuiEditBook CLASS none/bhf$a METHOD a draw (Lnone/bdo;II)V FIELD a LOGGER Lorg/apache/logging/log4j/Logger; @@ -9,9 +9,10 @@ CLASS none/bhf net/minecraft/client/gui/screen/ingame/GuiEditBook ARG 0 player ARG 1 stack METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD a handleTextComponentClick (Lnone/fa;)Z METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiEditSign.mapping b/mappings/net/minecraft/client/gui/ingame/GuiEditSign.mapping similarity index 64% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiEditSign.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiEditSign.mapping index 19b1188a30..c1b8360155 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiEditSign.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiEditSign.mapping @@ -1,9 +1,10 @@ -CLASS none/bhw net/minecraft/client/gui/screen/ingame/GuiEditSign +CLASS none/bhw net/minecraft/client/gui/ingame/GuiEditSign FIELD a sign Lnone/art; METHOD (Lnone/art;)V ARG 0 sign METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiStructureBlock.mapping b/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping similarity index 70% rename from mappings/net/minecraft/client/gui/screen/ingame/GuiStructureBlock.mapping rename to mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping index fa1dc7eca5..33d95a0c01 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiStructureBlock.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiStructureBlock.mapping @@ -1,11 +1,12 @@ -CLASS none/bhx net/minecraft/client/gui/screen/ingame/GuiStructureBlock +CLASS none/bhx net/minecraft/client/gui/ingame/GuiStructureBlock FIELD f LOGGER Lorg/apache/logging/log4j/Logger; FIELD g te Lnone/arv; METHOD (Lnone/arv;)V ARG 0 te METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiAchievements.mapping b/mappings/net/minecraft/client/gui/menu/GuiAchievements.mapping similarity index 69% rename from mappings/net/minecraft/client/gui/screen/menu/GuiAchievements.mapping rename to mappings/net/minecraft/client/gui/menu/GuiAchievements.mapping index af8cbc2c35..c6a451907e 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiAchievements.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiAchievements.mapping @@ -1,10 +1,11 @@ -CLASS none/bgv net/minecraft/client/gui/screen/menu/GuiAchievements +CLASS none/bgv net/minecraft/client/gui/menu/GuiAchievements FIELD C ACHIVEMENT_BG Lnone/kp; FIELD a parent Lnone/bgk; METHOD (Lnone/bgk;Lnone/nz;)V ARG 0 parent METHOD a finishLoading ()V METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiDemo.mapping b/mappings/net/minecraft/client/gui/menu/GuiDemo.mapping similarity index 63% rename from mappings/net/minecraft/client/gui/screen/menu/GuiDemo.mapping rename to mappings/net/minecraft/client/gui/menu/GuiDemo.mapping index 153a0b4aab..04d3d54663 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiDemo.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiDemo.mapping @@ -1,7 +1,8 @@ -CLASS none/bfw net/minecraft/client/gui/screen/menu/GuiDemo +CLASS none/bfw net/minecraft/client/gui/menu/GuiDemo FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD f DEMO_BG Lnone/kp; - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD c drawBackground ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiDisconnected.mapping b/mappings/net/minecraft/client/gui/menu/GuiDisconnected.mapping similarity index 78% rename from mappings/net/minecraft/client/gui/screen/menu/GuiDisconnected.mapping rename to mappings/net/minecraft/client/gui/menu/GuiDisconnected.mapping index b1402b452c..33143ed8ff 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiDisconnected.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiDisconnected.mapping @@ -1,4 +1,4 @@ -CLASS none/bfy net/minecraft/client/gui/screen/menu/GuiDisconnected +CLASS none/bfy net/minecraft/client/gui/menu/GuiDisconnected FIELD a title Ljava/lang/String; FIELD f reason Lnone/fa; FIELD g reasonFormatted Ljava/util/List; @@ -9,6 +9,6 @@ CLASS none/bfy net/minecraft/client/gui/screen/menu/GuiDisconnected ARG 1 title ARG 2 reason METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiEndCredits.mapping b/mappings/net/minecraft/client/gui/menu/GuiEndCredits.mapping similarity index 61% rename from mappings/net/minecraft/client/gui/screen/menu/GuiEndCredits.mapping rename to mappings/net/minecraft/client/gui/menu/GuiEndCredits.mapping index 61209a50cf..9916593431 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiEndCredits.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiEndCredits.mapping @@ -1,7 +1,8 @@ -CLASS none/bgt net/minecraft/client/gui/screen/menu/GuiEndCredits +CLASS none/bgt net/minecraft/client/gui/menu/GuiEndCredits FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD f MINECRAFT_TEX Lnone/kp; FIELD g VIGNETTE_TEX Lnone/kp; METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD b init ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiError.mapping b/mappings/net/minecraft/client/gui/menu/GuiError.mapping similarity index 73% rename from mappings/net/minecraft/client/gui/screen/menu/GuiError.mapping rename to mappings/net/minecraft/client/gui/menu/GuiError.mapping index 5c7a57e169..2a0b7b26fe 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiError.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiError.mapping @@ -1,10 +1,10 @@ -CLASS none/bga net/minecraft/client/gui/screen/menu/GuiError +CLASS none/bga net/minecraft/client/gui/menu/GuiError FIELD a title Ljava/lang/String; FIELD f message Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 0 title ARG 1 message METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiInGameMenu.mapping b/mappings/net/minecraft/client/gui/menu/GuiInGameMenu.mapping new file mode 100644 index 0000000000..34e0d5545e --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/GuiInGameMenu.mapping @@ -0,0 +1,5 @@ +CLASS none/bgg net/minecraft/client/gui/menu/GuiInGameMenu + METHOD a draw (IIF)V + METHOD a handleButtonPressed (Lnone/bei;)V + METHOD b init ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiMainMenu.mapping b/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping similarity index 79% rename from mappings/net/minecraft/client/gui/screen/menu/GuiMainMenu.mapping rename to mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping index 6094dbb59a..f1ac53f1b0 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiMainMenu.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping @@ -1,4 +1,4 @@ -CLASS none/bgr net/minecraft/client/gui/screen/menu/GuiMainMenu +CLASS none/bgr net/minecraft/client/gui/menu/GuiMainMenu FIELD A SPLASHES_LOC Lnone/kp; FIELD B LOGO_LOC Lnone/kp; FIELD C PANORAMA_LOC [Lnone/kp; @@ -6,9 +6,10 @@ CLASS none/bgr net/minecraft/client/gui/screen/menu/GuiMainMenu FIELD h RANDOM Ljava/util/Random; FIELD r splashText Ljava/lang/String; METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD a handle (ZI)V METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiMultiplayer.mapping b/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping similarity index 75% rename from mappings/net/minecraft/client/gui/screen/menu/GuiMultiplayer.mapping rename to mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping index e8c26b4b6a..8f710b717c 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiMultiplayer.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping @@ -1,13 +1,14 @@ -CLASS none/bia net/minecraft/client/gui/screen/menu/GuiMultiplayer +CLASS none/bia net/minecraft/client/gui/menu/GuiMultiplayer FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD g parent Lnone/bgk; METHOD (Lnone/bgk;)V ARG 0 parent METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD a handle (ZI)V METHOD b init ()V + METHOD e update ()V METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorld.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorld.mapping similarity index 68% rename from mappings/net/minecraft/client/gui/screen/menu/GuiNewWorld.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewWorld.mapping index ddc33bf889..4d3e6dc8dc 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorld.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorld.mapping @@ -1,10 +1,11 @@ -CLASS none/bit net/minecraft/client/gui/screen/menu/GuiNewWorld +CLASS none/bit net/minecraft/client/gui/menu/GuiNewWorld FIELD f parent Lnone/bgk; METHOD (Lnone/bgk;)V ARG 0 parent METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomize.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomize.mapping similarity index 61% rename from mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomize.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomize.mapping index f2f2827093..53b047ca2f 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomize.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomize.mapping @@ -1,6 +1,6 @@ -CLASS none/bfu net/minecraft/client/gui/screen/menu/GuiNewWorldCustomize +CLASS none/bfu net/minecraft/client/gui/menu/GuiNewWorldCustomize METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizeFlat.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping similarity index 63% rename from mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizeFlat.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping index 6dfb17e09c..50d1f93de9 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizeFlat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping @@ -1,8 +1,8 @@ -CLASS none/bfs net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizeFlat +CLASS none/bfs net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat FIELD a parent Lnone/bit; METHOD (Lnone/bit;Ljava/lang/String;)V ARG 0 parent - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD k handleMouseEvent ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizePresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping similarity index 61% rename from mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizePresets.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping index cd47e8c9ee..7991ba79aa 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizePresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping @@ -1,8 +1,9 @@ -CLASS none/bft net/minecraft/client/gui/screen/menu/GuiNewWorldCustomizePresets +CLASS none/bft net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldPresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping similarity index 62% rename from mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldPresets.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping index 0f95d0dc61..4b8c0e19f0 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiNewWorldPresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping @@ -1,8 +1,9 @@ -CLASS none/bgh net/minecraft/client/gui/screen/menu/GuiNewWorldPresets +CLASS none/bgh net/minecraft/client/gui/menu/GuiNewWorldPresets METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiOpenToLAN.mapping b/mappings/net/minecraft/client/gui/menu/GuiOpenToLAN.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/screen/menu/GuiOpenToLAN.mapping rename to mappings/net/minecraft/client/gui/menu/GuiOpenToLAN.mapping index 0eb2b2af1c..23b25ac38d 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiOpenToLAN.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiOpenToLAN.mapping @@ -1,4 +1,4 @@ -CLASS none/bgl net/minecraft/client/gui/screen/menu/GuiOpenToLAN +CLASS none/bgl net/minecraft/client/gui/menu/GuiOpenToLAN FIELD a parent Lnone/bgk; FIELD f buttonAllowCommands Lnone/bei; FIELD g buttonGameMode Lnone/bei; @@ -7,6 +7,6 @@ CLASS none/bgl net/minecraft/client/gui/screen/menu/GuiOpenToLAN METHOD (Lnone/bgk;)V ARG 0 parent METHOD a updateButtonText ()V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping b/mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping new file mode 100644 index 0000000000..61036776b8 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/GuiOutOfMemory.mapping @@ -0,0 +1,5 @@ +CLASS none/bgf net/minecraft/client/gui/menu/GuiOutOfMemory + METHOD a handleKeyPress (CI)V + METHOD a draw (IIF)V + METHOD a handleButtonPressed (Lnone/bei;)V + METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiRealms.mapping b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping similarity index 83% rename from mappings/net/minecraft/client/gui/screen/menu/GuiRealms.mapping rename to mappings/net/minecraft/client/gui/menu/GuiRealms.mapping index 5fc0a397e8..bbda701355 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiRealms.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping @@ -1,6 +1,6 @@ -CLASS none/bfi net/minecraft/client/gui/screen/menu/GuiRealms +CLASS none/bfi net/minecraft/client/gui/menu/GuiRealms METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a drawGradientRect (IIIIII)V METHOD a drawTooltip (Ljava/lang/String;II)V @@ -12,6 +12,7 @@ CLASS none/bfi net/minecraft/client/gui/screen/menu/GuiRealms METHOD b drawTexturedRect (IIIIII)V METHOD c drawBackground ()V METHOD d_ drawBackground (I)V + METHOD e update ()V METHOD k handleMouseEvent ()V METHOD l handleKeyboardEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiServerAdd.mapping b/mappings/net/minecraft/client/gui/menu/GuiServerAdd.mapping similarity index 72% rename from mappings/net/minecraft/client/gui/screen/menu/GuiServerAdd.mapping rename to mappings/net/minecraft/client/gui/menu/GuiServerAdd.mapping index 8c4a0ffd6d..5a589b328a 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiServerAdd.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiServerAdd.mapping @@ -1,12 +1,13 @@ -CLASS none/bfz net/minecraft/client/gui/screen/menu/GuiServerAdd +CLASS none/bfz net/minecraft/client/gui/menu/GuiServerAdd FIELD a parent Lnone/bgk; METHOD (Lnone/bgk;Lnone/bmh;)V ARG 0 parent METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiServerConnect.mapping b/mappings/net/minecraft/client/gui/menu/GuiServerConnect.mapping similarity index 58% rename from mappings/net/minecraft/client/gui/screen/menu/GuiServerConnect.mapping rename to mappings/net/minecraft/client/gui/menu/GuiServerConnect.mapping index 21b511948c..3e851442c5 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiServerConnect.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiServerConnect.mapping @@ -1,7 +1,8 @@ -CLASS none/bfx net/minecraft/client/gui/screen/menu/GuiServerConnect +CLASS none/bfx net/minecraft/client/gui/menu/GuiServerConnect METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiServerConnecting.mapping b/mappings/net/minecraft/client/gui/menu/GuiServerConnecting.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/screen/menu/GuiServerConnecting.mapping rename to mappings/net/minecraft/client/gui/menu/GuiServerConnecting.mapping index e48e344cdb..a65f59401c 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiServerConnecting.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiServerConnecting.mapping @@ -1,4 +1,4 @@ -CLASS none/bfr net/minecraft/client/gui/screen/menu/GuiServerConnecting +CLASS none/bfr net/minecraft/client/gui/menu/GuiServerConnecting FIELD f LOGGER Lorg/apache/logging/log4j/Logger; FIELD i parent Lnone/bgk; METHOD (Lnone/bgk;Lnone/bdo;Ljava/lang/String;I)V @@ -9,6 +9,7 @@ CLASS none/bfr net/minecraft/client/gui/screen/menu/GuiServerConnecting ARG 1 mc ARG 2 server METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettings.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping similarity index 72% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettings.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettings.mapping index a1f8cae260..1ae4a71ffe 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettings.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping @@ -1,11 +1,11 @@ -CLASS none/bge net/minecraft/client/gui/screen/menu/GuiSettings +CLASS none/bge net/minecraft/client/gui/menu/GuiSettings FIELD a title Ljava/lang/String; FIELD g parent Lnone/bgk; FIELD h settings Lnone/bdq; METHOD (Lnone/bgk;Lnone/bdq;)V ARG 0 parent ARG 1 settings - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD a handle (ZI)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsAudio.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping similarity index 74% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsAudio.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping index e8e2ec6a24..5e223ca291 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsAudio.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping @@ -1,4 +1,4 @@ -CLASS none/bgo net/minecraft/client/gui/screen/menu/GuiSettingsAudio +CLASS none/bgo net/minecraft/client/gui/menu/GuiSettingsAudio CLASS none/bgo$a METHOD c isWithinBounds (Lnone/bdo;II)Z FIELD a title Ljava/lang/String; @@ -7,6 +7,6 @@ CLASS none/bgo net/minecraft/client/gui/screen/menu/GuiSettingsAudio METHOD (Lnone/bgk;Lnone/bdq;)V ARG 0 parent ARG 1 settings - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsChat.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsChat.mapping similarity index 69% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsChat.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsChat.mapping index 11be145885..2bf631673f 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsChat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsChat.mapping @@ -1,10 +1,10 @@ -CLASS none/bfm net/minecraft/client/gui/screen/menu/GuiSettingsChat +CLASS none/bfm net/minecraft/client/gui/menu/GuiSettingsChat FIELD a SETTINGS [Lnone/bdq$a; FIELD f parent Lnone/bgk; FIELD g settings Lnone/bdq; METHOD (Lnone/bgk;Lnone/bdq;)V ARG 0 parent ARG 1 settings - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsControls.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsControls.mapping similarity index 79% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsControls.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsControls.mapping index 88b2189d71..be441ab363 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsControls.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsControls.mapping @@ -1,4 +1,4 @@ -CLASS none/bha net/minecraft/client/gui/screen/menu/GuiSettingsControls +CLASS none/bha net/minecraft/client/gui/menu/GuiSettingsControls FIELD a title Ljava/lang/String; FIELD h SETTINGS [Lnone/bdq$a; FIELD i parent Lnone/bgk; @@ -8,7 +8,7 @@ CLASS none/bha net/minecraft/client/gui/screen/menu/GuiSettingsControls ARG 0 parent ARG 1 settings METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsLanguage.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping similarity index 69% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsLanguage.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping index aa3bb4ad5b..d8e7d21f44 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsLanguage.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsLanguage.mapping @@ -1,10 +1,10 @@ -CLASS none/bgc net/minecraft/client/gui/screen/menu/GuiSettingsLanguage +CLASS none/bgc net/minecraft/client/gui/menu/GuiSettingsLanguage FIELD a parent Lnone/bgk; FIELD g settings Lnone/bdq; METHOD (Lnone/bgk;Lnone/bdq;Lnone/byl;)V ARG 0 parent ARG 1 settings - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD k handleMouseEvent ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsResourcePacks.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsResourcePacks.mapping similarity index 65% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsResourcePacks.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsResourcePacks.mapping index 2e8bc4ddec..99dde8eaa9 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsResourcePacks.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsResourcePacks.mapping @@ -1,8 +1,8 @@ -CLASS none/bih net/minecraft/client/gui/screen/menu/GuiSettingsResourcePacks +CLASS none/bih net/minecraft/client/gui/menu/GuiSettingsResourcePacks FIELD a parent Lnone/bgk; METHOD (Lnone/bgk;)V ARG 0 parent - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsSkin.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSkin.mapping similarity index 63% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsSkin.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsSkin.mapping index 22d0b4ea6e..5039d181df 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsSkin.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSkin.mapping @@ -1,8 +1,8 @@ -CLASS none/bgm net/minecraft/client/gui/screen/menu/GuiSettingsSkin +CLASS none/bgm net/minecraft/client/gui/menu/GuiSettingsSkin FIELD a parent Lnone/bgk; FIELD f title Ljava/lang/String; METHOD (Lnone/bgk;)V ARG 0 parent - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsSnooper.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping similarity index 69% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsSnooper.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping index 10b56a3971..6ccf2183b0 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsSnooper.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsSnooper.mapping @@ -1,10 +1,10 @@ -CLASS none/bgn net/minecraft/client/gui/screen/menu/GuiSettingsSnooper +CLASS none/bgn net/minecraft/client/gui/menu/GuiSettingsSnooper FIELD a parent Lnone/bgk; FIELD f settings Lnone/bdq; METHOD (Lnone/bgk;Lnone/bdq;)V ARG 0 parent ARG 1 settings - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD k handleMouseEvent ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsVideo.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsVideo.mapping similarity index 74% rename from mappings/net/minecraft/client/gui/screen/menu/GuiSettingsVideo.mapping rename to mappings/net/minecraft/client/gui/menu/GuiSettingsVideo.mapping index 2a898d8e5f..eb346d855f 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiSettingsVideo.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsVideo.mapping @@ -1,11 +1,11 @@ -CLASS none/bgs net/minecraft/client/gui/screen/menu/GuiSettingsVideo +CLASS none/bgs net/minecraft/client/gui/menu/GuiSettingsVideo FIELD a title Ljava/lang/String; FIELD f parent Lnone/bgk; FIELD g settings Lnone/bdq; METHOD (Lnone/bgk;Lnone/bdq;)V ARG 0 parent ARG 1 settings - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiStats.mapping b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping similarity index 69% rename from mappings/net/minecraft/client/gui/screen/menu/GuiStats.mapping rename to mappings/net/minecraft/client/gui/menu/GuiStats.mapping index d9bbc3f514..fe73b2294c 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiStats.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiStats.mapping @@ -1,9 +1,9 @@ -CLASS none/bgw net/minecraft/client/gui/screen/menu/GuiStats +CLASS none/bgw net/minecraft/client/gui/menu/GuiStats FIELD a parent Lnone/bgk; METHOD (Lnone/bgk;Lnone/nz;)V ARG 0 parent METHOD a finishLoading ()V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V METHOD k handleMouseEvent ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiWorking.mapping b/mappings/net/minecraft/client/gui/menu/GuiWorking.mapping new file mode 100644 index 0000000000..8a90aedc7a --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/GuiWorking.mapping @@ -0,0 +1,5 @@ +CLASS none/bgi net/minecraft/client/gui/menu/GuiWorking + FIELD a title Ljava/lang/String; + FIELD f task Ljava/lang/String; + FIELD g progress I + METHOD a draw (IIF)V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiWorldEdit.mapping b/mappings/net/minecraft/client/gui/menu/GuiWorldEdit.mapping similarity index 70% rename from mappings/net/minecraft/client/gui/screen/menu/GuiWorldEdit.mapping rename to mappings/net/minecraft/client/gui/menu/GuiWorldEdit.mapping index 2e6c8b2e2e..00cf93b6ed 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiWorldEdit.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiWorldEdit.mapping @@ -1,10 +1,11 @@ -CLASS none/biu net/minecraft/client/gui/screen/menu/GuiWorldEdit +CLASS none/biu net/minecraft/client/gui/menu/GuiWorldEdit FIELD a parent Lnone/bgk; METHOD (Lnone/bgk;Ljava/lang/String;)V ARG 0 parent METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiWorldLoading.mapping b/mappings/net/minecraft/client/gui/menu/GuiWorldLoading.mapping new file mode 100644 index 0000000000..74d3e586c0 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/GuiWorldLoading.mapping @@ -0,0 +1,5 @@ +CLASS none/bgj net/minecraft/client/gui/menu/GuiWorldLoading + METHOD a handleKeyPress (CI)V + METHOD a draw (IIF)V + METHOD b init ()V + METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiWorldSelect.mapping b/mappings/net/minecraft/client/gui/menu/GuiWorldSelect.mapping similarity index 74% rename from mappings/net/minecraft/client/gui/screen/menu/GuiWorldSelect.mapping rename to mappings/net/minecraft/client/gui/menu/GuiWorldSelect.mapping index 7608cfc225..6958e50b3d 100644 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiWorldSelect.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiWorldSelect.mapping @@ -1,10 +1,10 @@ -CLASS none/biv net/minecraft/client/gui/screen/menu/GuiWorldSelect +CLASS none/biv net/minecraft/client/gui/menu/GuiWorldSelect FIELD a parent Lnone/bgk; FIELD f title Ljava/lang/String; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnone/bgk;)V ARG 0 parent - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiAnvil.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiAnvil.mapping deleted file mode 100644 index 95e3421fee..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiAnvil.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS none/bhd net/minecraft/client/gui/screen/container/GuiAnvil - FIELD u BG_TEX Lnone/kp; - METHOD a handleKeyPress (CI)V - METHOD a drawBackground (FII)V - METHOD a drawScreen (IIF)V - METHOD a handleMouseClick (III)V - METHOD b init ()V - METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiBeacon.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiBeacon.mapping deleted file mode 100644 index f919618ffa..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiBeacon.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/bhe net/minecraft/client/gui/screen/container/GuiBeacon - CLASS none/bhe$d - METHOD a draw (Lnone/bdo;II)V - METHOD a drawBackground (FII)V - METHOD a handleButtonPressed (Lnone/bei;)V - METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiCraftingTable.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiCraftingTable.mapping deleted file mode 100644 index 44e5b4d484..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiCraftingTable.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bhj net/minecraft/client/gui/screen/container/GuiCraftingTable - FIELD u BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiDispenser.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiDispenser.mapping deleted file mode 100644 index 84ac5e2731..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiDispenser.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bhm net/minecraft/client/gui/screen/container/GuiDispenser - FIELD v BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiEnchanting.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiEnchanting.mapping deleted file mode 100644 index 2b198e7ef8..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiEnchanting.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/bhp net/minecraft/client/gui/screen/container/GuiEnchanting - FIELD B BG_TEX Lnone/kp; - FIELD C BOOK_TEX Lnone/kp; - METHOD a drawBackground (FII)V - METHOD a drawScreen (IIF)V - METHOD a handleMouseClick (III)V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiFurnace.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiFurnace.mapping deleted file mode 100644 index 109d1e5bc5..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiFurnace.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bhq net/minecraft/client/gui/screen/container/GuiFurnace - FIELD u BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiGeneric54.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiGeneric54.mapping deleted file mode 100644 index 8dbb6312e0..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiGeneric54.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bhi net/minecraft/client/gui/screen/container/GuiGeneric54 - FIELD u BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiHopper.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiHopper.mapping deleted file mode 100644 index 17c39b71c1..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiHopper.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bhr net/minecraft/client/gui/screen/container/GuiHopper - FIELD u BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiHorse.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiHorse.mapping deleted file mode 100644 index cc4156f500..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiHorse.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/bhs net/minecraft/client/gui/screen/container/GuiHorse - FIELD u BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V - METHOD a drawScreen (IIF)V diff --git a/mappings/net/minecraft/client/gui/screen/container/GuiVillager.mapping b/mappings/net/minecraft/client/gui/screen/container/GuiVillager.mapping deleted file mode 100644 index 0401d11b35..0000000000 --- a/mappings/net/minecraft/client/gui/screen/container/GuiVillager.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS none/bhu net/minecraft/client/gui/screen/container/GuiVillager - CLASS none/bhu$a - METHOD a draw (Lnone/bdo;II)V - FIELD u LOGGER Lorg/apache/logging/log4j/Logger; - FIELD v BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V - METHOD a drawScreen (IIF)V - METHOD a handleButtonPressed (Lnone/bei;)V - METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GuiBrewingStand.mapping b/mappings/net/minecraft/client/gui/screen/ingame/GuiBrewingStand.mapping deleted file mode 100644 index 7f384e0950..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ingame/GuiBrewingStand.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bhg net/minecraft/client/gui/screen/ingame/GuiBrewingStand - FIELD u BG_TEX Lnone/kp; - METHOD a drawBackground (FII)V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiInGameMenu.mapping b/mappings/net/minecraft/client/gui/screen/menu/GuiInGameMenu.mapping deleted file mode 100644 index e93aa4dda9..0000000000 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiInGameMenu.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/bgg net/minecraft/client/gui/screen/menu/GuiInGameMenu - METHOD a drawScreen (IIF)V - METHOD a handleButtonPressed (Lnone/bei;)V - METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiOutOfMemory.mapping b/mappings/net/minecraft/client/gui/screen/menu/GuiOutOfMemory.mapping deleted file mode 100644 index 779018bbac..0000000000 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiOutOfMemory.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/bgf net/minecraft/client/gui/screen/menu/GuiOutOfMemory - METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V - METHOD a handleButtonPressed (Lnone/bei;)V - METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiWorking.mapping b/mappings/net/minecraft/client/gui/screen/menu/GuiWorking.mapping deleted file mode 100644 index 8e8a84b20d..0000000000 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiWorking.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/bgi net/minecraft/client/gui/screen/menu/GuiWorking - FIELD a title Ljava/lang/String; - FIELD f task Ljava/lang/String; - FIELD g progress I - METHOD a drawScreen (IIF)V diff --git a/mappings/net/minecraft/client/gui/screen/menu/GuiWorldLoading.mapping b/mappings/net/minecraft/client/gui/screen/menu/GuiWorldLoading.mapping deleted file mode 100644 index 4bc2eddbce..0000000000 --- a/mappings/net/minecraft/client/gui/screen/menu/GuiWorldLoading.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/bgj net/minecraft/client/gui/screen/menu/GuiWorldLoading - METHOD a handleKeyPress (CI)V - METHOD a drawScreen (IIF)V - METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/widget/GuiButtonLanguage.mapping b/mappings/net/minecraft/client/gui/widget/GuiButtonLanguage.mapping deleted file mode 100644 index b544ab7580..0000000000 --- a/mappings/net/minecraft/client/gui/widget/GuiButtonLanguage.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bep net/minecraft/client/gui/widget/GuiButtonLanguage - METHOD a draw (Lnone/bdo;II)V diff --git a/mappings/net/minecraft/client/gui/widget/GuiButton.mapping b/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping similarity index 85% rename from mappings/net/minecraft/client/gui/widget/GuiButton.mapping rename to mappings/net/minecraft/client/gui/widget/WidgetButton.mapping index 3d1faddbaf..703412394b 100644 --- a/mappings/net/minecraft/client/gui/widget/GuiButton.mapping +++ b/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping @@ -1,4 +1,4 @@ -CLASS none/bei net/minecraft/client/gui/widget/GuiButton +CLASS none/bei net/minecraft/client/gui/widget/WidgetButton FIELD a WIDGET_TEXTURES Lnone/kp; FIELD f width I FIELD g height I @@ -6,6 +6,8 @@ CLASS none/bei net/minecraft/client/gui/widget/GuiButton FIELD i y I FIELD j text Ljava/lang/String; FIELD k id I + FIELD l enabled Z + FIELD m visible Z METHOD (IIIIILjava/lang/String;)V ARG 0 id ARG 1 x diff --git a/mappings/net/minecraft/client/gui/widget/WidgetButtonLanguage.mapping b/mappings/net/minecraft/client/gui/widget/WidgetButtonLanguage.mapping new file mode 100644 index 0000000000..46f3c1d172 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/WidgetButtonLanguage.mapping @@ -0,0 +1,6 @@ +CLASS none/bep net/minecraft/client/gui/widget/WidgetButtonLanguage + METHOD (III)V + ARG 0 id + ARG 1 x + ARG 2 y + METHOD a draw (Lnone/bdo;II)V diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index c553fb777d..6fa552006f 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,5 +1,11 @@ CLASS none/boq net/minecraft/client/render/WorldRenderer FIELD e LOGGER Lorg/apache/logging/log4j/Logger; FIELD h mc Lnone/bdo; + METHOD a (FJ)V + ARG 0 deltaTicks METHOD a onResourceReload (Lnone/bya;)V ARG 0 container + METHOD a (Lnone/kp;)V + ARG 0 shader + METHOD a onSetCameraEntity (Lnone/se;)V + ARG 0 entity diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index 7dc9f18c7a..ba1dbc9774 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -3,6 +3,9 @@ CLASS none/bme net/minecraft/client/world/WorldClient FIELD b netHandler Lnone/bmc; FIELD c chunkProvider Lnone/bma; METHOD a getEntityById (I)Lnone/se; + METHOD a hasChunk (IIZ)Z + ARG 0 chunkX + ARG 1 chunkZ METHOD a playSound (Lnone/aak;DDDLnone/nk;Lnone/nm;FF)V ARG 0 player ARG 1 x diff --git a/mappings/net/minecraft/container/impl/ContainerAnvil.mapping b/mappings/net/minecraft/container/impl/ContainerAnvil.mapping index 667944b998..924b256eda 100644 --- a/mappings/net/minecraft/container/impl/ContainerAnvil.mapping +++ b/mappings/net/minecraft/container/impl/ContainerAnvil.mapping @@ -5,6 +5,8 @@ CLASS none/abw net/minecraft/container/impl/ContainerAnvil METHOD a (Lnone/aeq;)Z ARG 0 stack FIELD f LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnone/aaj;Lnone/aiu;Lnone/aak;)V + ARG 0 playerInv METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD a addListener (Lnone/aca;)V diff --git a/mappings/net/minecraft/container/impl/ContainerBeacon.mapping b/mappings/net/minecraft/container/impl/ContainerBeacon.mapping index b6c660b0f3..ba68cff7d6 100644 --- a/mappings/net/minecraft/container/impl/ContainerBeacon.mapping +++ b/mappings/net/minecraft/container/impl/ContainerBeacon.mapping @@ -1,12 +1,18 @@ CLASS none/abx net/minecraft/container/impl/ContainerBeacon - CLASS none/abx$a + CLASS none/abx$a SlotPayment + METHOD (Lnone/abx;Lnone/qt;III)V + ARG 0 inventory + ARG 1 invSlot + ARG 2 x + ARG 3 y METHOD a getMaxStackSize ()I METHOD a (Lnone/aeq;)Z ARG 0 stack FIELD a inventory Lnone/qt; + FIELD f slotPayment Lnone/abx$a; METHOD (Lnone/qt;Lnone/qt;)V - ARG 0 invPlayer - ARG 1 invBeacon + ARG 0 playerInv + ARG 1 inventory METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD a addListener (Lnone/aca;)V diff --git a/mappings/net/minecraft/container/impl/ContainerBrewingStand.mapping b/mappings/net/minecraft/container/impl/ContainerBrewingStand.mapping index b3c394e803..c52571e3ed 100644 --- a/mappings/net/minecraft/container/impl/ContainerBrewingStand.mapping +++ b/mappings/net/minecraft/container/impl/ContainerBrewingStand.mapping @@ -1,16 +1,34 @@ CLASS none/aby net/minecraft/container/impl/ContainerBrewingStand - CLASS none/aby$a + CLASS none/aby$a SlotFuel + METHOD (Lnone/qt;III)V + ARG 2 x + ARG 3 y METHOD a getMaxStackSize ()I METHOD a (Lnone/aeq;)Z ARG 0 stack - CLASS none/aby$b + CLASS none/aby$b SlotIngredient + METHOD (Lnone/qt;III)V + ARG 2 x + ARG 3 y METHOD a getMaxStackSize ()I METHOD a (Lnone/aeq;)Z ARG 0 stack - CLASS none/aby$c + CLASS none/aby$c SlotPotion + FIELD a player Lnone/aak; + METHOD (Lnone/aak;Lnone/qt;III)V + ARG 0 player + ARG 1 inventory + ARG 2 invSlot + ARG 3 x + ARG 4 y METHOD a getMaxStackSize ()I METHOD a (Lnone/aeq;)Z ARG 0 stack + FIELD a inventory Lnone/qt; + FIELD f slotIngredient Lnone/act; + METHOD (Lnone/aaj;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD a addListener (Lnone/aca;)V diff --git a/mappings/net/minecraft/container/impl/ContainerCraftingTable.mapping b/mappings/net/minecraft/container/impl/ContainerCraftingTable.mapping index f3d1ecdad9..8eb7d566a1 100644 --- a/mappings/net/minecraft/container/impl/ContainerCraftingTable.mapping +++ b/mappings/net/minecraft/container/impl/ContainerCraftingTable.mapping @@ -1,10 +1,10 @@ CLASS none/acd net/minecraft/container/impl/ContainerCraftingTable - FIELD a invCrafting Lnone/acc; - FIELD f invCraftingResult Lnone/qt; + FIELD a craftingInv Lnone/acc; + FIELD f resultInv Lnone/qt; FIELD g world Lnone/aiu; FIELD h pos Lnone/cn; METHOD (Lnone/aaj;Lnone/aiu;Lnone/cn;)V - ARG 0 player + ARG 0 playerInv ARG 1 world ARG 2 pos METHOD a canUse (Lnone/aak;)Z diff --git a/mappings/net/minecraft/container/impl/ContainerDispenser.mapping b/mappings/net/minecraft/container/impl/ContainerDispenser.mapping index f4f917d881..b288c10f5c 100644 --- a/mappings/net/minecraft/container/impl/ContainerDispenser.mapping +++ b/mappings/net/minecraft/container/impl/ContainerDispenser.mapping @@ -1,8 +1,8 @@ CLASS none/ace net/minecraft/container/impl/ContainerDispenser FIELD a inventory Lnone/qt; METHOD (Lnone/qt;Lnone/qt;)V - ARG 0 invPlayer - ARG 1 inv + ARG 0 playerInv + ARG 1 inventory METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD b getStack (Lnone/aak;I)Lnone/aeq; diff --git a/mappings/net/minecraft/container/impl/ContainerEnchantingTable.mapping b/mappings/net/minecraft/container/impl/ContainerEnchantingTable.mapping index 6ad4c90e7d..8a22cada56 100644 --- a/mappings/net/minecraft/container/impl/ContainerEnchantingTable.mapping +++ b/mappings/net/minecraft/container/impl/ContainerEnchantingTable.mapping @@ -9,6 +9,17 @@ CLASS none/acf net/minecraft/container/impl/ContainerEnchantingTable CLASS none/acf$3 METHOD a (Lnone/aeq;)Z ARG 0 stack + FIELD a inventory Lnone/qt; + FIELD j world Lnone/aiu; + FIELD k pos Lnone/cn; + FIELD l rand Ljava/util/Random; + METHOD (Lnone/aaj;Lnone/aiu;)V + ARG 0 playerInv + ARG 1 world + METHOD (Lnone/aaj;Lnone/aiu;Lnone/cn;)V + ARG 0 playerInv + ARG 1 world + ARG 2 pos METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD a addListener (Lnone/aca;)V diff --git a/mappings/net/minecraft/container/impl/ContainerFurnace.mapping b/mappings/net/minecraft/container/impl/ContainerFurnace.mapping index 71baf1b84e..d462ecca30 100644 --- a/mappings/net/minecraft/container/impl/ContainerFurnace.mapping +++ b/mappings/net/minecraft/container/impl/ContainerFurnace.mapping @@ -1,4 +1,8 @@ CLASS none/ach net/minecraft/container/impl/ContainerFurnace + FIELD a inventory Lnone/qt; + METHOD (Lnone/aaj;Lnone/qt;)V + ARG 0 playerInv + ARG 1 inventory METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD a addListener (Lnone/aca;)V diff --git a/mappings/net/minecraft/container/impl/ContainerChest.mapping b/mappings/net/minecraft/container/impl/ContainerGeneric.mapping similarity index 75% rename from mappings/net/minecraft/container/impl/ContainerChest.mapping rename to mappings/net/minecraft/container/impl/ContainerGeneric.mapping index 372d96111f..b873af1430 100644 --- a/mappings/net/minecraft/container/impl/ContainerChest.mapping +++ b/mappings/net/minecraft/container/impl/ContainerGeneric.mapping @@ -1,9 +1,9 @@ -CLASS none/acb net/minecraft/container/impl/ContainerChest +CLASS none/acb net/minecraft/container/impl/ContainerGeneric FIELD a inventory Lnone/qt; FIELD f rows I METHOD (Lnone/qt;Lnone/qt;Lnone/aak;)V - ARG 0 invPlayer - ARG 1 inv + ARG 0 playerInv + ARG 1 inventory ARG 2 player METHOD a canUse (Lnone/aak;)Z ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerHopper.mapping b/mappings/net/minecraft/container/impl/ContainerHopper.mapping index 85f0e40445..6b9b3a2ebe 100644 --- a/mappings/net/minecraft/container/impl/ContainerHopper.mapping +++ b/mappings/net/minecraft/container/impl/ContainerHopper.mapping @@ -1,8 +1,8 @@ CLASS none/acj net/minecraft/container/impl/ContainerHopper FIELD a inventory Lnone/qt; METHOD (Lnone/aaj;Lnone/qt;Lnone/aak;)V - ARG 0 invPlayer - ARG 1 invHopper + ARG 0 playerInv + ARG 1 inventory ARG 2 player METHOD a canUse (Lnone/aak;)Z ARG 0 player diff --git a/mappings/net/minecraft/container/impl/ContainerHorse.mapping b/mappings/net/minecraft/container/impl/ContainerHorse.mapping index 7a89ce5895..d8d63f7735 100644 --- a/mappings/net/minecraft/container/impl/ContainerHorse.mapping +++ b/mappings/net/minecraft/container/impl/ContainerHorse.mapping @@ -5,6 +5,13 @@ CLASS none/acl net/minecraft/container/impl/ContainerHorse CLASS none/acl$2 METHOD a (Lnone/aeq;)Z ARG 0 stack + FIELD a playerInv Lnone/qt; + FIELD f entity Lnone/xb; + METHOD (Lnone/qt;Lnone/qt;Lnone/xb;Lnone/aak;)V + ARG 0 playerInv + ARG 1 inventory + ARG 2 entity + ARG 3 player METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD b close (Lnone/aak;)V diff --git a/mappings/net/minecraft/container/impl/ContainerVillager.mapping b/mappings/net/minecraft/container/impl/ContainerVillager.mapping index 519aaf01b6..92d22f539a 100644 --- a/mappings/net/minecraft/container/impl/ContainerVillager.mapping +++ b/mappings/net/minecraft/container/impl/ContainerVillager.mapping @@ -1,4 +1,8 @@ CLASS none/aco net/minecraft/container/impl/ContainerVillager + FIELD g world Lnone/aiu; + METHOD (Lnone/aaj;Lnone/aif;Lnone/aiu;)V + ARG 0 playerInv + ARG 2 world METHOD a canUse (Lnone/aak;)Z ARG 0 player METHOD a addListener (Lnone/aca;)V diff --git a/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping b/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping index 86653c32cc..1e2d1fa990 100644 --- a/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping +++ b/mappings/net/minecraft/container/slot/impl/SlotCraftingResult.mapping @@ -1,5 +1,12 @@ CLASS none/acs net/minecraft/container/slot/impl/SlotCraftingResult - FIELD a crafting Lnone/acc; + FIELD a craftingInv Lnone/acc; FIELD b player Lnone/aak; + METHOD (Lnone/aak;Lnone/acc;Lnone/qt;III)V + ARG 0 player + ARG 1 craftingInv + ARG 2 inventory + ARG 3 invSlot + ARG 4 x + ARG 5 y METHOD a (Lnone/aeq;)Z ARG 0 stack diff --git a/mappings/net/minecraft/container/slot/impl/SlotFurnaceFuel.mapping b/mappings/net/minecraft/container/slot/impl/SlotFurnaceFuel.mapping new file mode 100644 index 0000000000..eec95f846d --- /dev/null +++ b/mappings/net/minecraft/container/slot/impl/SlotFurnaceFuel.mapping @@ -0,0 +1,8 @@ +CLASS none/acg net/minecraft/container/slot/impl/SlotFurnaceFuel + METHOD (Lnone/qt;III)V + ARG 2 x + ARG 3 y + METHOD a (Lnone/aeq;)Z + ARG 0 stack + METHOD b getMaxStackSize (Lnone/aeq;)I + ARG 0 stack diff --git a/mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping b/mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping new file mode 100644 index 0000000000..57b94b4d77 --- /dev/null +++ b/mappings/net/minecraft/container/slot/impl/SlotFurnaceOutput.mapping @@ -0,0 +1,10 @@ +CLASS none/aci net/minecraft/container/slot/impl/SlotFurnaceOutput + FIELD a player Lnone/aak; + METHOD (Lnone/aak;Lnone/qt;III)V + ARG 0 player + ARG 1 inventory + ARG 2 invSlot + ARG 3 x + ARG 4 y + METHOD a (Lnone/aeq;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index ddc5d6d575..edfe0ac92d 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -17,6 +17,7 @@ CLASS none/se net/minecraft/entity/Entity FIELD at glowing Z FIELD au passengerList Ljava/util/List; FIELD av vehicle Lnone/se; + FIELD aw boundingBox Lnone/bcp; FIELD c NULL_BOX Lnone/bcp; FIELD g maxEntityId I FIELD h entityId I @@ -98,6 +99,7 @@ CLASS none/se net/minecraft/entity/Entity METHOD bf getUuidAsString ()Ljava/lang/String; METHOD bi getCustomName ()Ljava/lang/String; METHOD bj isCustomNameVisible ()Z + METHOD bo getBoundingBox ()Lnone/bcp; METHOD bl getHorizontalFacing ()Lnone/cu; METHOD bx getPassengerList ()Ljava/util/List; METHOD c getBlockPos ()Lnone/cn; diff --git a/mappings/net/minecraft/entity/unsorted/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping similarity index 86% rename from mappings/net/minecraft/entity/unsorted/EntityType.mapping rename to mappings/net/minecraft/entity/EntityType.mapping index ecfc2383c3..c992096046 100644 --- a/mappings/net/minecraft/entity/unsorted/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -1,4 +1,4 @@ -CLASS none/sp net/minecraft/entity/unsorted/EntityType +CLASS none/sp net/minecraft/entity/EntityType FIELD a MONSTER Lnone/sp; FIELD b ANIMAL Lnone/sp; FIELD c CAVE Lnone/sp; diff --git a/mappings/net/minecraft/entity/boss/BossBar.mapping b/mappings/net/minecraft/entity/boss/BossBar.mapping index 4fd39894a8..4dbfb9dd19 100644 --- a/mappings/net/minecraft/entity/boss/BossBar.mapping +++ b/mappings/net/minecraft/entity/boss/BossBar.mapping @@ -18,6 +18,8 @@ CLASS none/qr net/minecraft/entity/boss/BossBar FIELD c color Lnone/qr$a; FIELD d division Lnone/qr$b; FIELD e darkenSky Z + FIELD f dragonMusic Z + FIELD g thickenFog Z FIELD h uuid Ljava/util/UUID; METHOD (Ljava/util/UUID;Lnone/fa;Lnone/qr$a;Lnone/qr$b;)V ARG 0 uuid @@ -34,10 +36,15 @@ CLASS none/qr net/minecraft/entity/boss/BossBar ARG 0 division METHOD a setDarkenSky (Z)Lnone/qr; ARG 0 darkenSky + METHOD b setDragonMusic (Z)Lnone/qr; + ARG 0 dragonMusic + METHOD c setThickenFog (Z)Lnone/qr; + ARG 0 thickenFog METHOD d getUuid ()Ljava/util/UUID; METHOD e getName ()Lnone/fa; METHOD f getHealth ()F METHOD g getColor ()Lnone/qr$a; METHOD h getDivision ()Lnone/qr$b; METHOD i getDarkenSky ()Z - METHOD j ()Z + METHOD j hasDragonMusic ()Z + METHOD k getThickenFog ()Z diff --git a/mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping b/mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping new file mode 100644 index 0000000000..6a31b19086 --- /dev/null +++ b/mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping @@ -0,0 +1 @@ +CLASS none/wy net/minecraft/entity/mob/EntityAquaticBase diff --git a/mappings/net/minecraft/entity/mob/EntityMob.mapping b/mappings/net/minecraft/entity/mob/EntityMobBase.mapping similarity index 94% rename from mappings/net/minecraft/entity/mob/EntityMob.mapping rename to mappings/net/minecraft/entity/mob/EntityMobBase.mapping index c4ed11a79b..39db0343e6 100644 --- a/mappings/net/minecraft/entity/mob/EntityMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMobBase.mapping @@ -1,4 +1,4 @@ -CLASS none/so net/minecraft/entity/mob/EntityMob +CLASS none/so net/minecraft/entity/mob/EntityMobBase FIELD a mobFlags Lnone/kj; FIELD bE leashed Z FIELD bt handDropChances [F diff --git a/mappings/net/minecraft/entity/unsorted/EntityAnimal.mapping b/mappings/net/minecraft/entity/passive/EntityAnimalBase.mapping similarity index 58% rename from mappings/net/minecraft/entity/unsorted/EntityAnimal.mapping rename to mappings/net/minecraft/entity/passive/EntityAnimalBase.mapping index 082a8e0868..6fef0e0939 100644 --- a/mappings/net/minecraft/entity/unsorted/EntityAnimal.mapping +++ b/mappings/net/minecraft/entity/passive/EntityAnimalBase.mapping @@ -1,3 +1,3 @@ -CLASS none/wl net/minecraft/entity/unsorted/EntityAnimal +CLASS none/wl net/minecraft/entity/passive/EntityAnimalBase METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/unsorted/EntityHorseBase.mapping b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping similarity index 70% rename from mappings/net/minecraft/entity/unsorted/EntityHorseBase.mapping rename to mappings/net/minecraft/entity/passive/EntityHorseBase.mapping index 7324d738ce..cdf413b99d 100644 --- a/mappings/net/minecraft/entity/unsorted/EntityHorseBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping @@ -1,4 +1,4 @@ -CLASS none/xb net/minecraft/entity/unsorted/EntityHorseBase +CLASS none/xb net/minecraft/entity/passive/EntityHorseBase METHOD G getSoundDeath ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/horse/HorseArmorType.mapping b/mappings/net/minecraft/entity/passive/HorseArmorType.mapping similarity index 92% rename from mappings/net/minecraft/entity/horse/HorseArmorType.mapping rename to mappings/net/minecraft/entity/passive/HorseArmorType.mapping index d2ca637da2..0893da78f5 100644 --- a/mappings/net/minecraft/entity/horse/HorseArmorType.mapping +++ b/mappings/net/minecraft/entity/passive/HorseArmorType.mapping @@ -1,4 +1,4 @@ -CLASS none/xe net/minecraft/entity/horse/HorseArmorType +CLASS none/xe net/minecraft/entity/passive/HorseArmorType FIELD a NONE Lnone/xe; FIELD b IRON Lnone/xe; FIELD c GOLD Lnone/xe; diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index a545687469..62e2125d90 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -21,6 +21,7 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer FIELD bN experienceLevel I FIELD bO experienceBarProgress F FIELD bT gameProfile Lcom/mojang/authlib/GameProfile; + FIELD bU reducedDebugInfo Z FIELD bt inventory Lnone/aaj; FIELD bu containerPlayer Lnone/abv; FIELD bv container Lnone/abv; @@ -58,9 +59,12 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer METHOD cP getGameProfile ()Lcom/mojang/authlib/GameProfile; METHOD d getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; ARG 0 nickname + METHOD dc getReducedDebugInfo ()Z METHOD g setScore (I)V METHOD h_ getName ()Ljava/lang/String; METHOD i_ getNameComponent ()Lnone/fa; METHOD m update ()V + METHOD n setReducedDebugInfo (Z)V + ARG 0 value METHOD p dismountVehicle ()V METHOD y_ shouldEchoCommandFeedback ()Z diff --git a/mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping b/mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping deleted file mode 100644 index f6c1c77628..0000000000 --- a/mappings/net/minecraft/entity/unsorted/EntityAquatic.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/wy net/minecraft/entity/unsorted/EntityAquatic diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 684e8829d3..d780da4bda 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -92,4 +92,6 @@ CLASS none/aeq net/minecraft/item/ItemStack METHOD r getDisplayName ()Ljava/lang/String; METHOD s removeDisplayName ()V METHOD t hasDisplayName ()Z + METHOD u hasEnchantmentGlow ()Z + METHOD v getRarity ()Lnone/afe; METHOD x hasEnchantments ()Z diff --git a/mappings/net/minecraft/network/packet/client/CPacketBossBar.mapping b/mappings/net/minecraft/network/packet/client/CPacketBossBar.mapping index aec02f90a3..297b0c4186 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketBossBar.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketBossBar.mapping @@ -13,6 +13,8 @@ CLASS none/gb net/minecraft/network/packet/client/CPacketBossBar FIELD e color Lnone/qr$a; FIELD f division Lnone/qr$b; FIELD g darkenSky Z + FIELD h dragonMusic Z + FIELD i thickenFog Z METHOD (Lnone/gb$a;Lnone/qr;)V ARG 0 action ARG 1 bar @@ -29,4 +31,6 @@ CLASS none/gb net/minecraft/network/packet/client/CPacketBossBar METHOD e getBarColor ()Lnone/qr$a; METHOD f getBarDivision ()Lnone/qr$b; METHOD g shouldDarkenSky ()Z + METHOD h hasDragonMusic ()Z + METHOD i shouldThickenFog ()Z METHOD j getFlagBitfield ()I diff --git a/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping b/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping index f72826b977..76e05f1ef6 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping @@ -16,4 +16,4 @@ CLASS none/gy net/minecraft/network/packet/client/CPacketGameJoin METHOD d getDimensionId ()I METHOD e getDifficulty ()Lnone/qx; METHOD f getMaxPlayers ()I - METHOD h hasReducedDebugINfo ()Z + METHOD h hasReducedDebugInfo ()Z diff --git a/mappings/net/minecraft/network/packet/client/CPacketPlayerList.mapping b/mappings/net/minecraft/network/packet/client/CPacketPlayerList.mapping index 002417b1e3..c8ec6cf9a5 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketPlayerList.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketPlayerList.mapping @@ -11,6 +11,10 @@ CLASS none/hf net/minecraft/network/packet/client/CPacketPlayerList FIELD d gameProfile Lcom/mojang/authlib/GameProfile; FIELD e displayName Lnone/fa; METHOD (Lnone/hf;Lcom/mojang/authlib/GameProfile;ILnone/ais;Lnone/fa;)V + ARG 0 profile + ARG 1 latency + ARG 2 gameMode + ARG 3 displayName METHOD a getGameProfile ()Lcom/mojang/authlib/GameProfile; METHOD b getLatency ()I METHOD c getGameMode ()Lnone/ais; diff --git a/mappings/net/minecraft/stat/achievement/Achievement.mapping b/mappings/net/minecraft/stat/achievement/Achievement.mapping index 999ba7230a..a856bafb52 100644 --- a/mappings/net/minecraft/stat/achievement/Achievement.mapping +++ b/mappings/net/minecraft/stat/achievement/Achievement.mapping @@ -31,6 +31,7 @@ CLASS none/no net/minecraft/stat/achievement/Achievement METHOD c register ()Lnone/no; METHOD d isAchievement ()Z METHOD e getName ()Lnone/fa; + METHOD f getDescription ()Ljava/lang/String; METHOD g isSpecial ()Z METHOD h register ()Lnone/nu; METHOD i awardStatLocallyOnly ()Lnone/nu; diff --git a/mappings/net/minecraft/util/math/BlockRegion.mapping b/mappings/net/minecraft/util/math/BlockRegion.mapping new file mode 100644 index 0000000000..db5a046e01 --- /dev/null +++ b/mappings/net/minecraft/util/math/BlockRegion.mapping @@ -0,0 +1,54 @@ +CLASS none/awx net/minecraft/util/math/BlockRegion + FIELD a minX I + FIELD b minY I + FIELD c minZ I + FIELD d maxX I + FIELD e maxY I + FIELD f maxZ I + METHOD (IIII)V + ARG 0 minX + ARG 1 minZ + ARG 2 maxX + ARG 3 maxZ + METHOD (IIIIII)V + ARG 0 minX + ARG 1 minY + ARG 2 minZ + ARG 3 maxX + ARG 4 maxY + ARG 5 maxZ + METHOD (Lnone/awx;)V + ARG 0 region + METHOD (Lnone/dk;Lnone/dk;)V + ARG 0 a + ARG 1 b + METHOD a ()Lnone/awx; + METHOD a move (III)V + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a containsHorizontal (IIII)Z + ARG 0 minX + ARG 1 minZ + ARG 2 maxX + ARG 3 maxZ + METHOD a createValid (IIIIII)Lnone/awx; + ARG 0 x1 + ARG 1 y1 + ARG 2 z1 + ARG 3 x2 + ARG 4 y2 + ARG 5 z2 + METHOD a (IIIIIIIIILnone/cu;)Lnone/awx; + METHOD a contains (Lnone/awx;)Z + ARG 0 region + METHOD b getSize ()Lnone/dk; + METHOD b expand (Lnone/awx;)V + ARG 0 region + METHOD b contains (Lnone/dk;)Z + ARG 0 pos + METHOD c getWidth ()I + METHOD d getDepth ()I + METHOD e getHeight ()I + METHOD f getCenter ()Lnone/dk; + METHOD g toNbt ()Lnone/dx; diff --git a/mappings/net/minecraft/world/LocalDifficulty.mapping b/mappings/net/minecraft/world/LocalDifficulty.mapping new file mode 100644 index 0000000000..453c533f84 --- /dev/null +++ b/mappings/net/minecraft/world/LocalDifficulty.mapping @@ -0,0 +1 @@ +CLASS none/qy net/minecraft/world/LocalDifficulty diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 1e4c2b1dd1..b08683adb8 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -21,6 +21,8 @@ CLASS none/aiu net/minecraft/world/World METHOD A ()Lnone/ajl; METHOD A setSpawnPos (Lnone/cn;)V ARG 0 pos + METHOD D getLocalDifficulty (Lnone/cn;)Lnone/qy; + ARG 0 pos METHOD E isValidHeight (Lnone/cn;)Z ARG 0 pos METHOD G getChunkProviderStatus ()Ljava/lang/String; @@ -39,6 +41,16 @@ CLASS none/aiu net/minecraft/world/World METHOD a getChunk (II)Lnone/atm; ARG 0 chunkX ARG 1 chunkZ + METHOD a isValidRegion (IIIIIIZ)Z + ARG 0 minX + ARG 1 minY + ARG 2 minZ + ARG 3 maxX + ARG 4 maxY + ARG 5 maxZ + METHOD a hasChunk (IIZ)Z + ARG 0 chunkX + ARG 1 chunkZ METHOD a setTime (J)V ARG 0 value METHOD a getEntitiesIn (Ljava/lang/Class;Lnone/bcp;)Ljava/util/List; @@ -61,15 +73,31 @@ CLASS none/aiu net/minecraft/world/World ARG 3 category ARG 4 volume ARG 5 pitch + METHOD a isValidRegion (Lnone/awx;)Z + ARG 0 region METHOD a isValidPos (Lnone/cn;)Z ARG 0 pos + METHOD a isValidRegion (Lnone/cn;I)Z + ARG 0 center + ARG 1 radius + METHOD a isValidRegion (Lnone/cn;IZ)Z + ARG 0 center + ARG 1 radius METHOD a setBlockState (Lnone/cn;Lnone/asj;I)Z ARG 0 pos ARG 1 state ARG 2 flags + METHOD a isValidRegion (Lnone/cn;Lnone/cn;)Z + ARG 0 minPos + ARG 1 maxPos + METHOD a isValidRegion (Lnone/cn;Lnone/cn;Z)Z + ARG 0 minPos + ARG 1 maxPos METHOD a getEmittedStrongRedstonePower (Lnone/cn;Lnone/cu;)I ARG 0 pos ARG 1 facing + METHOD a isValid (Lnone/cn;Z)Z + ARG 0 pos METHOD a spawnParticle (Lnone/dd;DDDDDD[I)V METHOD a sendPacket (Lnone/fl;)V ARG 0 packet @@ -88,10 +116,14 @@ CLASS none/aiu net/minecraft/world/World ARG 1 predicate METHOD b getPlayerByUuid (Ljava/util/UUID;)Lnone/aak; ARG 0 uuid + METHOD b isValidRegion (Lnone/awx;Z)Z + ARG 0 region METHOD b getBiome (Lnone/cn;)Lnone/ajh; + ARG 0 pos METHOD b isEmittingRedstonePower (Lnone/cn;Lnone/cu;)Z ARG 0 pos ARG 1 facingFrom + METHOD c (Lnone/cn;)Lnone/asj; METHOD c getEmittedRedstonePower (Lnone/cn;Lnone/cu;)I ARG 0 pos ARG 1 facingFrom @@ -99,8 +131,9 @@ CLASS none/aiu net/minecraft/world/World ARG 0 chunkX ARG 1 chunkY METHOD d isAir (Lnone/cn;)Z + ARG 0 pos METHOD e updateSleepingStatus ()V - METHOD f (Lnone/cn;)Lnone/atm; + METHOD f getChunk (Lnone/cn;)Lnone/atm; ARG 0 pos METHOD f (Lnone/se;)V METHOD g setBlockToAir (Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index f089a8ae7c..c89ab9b50a 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -2,6 +2,9 @@ CLASS none/lu net/minecraft/world/WorldServer FIELD I server Lnet/minecraft/server/MinecraftServer; FIELD J entityTracker Lnone/lr; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a hasChunk (IIZ)Z + ARG 0 chunkX + ARG 1 chunkZ METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; METHOD a getEntityByUuid (Ljava/util/UUID;)Lnone/se; METHOD a spawnEntity (Lnone/se;)Z diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index c3a9f0a82e..06ddba3b0c 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -35,7 +35,7 @@ CLASS none/atm net/minecraft/world/chunk/Chunk ARG 0 pos METHOD a (Lnone/cn;I)I ARG 0 pos - METHOD a (Lnone/cn;Lnone/ajl;)Lnone/ajh; + METHOD a getBiome (Lnone/cn;Lnone/ajl;)Lnone/ajh; ARG 0 pos METHOD a addTileEntity (Lnone/cn;Lnone/arb;)V ARG 0 pos @@ -70,6 +70,7 @@ CLASS none/atm net/minecraft/world/chunk/Chunk ARG 0 pos METHOD e setLightPopulated (Z)V ARG 0 lightPopulated + METHOD f isEmpty ()Z METHOD g getLevelOfTopSection ()I METHOD h getSections ()[Lnone/atn; METHOD l getBiomeMap ()[B diff --git a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping index c648b5adbe..ad3889df07 100644 --- a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping @@ -25,3 +25,4 @@ CLASS none/atj net/minecraft/world/chunk/EmptyChunk ARG 0 pos METHOD d (Lnone/cn;)V ARG 0 pos + METHOD f isEmpty ()Z diff --git a/mappings/none/acg.mapping b/mappings/none/acg.mapping deleted file mode 100644 index f8d4c784ba..0000000000 --- a/mappings/none/acg.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/acg - METHOD a (Lnone/aeq;)Z - ARG 0 stack - METHOD b getMaxStackSize (Lnone/aeq;)I - ARG 0 stack diff --git a/mappings/none/aci.mapping b/mappings/none/aci.mapping deleted file mode 100644 index 95aa82e3a8..0000000000 --- a/mappings/none/aci.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/aci - METHOD a (Lnone/aeq;)Z - ARG 0 stack diff --git a/mappings/none/ajd.mapping b/mappings/none/ajd.mapping index f5bbf863a5..af9fc91b28 100644 --- a/mappings/none/ajd.mapping +++ b/mappings/none/ajd.mapping @@ -4,6 +4,8 @@ CLASS none/ajd ARG 0 pos ARG 1 facing METHOD b getBiome (Lnone/cn;)Lnone/ajh; + ARG 0 pos METHOD d isAir (Lnone/cn;)Z + ARG 0 pos METHOD o getBlockState (Lnone/cn;)Lnone/asj; METHOD r getTileEntity (Lnone/cn;)Lnone/arb; diff --git a/mappings/none/bhl.mapping b/mappings/none/bhl.mapping index 69481f2f92..e6524fc6df 100644 --- a/mappings/none/bhl.mapping +++ b/mappings/none/bhl.mapping @@ -21,10 +21,14 @@ CLASS none/bhl METHOD f markDirty ()V METHOD a handleKeyPress (CI)V METHOD a drawBackground (FII)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleMouseClick (III)V METHOD a drawStackTooltip (Lnone/aeq;II)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD e update ()V METHOD k handleMouseEvent ()V METHOD m onClosed ()V diff --git a/mappings/none/bhn.mapping b/mappings/none/bhn.mapping index d82ac56689..7290497504 100644 --- a/mappings/none/bhn.mapping +++ b/mappings/none/bhn.mapping @@ -1,3 +1,3 @@ CLASS none/bhn - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD b init ()V diff --git a/mappings/none/bht.mapping b/mappings/none/bht.mapping index b6b0254c9c..f0c0f2f7ad 100644 --- a/mappings/none/bht.mapping +++ b/mappings/none/bht.mapping @@ -1,5 +1,9 @@ CLASS none/bht METHOD a drawBackground (FII)V - METHOD a drawScreen (IIF)V + METHOD a draw (IIF)V METHOD a handleButtonPressed (Lnone/bei;)V METHOD b init ()V + METHOD b drawForeground (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD e update ()V diff --git a/mappings/none/bjk.mapping b/mappings/none/bjk.mapping deleted file mode 100644 index 921178d48b..0000000000 --- a/mappings/none/bjk.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS none/bjk - CLASS none/bjk$a - FIELD a displayWidth I - FIELD b displayHeight I - FIELD c fullscreen Z - CLASS none/bjk$b - FIELD a runDirectory Ljava/io/File; - CLASS none/bjk$c - FIELD a isDemo Z - CLASS none/bjk$e - FIELD d netProxy Ljava/net/Proxy; diff --git a/mappings/none/ls.mapping b/mappings/none/ls.mapping index 7cadfed2c5..999fde6898 100644 --- a/mappings/none/ls.mapping +++ b/mappings/none/ls.mapping @@ -9,3 +9,7 @@ CLASS none/ls ARG 0 division METHOD a setDarkenSky (Z)Lnone/qr; ARG 0 darkenSky + METHOD b setDragonMusic (Z)Lnone/qr; + ARG 0 dragonMusic + METHOD c setThickenFog (Z)Lnone/qr; + ARG 0 thickenFog