diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 949c313748..035fcaf9f8 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -122,9 +122,10 @@ CLASS none/bdr net/minecraft/client/MinecraftGame ARG 0 runnable METHOD a checkGlError (Ljava/lang/String;)V ARG 0 title - METHOD a (Ljava/lang/String;Ljava/lang/String;Lnone/aiz;)V - ARG 0 levelId - ARG 1 levelName + METHOD a startIntegratedServer (Ljava/lang/String;Ljava/lang/String;Lnone/aiz;)V + ARG 0 name + ARG 1 displayName + ARG 2 levelInfo METHOD a serializeBlockEntityTag (Lnone/aes;Lnone/are;)Lnone/aes; ARG 0 stack ARG 1 blockEntity diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Gui.mapping index 450beeaf58..842bae64ae 100644 --- a/mappings/net/minecraft/client/gui/Gui.mapping +++ b/mappings/net/minecraft/client/gui/Gui.mapping @@ -22,6 +22,7 @@ CLASS none/bgn net/minecraft/client/gui/Gui ARG 0 mouseX ARG 1 mouseY ARG 2 mouseButton + METHOD a mouseDragged (IIIJ)V METHOD a drawTooltip (Ljava/lang/String;II)V ARG 0 text ARG 1 x diff --git a/mappings/net/minecraft/client/gui/GuiContainer.mapping b/mappings/net/minecraft/client/gui/GuiContainer.mapping index 4014c73f0d..2e6d3152fc 100644 --- a/mappings/net/minecraft/client/gui/GuiContainer.mapping +++ b/mappings/net/minecraft/client/gui/GuiContainer.mapping @@ -23,6 +23,10 @@ CLASS none/bhf net/minecraft/client/gui/GuiContainer ARG 0 mouseX ARG 1 mouseY ARG 2 mouseButton + METHOD a mouseDragged (IIIJ)V + ARG 0 mouseX + ARG 1 mouseY + ARG 2 mouseButton METHOD a onMouseClick (Lnone/acv;IILnone/acb;)V ARG 0 slot ARG 1 invSlot diff --git a/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping index 6ee02abc5f..ae654fbb93 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiRealms.mapping @@ -21,14 +21,32 @@ CLASS none/bfl net/minecraft/client/gui/menu/GuiRealms ARG 3 bottom ARG 4 color1 ARG 5 color2 + METHOD a mouseDragged (IIIJ)V + ARG 0 mouseX + ARG 1 mouseY + ARG 2 mouseButton + METHOD a wrapStringToList (Ljava/lang/String;I)Ljava/util/List; METHOD a drawTooltip (Ljava/lang/String;II)V ARG 0 text ARG 1 x ARG 2 y + METHOD a drawStringCentered (Ljava/lang/String;III)V + ARG 0 text + ARG 1 x + ARG 2 y + ARG 3 color + METHOD a drawString (Ljava/lang/String;IIIZ)V + ARG 0 text + ARG 1 x + ARG 2 y + ARG 3 color + ARG 4 shadow METHOD a drawTooltip (Ljava/util/List;II)V ARG 0 text ARG 1 x ARG 2 y + METHOD a addButton (Lnet/minecraft/realms/RealmsButton;)V + ARG 0 button METHOD a drawStackTooltip (Lnone/aes;II)V ARG 0 stack ARG 1 x @@ -50,10 +68,21 @@ CLASS none/bfl net/minecraft/client/gui/menu/GuiRealms ARG 3 height ARG 4 u ARG 5 v + METHOD b drawString (Ljava/lang/String;III)V + ARG 0 text + ARG 1 x + ARG 2 y + ARG 3 color + METHOD b removeButton (Lnet/minecraft/realms/RealmsButton;)V + ARG 0 button METHOD c drawBackground ()V + METHOD c getStringWidth (Ljava/lang/String;)I + ARG 0 str METHOD d_ drawBackground (I)V ARG 0 id METHOD e update ()V + METHOD i clearWidgets ()V + METHOD j getButtons ()Ljava/util/List; METHOD k handleMouseEvent ()V METHOD l handleKeyboardEvent ()V METHOD m onClosed ()V diff --git a/mappings/net/minecraft/client/gui/widget/WidgetRealmsButton.mapping b/mappings/net/minecraft/client/gui/widget/WidgetRealmsButton.mapping new file mode 100644 index 0000000000..edf067bed1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/WidgetRealmsButton.mapping @@ -0,0 +1,41 @@ +CLASS none/bfj net/minecraft/client/gui/widget/WidgetRealmsButton + FIELD o realmsButton Lnet/minecraft/realms/RealmsButton; + METHOD (Lnet/minecraft/realms/RealmsButton;IIILjava/lang/String;)V + ARG 0 button + ARG 1 id + ARG 2 x + ARG 3 y + ARG 4 text + METHOD (Lnet/minecraft/realms/RealmsButton;IIILjava/lang/String;II)V + ARG 0 button + ARG 1 id + ARG 2 x + ARG 3 y + ARG 4 text + ARG 5 width + ARG 6 height + METHOD a released (II)V + ARG 0 mouseX + ARG 1 mouseY + METHOD a setText (Ljava/lang/String;)V + ARG 0 value + METHOD a getTextureId (Z)I + ARG 0 pressed + METHOD b getWidth ()I + METHOD b drawBackground (Lnone/bdr;II)V + ARG 0 game + ARG 1 mouseX + ARG 2 mouseY + METHOD b setEnabled (Z)V + ARG 0 value + METHOD c getId ()I + METHOD c isWithinBounds (Lnone/bdr;II)Z + ARG 0 game + ARG 1 mouseX + ARG 2 mouseY + METHOD c getTexId (Z)I + ARG 0 value + METHOD d getEnabled ()Z + METHOD e getY ()I + METHOD f getRealmsButton ()Lnet/minecraft/realms/RealmsButton; + METHOD g getHeight ()I diff --git a/mappings/net/minecraft/client/settings/ServerEntry.mapping b/mappings/net/minecraft/client/settings/ServerEntry.mapping index fc284bd2ee..c24dcc6783 100644 --- a/mappings/net/minecraft/client/settings/ServerEntry.mapping +++ b/mappings/net/minecraft/client/settings/ServerEntry.mapping @@ -12,6 +12,7 @@ CLASS none/bmk net/minecraft/client/settings/ServerEntry FIELD e ping J FIELD f protocolVersion I FIELD g version Ljava/lang/String; + FIELD i playerListSummary Ljava/lang/String; FIELD j resourcePackState Lnone/bmk$a; FIELD k icon Ljava/lang/String; FIELD l local Z diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 678e86702d..60151c1343 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -29,6 +29,7 @@ CLASS none/eq net/minecraft/network/ClientConnection FIELD p disconnected Z METHOD (Lnone/fm;)V ARG 0 side + METHOD a tick ()V METHOD a setMinCompressedSize (I)V ARG 0 value METHOD a (Lio/netty/channel/ChannelHandlerContext;Lnone/fl;)V diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index 9e9e9304e7..628231b0b6 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -6,14 +6,21 @@ CLASS none/cam net/minecraft/server/IntegratedServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; FIELD l game Lnone/bdr; FIELD m levelInfo Lnone/aiz; + FIELD o openedToLan Z + FIELD p lanPinger Lnone/caq; METHOD (Lnone/bdr;Ljava/lang/String;Ljava/lang/String;Lnone/aiz;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V ARG 0 game - ARG 1 levelId - ARG 2 levelName + ARG 1 levelName + ARG 2 displayName ARG 3 levelInfo + ARG 4 authService + ARG 5 sessionService + ARG 6 profileRepo + ARG 7 userCache METHOD A getRunDirectory ()Ljava/io/File; METHOD C doServerTick ()V METHOD Z isSnooperEnabled ()Z + METHOD a isOpenToLan ()Z METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/ajb;Ljava/lang/String;)V ARG 0 oldLevelName ARG 1 levelName @@ -22,7 +29,7 @@ CLASS none/cam net/minecraft/server/IntegratedServer ARG 4 generatorOptions METHOD a setGameMode (Lnone/aiu;)V ARG 0 gameMode - METHOD a (Lnone/aiu;Z)Ljava/lang/String; + METHOD a openToLan (Lnone/aiu;Z)Ljava/lang/String; ARG 0 gameMode ARG 1 cheatsAllowed METHOD a setDifficulty (Lnone/qz;)V @@ -38,7 +45,7 @@ CLASS none/cam net/minecraft/server/IntegratedServer METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; ARG 0 report METHOD i createCommandManager ()Lnone/bc; - METHOD j ()Z + METHOD j setupServer ()Z METHOD m shouldGenerateStructures ()Z METHOD n getGameMode ()Lnone/aiu; METHOD o getDifficulty ()Lnone/qz; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index e151fba491..30f9bfdf49 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -23,8 +23,9 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD G worldHeight I FIELD H playerIdleTimeout I FIELD I keyPair Ljava/security/KeyPair; - FIELD K levelId Ljava/lang/String; - FIELD L levelName Ljava/lang/String; + FIELD J userName Ljava/lang/String; + FIELD K levelName Ljava/lang/String; + FIELD L displayName Ljava/lang/String; FIELD M demo Z FIELD N bonusChest Z FIELD O resourcePackUrl Ljava/lang/String; @@ -88,8 +89,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD P getServerPort ()I METHOD Q getUserName ()Ljava/lang/String; METHOD R isSinglePlayer ()Z - METHOD S getLevelId ()Ljava/lang/String; - METHOD T getLevelName ()Ljava/lang/String; + METHOD S getLevelName ()Ljava/lang/String; + METHOD T getServerName ()Ljava/lang/String; METHOD U isMonsterSpawningEnabled ()Z METHOD V isDemo ()Z METHOD W getLevelStorage ()Lnone/bax; @@ -122,7 +123,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 job METHOD a setGameMode (Lnone/aiu;)V ARG 0 gameMode - METHOD a (Lnone/aiu;Z)Ljava/lang/String; + METHOD a openToLan (Lnone/aiu;Z)Ljava/lang/String; ARG 0 gameMode ARG 1 cheatsAllowed METHOD a canModifyBlock (Lnone/aiw;Lnone/cn;Lnone/aam;)Z @@ -234,16 +235,18 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 value METHOD h_ getName ()Ljava/lang/String; METHOD i createCommandManager ()Lnone/bc; + METHOD i setUserName (Ljava/lang/String;)V + ARG 0 value METHOD i setFlightEnabled (Z)V ARG 0 value METHOD i_ getNameComponent ()Lnone/fa; - METHOD j ()Z - METHOD j setLevelId (Ljava/lang/String;)V + METHOD j setupServer ()Z + METHOD j setLevelName (Ljava/lang/String;)V ARG 0 value METHOD j setForceGameMode (Z)V ARG 0 value METHOD k getCurrentTaskName ()Ljava/lang/String; - METHOD k setLevelName (Ljava/lang/String;)V + METHOD k setServerName (Ljava/lang/String;)V ARG 0 value METHOD l generateTerrain ()V METHOD l setMotd (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/ServerNetworkManager.mapping b/mappings/net/minecraft/server/ServerNetworkManager.mapping index 49ede694ad..8a0152fdb7 100644 --- a/mappings/net/minecraft/server/ServerNetworkManager.mapping +++ b/mappings/net/minecraft/server/ServerNetworkManager.mapping @@ -8,14 +8,29 @@ CLASS none/mf net/minecraft/server/ServerNetworkManager CLASS none/mf$3 METHOD a createInstance ()Lio/netty/channel/local/LocalEventLoopGroup; METHOD b createInstance ()Ljava/lang/Object; + CLASS none/mf$4 + METHOD initChannel (Lio/netty/channel/Channel;)V + ARG 0 channel + CLASS none/mf$5 + METHOD initChannel (Lio/netty/channel/Channel;)V + ARG 0 channel CLASS none/mf$6 METHOD a call ()Ljava/lang/String; + FIELD a nioEventLoop Lnone/on; + FIELD b epollEventLoop Lnone/on; + FIELD c localEventLoop Lnone/on; FIELD d running Z FIELD e LOGGER Lorg/apache/logging/log4j/Logger; FIELD f server Lnet/minecraft/server/MinecraftServer; + FIELD g channels Ljava/util/List; + FIELD h clientConnections Ljava/util/List; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 0 server - METHOD a ()Ljava/net/SocketAddress; + METHOD a setupLocalChannel ()Ljava/net/SocketAddress; + METHOD a setupServerChannel (Ljava/net/InetAddress;I)V + ARG 0 addr + ARG 1 port METHOD b stop ()V METHOD b getServer (Lnone/mf;)Lnet/minecraft/server/MinecraftServer; + METHOD c tick ()V METHOD d getServer ()Lnet/minecraft/server/MinecraftServer; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 16764265e7..c93248c955 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -40,7 +40,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer ARG 1 defaultValue METHOD a setGameMode (Lnone/aiu;)V ARG 0 gameMode - METHOD a (Lnone/aiu;Z)Ljava/lang/String; + METHOD a openToLan (Lnone/aiu;Z)Ljava/lang/String; ARG 0 gameMode ARG 1 cheatsAllowed METHOD a canModifyBlock (Lnone/aiw;Lnone/cn;Lnone/aam;)Z @@ -60,7 +60,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer METHOD a_ executeCommand (Ljava/lang/String;)Ljava/lang/String; ARG 0 command METHOD aa isDedicated ()Z - METHOD af isUsingNativeTransport ()Z + METHOD af canUseEpoll ()Z METHOD ai areCommandBlocksEnabled ()Z METHOD am getConfigManager ()Lnone/mr; METHOD ap hasGui ()Z @@ -75,7 +75,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer METHOD e_ getPort ()I METHOD f_ getMOTD ()Ljava/lang/String; METHOD g_ getPluginInfoString ()Ljava/lang/String; - METHOD j ()Z + METHOD j setupServer ()Z METHOD m shouldGenerateStructures ()Z METHOD n getGameMode ()Lnone/aiu; METHOD o getDifficulty ()Lnone/qz; diff --git a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping b/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping index 8d8cc793a4..81e749c531 100644 --- a/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping +++ b/mappings/net/minecraft/sortme/ServerEntryNetworkPart.mapping @@ -14,6 +14,7 @@ CLASS none/bmm net/minecraft/sortme/ServerEntryNetworkPart ARG 0 channel FIELD a ZERO_SPLITTER Lcom/google/common/base/Splitter; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c clientConnections Ljava/util/List; METHOD a refresh (Lnone/bmk;)V ARG 0 serverEntry METHOD b ping (Lnone/bmk;)V diff --git a/mappings/none/lq.mapping b/mappings/net/minecraft/sortme/WorldServerSomething.mapping similarity index 73% rename from mappings/none/lq.mapping rename to mappings/net/minecraft/sortme/WorldServerSomething.mapping index e111c05bfb..b34f5ed037 100644 --- a/mappings/none/lq.mapping +++ b/mappings/net/minecraft/sortme/WorldServerSomething.mapping @@ -1,4 +1,4 @@ -CLASS none/lq +CLASS none/lq net/minecraft/sortme/WorldServerSomething CLASS none/lq$1 METHOD a onSetSize (Lnone/atg;D)V ARG 0 border @@ -24,5 +24,11 @@ CLASS none/lq METHOD c onSetSafeZone (Lnone/atg;D)V ARG 0 border ARG 1 safeZone + FIELD a parent Lnone/lu; + METHOD (Lnet/minecraft/server/MinecraftServer;Lnone/bav;ILnone/lu;Lnone/os;)V + ARG 0 gameServer + ARG 1 saveHandler + ARG 3 parent + ARG 4 profiler METHOD a saveLevel ()V METHOD b ()Lnone/aiw; diff --git a/mappings/none/bar.mapping b/mappings/net/minecraft/world/level/LevelPropertiesImmutable.mapping similarity index 94% rename from mappings/none/bar.mapping rename to mappings/net/minecraft/world/level/LevelPropertiesImmutable.mapping index 4a6ee0a011..31e8920466 100644 --- a/mappings/none/bar.mapping +++ b/mappings/net/minecraft/world/level/LevelPropertiesImmutable.mapping @@ -1,4 +1,5 @@ -CLASS none/bar +CLASS none/bar net/minecraft/world/level/LevelPropertiesImmutable + FIELD b properties Lnone/bau; METHOD a getSeed ()J METHOD a setSpawnX (I)V ARG 0 value diff --git a/mappings/none/bfj.mapping b/mappings/none/bfj.mapping deleted file mode 100644 index 31bae37073..0000000000 --- a/mappings/none/bfj.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS none/bfj - FIELD o realmsButton Lnet/minecraft/realms/RealmsButton; - METHOD a released (II)V - ARG 0 mouseX - ARG 1 mouseY - METHOD a getTextureId (Z)I - ARG 0 pressed - METHOD b getWidth ()I - METHOD b drawBackground (Lnone/bdr;II)V - ARG 0 game - ARG 1 mouseX - ARG 2 mouseY - METHOD c isWithinBounds (Lnone/bdr;II)Z - ARG 0 game - ARG 1 mouseX - ARG 2 mouseY