From 7d64ca1c525134676b110e6beab339145d3a4a76 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 18 Sep 2016 16:43:16 +0200 Subject: [PATCH] client gui, resource mapping work --- .../entity/impl/BlockEntityMobSpawner.mapping | 2 + .../minecraft/client/MinecraftGame.mapping | 13 +++- mappings/net/minecraft/client/RunArgs.mapping | 8 ++- .../client/audio/SoundLoader.mapping | 2 + .../client/audio/SoundManager.mapping | 3 + .../net/minecraft/client/gui/Drawable.mapping | 19 ++++++ mappings/net/minecraft/client/gui/Gui.mapping | 12 ++++ .../net/minecraft/client/gui/GuiYesNo.mapping | 19 +++++- .../client/gui/container/GuiAnvil.mapping | 1 + .../client/gui/hud/HudInGame.mapping | 1 + .../client/gui/hud/HudSubtitles.mapping | 1 + .../client/gui/ingame/GuiDeath.mapping | 1 + .../client/gui/menu/GuiMainMenu.mapping | 1 + .../client/gui/menu/GuiMultiplayer.mapping | 1 + .../client/gui/menu/GuiRealms.mapping | 1 + .../client/gui/menu/GuiSettings.mapping | 1 + .../client/gui/menu/GuiSettingsAudio.mapping | 4 ++ .../client/gui/widget/WidgetButton.mapping | 6 ++ .../client/gui/widget/WidgetTextField.mapping | 4 ++ .../language/LanguageDefinition.mapping | 2 - .../client/language/LanguageManager.mapping | 13 ---- .../impl/NetworkGameHandlerClient.mapping | 4 ++ .../client/resource/IResource.mapping | 4 +- .../client/resource/IResourceMetadata.mapping | 1 - .../client/resource/Resource.mapping | 8 +-- .../client/resource/ResourceContainer.mapping | 4 +- .../client/resource/ResourceManager.mapping | 4 +- .../resource/ResourcePackManager.mapping | 61 +++++++++++++++++++ .../{ => resource}/language/I18n.mapping | 2 +- .../language/LanguageDefinition.mapping | 16 +++++ .../resource/language/LanguageManager.mapping | 18 ++++++ .../language/TranslationStorage.mapping | 2 +- .../metadata/IResourceSection.mapping | 1 + .../IResourceSectionDeserializer.mapping | 2 + .../ResourceMetadataDeserializer.mapping | 14 +++++ .../metadata/ResourceSectionAnimation.mapping | 26 ++++++++ .../ResourceSectionAnimationFrame.mapping | 11 ++++ .../ResourceSectionDeserializer.mapping | 1 + ...sourceSectionDeserializerAnimation.mapping | 2 + .../ResourceSectionDeserializerFont.mapping | 2 + ...esourceSectionDeserializerLanguage.mapping | 2 + .../ResourceSectionDeserializerPack.mapping | 2 + ...ResourceSectionDeserializerTexture.mapping | 2 + .../metadata/ResourceSectionFont.mapping | 8 +++ .../metadata/ResourceSectionLanguage.mapping | 5 ++ .../metadata/ResourceSectionPack.mapping | 8 +++ .../metadata/ResourceSectionTexture.mapping | 8 +++ .../resource/pack/IResourcePack.mapping | 5 +- .../pack/MinecraftResourcePack.mapping | 5 +- .../pack/PhysicalResourcePack.mapping | 5 +- .../pack/ResourcePackMetadata.mapping | 1 - .../minecraft/client/texture/ITexture.mapping | 1 + .../minecraft/client/texture/Texture.mapping | 2 + .../client/texture/TextureDynamic.mapping | 11 ++++ .../client/texture/TextureManager.mapping | 4 ++ .../client/util/TextureUtils.mapping | 13 +++- .../client/util/YesNoCallback.mapping | 1 + .../minecraft/server/IntegratedServer.mapping | 1 + .../minecraft/sortme/MobSpawnerEntry.mapping | 9 +++ .../minecraft/sortme/MobSpawnerLogic.mapping | 5 ++ .../net/minecraft/sortme/ServerList.mapping | 6 +- .../ServerResourcePackDownloader.mapping | 6 -- .../sortme/WeightedSomething.mapping | 17 ++++++ .../minecraft/sortme/WidgetWorldEntry.mapping | 3 + mappings/none/bep.mapping | 2 + mappings/none/bfc.mapping | 2 + mappings/none/bfi.mapping | 2 + mappings/none/bik.mapping | 1 + mappings/none/bwu.mapping | 2 + mappings/none/byf.mapping | 5 +- mappings/none/bzb.mapping | 5 -- 71 files changed, 393 insertions(+), 54 deletions(-) delete mode 100644 mappings/net/minecraft/client/language/LanguageDefinition.mapping delete mode 100644 mappings/net/minecraft/client/language/LanguageManager.mapping delete mode 100644 mappings/net/minecraft/client/resource/IResourceMetadata.mapping create mode 100644 mappings/net/minecraft/client/resource/ResourcePackManager.mapping rename mappings/net/minecraft/client/{ => resource}/language/I18n.mapping (80%) create mode 100644 mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping create mode 100644 mappings/net/minecraft/client/resource/language/LanguageManager.mapping rename mappings/net/minecraft/client/{ => resource}/language/TranslationStorage.mapping (88%) create mode 100644 mappings/net/minecraft/client/resource/metadata/IResourceSection.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/IResourceSectionDeserializer.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceMetadataDeserializer.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimation.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimationFrame.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializer.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerAnimation.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerFont.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerLanguage.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerPack.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerTexture.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionFont.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionLanguage.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionPack.mapping create mode 100644 mappings/net/minecraft/client/resource/metadata/ResourceSectionTexture.mapping delete mode 100644 mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping create mode 100644 mappings/net/minecraft/client/texture/TextureDynamic.mapping create mode 100644 mappings/net/minecraft/sortme/MobSpawnerEntry.mapping delete mode 100644 mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping create mode 100644 mappings/net/minecraft/sortme/WeightedSomething.mapping create mode 100644 mappings/none/bwu.mapping delete mode 100644 mappings/none/bzb.mapping diff --git a/mappings/net/minecraft/block/entity/impl/BlockEntityMobSpawner.mapping b/mappings/net/minecraft/block/entity/impl/BlockEntityMobSpawner.mapping index 1527fe0049..31aeb45545 100644 --- a/mappings/net/minecraft/block/entity/impl/BlockEntityMobSpawner.mapping +++ b/mappings/net/minecraft/block/entity/impl/BlockEntityMobSpawner.mapping @@ -1,6 +1,8 @@ CLASS none/ars net/minecraft/block/entity/impl/BlockEntityMobSpawner CLASS none/ars$1 METHOD a getWorld ()Lnone/aiv; + METHOD a setSpawnEntry (Lnone/ajf;)V + ARG 0 value METHOD b getPos ()Lnone/cn; CLASS none/ars$2 METHOD a upgradeTag (Lnone/pe;Lnone/dt;I)Lnone/dt; diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 8fea191bd6..2281dcf0ea 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -4,6 +4,7 @@ CLASS none/bdq net/minecraft/client/MinecraftGame FIELD J LOGGER Lorg/apache/logging/log4j/Logger; FIELD K RESOURCE_LOGO Lnone/kp; FIELD L DISPLAY_MODES Ljava/util/List; + FIELD M resourcePackDirectory Ljava/io/File; FIELD O sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap; FIELD P currentServerEntry Lnone/bmj; FIELD Q textureManager Lnone/bxe; @@ -11,9 +12,10 @@ CLASS none/bdq net/minecraft/client/MinecraftGame FIELD S migrationHandler Lnone/pf; FIELD T fullscreen Z FIELD Z snooper Lnone/rk; + FIELD aA metadataDeserializer Lnone/byt; FIELD aB defaultResourcePacks Ljava/util/List; FIELD aC gameResourcePack Lnone/bxt; - FIELD aD resourcePackDownloader Lnone/byh; + FIELD aD resourcePackManager Lnone/byh; FIELD aE languageManager Lnone/byn; FIELD aF blockColorMap Lnone/bdz; FIELD aG itemColorMap Lnone/bec; @@ -30,6 +32,7 @@ CLASS none/bdq net/minecraft/client/MinecraftGame FIELD ad cameraEntity Lnone/sf; FIELD ae session Lnone/bdx; FIELD aj server Lnone/cal; + FIELD ak assetDirectory Ljava/io/File; FIELD al gameVersion Ljava/lang/String; FIELD an netProxy Ljava/net/Proxy; FIELD ao worldStorage Lnone/baw; @@ -52,6 +55,8 @@ CLASS none/bdq net/minecraft/client/MinecraftGame FIELD t hitResult Lnone/bcs; FIELD u settings Lnone/bds; FIELD w runDirectory Ljava/io/File; + FIELD x guiClosed Z + METHOD A scheduleReloadResources ()Lcom/google/common/util/concurrent/ListenableFuture; METHOD B checkMaxTextureSize ()I METHOD C getCurrentServerEntry ()Lnone/bmj; METHOD F getServer ()Lnone/cal; @@ -82,7 +87,7 @@ CLASS none/bdq net/minecraft/client/MinecraftGame METHOD a serializeBlockEntityTag (Lnone/aer;Lnone/ard;)Lnone/aer; ARG 0 stack ARG 1 blockEntity - METHOD a setGui (Lnone/bgm;)V + METHOD a openGui (Lnone/bgm;)V ARG 0 screen METHOD a setCurrentServerEntry (Lnone/bmj;)V ARG 0 value @@ -117,10 +122,14 @@ CLASS none/bdq net/minecraft/client/MinecraftGame METHOD b addSnooperInitialInfo (Lnone/rk;)V ARG 0 snooper METHOD c getGameVersion ()Ljava/lang/String; + METHOD f reloadResources ()V METHOD g getWorldStorage ()Lnone/baw; METHOD h stop ()V METHOD k getMaxFps ()I METHOD l limitFramerate ()Z + METHOD o closeGui ()V + METHOD p afterOpenGui ()V + METHOD q openInGameMenu ()V METHOD r toggleFullscreen ()V METHOD s getMusicTracker ()Lnone/cat; METHOD u isDemo ()Z diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index 7b679aaa17..aabd41281e 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -3,8 +3,11 @@ CLASS none/bjm net/minecraft/client/RunArgs FIELD a displayWidth I FIELD b displayHeight I FIELD c fullscreen Z - CLASS none/bjm$b - FIELD a runDirectory Ljava/io/File; + CLASS none/bjm$b Directories + FIELD a runDir Ljava/io/File; + FIELD b resourcePackDir Ljava/io/File; + FIELD c assetDir Ljava/io/File; + FIELD d assetIndex Ljava/lang/String; CLASS none/bjm$c FIELD a isDemo Z FIELD b gameVersion Ljava/lang/String; @@ -16,4 +19,5 @@ CLASS none/bjm net/minecraft/client/RunArgs ARG 1 serverPort CLASS none/bjm$e FIELD d netProxy Ljava/net/Proxy; + FIELD c dirs Lnone/bjm$b; FIELD e autoConnect Lnone/bjm$d; diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index 62b28b0227..e44877d5d5 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -20,8 +20,10 @@ CLASS none/caw net/minecraft/client/audio/SoundLoader ARG 0 container METHOD a play (Lnone/cag;)V ARG 0 sound + METHOD a registerListener (Lnone/cav;)V METHOD a getSoundAccessor (Lnone/kp;)Lnone/cay; ARG 0 id METHOD a updateSoundVolume (Lnone/nm;F)V ARG 0 category ARG 1 volume + METHOD b unregisterListener (Lnone/cav;)V diff --git a/mappings/net/minecraft/client/audio/SoundManager.mapping b/mappings/net/minecraft/client/audio/SoundManager.mapping index 86d9371f5b..35d1c00daf 100644 --- a/mappings/net/minecraft/client/audio/SoundManager.mapping +++ b/mappings/net/minecraft/client/audio/SoundManager.mapping @@ -5,15 +5,18 @@ CLASS none/cau net/minecraft/client/audio/SoundManager FIELD d loader Lnone/caw; FIELD e settings Lnone/bds; FIELD f system Lnone/cau$a; + FIELD o listeners Ljava/util/List; METHOD (Lnone/caw;Lnone/bds;)V ARG 0 loader ARG 1 settings METHOD a reloadSounds ()V + METHOD a registerListener (Lnone/cav;)V METHOD a getSoundVolume (Lnone/nm;)F ARG 0 category METHOD a updateSoundVolume (Lnone/nm;F)V ARG 0 category ARG 1 value + METHOD b unregisterListener (Lnone/cav;)V METHOD c play (Lnone/cag;)V ARG 0 sound METHOD d update ()V diff --git a/mappings/net/minecraft/client/gui/Drawable.mapping b/mappings/net/minecraft/client/gui/Drawable.mapping index 595ddb56b3..1a0c867ec1 100644 --- a/mappings/net/minecraft/client/gui/Drawable.mapping +++ b/mappings/net/minecraft/client/gui/Drawable.mapping @@ -11,6 +11,25 @@ CLASS none/beg net/minecraft/client/gui/Drawable ARG 4 u ARG 5 v METHOD a drawTexturedRect (IIFFIIFF)V + ARG 0 x + ARG 1 y + ARG 2 u + ARG 3 v + ARG 4 width + ARG 5 height + ARG 6 texWidth + ARG 7 texHeight + METHOD a drawTexturedRect (IIFFIIIIFF)V + ARG 0 x + ARG 1 y + ARG 2 u + ARG 3 v + ARG 4 uWidth + ARG 5 vHeight + ARG 6 width + ARG 7 height + ARG 8 texWidth + ARG 9 texHeight METHOD a drawHorizontalLine (IIII)V ARG 0 left ARG 1 right diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Gui.mapping index e2769aa29c..b116552dd3 100644 --- a/mappings/net/minecraft/client/gui/Gui.mapping +++ b/mappings/net/minecraft/client/gui/Gui.mapping @@ -11,6 +11,9 @@ CLASS none/bgm net/minecraft/client/gui/Gui METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode + METHOD a setSize (II)V + ARG 0 width + ARG 1 height METHOD a draw (IIF)V ARG 0 mouseX ARG 1 mouseY @@ -47,6 +50,7 @@ CLASS none/bgm net/minecraft/client/gui/Gui ARG 2 y METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId METHOD b init ()V METHOD b init0 (Lnone/bdq;II)V ARG 0 game @@ -57,11 +61,19 @@ CLASS none/bgm net/minecraft/client/gui/Gui METHOD c drawBackground ()V METHOD c drawTextureBackground (I)V ARG 0 i + METHOD d isShortcutCutDown (I)Z + ARG 0 keycode METHOD d_ drawBackground (I)V ARG 0 id METHOD e update ()V + METHOD e isShortcutPasteDown (I)Z + ARG 0 keycode METHOD e setClipboardContents (Ljava/lang/String;)V ARG 0 str + METHOD f isShortcutCopyDown (I)Z + ARG 0 keycode + METHOD g isShortcutSelectAllDown (I)Z + ARG 0 keycode METHOD k handleMouseEvent ()V METHOD l handleKeyboardEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/GuiYesNo.mapping b/mappings/net/minecraft/client/gui/GuiYesNo.mapping index 7f8e37b61f..5e01bd944b 100644 --- a/mappings/net/minecraft/client/gui/GuiYesNo.mapping +++ b/mappings/net/minecraft/client/gui/GuiYesNo.mapping @@ -1,11 +1,24 @@ CLASS none/bfs net/minecraft/client/gui/GuiYesNo FIELD a callback Lnone/bfr; - FIELD g yes Ljava/lang/String; - FIELD h no Ljava/lang/String; + FIELD f title Ljava/lang/String; + FIELD g yesTranslated Ljava/lang/String; + FIELD h noTranslated Ljava/lang/String; + FIELD i callbackId I + FIELD r message Ljava/lang/String; + FIELD s messageSplit Ljava/util/List; + FIELD t buttonEnableTimer I METHOD (Lnone/bfr;Ljava/lang/String;Ljava/lang/String;I)V ARG 0 callback + ARG 1 title + ARG 2 message + ARG 3 callbackId METHOD (Lnone/bfr;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V ARG 0 callback + ARG 1 title + ARG 2 message + ARG 3 yesTranslated + ARG 4 noTranslated + ARG 5 callbackId METHOD a draw (IIF)V ARG 0 mouseX ARG 1 mouseY @@ -13,4 +26,6 @@ CLASS none/bfs net/minecraft/client/gui/GuiYesNo METHOD a handleButtonPressed (Lnone/bek;)V ARG 0 button METHOD b init ()V + METHOD b disableButtons (I)V + ARG 0 durationTicks METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping b/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping index 45c42ef65a..273f859c42 100644 --- a/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping +++ b/mappings/net/minecraft/client/gui/container/GuiAnvil.mapping @@ -1,6 +1,7 @@ CLASS none/bhf net/minecraft/client/gui/container/GuiAnvil FIELD u BG_TEX Lnone/kp; FIELD v anvilContainer Lnone/abx; + FIELD w nameField Lnone/beo; FIELD x playerInv Lnone/aak; METHOD (Lnone/aak;Lnone/aiv;)V ARG 0 playerInv diff --git a/mappings/net/minecraft/client/gui/hud/HudInGame.mapping b/mappings/net/minecraft/client/gui/hud/HudInGame.mapping index 6752774335..a8b16a0c2c 100644 --- a/mappings/net/minecraft/client/gui/hud/HudInGame.mapping +++ b/mappings/net/minecraft/client/gui/hud/HudInGame.mapping @@ -4,6 +4,7 @@ CLASS none/bef net/minecraft/client/gui/hud/HudInGame FIELD h PUMPKIN_BLUR Lnone/kp; FIELD i rand Ljava/util/Random; FIELD j game Lnone/bdq; + FIELD k itemRenderer Lnone/btq; FIELD l hudChat Lnone/bel; FIELD r currentStack Lnone/aer; FIELD s hudDebug Lnone/ben; diff --git a/mappings/net/minecraft/client/gui/hud/HudSubtitles.mapping b/mappings/net/minecraft/client/gui/hud/HudSubtitles.mapping index ac181592ad..67fb0effe7 100644 --- a/mappings/net/minecraft/client/gui/hud/HudSubtitles.mapping +++ b/mappings/net/minecraft/client/gui/hud/HudSubtitles.mapping @@ -13,6 +13,7 @@ CLASS none/bfd net/minecraft/client/gui/hud/HudSubtitles METHOD c getPosition ()Lnone/bcu; FIELD a game Lnone/bdq; FIELD f entries Ljava/util/List; + FIELD g enabled Z METHOD (Lnone/bdq;)V ARG 0 game METHOD a draw (Lnone/bei;)V diff --git a/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping b/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping index 02458b5b39..d0e8abe14d 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiDeath.mapping @@ -14,5 +14,6 @@ CLASS none/bfx net/minecraft/client/gui/ingame/GuiDeath ARG 0 button METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId METHOD b init ()V METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping b/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping index 2ac7d6334c..a0fcd8bea8 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiMainMenu.mapping @@ -20,6 +20,7 @@ CLASS none/bgt net/minecraft/client/gui/menu/GuiMainMenu ARG 0 button METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId METHOD b init ()V METHOD e update ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping b/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping index 8b4c4e7d43..6ac4ccb61d 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiMultiplayer.mapping @@ -18,6 +18,7 @@ CLASS none/bic net/minecraft/client/gui/menu/GuiMultiplayer ARG 0 button METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId METHOD b init ()V METHOD b setIndex (I)V METHOD e update ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping index 57be651b21..8ff3f20abb 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping @@ -37,6 +37,7 @@ CLASS none/bfk net/minecraft/client/gui/menu/GuiRealms ARG 0 button METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId METHOD b init ()V METHOD b drawTexturedRect (IIIIII)V ARG 0 x diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping index 07ec7dccbc..bfdb59e972 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettings.mapping @@ -13,4 +13,5 @@ CLASS none/bgg net/minecraft/client/gui/menu/GuiSettings ARG 0 button METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId METHOD b init ()V diff --git a/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping b/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping index 469f2d6e48..89bf51fc56 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiSettingsAudio.mapping @@ -1,5 +1,9 @@ CLASS none/bgq net/minecraft/client/gui/menu/GuiSettingsAudio CLASS none/bgq$a + METHOD a onPressed (Lnone/caw;)V + ARG 0 soundLoader + METHOD a getTextureId (Z)I + ARG 0 pressed METHOD b (Lnone/bdq;II)V ARG 0 game METHOD c isWithinBounds (Lnone/bdq;II)Z diff --git a/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping b/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping index dc6c26eef2..ae4710c09e 100644 --- a/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping +++ b/mappings/net/minecraft/client/gui/widget/WidgetButton.mapping @@ -8,6 +8,7 @@ CLASS none/bek net/minecraft/client/gui/widget/WidgetButton FIELD k id I FIELD l enabled Z FIELD m visible Z + FIELD n pressed Z METHOD (IIIIILjava/lang/String;)V ARG 0 id ARG 1 x @@ -20,12 +21,17 @@ CLASS none/bek net/minecraft/client/gui/widget/WidgetButton ARG 1 x ARG 2 y ARG 3 text + METHOD a isPressed ()Z METHOD a setWidth (I)V ARG 0 width METHOD a draw (Lnone/bdq;II)V ARG 0 game ARG 1 mouseX ARG 2 mouseY + METHOD a onPressed (Lnone/caw;)V + ARG 0 soundLoader + METHOD a getTextureId (Z)I + ARG 0 pressed METHOD b getWidth ()I METHOD b (Lnone/bdq;II)V ARG 0 game diff --git a/mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping b/mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping index 71f544a5a4..3b4995fd9e 100644 --- a/mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping +++ b/mappings/net/minecraft/client/gui/widget/WidgetTextField.mapping @@ -15,3 +15,7 @@ CLASS none/beo net/minecraft/client/gui/widget/WidgetTextField ARG 5 height METHOD a setText (Ljava/lang/String;)V ARG 0 text + METHOD b getText ()Ljava/lang/String; + METHOD b addText (Ljava/lang/String;)V + ARG 0 text + METHOD c getSelectedText ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/language/LanguageDefinition.mapping b/mappings/net/minecraft/client/language/LanguageDefinition.mapping deleted file mode 100644 index 1e1efd93b5..0000000000 --- a/mappings/net/minecraft/client/language/LanguageDefinition.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bym net/minecraft/client/language/LanguageDefinition - METHOD a getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/language/LanguageManager.mapping b/mappings/net/minecraft/client/language/LanguageManager.mapping deleted file mode 100644 index 5d608e7698..0000000000 --- a/mappings/net/minecraft/client/language/LanguageManager.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS none/byn net/minecraft/client/language/LanguageManager - FIELD a STORAGE Lnone/byo; - FIELD b LOGGER Lorg/apache/logging/log4j/Logger; - FIELD c packMetadata Lnone/byt; - FIELD d languageId Ljava/lang/String; - FIELD e languageDefs Ljava/util/Map; - METHOD (Lnone/byt;Ljava/lang/String;)V - ARG 0 metadata - ARG 1 languageId - METHOD a onResourceReload (Lnone/byc;)V - ARG 0 container - METHOD a setLanguage (Lnone/bym;)V - METHOD c getLanguage ()Lnone/bym; diff --git a/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping index 668c32e007..28309dff7f 100644 --- a/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/impl/NetworkGameHandlerClient.mapping @@ -3,6 +3,7 @@ CLASS none/bme net/minecraft/client/network/handler/impl/NetworkGameHandlerClien CLASS none/bme$1$1 METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId FIELD a maxPlayers I FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c connection Lnone/eq; @@ -158,3 +159,6 @@ CLASS none/bme net/minecraft/client/network/handler/impl/NetworkGameHandlerClien ARG 0 packet METHOD a onEntityPotionEffect (Lnone/ik;)V ARG 0 packet + METHOD b validateResourcePackUrl (Ljava/lang/String;)Z + ARG 0 url + METHOD f getResourcePackDownloadCallback ()Lcom/google/common/util/concurrent/FutureCallback; diff --git a/mappings/net/minecraft/client/resource/IResource.mapping b/mappings/net/minecraft/client/resource/IResource.mapping index 2c5cdd477f..0e634897f5 100644 --- a/mappings/net/minecraft/client/resource/IResource.mapping +++ b/mappings/net/minecraft/client/resource/IResource.mapping @@ -1,7 +1,7 @@ CLASS none/byb net/minecraft/client/resource/IResource METHOD a getId ()Lnone/kp; - METHOD a getMetadata (Ljava/lang/String;)Lnone/byr; - ARG 0 key + METHOD a getMetadataSection (Ljava/lang/String;)Lnone/byr; + ARG 0 name METHOD b getInputStream ()Ljava/io/InputStream; METHOD c hasMetadata ()Z METHOD d getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/IResourceMetadata.mapping b/mappings/net/minecraft/client/resource/IResourceMetadata.mapping deleted file mode 100644 index f9c9fda090..0000000000 --- a/mappings/net/minecraft/client/resource/IResourceMetadata.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/byr net/minecraft/client/resource/IResourceMetadata diff --git a/mappings/net/minecraft/client/resource/Resource.mapping b/mappings/net/minecraft/client/resource/Resource.mapping index 614cb6c290..b526c5ef39 100644 --- a/mappings/net/minecraft/client/resource/Resource.mapping +++ b/mappings/net/minecraft/client/resource/Resource.mapping @@ -4,7 +4,7 @@ CLASS none/byj net/minecraft/client/resource/Resource FIELD c id Lnone/kp; FIELD d input Ljava/io/InputStream; FIELD e metadataInput Ljava/io/InputStream; - FIELD f packMetadata Lnone/byt; + FIELD f metadataDeserializer Lnone/byt; FIELD g metadataLoaded Z FIELD h metadataJson Lcom/google/gson/JsonObject; METHOD (Ljava/lang/String;Lnone/kp;Ljava/io/InputStream;Ljava/io/InputStream;Lnone/byt;)V @@ -12,10 +12,10 @@ CLASS none/byj net/minecraft/client/resource/Resource ARG 1 id ARG 2 input ARG 3 metadataInput - ARG 4 packMetadata + ARG 4 deserializer METHOD a getId ()Lnone/kp; - METHOD a getMetadata (Ljava/lang/String;)Lnone/byr; - ARG 0 key + METHOD a getMetadataSection (Ljava/lang/String;)Lnone/byr; + ARG 0 name METHOD b getInputStream ()Ljava/io/InputStream; METHOD c hasMetadata ()Z METHOD close close ()V diff --git a/mappings/net/minecraft/client/resource/ResourceContainer.mapping b/mappings/net/minecraft/client/resource/ResourceContainer.mapping index 143fd204f6..2c5b02f945 100644 --- a/mappings/net/minecraft/client/resource/ResourceContainer.mapping +++ b/mappings/net/minecraft/client/resource/ResourceContainer.mapping @@ -11,9 +11,9 @@ CLASS none/bxv net/minecraft/client/resource/ResourceContainer METHOD read read ()I FIELD a packs Ljava/util/List; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; - FIELD c metadata Lnone/byt; + FIELD c metadataDeserializer Lnone/byt; METHOD (Lnone/byt;)V - ARG 0 metadata + ARG 0 metadataDeserializer METHOD a getProvidedAssets ()Ljava/util/Set; METHOD a add (Lnone/bye;)V ARG 0 pack diff --git a/mappings/net/minecraft/client/resource/ResourceManager.mapping b/mappings/net/minecraft/client/resource/ResourceManager.mapping index c18b6f71da..a6e6bf8615 100644 --- a/mappings/net/minecraft/client/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/client/resource/ResourceManager.mapping @@ -4,9 +4,9 @@ CLASS none/byi net/minecraft/client/resource/ResourceManager FIELD c containers Ljava/util/Map; FIELD d listeners Ljava/util/List; FIELD e providedAssets Ljava/util/Set; - FIELD f defaultMetadata Lnone/byt; + FIELD f metadataDeserializer Lnone/byt; METHOD (Lnone/byt;)V - ARG 0 defaultMetadata + ARG 0 metadataDeserializer METHOD a getProvidedAssets ()Ljava/util/Set; METHOD a reload (Ljava/util/List;)V ARG 0 packs diff --git a/mappings/net/minecraft/client/resource/ResourcePackManager.mapping b/mappings/net/minecraft/client/resource/ResourcePackManager.mapping new file mode 100644 index 0000000000..e6ff7bb059 --- /dev/null +++ b/mappings/net/minecraft/client/resource/ResourcePackManager.mapping @@ -0,0 +1,61 @@ +CLASS none/byh net/minecraft/client/resource/ResourcePackManager + CLASS none/byh$1 + METHOD accept accept (Ljava/io/File;)Z + ARG 0 file + CLASS none/byh$3 + METHOD onFailure onFailure (Ljava/lang/Throwable;)V + METHOD onSuccess onSuccess (Ljava/lang/Object;)V + CLASS none/byh$a Entry + FIELD b pack Lnone/bye; + FIELD c metadata Lnone/bze; + FIELD d iconTexture Lnone/kp; + METHOD (Lnone/byh;Ljava/io/File;)V + METHOD (Lnone/byh;Lnone/bye;)V + METHOD a bindIconTexture (Lnone/bxe;)V + ARG 0 manager + METHOD b close ()V + METHOD c getPack ()Lnone/bye; + METHOD d getName ()Ljava/lang/String; + METHOD e getDescription ()Ljava/lang/String; + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other + METHOD f getVersion ()I + FIELD a builtinPack Lnone/bye; + FIELD b metadataDeserializer Lnone/byt; + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + FIELD d RESOURCE_PACK_FILTER Ljava/io/FileFilter; + FIELD e SHA1_HASH_PATTERN Ljava/util/regex/Pattern; + FIELD f ICON_UNKNOWN Lnone/kp; + FIELD g resourcePacksDir Ljava/io/File; + FIELD h serverResourcePacksDir Ljava/io/File; + FIELD i pack Lnone/bye; + FIELD j downloadLock Ljava/util/concurrent/locks/ReentrantLock; + FIELD k downloadFuture Lcom/google/common/util/concurrent/ListenableFuture; + FIELD l availableResourcePacks Ljava/util/List; + FIELD m enabledResourcePacks Ljava/util/List; + METHOD (Ljava/io/File;Ljava/io/File;Lnone/bye;Lnone/byt;Lnone/bds;)V + ARG 0 resourcePacksDir + ARG 1 serverResourcePacksDir + ARG 2 builtinPack + ARG 3 metadataDeserializer + ARG 4 settings + METHOD a getDownloadHeaders ()Ljava/util/Map; + METHOD a verifyHash (Ljava/lang/String;Ljava/io/File;)Z + ARG 0 sha1 + ARG 1 file + METHOD a download (Ljava/lang/String;Ljava/lang/String;)Lcom/google/common/util/concurrent/ListenableFuture; + ARG 0 url + ARG 1 sha1 + METHOD a setEnabledResourcePacks (Ljava/util/List;)V + ARG 0 entryList + METHOD b getResourcePack (Ljava/io/File;)Lnone/bye; + ARG 0 file + METHOD c (Ljava/io/File;)Z + ARG 0 file + METHOD d getAvailableResourcePacks ()Ljava/util/List; + METHOD e getEnabledResourcePacks ()Ljava/util/List; + METHOD f getResourcePackDirectory ()Ljava/io/File; + METHOD g getPack ()Lnone/bye; + METHOD k createResourcePackDir ()V + METHOD l getLocalResourcePackFiles ()Ljava/util/List; + METHOD m purgeOldCachedPacks ()V diff --git a/mappings/net/minecraft/client/language/I18n.mapping b/mappings/net/minecraft/client/resource/language/I18n.mapping similarity index 80% rename from mappings/net/minecraft/client/language/I18n.mapping rename to mappings/net/minecraft/client/resource/language/I18n.mapping index 1a792a558b..1cb5f9f139 100644 --- a/mappings/net/minecraft/client/language/I18n.mapping +++ b/mappings/net/minecraft/client/resource/language/I18n.mapping @@ -1,4 +1,4 @@ -CLASS none/byl net/minecraft/client/language/I18n +CLASS none/byl net/minecraft/client/resource/language/I18n FIELD a language Lnone/byo; METHOD a hasTranslation (Ljava/lang/String;)Z ARG 0 key diff --git a/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping new file mode 100644 index 0000000000..5c4f0fbb11 --- /dev/null +++ b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping @@ -0,0 +1,16 @@ +CLASS none/bym net/minecraft/client/resource/language/LanguageDefinition + FIELD a code Ljava/lang/String; + FIELD b name Ljava/lang/String; + FIELD c region Ljava/lang/String; + FIELD d rightToLeft Z + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V + ARG 0 code + ARG 1 name + ARG 2 region + ARG 3 rightToLeft + METHOD a getCode ()Ljava/lang/String; + METHOD a compareTo (Lnone/bym;)I + ARG 0 other + METHOD b isRightToLeft ()Z + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping new file mode 100644 index 0000000000..8f2e49c2d4 --- /dev/null +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -0,0 +1,18 @@ +CLASS none/byn net/minecraft/client/resource/language/LanguageManager + FIELD a STORAGE Lnone/byo; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c metadataDeserializer Lnone/byt; + FIELD d currentLanguageCode Ljava/lang/String; + FIELD e languageDefs Ljava/util/Map; + METHOD (Lnone/byt;Ljava/lang/String;)V + ARG 0 metadataDeserializer + ARG 1 languageId + METHOD a reloadResources (Ljava/util/List;)V + ARG 0 packs + METHOD a onResourceReload (Lnone/byc;)V + ARG 0 container + METHOD a setLanguage (Lnone/bym;)V + ARG 0 definition + METHOD b isRightToLeft ()Z + METHOD c getLanguage ()Lnone/bym; + METHOD d getAllLanguages ()Ljava/util/SortedSet; diff --git a/mappings/net/minecraft/client/language/TranslationStorage.mapping b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping similarity index 88% rename from mappings/net/minecraft/client/language/TranslationStorage.mapping rename to mappings/net/minecraft/client/resource/language/TranslationStorage.mapping index 808e2a4383..0179e06ede 100644 --- a/mappings/net/minecraft/client/language/TranslationStorage.mapping +++ b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping @@ -1,4 +1,4 @@ -CLASS none/byo net/minecraft/client/language/TranslationStorage +CLASS none/byo net/minecraft/client/resource/language/TranslationStorage FIELD a translations Ljava/util/Map; FIELD b EQUALS_SPLITTER Lcom/google/common/base/Splitter; METHOD a loadTranslations (Ljava/io/InputStream;)V diff --git a/mappings/net/minecraft/client/resource/metadata/IResourceSection.mapping b/mappings/net/minecraft/client/resource/metadata/IResourceSection.mapping new file mode 100644 index 0000000000..dcc0cf3be5 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/IResourceSection.mapping @@ -0,0 +1 @@ +CLASS none/byr net/minecraft/client/resource/metadata/IResourceSection diff --git a/mappings/net/minecraft/client/resource/metadata/IResourceSectionDeserializer.mapping b/mappings/net/minecraft/client/resource/metadata/IResourceSectionDeserializer.mapping new file mode 100644 index 0000000000..8035e57001 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/IResourceSectionDeserializer.mapping @@ -0,0 +1,2 @@ +CLASS none/bys net/minecraft/client/resource/metadata/IResourceSectionDeserializer + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceMetadataDeserializer.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataDeserializer.mapping new file mode 100644 index 0000000000..25125485a4 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceMetadataDeserializer.mapping @@ -0,0 +1,14 @@ +CLASS none/byt net/minecraft/client/resource/metadata/ResourceMetadataDeserializer + CLASS none/byt$a Entry + FIELD a deserializer Lnone/bys; + FIELD b classType Ljava/lang/Class; + FIELD a deserializers Lnone/dg; + FIELD b gsonBuilder Lcom/google/gson/GsonBuilder; + FIELD c gson Lcom/google/gson/Gson; + METHOD a getGson ()Lcom/google/gson/Gson; + METHOD a deserialize (Ljava/lang/String;Lcom/google/gson/JsonObject;)Lnone/byr; + ARG 0 sectionName + ARG 1 sectionJson + METHOD a register (Lnone/bys;Ljava/lang/Class;)V + ARG 0 deserializer + ARG 1 classType diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimation.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimation.mapping new file mode 100644 index 0000000000..902e3d26ce --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimation.mapping @@ -0,0 +1,26 @@ +CLASS none/byv net/minecraft/client/resource/metadata/ResourceSectionAnimation + FIELD a frames Ljava/util/List; + FIELD b width I + FIELD c height I + FIELD d defaultFrameTime I + FIELD e interpolate Z + METHOD (Ljava/util/List;IIIZ)V + ARG 0 frames + ARG 1 width + ARG 2 height + ARG 3 defaultFrameTime + ARG 4 interpolate + METHOD a getHeight ()I + METHOD a getFrameTime (I)I + ARG 0 pos + METHOD b getWidth ()I + METHOD b hasCustomFrameTime (I)Z + ARG 0 pos + METHOD c getFrameCount ()I + METHOD c getFrameIndex (I)I + ARG 0 pos + METHOD d getDefaultFrameTime ()I + METHOD d getFrame (I)Lnone/byu; + ARG 0 pos + METHOD e shouldInterpolate ()Z + METHOD f getFrameIndexSet ()Ljava/util/Set; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimationFrame.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimationFrame.mapping new file mode 100644 index 0000000000..d5c0edb187 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionAnimationFrame.mapping @@ -0,0 +1,11 @@ +CLASS none/byu net/minecraft/client/resource/metadata/ResourceSectionAnimationFrame + FIELD a index I + FIELD b time I + METHOD (I)V + ARG 0 index + METHOD (II)V + ARG 0 index + ARG 1 time + METHOD a usesDefaultFrameTime ()Z + METHOD b getTime ()I + METHOD c getIndex ()I diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializer.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializer.mapping new file mode 100644 index 0000000000..fc77249cdd --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializer.mapping @@ -0,0 +1 @@ +CLASS none/byq net/minecraft/client/resource/metadata/ResourceSectionDeserializer diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerAnimation.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerAnimation.mapping new file mode 100644 index 0000000000..14dd754f78 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerAnimation.mapping @@ -0,0 +1,2 @@ +CLASS none/byw net/minecraft/client/resource/metadata/ResourceSectionDeserializerAnimation + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerFont.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerFont.mapping new file mode 100644 index 0000000000..f0200f4890 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerFont.mapping @@ -0,0 +1,2 @@ +CLASS none/byz net/minecraft/client/resource/metadata/ResourceSectionDeserializerFont + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerLanguage.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerLanguage.mapping new file mode 100644 index 0000000000..d8d3392764 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerLanguage.mapping @@ -0,0 +1,2 @@ +CLASS none/bzc net/minecraft/client/resource/metadata/ResourceSectionDeserializerLanguage + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerPack.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerPack.mapping new file mode 100644 index 0000000000..d7e141fe06 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerPack.mapping @@ -0,0 +1,2 @@ +CLASS none/bzf net/minecraft/client/resource/metadata/ResourceSectionDeserializerPack + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerTexture.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerTexture.mapping new file mode 100644 index 0000000000..478c33e599 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionDeserializerTexture.mapping @@ -0,0 +1,2 @@ +CLASS none/bzj net/minecraft/client/resource/metadata/ResourceSectionDeserializerTexture + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionFont.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionFont.mapping new file mode 100644 index 0000000000..93f26bb22d --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionFont.mapping @@ -0,0 +1,8 @@ +CLASS none/byy net/minecraft/client/resource/metadata/ResourceSectionFont + FIELD a widths [F + FIELD b lefts [F + FIELD c spacings [F + METHOD ([F[F[F)V + ARG 0 width + ARG 1 left + ARG 2 spacing diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionLanguage.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionLanguage.mapping new file mode 100644 index 0000000000..2d592c9a0a --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionLanguage.mapping @@ -0,0 +1,5 @@ +CLASS none/bzb net/minecraft/client/resource/metadata/ResourceSectionLanguage + FIELD a definitions Ljava/util/Collection; + METHOD (Ljava/util/Collection;)V + ARG 0 defs + METHOD a getLanguageDefinitions ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionPack.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionPack.mapping new file mode 100644 index 0000000000..746ca6f278 --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionPack.mapping @@ -0,0 +1,8 @@ +CLASS none/bze net/minecraft/client/resource/metadata/ResourceSectionPack + FIELD a description Lnone/fa; + FIELD b version I + METHOD (Lnone/fa;I)V + ARG 0 description + ARG 1 version + METHOD a getDescription ()Lnone/fa; + METHOD b getVersion ()I diff --git a/mappings/net/minecraft/client/resource/metadata/ResourceSectionTexture.mapping b/mappings/net/minecraft/client/resource/metadata/ResourceSectionTexture.mapping new file mode 100644 index 0000000000..c526da5dfe --- /dev/null +++ b/mappings/net/minecraft/client/resource/metadata/ResourceSectionTexture.mapping @@ -0,0 +1,8 @@ +CLASS none/bzi net/minecraft/client/resource/metadata/ResourceSectionTexture + FIELD a blur Z + FIELD b clamp Z + METHOD (ZZ)V + ARG 0 blur + ARG 1 clamp + METHOD a shouldBlur ()Z + METHOD b shouldClamp ()Z diff --git a/mappings/net/minecraft/client/resource/pack/IResourcePack.mapping b/mappings/net/minecraft/client/resource/pack/IResourcePack.mapping index 9e307ea428..8089b9d2c3 100644 --- a/mappings/net/minecraft/client/resource/pack/IResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/pack/IResourcePack.mapping @@ -1,5 +1,8 @@ CLASS none/bye net/minecraft/client/resource/pack/IResourcePack - METHOD a getLogo ()Ljava/awt/image/BufferedImage; + METHOD a getIcon ()Ljava/awt/image/BufferedImage; + METHOD a deserialize (Lnone/byt;Ljava/lang/String;)Lnone/byr; + ARG 0 deserializer + ARG 1 sectionName METHOD a open (Lnone/kp;)Ljava/io/InputStream; ARG 0 id METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping b/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping index 4150a1471f..e32d254759 100644 --- a/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping @@ -1,6 +1,9 @@ CLASS none/bxt net/minecraft/client/resource/pack/MinecraftResourcePack FIELD a ASSET_NAMES Ljava/util/Set; - METHOD a getLogo ()Ljava/awt/image/BufferedImage; + METHOD a getIcon ()Ljava/awt/image/BufferedImage; + METHOD a deserialize (Lnone/byt;Ljava/lang/String;)Lnone/byr; + ARG 0 deserializer + ARG 1 sectionName METHOD a open (Lnone/kp;)Ljava/io/InputStream; ARG 0 id METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/pack/PhysicalResourcePack.mapping b/mappings/net/minecraft/client/resource/pack/PhysicalResourcePack.mapping index c2b8236f55..f58c2fbf49 100644 --- a/mappings/net/minecraft/client/resource/pack/PhysicalResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/pack/PhysicalResourcePack.mapping @@ -3,12 +3,15 @@ CLASS none/bxq net/minecraft/client/resource/pack/PhysicalResourcePack FIELD b LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/io/File;)V ARG 0 location - METHOD a getLogo ()Ljava/awt/image/BufferedImage; + METHOD a getIcon ()Ljava/awt/image/BufferedImage; METHOD a getRelativePath (Ljava/io/File;Ljava/io/File;)Ljava/lang/String; ARG 0 path ARG 1 pathRelativeTo METHOD a openByPath (Ljava/lang/String;)Ljava/io/InputStream; ARG 0 path + METHOD a deserialize (Lnone/byt;Ljava/lang/String;)Lnone/byr; + ARG 0 deserializer + ARG 1 sectionName METHOD a open (Lnone/kp;)Ljava/io/InputStream; ARG 0 id METHOD b getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping b/mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping deleted file mode 100644 index a0fae72f7d..0000000000 --- a/mappings/net/minecraft/client/resource/pack/ResourcePackMetadata.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/byt net/minecraft/client/resource/pack/ResourcePackMetadata diff --git a/mappings/net/minecraft/client/texture/ITexture.mapping b/mappings/net/minecraft/client/texture/ITexture.mapping index 6f1944de8c..6cb7b19ac8 100644 --- a/mappings/net/minecraft/client/texture/ITexture.mapping +++ b/mappings/net/minecraft/client/texture/ITexture.mapping @@ -1 +1,2 @@ CLASS none/bxf net/minecraft/client/texture/ITexture + METHOD b getGlId ()I diff --git a/mappings/net/minecraft/client/texture/Texture.mapping b/mappings/net/minecraft/client/texture/Texture.mapping index fbc3a7a0bb..6cf3c3b400 100644 --- a/mappings/net/minecraft/client/texture/Texture.mapping +++ b/mappings/net/minecraft/client/texture/Texture.mapping @@ -1 +1,3 @@ CLASS none/bws net/minecraft/client/texture/Texture + FIELD a glId I + METHOD b getGlId ()I diff --git a/mappings/net/minecraft/client/texture/TextureDynamic.mapping b/mappings/net/minecraft/client/texture/TextureDynamic.mapping new file mode 100644 index 0000000000..aff14e82d5 --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureDynamic.mapping @@ -0,0 +1,11 @@ +CLASS none/bwt net/minecraft/client/texture/TextureDynamic + FIELD f data [I + FIELD g width I + FIELD h height I + METHOD (II)V + ARG 0 width + ARG 1 height + METHOD (Ljava/awt/image/BufferedImage;)V + ARG 0 image + METHOD d upload ()V + METHOD e getData ()[I diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index e7ccfb4a60..3bf6578994 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -2,6 +2,10 @@ CLASS none/bxe net/minecraft/client/texture/TextureManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b textures Ljava/util/Map; FIELD c updateable Ljava/util/List; + FIELD d dynamicIdCounters Ljava/util/Map; + METHOD a registerDynamicTexture (Ljava/lang/String;Lnone/bwt;)Lnone/kp; + ARG 0 prefix + ARG 1 texture METHOD a onResourceReload (Lnone/byc;)V ARG 0 container METHOD a bindTexture (Lnone/kp;)V diff --git a/mappings/net/minecraft/client/util/TextureUtils.mapping b/mappings/net/minecraft/client/util/TextureUtils.mapping index 538d787a46..45fbda1329 100644 --- a/mappings/net/minecraft/client/util/TextureUtils.mapping +++ b/mappings/net/minecraft/client/util/TextureUtils.mapping @@ -1,6 +1,17 @@ CLASS none/bxg net/minecraft/client/util/TextureUtils + FIELD a TEXTURE_MISSING Lnone/bwt; + FIELD b TEXTURE_MISSING_DATA [I FIELD c LOGGER Lorg/apache/logging/log4j/Logger; - METHOD a ()I + METHOD a createTextureId ()I + METHOD a (I)V + METHOD a (ILjava/awt/image/BufferedImage;)I + ARG 0 textureId + ARG 1 image + METHOD a upload (I[III)V + ARG 0 textureId + ARG 1 data + ARG 2 width + ARG 3 height METHOD a getBufferedImage (Ljava/io/InputStream;)Ljava/awt/image/BufferedImage; ARG 0 stream METHOD a getImagePixels (Lnone/byc;Lnone/kp;)[I diff --git a/mappings/net/minecraft/client/util/YesNoCallback.mapping b/mappings/net/minecraft/client/util/YesNoCallback.mapping index 474046f0f5..e702b7add1 100644 --- a/mappings/net/minecraft/client/util/YesNoCallback.mapping +++ b/mappings/net/minecraft/client/util/YesNoCallback.mapping @@ -1,3 +1,4 @@ CLASS none/bfr net/minecraft/client/util/YesNoCallback METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index abd8b71a18..94ff20de2b 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -20,6 +20,7 @@ CLASS none/cal net/minecraft/server/IntegratedServer METHOD aa isDedicated ()Z METHOD ae isUsingNativeTransport ()Z METHOD ah areCommandBlocksEnabled ()Z + METHOD b reloadResources ()V METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; ARG 0 report METHOD i createCommandManager ()Lnone/bc; diff --git a/mappings/net/minecraft/sortme/MobSpawnerEntry.mapping b/mappings/net/minecraft/sortme/MobSpawnerEntry.mapping new file mode 100644 index 0000000000..43aba6b23a --- /dev/null +++ b/mappings/net/minecraft/sortme/MobSpawnerEntry.mapping @@ -0,0 +1,9 @@ +CLASS none/ajf net/minecraft/sortme/MobSpawnerEntry + FIELD b entityTag Lnone/dt; + METHOD (ILnone/dt;)V + ARG 0 weight + ARG 1 entityTag + METHOD (Lnone/dt;)V + ARG 0 tag + METHOD a serialize ()Lnone/dt; + METHOD b getEntityTag ()Lnone/dt; diff --git a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping index 2978022a83..96c0576b67 100644 --- a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping @@ -1,5 +1,7 @@ CLASS none/ail net/minecraft/sortme/MobSpawnerLogic FIELD a spawnDelay I + FIELD b spawnPotentials Ljava/util/List; + FIELD c spawnEntry Lnone/ajf; FIELD f minSpawnDelay I FIELD g maxSpawnDelay I FIELD h spawnCount I @@ -7,7 +9,10 @@ CLASS none/ail net/minecraft/sortme/MobSpawnerLogic FIELD k requiredPlayerRange I FIELD l spawnRange I METHOD a getWorld ()Lnone/aiv; + METHOD a setSpawnEntry (Lnone/ajf;)V + ARG 0 value METHOD a deserialize (Lnone/dt;)V METHOD b getPos ()Lnone/cn; METHOD b serialize (Lnone/dt;)Lnone/dt; METHOD c update ()V + METHOD g getEntityId ()Lnone/kp; diff --git a/mappings/net/minecraft/sortme/ServerList.mapping b/mappings/net/minecraft/sortme/ServerList.mapping index 707a08f1f4..f899e1b1e6 100644 --- a/mappings/net/minecraft/sortme/ServerList.mapping +++ b/mappings/net/minecraft/sortme/ServerList.mapping @@ -4,10 +4,10 @@ CLASS none/bmk net/minecraft/sortme/ServerList FIELD c serverEntries Ljava/util/List; METHOD (Lnone/bdq;)V ARG 0 mc - METHOD a loadServerList ()V + METHOD a loadFile ()V METHOD a get (I)Lnone/bmj; ARG 0 index - METHOD a swapServerListEntries (II)V + METHOD a swapEntries (II)V ARG 0 index1 ARG 1 index2 METHOD a set (ILnone/bmj;)V @@ -15,7 +15,7 @@ CLASS none/bmk net/minecraft/sortme/ServerList ARG 1 e METHOD a add (Lnone/bmj;)V ARG 0 e - METHOD b saveServerList ()V + METHOD b saveFile ()V METHOD b remove (I)V ARG 0 index METHOD b updateServerListEntry (Lnone/bmj;)V diff --git a/mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping b/mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping deleted file mode 100644 index 165e1e9370..0000000000 --- a/mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/byh net/minecraft/sortme/ServerResourcePackDownloader - FIELD c LOGGER Lorg/apache/logging/log4j/Logger; - FIELD h serverResourcePacksDir Ljava/io/File; - METHOD (Ljava/io/File;Ljava/io/File;Lnone/bye;Lnone/byt;Lnone/bds;)V - ARG 1 serverResourcePacksDir - ARG 4 settings diff --git a/mappings/net/minecraft/sortme/WeightedSomething.mapping b/mappings/net/minecraft/sortme/WeightedSomething.mapping new file mode 100644 index 0000000000..dffefc6a27 --- /dev/null +++ b/mappings/net/minecraft/sortme/WeightedSomething.mapping @@ -0,0 +1,17 @@ +CLASS none/oz net/minecraft/sortme/WeightedSomething + CLASS none/oz$a Entry + FIELD a weight I + METHOD (I)V + ARG 0 weight + METHOD a getTotalWeight (Ljava/util/List;)I + ARG 0 list + METHOD a get (Ljava/util/List;I)Lnone/oz$a; + ARG 0 list + ARG 1 weightedOffset + METHOD a getRandom (Ljava/util/Random;Ljava/util/List;)Lnone/oz$a; + ARG 0 rand + ARG 1 list + METHOD a getRandom (Ljava/util/Random;Ljava/util/List;I)Lnone/oz$a; + ARG 0 rand + ARG 1 list + ARG 2 totalWeight diff --git a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping index 98810a6d74..77aca8e7d1 100644 --- a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping +++ b/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping @@ -2,9 +2,11 @@ CLASS none/biy net/minecraft/sortme/WidgetWorldEntry CLASS none/biy$1 METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId CLASS none/biy$2 METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b DATE_FORMAT Ljava/text/DateFormat; FIELD e game Lnone/bdq; @@ -12,6 +14,7 @@ CLASS none/biy net/minecraft/sortme/WidgetWorldEntry FIELD g worldSummary Lnone/bax; FIELD h iconLocation Lnone/kp; FIELD j iconFile Ljava/io/File; + FIELD k iconTexture Lnone/bwt; METHOD (Lnone/biz;Lnone/bax;Lnone/baw;)V ARG 1 worldSummary ARG 2 worldStorage diff --git a/mappings/none/bep.mapping b/mappings/none/bep.mapping index 34cff8bc34..a68a5f3470 100644 --- a/mappings/none/bep.mapping +++ b/mappings/none/bep.mapping @@ -1,4 +1,6 @@ CLASS none/bep + METHOD a getTextureId (Z)I + ARG 0 pressed METHOD b (Lnone/bdq;II)V ARG 0 game METHOD c isWithinBounds (Lnone/bdq;II)Z diff --git a/mappings/none/bfc.mapping b/mappings/none/bfc.mapping index d2c48a77ff..275c3feef6 100644 --- a/mappings/none/bfc.mapping +++ b/mappings/none/bfc.mapping @@ -15,6 +15,8 @@ CLASS none/bfc ARG 3 option ARG 4 minValue ARG 5 maxValue + METHOD a getTextureId (Z)I + ARG 0 pressed METHOD b (Lnone/bdq;II)V ARG 0 game METHOD c isWithinBounds (Lnone/bdq;II)Z diff --git a/mappings/none/bfi.mapping b/mappings/none/bfi.mapping index 8671d30d1a..47e89fb6cf 100644 --- a/mappings/none/bfi.mapping +++ b/mappings/none/bfi.mapping @@ -1,5 +1,7 @@ CLASS none/bfi FIELD o realmsButton Lnet/minecraft/realms/RealmsButton; + METHOD a getTextureId (Z)I + ARG 0 pressed METHOD b getWidth ()I METHOD b (Lnone/bdq;II)V ARG 0 game diff --git a/mappings/none/bik.mapping b/mappings/none/bik.mapping index c8c150291f..11931c9806 100644 --- a/mappings/none/bik.mapping +++ b/mappings/none/bik.mapping @@ -2,6 +2,7 @@ CLASS none/bik CLASS none/bik$1 METHOD a handle (ZI)V ARG 0 result + ARG 1 callbackId METHOD a (III)V ARG 0 index ARG 1 x diff --git a/mappings/none/bwu.mapping b/mappings/none/bwu.mapping new file mode 100644 index 0000000000..69801a7f1d --- /dev/null +++ b/mappings/none/bwu.mapping @@ -0,0 +1,2 @@ +CLASS none/bwu + METHOD b getGlId ()I diff --git a/mappings/none/byf.mapping b/mappings/none/byf.mapping index 3e6ca6652f..2f2b602091 100644 --- a/mappings/none/byf.mapping +++ b/mappings/none/byf.mapping @@ -1,7 +1,10 @@ CLASS none/byf CLASS none/byf$1 METHOD a getName ()Ljava/lang/String; - METHOD a getLogo ()Ljava/awt/image/BufferedImage; + METHOD a getIcon ()Ljava/awt/image/BufferedImage; + METHOD a deserialize (Lnone/byt;Ljava/lang/String;)Lnone/byr; + ARG 0 deserializer + ARG 1 sectionName METHOD a open (Lnone/kp;)Ljava/io/InputStream; ARG 0 id METHOD b getName ()Ljava/lang/String; diff --git a/mappings/none/bzb.mapping b/mappings/none/bzb.mapping deleted file mode 100644 index d3efb0c507..0000000000 --- a/mappings/none/bzb.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/bzb - FIELD a defs Ljava/util/Collection; - METHOD (Ljava/util/Collection;)V - ARG 0 defs - METHOD a get ()Ljava/util/Collection;