diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index e4dfbf16b1..223037f814 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -26,7 +26,7 @@ CLASS bpo net/minecraft/block/entity/StructureBlockBlockEntity METHOD a setIntegrity (F)V METHOD a setSeed (J)V METHOD a setAuthor (Lahl;)V - METHOD a openGui (Larj;)Z + METHOD a openScreen (Larj;)Z METHOD a setMode (Lbrs;)V METHOD a findStructureBlockEntities (Let;Let;)Ljava/util/List; ARG 1 pos1 diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 10de968f45..4bd81156f3 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -76,7 +76,7 @@ CLASS cpy net/minecraft/client/MinecraftClient FIELD j targetedEntity Lahc; FIELD k particleManager Lddn; FIELD l fontRenderer Lcqm; - FIELD m currentGui Lcuf; + FIELD m currentScreen Lcuf; FIELD n gameRenderer Ldew; FIELD o debugRenderer Ldih; FIELD p attackCooldown I @@ -122,7 +122,8 @@ CLASS cpy net/minecraft/client/MinecraftClient ARG 1 stack ARG 2 blockEntity METHOD a setCrashReport (Lb;)V - METHOD a openGui (Lcuf;)V + METHOD a openScreen (Lcuf;)V + ARG 1 screen METHOD a setCurrentServerEntry (Ldch;)V METHOD a getSearchableContainer (Ldrd$a;)Ldra; ARG 1 key diff --git a/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping b/mappings/net/minecraft/client/gui/AbstractCommandBlockScreen.mapping similarity index 77% rename from mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping rename to mappings/net/minecraft/client/gui/AbstractCommandBlockScreen.mapping index 84b362be85..f11c85c30f 100644 --- a/mappings/net/minecraft/client/gui/AbstractCommandBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/AbstractCommandBlockScreen.mapping @@ -1,4 +1,4 @@ -CLASS cuz net/minecraft/client/gui/AbstractCommandBlockGui +CLASS cuz net/minecraft/client/gui/AbstractCommandBlockScreen FIELD a consoleCommandTextField Lcra; FIELD f previousOutputTextField Lcra; FIELD g doneButton Lcqw; diff --git a/mappings/net/minecraft/client/gui/CloseWorldGui.mapping b/mappings/net/minecraft/client/gui/CloseWorldScreen.mapping similarity index 63% rename from mappings/net/minecraft/client/gui/CloseWorldGui.mapping rename to mappings/net/minecraft/client/gui/CloseWorldScreen.mapping index a19b161bac..d0f6fe005f 100644 --- a/mappings/net/minecraft/client/gui/CloseWorldGui.mapping +++ b/mappings/net/minecraft/client/gui/CloseWorldScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctt net/minecraft/client/gui/CloseWorldGui +CLASS ctt net/minecraft/client/gui/CloseWorldScreen FIELD a message Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/client/gui/CommandBlockMinecartGui.mapping b/mappings/net/minecraft/client/gui/CommandBlockMinecartGui.mapping deleted file mode 100644 index f0ab9ec645..0000000000 --- a/mappings/net/minecraft/client/gui/CommandBlockMinecartGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cwc net/minecraft/client/gui/CommandBlockMinecartGui diff --git a/mappings/net/minecraft/client/gui/CommandBlockMinecartScreen.mapping b/mappings/net/minecraft/client/gui/CommandBlockMinecartScreen.mapping new file mode 100644 index 0000000000..066d9ddade --- /dev/null +++ b/mappings/net/minecraft/client/gui/CommandBlockMinecartScreen.mapping @@ -0,0 +1 @@ +CLASS cwc net/minecraft/client/gui/CommandBlockMinecartScreen diff --git a/mappings/net/minecraft/client/gui/CommandBlockGui.mapping b/mappings/net/minecraft/client/gui/CommandBlockScreen.mapping similarity index 75% rename from mappings/net/minecraft/client/gui/CommandBlockGui.mapping rename to mappings/net/minecraft/client/gui/CommandBlockScreen.mapping index 3b8f546390..fe1743bb1f 100644 --- a/mappings/net/minecraft/client/gui/CommandBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/CommandBlockScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvj net/minecraft/client/gui/CommandBlockGui +CLASS cvj net/minecraft/client/gui/CommandBlockScreen FIELD A typeButton Lcqw; FIELD B conditionalModeButton Lcqw; FIELD C redstoneTriggerButton Lcqw; diff --git a/mappings/net/minecraft/client/gui/ContainerGui.mapping b/mappings/net/minecraft/client/gui/ContainerScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/ContainerGui.mapping rename to mappings/net/minecraft/client/gui/ContainerScreen.mapping index e2501811b1..1096dda95f 100644 --- a/mappings/net/minecraft/client/gui/ContainerGui.mapping +++ b/mappings/net/minecraft/client/gui/ContainerScreen.mapping @@ -1,4 +1,4 @@ -CLASS cva net/minecraft/client/gui/ContainerGui +CLASS cva net/minecraft/client/gui/ContainerScreen FIELD a BACKGROUND_TEXTURE Lqd; FIELD f containerWidth I FIELD g containerHeight I diff --git a/mappings/net/minecraft/client/gui/ContainerGuiRegistry.mapping b/mappings/net/minecraft/client/gui/ContainerScreenRegistry.mapping similarity index 74% rename from mappings/net/minecraft/client/gui/ContainerGuiRegistry.mapping rename to mappings/net/minecraft/client/gui/ContainerScreenRegistry.mapping index f2b073085f..7e47456f28 100644 --- a/mappings/net/minecraft/client/gui/ContainerGuiRegistry.mapping +++ b/mappings/net/minecraft/client/gui/ContainerScreenRegistry.mapping @@ -1,6 +1,6 @@ -CLASS cty net/minecraft/client/gui/ContainerGuiRegistry +CLASS cty net/minecraft/client/gui/ContainerScreenRegistry CLASS cty$a GuiFactory - METHOD a openGui (Ljc;Lauf;Lcpy;I)V + METHOD a openScreen (Ljc;Lauf;Lcpy;I)V ARG 1 name ARG 2 containerType ARG 3 client @@ -12,7 +12,7 @@ CLASS cty net/minecraft/client/gui/ContainerGuiRegistry FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b GUI_FACTORIES Ljava/util/Map; METHOD a checkData ()Z - METHOD a openGui (Lauf;Lcpy;ILjc;)V + METHOD a openScreen (Lauf;Lcpy;ILjc;)V ARG 0 containerType ARG 1 client ARG 2 syncId diff --git a/mappings/net/minecraft/client/gui/MainMenuGui.mapping b/mappings/net/minecraft/client/gui/MainMenuScreen.mapping similarity index 93% rename from mappings/net/minecraft/client/gui/MainMenuGui.mapping rename to mappings/net/minecraft/client/gui/MainMenuScreen.mapping index b7168bdd4d..9df03479cc 100644 --- a/mappings/net/minecraft/client/gui/MainMenuGui.mapping +++ b/mappings/net/minecraft/client/gui/MainMenuScreen.mapping @@ -1,4 +1,4 @@ -CLASS cuk net/minecraft/client/gui/MainMenuGui +CLASS cuk net/minecraft/client/gui/MainMenuScreen FIELD A warningTitle Ljava/lang/String; FIELD B warningText Ljava/lang/String; FIELD C warningLink Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Screen.mapping similarity index 97% rename from mappings/net/minecraft/client/gui/Gui.mapping rename to mappings/net/minecraft/client/gui/Screen.mapping index 6c704c9fd6..b42a6b878d 100644 --- a/mappings/net/minecraft/client/gui/Gui.mapping +++ b/mappings/net/minecraft/client/gui/Screen.mapping @@ -1,4 +1,4 @@ -CLASS cuf net/minecraft/client/gui/Gui +CLASS cuf net/minecraft/client/gui/Screen FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD f PROTOCOLS Ljava/util/Set; FIELD g uri Ljava/net/URI; diff --git a/mappings/net/minecraft/client/gui/SplashGui.mapping b/mappings/net/minecraft/client/gui/SplashGui.mapping deleted file mode 100644 index 84837ab6b7..0000000000 --- a/mappings/net/minecraft/client/gui/SplashGui.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS ctx net/minecraft/client/gui/SplashGui - FIELD f LOGO Lqd; - FIELD g logo Lqd; diff --git a/mappings/net/minecraft/client/gui/SplashScreen.mapping b/mappings/net/minecraft/client/gui/SplashScreen.mapping new file mode 100644 index 0000000000..459222a7df --- /dev/null +++ b/mappings/net/minecraft/client/gui/SplashScreen.mapping @@ -0,0 +1,4 @@ +CLASS ctx net/minecraft/client/gui/SplashScreen + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD f LOGO Lqd; + FIELD g logo Lqd; diff --git a/mappings/net/minecraft/client/gui/WorldGenerationProgressGui.mapping b/mappings/net/minecraft/client/gui/WorldGenerationProgressScreen.mapping similarity index 80% rename from mappings/net/minecraft/client/gui/WorldGenerationProgressGui.mapping rename to mappings/net/minecraft/client/gui/WorldGenerationProgressScreen.mapping index a66d9b6c6c..5f6b0aa817 100644 --- a/mappings/net/minecraft/client/gui/WorldGenerationProgressGui.mapping +++ b/mappings/net/minecraft/client/gui/WorldGenerationProgressScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctw net/minecraft/client/gui/WorldGenerationProgressGui +CLASS ctw net/minecraft/client/gui/WorldGenerationProgressScreen FIELD a progressProvider Lvg; FIELD f STATUS_TO_COLOR Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD (Lvg;)V diff --git a/mappings/net/minecraft/client/gui/WrittenBookGui.mapping b/mappings/net/minecraft/client/gui/WrittenBookScreen.mapping similarity index 92% rename from mappings/net/minecraft/client/gui/WrittenBookGui.mapping rename to mappings/net/minecraft/client/gui/WrittenBookScreen.mapping index a564100230..0fff85b6a2 100644 --- a/mappings/net/minecraft/client/gui/WrittenBookGui.mapping +++ b/mappings/net/minecraft/client/gui/WrittenBookScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvg net/minecraft/client/gui/WrittenBookGui +CLASS cvg net/minecraft/client/gui/WrittenBookScreen FIELD a EMPTY_PAGE_PROVIDER Lcvg$a; FIELD f BOOK_TEXTURE Lqd; FIELD g pageProvider Lcvg$a; diff --git a/mappings/net/minecraft/client/gui/container/AbstractFurnaceRecipeBookGui.mapping b/mappings/net/minecraft/client/gui/container/AbstractFurnaceRecipeBookScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/container/AbstractFurnaceRecipeBookGui.mapping rename to mappings/net/minecraft/client/gui/container/AbstractFurnaceRecipeBookScreen.mapping index 388c0bf3ad..9a47410ca3 100644 --- a/mappings/net/minecraft/client/gui/container/AbstractFurnaceRecipeBookGui.mapping +++ b/mappings/net/minecraft/client/gui/container/AbstractFurnaceRecipeBookScreen.mapping @@ -1,4 +1,4 @@ -CLASS cws net/minecraft/client/gui/container/AbstractFurnaceRecipeBookGui +CLASS cws net/minecraft/client/gui/container/AbstractFurnaceRecipeBookScreen FIELD o outputSlot Laur; METHOD b isFilteringCraftable ()Z METHOD d isGuiOpen ()Z diff --git a/mappings/net/minecraft/client/gui/container/AbstractFurnaceGui.mapping b/mappings/net/minecraft/client/gui/container/AbstractFurnaceScreen.mapping similarity index 59% rename from mappings/net/minecraft/client/gui/container/AbstractFurnaceGui.mapping rename to mappings/net/minecraft/client/gui/container/AbstractFurnaceScreen.mapping index 816aba46bd..15f1236758 100644 --- a/mappings/net/minecraft/client/gui/container/AbstractFurnaceGui.mapping +++ b/mappings/net/minecraft/client/gui/container/AbstractFurnaceScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvb net/minecraft/client/gui/container/AbstractFurnaceGui +CLASS cvb net/minecraft/client/gui/container/AbstractFurnaceScreen FIELD y recipeBook Lcws; FIELD z RECIPE_BUTTON_TEXTURE Lqd; METHOD i getBackgroundTexture ()Lqd; diff --git a/mappings/net/minecraft/client/gui/container/AnvilGui.mapping b/mappings/net/minecraft/client/gui/container/AnvilGui.mapping deleted file mode 100644 index e006351ac1..0000000000 --- a/mappings/net/minecraft/client/gui/container/AnvilGui.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cvc net/minecraft/client/gui/container/AnvilGui - FIELD y BG_TEX Lqd; - FIELD z nameField Lcra; diff --git a/mappings/net/minecraft/client/gui/container/AnvilScreen.mapping b/mappings/net/minecraft/client/gui/container/AnvilScreen.mapping new file mode 100644 index 0000000000..7988f485e4 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/AnvilScreen.mapping @@ -0,0 +1,3 @@ +CLASS cvc net/minecraft/client/gui/container/AnvilScreen + FIELD y BG_TEX Lqd; + FIELD z nameField Lcra; diff --git a/mappings/net/minecraft/client/gui/container/BeaconGui.mapping b/mappings/net/minecraft/client/gui/container/BeaconScreen.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/container/BeaconGui.mapping rename to mappings/net/minecraft/client/gui/container/BeaconScreen.mapping index 25d9ecbe8e..f3cfb431bf 100644 --- a/mappings/net/minecraft/client/gui/container/BeaconGui.mapping +++ b/mappings/net/minecraft/client/gui/container/BeaconScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvd net/minecraft/client/gui/container/BeaconGui +CLASS cvd net/minecraft/client/gui/container/BeaconScreen CLASS cvd$a WidgetButtonIconCancel CLASS cvd$b WidgetButtonIconDone CLASS cvd$c WidgetButtonIconEffect diff --git a/mappings/net/minecraft/client/gui/container/BlastFurnaceGui.mapping b/mappings/net/minecraft/client/gui/container/BlastFurnaceGui.mapping deleted file mode 100644 index 81334520a5..0000000000 --- a/mappings/net/minecraft/client/gui/container/BlastFurnaceGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cve net/minecraft/client/gui/container/BlastFurnaceGui - FIELD z BG_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/container/BlastFurnaceRecipeBookGui.mapping b/mappings/net/minecraft/client/gui/container/BlastFurnaceRecipeBookScreen.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/container/BlastFurnaceRecipeBookGui.mapping rename to mappings/net/minecraft/client/gui/container/BlastFurnaceRecipeBookScreen.mapping index 5b9991199b..cdca64fe1b 100644 --- a/mappings/net/minecraft/client/gui/container/BlastFurnaceRecipeBookGui.mapping +++ b/mappings/net/minecraft/client/gui/container/BlastFurnaceRecipeBookScreen.mapping @@ -1 +1 @@ -CLASS cwt net/minecraft/client/gui/container/BlastFurnaceRecipeBookGui +CLASS cwt net/minecraft/client/gui/container/BlastFurnaceRecipeBookScreen diff --git a/mappings/net/minecraft/client/gui/container/BlastFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/container/BlastFurnaceScreen.mapping new file mode 100644 index 0000000000..98f95bb20b --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/BlastFurnaceScreen.mapping @@ -0,0 +1,2 @@ +CLASS cve net/minecraft/client/gui/container/BlastFurnaceScreen + FIELD z BG_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/CartographyTableGui.mapping b/mappings/net/minecraft/client/gui/container/CartographyTableScreen.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/CartographyTableGui.mapping rename to mappings/net/minecraft/client/gui/container/CartographyTableScreen.mapping index 76067b6108..70d2c45004 100644 --- a/mappings/net/minecraft/client/gui/CartographyTableGui.mapping +++ b/mappings/net/minecraft/client/gui/container/CartographyTableScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvi net/minecraft/client/gui/CartographyTableGui +CLASS cvi net/minecraft/client/gui/container/CartographyTableScreen FIELD y TEXTURE Lqd; METHOD (Latk;Lari;Ljc;)V ARG 1 atl2 diff --git a/mappings/net/minecraft/client/gui/container/ContainerGui54.mapping b/mappings/net/minecraft/client/gui/container/ContainerGui54.mapping deleted file mode 100644 index 262ed0ea37..0000000000 --- a/mappings/net/minecraft/client/gui/container/ContainerGui54.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cvk net/minecraft/client/gui/container/ContainerGui54 - FIELD y TEXTURE Lqd; - FIELD z rows I diff --git a/mappings/net/minecraft/client/gui/container/ContainerGui9.mapping b/mappings/net/minecraft/client/gui/container/ContainerGui9.mapping deleted file mode 100644 index 0f74d51a60..0000000000 --- a/mappings/net/minecraft/client/gui/container/ContainerGui9.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cvo net/minecraft/client/gui/container/ContainerGui9 - FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/ContainerScreen54.mapping b/mappings/net/minecraft/client/gui/container/ContainerScreen54.mapping new file mode 100644 index 0000000000..daf6d7274a --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/ContainerScreen54.mapping @@ -0,0 +1,3 @@ +CLASS cvk net/minecraft/client/gui/container/ContainerScreen54 + FIELD y TEXTURE Lqd; + FIELD z rows I diff --git a/mappings/net/minecraft/client/gui/container/ContainerScreen9.mapping b/mappings/net/minecraft/client/gui/container/ContainerScreen9.mapping new file mode 100644 index 0000000000..a5552cb266 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/ContainerScreen9.mapping @@ -0,0 +1,2 @@ +CLASS cvo net/minecraft/client/gui/container/ContainerScreen9 + FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/CraftingTableGui.mapping b/mappings/net/minecraft/client/gui/container/CraftingTableScreen.mapping similarity index 61% rename from mappings/net/minecraft/client/gui/container/CraftingTableGui.mapping rename to mappings/net/minecraft/client/gui/container/CraftingTableScreen.mapping index fe6feb479b..77c8a9ddd1 100644 --- a/mappings/net/minecraft/client/gui/container/CraftingTableGui.mapping +++ b/mappings/net/minecraft/client/gui/container/CraftingTableScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvl net/minecraft/client/gui/container/CraftingTableGui +CLASS cvl net/minecraft/client/gui/container/CraftingTableScreen FIELD A recipeBookGui Lcww; FIELD B isNarrow Z FIELD y BG_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/container/EnchantingGui.mapping b/mappings/net/minecraft/client/gui/container/EnchantingScreen.mapping similarity index 77% rename from mappings/net/minecraft/client/gui/container/EnchantingGui.mapping rename to mappings/net/minecraft/client/gui/container/EnchantingScreen.mapping index b7c305f5e9..078bcb513a 100644 --- a/mappings/net/minecraft/client/gui/container/EnchantingGui.mapping +++ b/mappings/net/minecraft/client/gui/container/EnchantingScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvr net/minecraft/client/gui/container/EnchantingGui +CLASS cvr net/minecraft/client/gui/container/EnchantingScreen FIELD A pageAngle F FIELD D nextPageTurningSpeed F FIELD E pageTurningSpeed F diff --git a/mappings/net/minecraft/client/gui/container/FurnaceGui.mapping b/mappings/net/minecraft/client/gui/container/FurnaceGui.mapping deleted file mode 100644 index a52caedc3d..0000000000 --- a/mappings/net/minecraft/client/gui/container/FurnaceGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cvs net/minecraft/client/gui/container/FurnaceGui - FIELD z BG_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/container/FurnaceRecipeBookGui.mapping b/mappings/net/minecraft/client/gui/container/FurnaceRecipeBookGui.mapping deleted file mode 100644 index efacb26c64..0000000000 --- a/mappings/net/minecraft/client/gui/container/FurnaceRecipeBookGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cxd net/minecraft/client/gui/container/FurnaceRecipeBookGui diff --git a/mappings/net/minecraft/client/gui/container/FurnaceRecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/container/FurnaceRecipeBookScreen.mapping new file mode 100644 index 0000000000..ab2fddcbb0 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/FurnaceRecipeBookScreen.mapping @@ -0,0 +1 @@ +CLASS cxd net/minecraft/client/gui/container/FurnaceRecipeBookScreen diff --git a/mappings/net/minecraft/client/gui/container/FurnaceScreen.mapping b/mappings/net/minecraft/client/gui/container/FurnaceScreen.mapping new file mode 100644 index 0000000000..33486fe820 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/FurnaceScreen.mapping @@ -0,0 +1,2 @@ +CLASS cvs net/minecraft/client/gui/container/FurnaceScreen + FIELD z BG_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/container/GrindstoneGui.mapping b/mappings/net/minecraft/client/gui/container/GrindstoneGui.mapping deleted file mode 100644 index 5e0e2fbc4e..0000000000 --- a/mappings/net/minecraft/client/gui/container/GrindstoneGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cvt net/minecraft/client/gui/container/GrindstoneGui - FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/GrindstoneScreen.mapping b/mappings/net/minecraft/client/gui/container/GrindstoneScreen.mapping new file mode 100644 index 0000000000..11c3250845 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/GrindstoneScreen.mapping @@ -0,0 +1,2 @@ +CLASS cvt net/minecraft/client/gui/container/GrindstoneScreen + FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/HopperGui.mapping b/mappings/net/minecraft/client/gui/container/HopperGui.mapping deleted file mode 100644 index 165383cbb4..0000000000 --- a/mappings/net/minecraft/client/gui/container/HopperGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cvu net/minecraft/client/gui/container/HopperGui - FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/HopperScreen.mapping b/mappings/net/minecraft/client/gui/container/HopperScreen.mapping new file mode 100644 index 0000000000..bdb7b5c5d7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/HopperScreen.mapping @@ -0,0 +1,2 @@ +CLASS cvu net/minecraft/client/gui/container/HopperScreen + FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/HorseGui.mapping b/mappings/net/minecraft/client/gui/container/HorseScreen.mapping similarity index 58% rename from mappings/net/minecraft/client/gui/container/HorseGui.mapping rename to mappings/net/minecraft/client/gui/container/HorseScreen.mapping index aed2c04d7f..2364ecf836 100644 --- a/mappings/net/minecraft/client/gui/container/HorseGui.mapping +++ b/mappings/net/minecraft/client/gui/container/HorseScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvv net/minecraft/client/gui/container/HorseGui +CLASS cvv net/minecraft/client/gui/container/HorseScreen FIELD A mouseX F FIELD B mouseY F FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/LecternGui.mapping b/mappings/net/minecraft/client/gui/container/LecternScreen.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/LecternGui.mapping rename to mappings/net/minecraft/client/gui/container/LecternScreen.mapping index 1572bd8ec8..b3496df403 100644 --- a/mappings/net/minecraft/client/gui/LecternGui.mapping +++ b/mappings/net/minecraft/client/gui/container/LecternScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvy net/minecraft/client/gui/LecternGui +CLASS cvy net/minecraft/client/gui/container/LecternScreen FIELD g lecternContainer Lauc; FIELD h listener Latp; METHOD i sendButtonPressPacket (I)V diff --git a/mappings/net/minecraft/client/gui/container/LoomGui.mapping b/mappings/net/minecraft/client/gui/container/LoomGui.mapping deleted file mode 100644 index d06008eec6..0000000000 --- a/mappings/net/minecraft/client/gui/container/LoomGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cvz net/minecraft/client/gui/container/LoomGui - FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/LoomScreen.mapping b/mappings/net/minecraft/client/gui/container/LoomScreen.mapping new file mode 100644 index 0000000000..8b75045b9a --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/LoomScreen.mapping @@ -0,0 +1,2 @@ +CLASS cvz net/minecraft/client/gui/container/LoomScreen + FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/ShulkerBoxGui.mapping b/mappings/net/minecraft/client/gui/container/ShulkerBoxGui.mapping deleted file mode 100644 index cc00bcf2cb..0000000000 --- a/mappings/net/minecraft/client/gui/container/ShulkerBoxGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cwe net/minecraft/client/gui/container/ShulkerBoxGui - FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/ShulkerBoxScreen.mapping b/mappings/net/minecraft/client/gui/container/ShulkerBoxScreen.mapping new file mode 100644 index 0000000000..22de02f4c1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/ShulkerBoxScreen.mapping @@ -0,0 +1,2 @@ +CLASS cwe net/minecraft/client/gui/container/ShulkerBoxScreen + FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/container/SmokerGui.mapping b/mappings/net/minecraft/client/gui/container/SmokerGui.mapping deleted file mode 100644 index 8c4c48f0ee..0000000000 --- a/mappings/net/minecraft/client/gui/container/SmokerGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cwg net/minecraft/client/gui/container/SmokerGui - FIELD z BG_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/container/SmokerRecipeBookGui.mapping b/mappings/net/minecraft/client/gui/container/SmokerRecipeBookGui.mapping deleted file mode 100644 index 1b7eca1c92..0000000000 --- a/mappings/net/minecraft/client/gui/container/SmokerRecipeBookGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cxe net/minecraft/client/gui/container/SmokerRecipeBookGui diff --git a/mappings/net/minecraft/client/gui/container/SmokerRecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/container/SmokerRecipeBookScreen.mapping new file mode 100644 index 0000000000..9f9e365a68 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/SmokerRecipeBookScreen.mapping @@ -0,0 +1 @@ +CLASS cxe net/minecraft/client/gui/container/SmokerRecipeBookScreen diff --git a/mappings/net/minecraft/client/gui/container/SmokerScreen.mapping b/mappings/net/minecraft/client/gui/container/SmokerScreen.mapping new file mode 100644 index 0000000000..3b689a9dc1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/container/SmokerScreen.mapping @@ -0,0 +1,2 @@ +CLASS cwg net/minecraft/client/gui/container/SmokerScreen + FIELD z BG_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/container/StonecutterGui.mapping b/mappings/net/minecraft/client/gui/container/StonecutterScreen.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/container/StonecutterGui.mapping rename to mappings/net/minecraft/client/gui/container/StonecutterScreen.mapping index 0599ec7b91..876cc15eb2 100644 --- a/mappings/net/minecraft/client/gui/container/StonecutterGui.mapping +++ b/mappings/net/minecraft/client/gui/container/StonecutterScreen.mapping @@ -1,4 +1,4 @@ -CLASS cwh net/minecraft/client/gui/container/StonecutterGui +CLASS cwh net/minecraft/client/gui/container/StonecutterScreen FIELD A mouseClicked Z FIELD B scrollOffset I FIELD C canCraft Z diff --git a/mappings/net/minecraft/client/gui/container/VillagerGui.mapping b/mappings/net/minecraft/client/gui/container/VillagerScreen.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/container/VillagerGui.mapping rename to mappings/net/minecraft/client/gui/container/VillagerScreen.mapping index c5151f61c6..3e474585ca 100644 --- a/mappings/net/minecraft/client/gui/container/VillagerGui.mapping +++ b/mappings/net/minecraft/client/gui/container/VillagerScreen.mapping @@ -1,4 +1,4 @@ -CLASS cwb net/minecraft/client/gui/container/VillagerGui +CLASS cwb net/minecraft/client/gui/container/VillagerScreen CLASS cwb$a WidgetButtonPage FIELD o next Z METHOD (IIIZ)V diff --git a/mappings/net/minecraft/client/gui/ingame/AbstractPlayerInventoryGui.mapping b/mappings/net/minecraft/client/gui/ingame/AbstractPlayerInventoryScreen.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/ingame/AbstractPlayerInventoryGui.mapping rename to mappings/net/minecraft/client/gui/ingame/AbstractPlayerInventoryScreen.mapping index 583ce95eea..171aaf12cb 100644 --- a/mappings/net/minecraft/client/gui/ingame/AbstractPlayerInventoryGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/AbstractPlayerInventoryScreen.mapping @@ -1,3 +1,3 @@ -CLASS cvp net/minecraft/client/gui/ingame/AbstractPlayerInventoryGui +CLASS cvp net/minecraft/client/gui/ingame/AbstractPlayerInventoryScreen FIELD y offsetGuiForEffects Z METHOD j drawPotionEffects ()V diff --git a/mappings/net/minecraft/client/gui/ingame/BrewingStandGui.mapping b/mappings/net/minecraft/client/gui/ingame/BrewingStandGui.mapping deleted file mode 100644 index 7805fe05d6..0000000000 --- a/mappings/net/minecraft/client/gui/ingame/BrewingStandGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cvh net/minecraft/client/gui/ingame/BrewingStandGui - FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/ingame/BrewingStandScreen.mapping b/mappings/net/minecraft/client/gui/ingame/BrewingStandScreen.mapping new file mode 100644 index 0000000000..c65c6cdc5c --- /dev/null +++ b/mappings/net/minecraft/client/gui/ingame/BrewingStandScreen.mapping @@ -0,0 +1,2 @@ +CLASS cvh net/minecraft/client/gui/ingame/BrewingStandScreen + FIELD y TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping b/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping deleted file mode 100644 index 6f14158082..0000000000 --- a/mappings/net/minecraft/client/gui/ingame/ChatGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ctg net/minecraft/client/gui/ingame/ChatGui - FIELD a chatField Lcra; diff --git a/mappings/net/minecraft/client/gui/ingame/ChatScreen.mapping b/mappings/net/minecraft/client/gui/ingame/ChatScreen.mapping new file mode 100644 index 0000000000..8c1a80906b --- /dev/null +++ b/mappings/net/minecraft/client/gui/ingame/ChatScreen.mapping @@ -0,0 +1,2 @@ +CLASS ctg net/minecraft/client/gui/ingame/ChatScreen + FIELD a chatField Lcra; diff --git a/mappings/net/minecraft/client/gui/ingame/ChatSleepingGui.mapping b/mappings/net/minecraft/client/gui/ingame/ChatSleepingGui.mapping deleted file mode 100644 index 9cac69a06e..0000000000 --- a/mappings/net/minecraft/client/gui/ingame/ChatSleepingGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ctu net/minecraft/client/gui/ingame/ChatSleepingGui diff --git a/mappings/net/minecraft/client/gui/ingame/ConfirmChatLinkGui.mapping b/mappings/net/minecraft/client/gui/ingame/ConfirmChatLinkScreen.mapping similarity index 78% rename from mappings/net/minecraft/client/gui/ingame/ConfirmChatLinkGui.mapping rename to mappings/net/minecraft/client/gui/ingame/ConfirmChatLinkScreen.mapping index d2e32bb562..484d0f314d 100644 --- a/mappings/net/minecraft/client/gui/ingame/ConfirmChatLinkGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/ConfirmChatLinkScreen.mapping @@ -1,4 +1,4 @@ -CLASS cth net/minecraft/client/gui/ingame/ConfirmChatLinkGui +CLASS cth net/minecraft/client/gui/ingame/ConfirmChatLinkScreen FIELD s warning Ljava/lang/String; FIELD t copy Ljava/lang/String; FIELD u link Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/ingame/CreativePlayerInventoryGui.mapping b/mappings/net/minecraft/client/gui/ingame/CreativePlayerInventoryScreen.mapping similarity index 98% rename from mappings/net/minecraft/client/gui/ingame/CreativePlayerInventoryGui.mapping rename to mappings/net/minecraft/client/gui/ingame/CreativePlayerInventoryScreen.mapping index e0ad6da64c..6b096a892c 100644 --- a/mappings/net/minecraft/client/gui/ingame/CreativePlayerInventoryGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/CreativePlayerInventoryScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvn net/minecraft/client/gui/ingame/CreativePlayerInventoryGui +CLASS cvn net/minecraft/client/gui/ingame/CreativePlayerInventoryScreen CLASS cvn$a METHOD (Lafq;III)V ARG 1 invSlot diff --git a/mappings/net/minecraft/client/gui/ingame/DeathGui.mapping b/mappings/net/minecraft/client/gui/ingame/DeathGui.mapping deleted file mode 100644 index f7827da1bb..0000000000 --- a/mappings/net/minecraft/client/gui/ingame/DeathGui.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS ctn net/minecraft/client/gui/ingame/DeathGui - FIELD a ticksSinceDeath I - FIELD f msg Ljc; diff --git a/mappings/net/minecraft/client/gui/ingame/DeathScreen.mapping b/mappings/net/minecraft/client/gui/ingame/DeathScreen.mapping new file mode 100644 index 0000000000..01d15f66ae --- /dev/null +++ b/mappings/net/minecraft/client/gui/ingame/DeathScreen.mapping @@ -0,0 +1,3 @@ +CLASS ctn net/minecraft/client/gui/ingame/DeathScreen + FIELD a ticksSinceDeath I + FIELD f msg Ljc; diff --git a/mappings/net/minecraft/client/gui/ingame/EditBookGui.mapping b/mappings/net/minecraft/client/gui/ingame/EditBookScreen.mapping similarity index 98% rename from mappings/net/minecraft/client/gui/ingame/EditBookGui.mapping rename to mappings/net/minecraft/client/gui/ingame/EditBookScreen.mapping index dd1dfce167..3e20e37632 100644 --- a/mappings/net/minecraft/client/gui/ingame/EditBookGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/EditBookScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvf net/minecraft/client/gui/ingame/EditBookGui +CLASS cvf net/minecraft/client/gui/ingame/EditBookScreen CLASS cvf$a Position FIELD b x I FIELD c y I diff --git a/mappings/net/minecraft/client/gui/ingame/EditSignGui.mapping b/mappings/net/minecraft/client/gui/ingame/EditSignScreen.mapping similarity index 64% rename from mappings/net/minecraft/client/gui/ingame/EditSignGui.mapping rename to mappings/net/minecraft/client/gui/ingame/EditSignScreen.mapping index e9b2ef0e8c..88f91a6a43 100644 --- a/mappings/net/minecraft/client/gui/ingame/EditSignGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/EditSignScreen.mapping @@ -1,4 +1,4 @@ -CLASS cwf net/minecraft/client/gui/ingame/EditSignGui +CLASS cwf net/minecraft/client/gui/ingame/EditSignScreen FIELD a sign Lbpk; FIELD f ticksSinceOpened I FIELD g currentRow I diff --git a/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping b/mappings/net/minecraft/client/gui/ingame/JigsawBlockScreen.mapping similarity index 81% rename from mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping rename to mappings/net/minecraft/client/gui/ingame/JigsawBlockScreen.mapping index c7f20b1340..81d26664f7 100644 --- a/mappings/net/minecraft/client/gui/ingame/JigsawBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/JigsawBlockScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvx net/minecraft/client/gui/ingame/JigsawBlockGui +CLASS cvx net/minecraft/client/gui/ingame/JigsawBlockScreen FIELD a jigsaw Lbpe; FIELD f attachmentTypeField Lcra; FIELD g targetPoolField Lcra; diff --git a/mappings/net/minecraft/client/gui/ingame/PlayerInventoryGui.mapping b/mappings/net/minecraft/client/gui/ingame/PlayerInventoryScreen.mapping similarity index 76% rename from mappings/net/minecraft/client/gui/ingame/PlayerInventoryGui.mapping rename to mappings/net/minecraft/client/gui/ingame/PlayerInventoryScreen.mapping index 1e6cac2b7d..37f0b23a81 100644 --- a/mappings/net/minecraft/client/gui/ingame/PlayerInventoryGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/PlayerInventoryScreen.mapping @@ -1,4 +1,4 @@ -CLASS cvw net/minecraft/client/gui/ingame/PlayerInventoryGui +CLASS cvw net/minecraft/client/gui/ingame/PlayerInventoryScreen FIELD A mouseX F FIELD B mouseY F FIELD C recipeBook Lcww; diff --git a/mappings/net/minecraft/client/gui/ingame/SleepingChatScreen.mapping b/mappings/net/minecraft/client/gui/ingame/SleepingChatScreen.mapping new file mode 100644 index 0000000000..7cdaa76017 --- /dev/null +++ b/mappings/net/minecraft/client/gui/ingame/SleepingChatScreen.mapping @@ -0,0 +1 @@ +CLASS ctu net/minecraft/client/gui/ingame/SleepingChatScreen diff --git a/mappings/net/minecraft/client/gui/ingame/StructureBlockGui.mapping b/mappings/net/minecraft/client/gui/ingame/StructureBlockScreen.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/ingame/StructureBlockGui.mapping rename to mappings/net/minecraft/client/gui/ingame/StructureBlockScreen.mapping index af8d7e6fd9..909a2dfb4a 100644 --- a/mappings/net/minecraft/client/gui/ingame/StructureBlockGui.mapping +++ b/mappings/net/minecraft/client/gui/ingame/StructureBlockScreen.mapping @@ -1,4 +1,4 @@ -CLASS cwi net/minecraft/client/gui/ingame/StructureBlockGui +CLASS cwi net/minecraft/client/gui/ingame/StructureBlockScreen FIELD A inputSizeY Lcra; FIELD B inputSizeZ Lcra; FIELD C inputIntegrity Lcra; diff --git a/mappings/net/minecraft/client/gui/ingame/UpdateWorldGui.mapping b/mappings/net/minecraft/client/gui/ingame/UpdateWorldGui.mapping deleted file mode 100644 index fea86aa07c..0000000000 --- a/mappings/net/minecraft/client/gui/ingame/UpdateWorldGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cxr net/minecraft/client/gui/ingame/UpdateWorldGui - FIELD g updater Lafl; diff --git a/mappings/net/minecraft/client/gui/ingame/UpdateWorldScreen.mapping b/mappings/net/minecraft/client/gui/ingame/UpdateWorldScreen.mapping new file mode 100644 index 0000000000..d0a947d663 --- /dev/null +++ b/mappings/net/minecraft/client/gui/ingame/UpdateWorldScreen.mapping @@ -0,0 +1,2 @@ +CLASS cxr net/minecraft/client/gui/ingame/UpdateWorldScreen + FIELD g updater Lafl; diff --git a/mappings/net/minecraft/client/gui/menu/AddServerGui.mapping b/mappings/net/minecraft/client/gui/menu/AddServerGui.mapping deleted file mode 100644 index f7249d1f57..0000000000 --- a/mappings/net/minecraft/client/gui/menu/AddServerGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ctr net/minecraft/client/gui/menu/AddServerGui - FIELD f parent Lcuf; diff --git a/mappings/net/minecraft/client/gui/menu/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/menu/AddServerScreen.mapping new file mode 100644 index 0000000000..3ef9badec2 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/AddServerScreen.mapping @@ -0,0 +1,2 @@ +CLASS ctr net/minecraft/client/gui/menu/AddServerScreen + FIELD f parent Lcuf; diff --git a/mappings/net/minecraft/client/gui/menu/AdvancementsGui.mapping b/mappings/net/minecraft/client/gui/menu/AdvancementsScreen.mapping similarity index 85% rename from mappings/net/minecraft/client/gui/menu/AdvancementsGui.mapping rename to mappings/net/minecraft/client/gui/menu/AdvancementsScreen.mapping index 8e147bd0ce..8bb558af63 100644 --- a/mappings/net/minecraft/client/gui/menu/AdvancementsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/AdvancementsScreen.mapping @@ -1,4 +1,4 @@ -CLASS cuu net/minecraft/client/gui/menu/AdvancementsGui +CLASS cuu net/minecraft/client/gui/menu/AdvancementsScreen FIELD a WINDOW_TEXTURE Lqd; FIELD f TABS_TEXTURE Lqd; FIELD g advancementHandler Ldby; diff --git a/mappings/net/minecraft/client/gui/menu/BackupLevelGui.mapping b/mappings/net/minecraft/client/gui/menu/BackupLevelScreen.mapping similarity index 80% rename from mappings/net/minecraft/client/gui/menu/BackupLevelGui.mapping rename to mappings/net/minecraft/client/gui/menu/BackupLevelScreen.mapping index 9813411182..fad588a7f8 100644 --- a/mappings/net/minecraft/client/gui/menu/BackupLevelGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/BackupLevelScreen.mapping @@ -1,4 +1,4 @@ -CLASS cxq net/minecraft/client/gui/menu/BackupLevelGui +CLASS cxq net/minecraft/client/gui/menu/BackupLevelScreen FIELD a saveButton Lcqw; FIELD f callback Lcti; FIELD h levelName Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping b/mappings/net/minecraft/client/gui/menu/BackupPromptScreen.mapping similarity index 87% rename from mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping rename to mappings/net/minecraft/client/gui/menu/BackupPromptScreen.mapping index 9120695912..2e82b3fbbe 100644 --- a/mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/BackupPromptScreen.mapping @@ -1,4 +1,4 @@ -CLASS cte net/minecraft/client/gui/menu/BackupPromptGui +CLASS cte net/minecraft/client/gui/menu/BackupPromptScreen CLASS cte$a Callback FIELD a callback Lcte$a; FIELD f title Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelGui.mapping b/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelGui.mapping deleted file mode 100644 index 1cadb205f9..0000000000 --- a/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ctl net/minecraft/client/gui/menu/CustomizeBuffetLevelGui diff --git a/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen.mapping new file mode 100644 index 0000000000..ee957836f4 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen.mapping @@ -0,0 +1 @@ +CLASS ctl net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen diff --git a/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelGui.mapping b/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelGui.mapping rename to mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping index 7d89a237c3..eda37f0f76 100644 --- a/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctm net/minecraft/client/gui/menu/CustomizeFlatLevelGui +CLASS ctm net/minecraft/client/gui/menu/CustomizeFlatLevelScreen CLASS ctm$a METHOD a renderGuiItemStack (IILaxd;)V ARG 1 y diff --git a/mappings/net/minecraft/client/gui/menu/DemoGui.mapping b/mappings/net/minecraft/client/gui/menu/DemoGui.mapping deleted file mode 100644 index 8be882fd02..0000000000 --- a/mappings/net/minecraft/client/gui/menu/DemoGui.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cto net/minecraft/client/gui/menu/DemoGui - FIELD a DEMO_BG Lqd; diff --git a/mappings/net/minecraft/client/gui/menu/DemoScreen.mapping b/mappings/net/minecraft/client/gui/menu/DemoScreen.mapping new file mode 100644 index 0000000000..5ad3b79cc1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/DemoScreen.mapping @@ -0,0 +1,2 @@ +CLASS cto net/minecraft/client/gui/menu/DemoScreen + FIELD a DEMO_BG Lqd; diff --git a/mappings/net/minecraft/client/gui/menu/DirectConnectServerGui.mapping b/mappings/net/minecraft/client/gui/menu/DirectConnectServerGui.mapping deleted file mode 100644 index 0dc1bfa0ee..0000000000 --- a/mappings/net/minecraft/client/gui/menu/DirectConnectServerGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ctp net/minecraft/client/gui/menu/DirectConnectServerGui diff --git a/mappings/net/minecraft/client/gui/menu/DirectConnectServerScreen.mapping b/mappings/net/minecraft/client/gui/menu/DirectConnectServerScreen.mapping new file mode 100644 index 0000000000..e4dc7d8359 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/DirectConnectServerScreen.mapping @@ -0,0 +1 @@ +CLASS ctp net/minecraft/client/gui/menu/DirectConnectServerScreen diff --git a/mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping b/mappings/net/minecraft/client/gui/menu/DisconnectedScreen.mapping similarity index 78% rename from mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping rename to mappings/net/minecraft/client/gui/menu/DisconnectedScreen.mapping index e8d79586e5..1858454e2a 100644 --- a/mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/DisconnectedScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctq net/minecraft/client/gui/menu/DisconnectedGui +CLASS ctq net/minecraft/client/gui/menu/DisconnectedScreen FIELD a title Ljava/lang/String; FIELD f reason Ljc; FIELD g reasonFormatted Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping b/mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping deleted file mode 100644 index 0d81b2f3c6..0000000000 --- a/mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cue net/minecraft/client/gui/menu/DownloadingTerrainGui diff --git a/mappings/net/minecraft/client/gui/menu/DownloadingTerrainScreen.mapping b/mappings/net/minecraft/client/gui/menu/DownloadingTerrainScreen.mapping new file mode 100644 index 0000000000..0ddb3d56e2 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/DownloadingTerrainScreen.mapping @@ -0,0 +1 @@ +CLASS cue net/minecraft/client/gui/menu/DownloadingTerrainScreen diff --git a/mappings/net/minecraft/client/gui/menu/EndCreditsGui.mapping b/mappings/net/minecraft/client/gui/menu/EndCreditsScreen.mapping similarity index 73% rename from mappings/net/minecraft/client/gui/menu/EndCreditsGui.mapping rename to mappings/net/minecraft/client/gui/menu/EndCreditsScreen.mapping index 09fff0263e..ed8ba086d3 100644 --- a/mappings/net/minecraft/client/gui/menu/EndCreditsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/EndCreditsScreen.mapping @@ -1,4 +1,4 @@ -CLASS cum net/minecraft/client/gui/menu/EndCreditsGui +CLASS cum net/minecraft/client/gui/menu/EndCreditsScreen FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD f MINECRAFT_TITLE_TEXTURE Lqd; FIELD g EDITION_TITLE_TEXTURE Lqd; diff --git a/mappings/net/minecraft/client/gui/menu/ErrorGui.mapping b/mappings/net/minecraft/client/gui/menu/ErrorScreen.mapping similarity index 72% rename from mappings/net/minecraft/client/gui/menu/ErrorGui.mapping rename to mappings/net/minecraft/client/gui/menu/ErrorScreen.mapping index 013b5ed87e..be3cfa9b67 100644 --- a/mappings/net/minecraft/client/gui/menu/ErrorGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/ErrorScreen.mapping @@ -1,4 +1,4 @@ -CLASS cts net/minecraft/client/gui/menu/ErrorGui +CLASS cts net/minecraft/client/gui/menu/ErrorScreen FIELD a title Ljava/lang/String; FIELD f message Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/gui/menu/LevelSelectGui.mapping b/mappings/net/minecraft/client/gui/menu/LevelSelectScreen.mapping similarity index 84% rename from mappings/net/minecraft/client/gui/menu/LevelSelectGui.mapping rename to mappings/net/minecraft/client/gui/menu/LevelSelectScreen.mapping index b5c2ed57ce..2816e8fbba 100644 --- a/mappings/net/minecraft/client/gui/menu/LevelSelectGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/LevelSelectScreen.mapping @@ -1,4 +1,4 @@ -CLASS cxs net/minecraft/client/gui/menu/LevelSelectGui +CLASS cxs net/minecraft/client/gui/menu/LevelSelectScreen FIELD a parent Lcuf; FIELD f title Ljava/lang/String; FIELD g searchBox Lcra; diff --git a/mappings/net/minecraft/client/gui/menu/LocalScanProgressListEntry.mapping b/mappings/net/minecraft/client/gui/menu/LocalScanProgressListEntry.mapping deleted file mode 100644 index 7244751d04..0000000000 --- a/mappings/net/minecraft/client/gui/menu/LocalScanProgressListEntry.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cwm net/minecraft/client/gui/menu/LocalScanProgressListEntry - FIELD c client Lcpy; diff --git a/mappings/net/minecraft/client/gui/menu/MultiplayerGui.mapping b/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping similarity index 62% rename from mappings/net/minecraft/client/gui/menu/MultiplayerGui.mapping rename to mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping index 2297f4e3d4..93af9d8b79 100644 --- a/mappings/net/minecraft/client/gui/menu/MultiplayerGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping @@ -1,4 +1,4 @@ -CLASS cwl net/minecraft/client/gui/menu/MultiplayerGui +CLASS cwl net/minecraft/client/gui/menu/MultiplayerScreen FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD g parent Lcuf; METHOD b setIndex (I)V diff --git a/mappings/net/minecraft/client/gui/menu/NewLevelPresetsGui.mapping b/mappings/net/minecraft/client/gui/menu/NewLevelPresetsGui.mapping deleted file mode 100644 index 2aea3b9908..0000000000 --- a/mappings/net/minecraft/client/gui/menu/NewLevelPresetsGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cuc net/minecraft/client/gui/menu/NewLevelPresetsGui diff --git a/mappings/net/minecraft/client/gui/menu/NewLevelPresetsScreen.mapping b/mappings/net/minecraft/client/gui/menu/NewLevelPresetsScreen.mapping new file mode 100644 index 0000000000..c0fdc7a9c1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/NewLevelPresetsScreen.mapping @@ -0,0 +1 @@ +CLASS cuc net/minecraft/client/gui/menu/NewLevelPresetsScreen diff --git a/mappings/net/minecraft/client/gui/menu/NewLevelGui.mapping b/mappings/net/minecraft/client/gui/menu/NewLevelScreen.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/menu/NewLevelGui.mapping rename to mappings/net/minecraft/client/gui/menu/NewLevelScreen.mapping index f1ec0ac9c9..b1c67463c3 100644 --- a/mappings/net/minecraft/client/gui/menu/NewLevelGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/NewLevelScreen.mapping @@ -1,4 +1,4 @@ -CLASS cxp net/minecraft/client/gui/menu/NewLevelGui +CLASS cxp net/minecraft/client/gui/menu/NewLevelScreen FIELD C buttonGameModeSwitch Lcqw; FIELD D buttonMoreOptions Lcqw; FIELD E buttonGenerateStructures Lcqw; diff --git a/mappings/net/minecraft/client/gui/menu/OpenToLanGui.mapping b/mappings/net/minecraft/client/gui/menu/OpenToLanScreen.mapping similarity index 79% rename from mappings/net/minecraft/client/gui/menu/OpenToLanGui.mapping rename to mappings/net/minecraft/client/gui/menu/OpenToLanScreen.mapping index c4df615d9e..8eb8508393 100644 --- a/mappings/net/minecraft/client/gui/menu/OpenToLanGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/OpenToLanScreen.mapping @@ -1,4 +1,4 @@ -CLASS cug net/minecraft/client/gui/menu/OpenToLanGui +CLASS cug net/minecraft/client/gui/menu/OpenToLanScreen FIELD a parent Lcuf; FIELD f buttonAllowCommands Lcqw; FIELD g buttonGameMode Lcqw; diff --git a/mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping b/mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping deleted file mode 100644 index dd5e418312..0000000000 --- a/mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cua net/minecraft/client/gui/menu/OutOfMemoryGui diff --git a/mappings/net/minecraft/client/gui/menu/OutOfMemoryScreen.mapping b/mappings/net/minecraft/client/gui/menu/OutOfMemoryScreen.mapping new file mode 100644 index 0000000000..3926b28b16 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/OutOfMemoryScreen.mapping @@ -0,0 +1 @@ +CLASS cua net/minecraft/client/gui/menu/OutOfMemoryScreen diff --git a/mappings/net/minecraft/client/gui/menu/PauseMenuGui.mapping b/mappings/net/minecraft/client/gui/menu/PauseMenuGui.mapping deleted file mode 100644 index 5a16b4e1cb..0000000000 --- a/mappings/net/minecraft/client/gui/menu/PauseMenuGui.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cub net/minecraft/client/gui/menu/PauseMenuGui diff --git a/mappings/net/minecraft/client/gui/menu/PauseMenuScreen.mapping b/mappings/net/minecraft/client/gui/menu/PauseMenuScreen.mapping new file mode 100644 index 0000000000..6cc0388b7a --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/PauseMenuScreen.mapping @@ -0,0 +1 @@ +CLASS cub net/minecraft/client/gui/menu/PauseMenuScreen diff --git a/mappings/net/minecraft/client/gui/menu/RealmsGui.mapping b/mappings/net/minecraft/client/gui/menu/RealmsScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/menu/RealmsGui.mapping rename to mappings/net/minecraft/client/gui/menu/RealmsScreen.mapping index 440a38e0c3..6fa1276ffd 100644 --- a/mappings/net/minecraft/client/gui/menu/RealmsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/RealmsScreen.mapping @@ -1,4 +1,4 @@ -CLASS csz net/minecraft/client/gui/menu/RealmsGui +CLASS csz net/minecraft/client/gui/menu/RealmsScreen FIELD a realmsScreen Lnet/minecraft/realms/RealmsScreen; FIELD f LOGGER_REALMS Lorg/apache/logging/log4j/Logger; METHOD a getRealmsScreen ()Lnet/minecraft/realms/RealmsScreen; diff --git a/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping b/mappings/net/minecraft/client/gui/menu/ServerConnectingScreen.mapping similarity index 71% rename from mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping rename to mappings/net/minecraft/client/gui/menu/ServerConnectingScreen.mapping index 3b9cb2084e..4f196f51c9 100644 --- a/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/ServerConnectingScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctk net/minecraft/client/gui/menu/ServerConnectingGui +CLASS ctk net/minecraft/client/gui/menu/ServerConnectingScreen FIELD f LOGGER Lorg/apache/logging/log4j/Logger; FIELD g connection Liq; FIELD i parent Lcuf; diff --git a/mappings/net/minecraft/client/gui/menu/SettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/SettingsScreen.mapping similarity index 77% rename from mappings/net/minecraft/client/gui/menu/SettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/SettingsScreen.mapping index 1fc2872eab..1cc169c78a 100644 --- a/mappings/net/minecraft/client/gui/menu/SettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/SettingsScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctz net/minecraft/client/gui/menu/SettingsGui +CLASS ctz net/minecraft/client/gui/menu/SettingsScreen FIELD a title Ljava/lang/String; FIELD g parent Lcuf; FIELD h settings Lcqa; diff --git a/mappings/net/minecraft/client/gui/menu/StatsGui.mapping b/mappings/net/minecraft/client/gui/menu/StatsGui.mapping deleted file mode 100644 index 325fe6232a..0000000000 --- a/mappings/net/minecraft/client/gui/menu/StatsGui.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cun net/minecraft/client/gui/menu/StatsGui - METHOD (Lcuf;Lyc;)V - ARG 1 parent diff --git a/mappings/net/minecraft/client/gui/menu/StatsScreen.mapping b/mappings/net/minecraft/client/gui/menu/StatsScreen.mapping new file mode 100644 index 0000000000..292a1eac11 --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/StatsScreen.mapping @@ -0,0 +1,3 @@ +CLASS cun net/minecraft/client/gui/menu/StatsScreen + METHOD (Lcuf;Lyc;)V + ARG 1 parent diff --git a/mappings/net/minecraft/client/gui/menu/WorkingGui.mapping b/mappings/net/minecraft/client/gui/menu/WorkingScreen.mapping similarity index 65% rename from mappings/net/minecraft/client/gui/menu/WorkingGui.mapping rename to mappings/net/minecraft/client/gui/menu/WorkingScreen.mapping index 64acc51c73..5267d9c93f 100644 --- a/mappings/net/minecraft/client/gui/menu/WorkingGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/WorkingScreen.mapping @@ -1,4 +1,4 @@ -CLASS cud net/minecraft/client/gui/menu/WorkingGui +CLASS cud net/minecraft/client/gui/menu/WorkingScreen FIELD a title Ljava/lang/String; FIELD f task Ljava/lang/String; FIELD g progress I diff --git a/mappings/net/minecraft/client/gui/menu/YesNoGui.mapping b/mappings/net/minecraft/client/gui/menu/YesNoScreen.mapping similarity index 91% rename from mappings/net/minecraft/client/gui/menu/YesNoGui.mapping rename to mappings/net/minecraft/client/gui/menu/YesNoScreen.mapping index ffc95eb973..6af0f1cf70 100644 --- a/mappings/net/minecraft/client/gui/menu/YesNoGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/YesNoScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctj net/minecraft/client/gui/menu/YesNoGui +CLASS ctj net/minecraft/client/gui/menu/YesNoScreen FIELD a callback Lcti; FIELD f title Ljava/lang/String; FIELD g yesTranslated Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsScreen.mapping similarity index 64% rename from mappings/net/minecraft/client/gui/menu/settings/AudioSettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/settings/AudioSettingsScreen.mapping index 4c5ad02fa8..56fa9a41f3 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/AudioSettingsScreen.mapping @@ -1,4 +1,4 @@ -CLASS cuj net/minecraft/client/gui/menu/settings/AudioSettingsGui +CLASS cuj net/minecraft/client/gui/menu/settings/AudioSettingsScreen FIELD a title Ljava/lang/String; FIELD f parent Lcuf; FIELD g settings Lcqa; diff --git a/mappings/net/minecraft/client/gui/menu/settings/ChatSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/ChatSettingsScreen.mapping similarity index 63% rename from mappings/net/minecraft/client/gui/menu/settings/ChatSettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/settings/ChatSettingsScreen.mapping index 3844802887..56e90cb552 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/ChatSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/ChatSettingsScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctf net/minecraft/client/gui/menu/settings/ChatSettingsGui +CLASS ctf net/minecraft/client/gui/menu/settings/ChatSettingsScreen FIELD a SETTINGS [Lcqa$a; FIELD f parent Lcuf; FIELD g settings Lcqa; diff --git a/mappings/net/minecraft/client/gui/menu/settings/ControlsSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/ControlsSettingsScreen.mapping similarity index 96% rename from mappings/net/minecraft/client/gui/menu/settings/ControlsSettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/settings/ControlsSettingsScreen.mapping index a0b1436a23..03c853ab19 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/ControlsSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/ControlsSettingsScreen.mapping @@ -1,4 +1,4 @@ -CLASS cux net/minecraft/client/gui/menu/settings/ControlsSettingsGui +CLASS cux net/minecraft/client/gui/menu/settings/ControlsSettingsScreen FIELD a title Ljava/lang/String; FIELD h SETTINGS [Lcqa$a; FIELD i parent Lcuf; diff --git a/mappings/net/minecraft/client/gui/menu/settings/LanguageSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/LanguageSettingsScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/menu/settings/LanguageSettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/settings/LanguageSettingsScreen.mapping index 0ecb8a6fdc..19f078ec49 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/LanguageSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/LanguageSettingsScreen.mapping @@ -1,4 +1,4 @@ -CLASS ctv net/minecraft/client/gui/menu/settings/LanguageSettingsGui +CLASS ctv net/minecraft/client/gui/menu/settings/LanguageSettingsScreen FIELD g settings Lcqa; FIELD h languageManager Ldpg; METHOD (Lcuf;Lcqa;Ldpg;)V diff --git a/mappings/net/minecraft/client/gui/menu/settings/ResourcePackSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/ResourcePackSettingsScreen.mapping similarity index 87% rename from mappings/net/minecraft/client/gui/menu/settings/ResourcePackSettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/settings/ResourcePackSettingsScreen.mapping index 52d7d9a887..cf4057da58 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/ResourcePackSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/ResourcePackSettingsScreen.mapping @@ -1,2 +1,2 @@ -CLASS cxg net/minecraft/client/gui/menu/settings/ResourcePackSettingsGui +CLASS cxg net/minecraft/client/gui/menu/settings/ResourcePackSettingsScreen FIELD a parent Lcuf; diff --git a/mappings/net/minecraft/client/gui/menu/settings/SkinSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/SkinSettingsGui.mapping deleted file mode 100644 index 0a2051f5c7..0000000000 --- a/mappings/net/minecraft/client/gui/menu/settings/SkinSettingsGui.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cuh net/minecraft/client/gui/menu/settings/SkinSettingsGui - FIELD a parent Lcuf; - FIELD f title Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/menu/settings/SkinSettingsScreen.mapping b/mappings/net/minecraft/client/gui/menu/settings/SkinSettingsScreen.mapping new file mode 100644 index 0000000000..e7603a80da --- /dev/null +++ b/mappings/net/minecraft/client/gui/menu/settings/SkinSettingsScreen.mapping @@ -0,0 +1,3 @@ +CLASS cuh net/minecraft/client/gui/menu/settings/SkinSettingsScreen + FIELD a parent Lcuf; + FIELD f title Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/menu/settings/SnooperSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/SnooperSettingsScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/menu/settings/SnooperSettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/settings/SnooperSettingsScreen.mapping index 8fcf0d6e8c..cccc6ce030 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/SnooperSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/SnooperSettingsScreen.mapping @@ -1,4 +1,4 @@ -CLASS cui net/minecraft/client/gui/menu/settings/SnooperSettingsGui +CLASS cui net/minecraft/client/gui/menu/settings/SnooperSettingsScreen FIELD a parent Lcuf; FIELD f settings Lcqa; METHOD (Lcuf;Lcqa;)V diff --git a/mappings/net/minecraft/client/gui/menu/settings/VideoSettingsGui.mapping b/mappings/net/minecraft/client/gui/menu/settings/VideoSettingsScreen.mapping similarity index 69% rename from mappings/net/minecraft/client/gui/menu/settings/VideoSettingsGui.mapping rename to mappings/net/minecraft/client/gui/menu/settings/VideoSettingsScreen.mapping index 09198f34e3..20ee7ad490 100644 --- a/mappings/net/minecraft/client/gui/menu/settings/VideoSettingsGui.mapping +++ b/mappings/net/minecraft/client/gui/menu/settings/VideoSettingsScreen.mapping @@ -1,4 +1,4 @@ -CLASS cul net/minecraft/client/gui/menu/settings/VideoSettingsGui +CLASS cul net/minecraft/client/gui/menu/settings/VideoSettingsScreen FIELD a title Ljava/lang/String; FIELD f parent Lcuf; FIELD g settings Lcqa; diff --git a/mappings/net/minecraft/client/gui/menu/LevelSelectEntryWidget.mapping b/mappings/net/minecraft/client/gui/widget/LevelSelectEntryWidget.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/menu/LevelSelectEntryWidget.mapping rename to mappings/net/minecraft/client/gui/widget/LevelSelectEntryWidget.mapping index 0c0adf98f7..bdc5711e6e 100644 --- a/mappings/net/minecraft/client/gui/menu/LevelSelectEntryWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/LevelSelectEntryWidget.mapping @@ -1,4 +1,4 @@ -CLASS cxt net/minecraft/client/gui/menu/LevelSelectEntryWidget +CLASS cxt net/minecraft/client/gui/widget/LevelSelectEntryWidget FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d DATE_FORMAT Ljava/text/DateFormat; FIELD e UNKNOWN_SERVER_TEX Lqd; diff --git a/mappings/net/minecraft/client/gui/widget/LocalScanProgressListEntry.mapping b/mappings/net/minecraft/client/gui/widget/LocalScanProgressListEntry.mapping new file mode 100644 index 0000000000..553fd4e839 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/LocalScanProgressListEntry.mapping @@ -0,0 +1,2 @@ +CLASS cwm net/minecraft/client/gui/widget/LocalScanProgressListEntry + FIELD c client Lcpy; diff --git a/mappings/net/minecraft/client/gui/menu/LocalServerListEntry.mapping b/mappings/net/minecraft/client/gui/widget/LocalServerListEntry.mapping similarity index 72% rename from mappings/net/minecraft/client/gui/menu/LocalServerListEntry.mapping rename to mappings/net/minecraft/client/gui/widget/LocalServerListEntry.mapping index c9655a5394..91118f4670 100644 --- a/mappings/net/minecraft/client/gui/menu/LocalServerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/widget/LocalServerListEntry.mapping @@ -1,4 +1,4 @@ -CLASS cwn net/minecraft/client/gui/menu/LocalServerListEntry +CLASS cwn net/minecraft/client/gui/widget/LocalServerListEntry FIELD c client Lcpy; FIELD d entry Ldrj; FIELD e gui Lcwl; diff --git a/mappings/net/minecraft/client/gui/menu/RemoteServerListEntry.mapping b/mappings/net/minecraft/client/gui/widget/RemoteServerListEntry.mapping similarity index 81% rename from mappings/net/minecraft/client/gui/menu/RemoteServerListEntry.mapping rename to mappings/net/minecraft/client/gui/widget/RemoteServerListEntry.mapping index 21008bc017..5b3f55de1d 100644 --- a/mappings/net/minecraft/client/gui/menu/RemoteServerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/widget/RemoteServerListEntry.mapping @@ -1,4 +1,4 @@ -CLASS cwo net/minecraft/client/gui/menu/RemoteServerListEntry +CLASS cwo net/minecraft/client/gui/widget/RemoteServerListEntry FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d PING_THREAD_POOL Ljava/util/concurrent/ThreadPoolExecutor; FIELD e UNKNOWN_SERVER Lqd; diff --git a/mappings/net/minecraft/client/gui/menu/ServerListGuiWidget.mapping b/mappings/net/minecraft/client/gui/widget/ServerListWidget.mapping similarity index 80% rename from mappings/net/minecraft/client/gui/menu/ServerListGuiWidget.mapping rename to mappings/net/minecraft/client/gui/widget/ServerListWidget.mapping index 70306e4a89..cc5841d1b4 100644 --- a/mappings/net/minecraft/client/gui/menu/ServerListGuiWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ServerListWidget.mapping @@ -1,6 +1,6 @@ -CLASS cwp net/minecraft/client/gui/menu/ServerListGuiWidget +CLASS cwp net/minecraft/client/gui/widget/ServerListWidget CLASS cwp$a Entry - FIELD v guiMultiplayer Lcwl; + FIELD v multiplayerScreen Lcwl; FIELD w userServers Ljava/util/List; FIELD x localScanWidget Lcwp$a; FIELD y lanServers Ljava/util/List; diff --git a/mappings/net/minecraft/client/network/packet/GuiActionConfirmClientPacket.mapping b/mappings/net/minecraft/client/network/packet/ConfirmGuiActionClientPacket.mapping similarity index 74% rename from mappings/net/minecraft/client/network/packet/GuiActionConfirmClientPacket.mapping rename to mappings/net/minecraft/client/network/packet/ConfirmGuiActionClientPacket.mapping index 267be2edce..b7c7000c8a 100644 --- a/mappings/net/minecraft/client/network/packet/GuiActionConfirmClientPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/ConfirmGuiActionClientPacket.mapping @@ -1,4 +1,4 @@ -CLASS km net/minecraft/client/network/packet/GuiActionConfirmClientPacket +CLASS km net/minecraft/client/network/packet/ConfirmGuiActionClientPacket FIELD a id I FIELD b actionId S FIELD c accepted Z