diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index adffcb5787..93191fe2f7 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -1,5 +1,13 @@ CLASS none/boe net/minecraft/client/player/EntityPlayerClient + FIELD bY statManager Lnone/nz; FIELD d networkHandler Lnone/bmc; + FIELD f mc Lnone/bdo; + METHOD (Lnone/bdo;Lnone/aiu;Lnone/bmc;Lnone/nz;)V + ARG 0 mc + ARG 1 world + ARG 2 networkHandler + ARG 3 statManager + METHOD G getStatManager ()Lnone/nz; METHOD a appendCommandFeedback (Lnone/fa;)V ARG 0 component METHOD a addChatMsg (Lnone/fa;Z)V diff --git a/mappings/net/minecraft/network/IServer.mapping b/mappings/net/minecraft/network/IServer.mapping index 4c79fbedc5..c075937e0e 100644 --- a/mappings/net/minecraft/network/IServer.mapping +++ b/mappings/net/minecraft/network/IServer.mapping @@ -1,8 +1,9 @@ CLASS none/la net/minecraft/network/IServer METHOD G getVersion ()Ljava/lang/String; METHOD H getCurrentPlayerCount ()I - METHOD I getMaxPlayers ()I - METHOD J getConnectedPlayers ()[Ljava/lang/String; + METHOD I getMaxPlayerCount ()I + METHOD J getPlayerNames ()[Ljava/lang/String; + METHOD S getWorldName ()Ljava/lang/String; METHOD a saveProperties ()V METHOD a getInt (Ljava/lang/String;I)I ARG 0 key @@ -21,3 +22,4 @@ CLASS none/la net/minecraft/network/IServer ARG 0 msg METHOD e_ getPort ()I METHOD f_ getMOTD ()Ljava/lang/String; + METHOD g (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index 13f1893109..ee729a845d 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -2,8 +2,10 @@ CLASS none/caj net/minecraft/server/IntegratedServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; FIELD l mc Lnone/bdo; METHOD A getRunDirectory ()Ljava/io/File; + METHOD C doServerTick ()V METHOD Z isSnooperEnabled ()Z METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aiz;Ljava/lang/String;)V + ARG 0 worldName METHOD a setGameMode (Lnone/ais;)V ARG 0 gameMode METHOD a (Lnone/qx;)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 6e37a6c872..088c874c27 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -4,20 +4,30 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD C pvpEnabled Z FIELD D flightEnabled Z FIELD E motd Ljava/lang/String; + FIELD F worldHeight I FIELD G playerIdleTimeout I FIELD H keyPair Ljava/security/KeyPair; + FIELD J worldName Ljava/lang/String; FIELD L demo Z FIELD M bonusChest Z FIELD R currentTaskName Ljava/lang/String; FIELD T forceGameMode Z + FIELD U authService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; + FIELD V sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; + FIELD W gameProfileRepo Lcom/mojang/authlib/GameProfileRepository; + FIELD X userCache Lnone/mn; FIELD Z serverThread Ljava/lang/Thread; FIELD a USER_CACHE_FILE Ljava/io/File; FIELD aa serverStartTime J FIELD b commandManager Lnone/m; FIELD c profiler Lnone/os; FIELD d worlds [Lnone/lu; + FIELD e proxy Ljava/net/Proxy; + FIELD f currentOperation Ljava/lang/String; + FIELD g currentOperationPercent I FIELD k LOGGER Lorg/apache/logging/log4j/Logger; FIELD m snooper Lnone/rj; + FIELD n gameDir Ljava/io/File; FIELD p networkManager Lnone/mf; FIELD q metadata Lnone/ke; FIELD r rand Ljava/util/Random; @@ -25,15 +35,31 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD u serverPort I FIELD v serverConfigManager Lnone/mr; FIELD w running Z + FIELD x stopped Z FIELD z onlineMode Z + METHOD (Ljava/io/File;Ljava/net/Proxy;Lnone/pf;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V + ARG 0 gameDir + ARG 1 proxy + ARG 3 authService + ARG 4 sessionService + ARG 5 gameProfileRepo + ARG 6 userCache METHOD A getRunDirectory ()Ljava/io/File; METHOD B exit ()V + METHOD C doServerTick ()V + METHOD D doLevelTick ()V METHOD E isNetherAllowed ()Z METHOD F start ()V METHOD G getVersion ()Ljava/lang/String; + METHOD H getCurrentPlayerCount ()I + METHOD I getMaxPlayerCount ()I + METHOD J getPlayerNames ()[Ljava/lang/String; + METHOD K getPlayerProfiles ()[Lcom/mojang/authlib/GameProfile; METHOD N getCommandManager ()Lnone/m; METHOD O getKeyPair ()Ljava/security/KeyPair; METHOD P getServerPort ()I + METHOD R isSinglePlayer ()Z + METHOD S getWorldName ()Ljava/lang/String; METHOD U isMonsterSpawningEnabled ()Z METHOD V isDemo ()Z METHOD Z isSnooperEnabled ()Z @@ -42,23 +68,38 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; METHOD a convertSave (Ljava/lang/String;)V METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aiz;Ljava/lang/String;)V + ARG 0 worldName + METHOD a loadWorldResourcePack (Ljava/lang/String;Lnone/bas;)V + ARG 0 gameDir + ARG 1 worldSaveHandler METHOD a setKeyPair (Ljava/security/KeyPair;)V ARG 0 value + METHOD a getEntityByUuid (Ljava/util/UUID;)Lnone/se; + ARG 0 uuid METHOD a setGameMode (Lnone/ais;)V ARG 0 gameMode METHOD a appendCommandFeedback (Lnone/fa;)V ARG 0 component METHOD a loadServerIcon (Lnone/ke;)V + ARG 0 metadata METHOD a getSpawnRadius (Lnone/lu;)I ARG 0 world + METHOD a setConfigManager (Lnone/mr;)V + ARG 0 serverConfigManager METHOD a (Lnone/qx;)V METHOD a saveWorlds (Z)V ARG 0 dontLog + METHOD aA getUserCache ()Lnone/mn; + METHOD aB getMetadata ()Lnone/ke; METHOD aD getMaxWorldBorderRadius ()I METHOD aE isMainThread ()Z METHOD aF getNetworkCompressionThreshold ()I + METHOD aG getServerStartTime ()J METHOD aH getMainThread ()Ljava/lang/Thread; METHOD aJ getLogger ()Lorg/apache/logging/log4j/Logger; + METHOD a_ updateSpawnAreaProgress (Ljava/lang/String;I)V + ARG 0 message + ARG 1 percentage METHOD a_ setResourcePack (Ljava/lang/String;Ljava/lang/String;)V METHOD aa isDedicated ()Z METHOD ab isOnlineMode ()Z @@ -69,13 +110,19 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD ag isFlightEnabled ()Z METHOD ah areCommandBlocksEnabled ()Z METHOD ai getMotd ()Ljava/lang/String; + METHOD aj getWorldHeight ()I + METHOD ak isStopped ()Z + METHOD al getConfigManager ()Lnone/mr; METHOD am getNetworkManager ()Lnone/mf; METHOD ar getSnooper ()Lnone/rj; METHOD as isSpawnProtectionEnabled ()I METHOD at shouldForceGameMode ()Z + METHOD au getProxy ()Ljava/net/Proxy; METHOD av getCurrentTimeMillis ()J METHOD aw getPlayerIdleTimeout ()I METHOD ax shouldAnnouncePlayerAchievements ()Z + METHOD ay getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; + METHOD az getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; METHOD b setServerPort (I)V ARG 0 port METHOD b setCurrentTaskName (Ljava/lang/String;)V @@ -85,6 +132,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD b setDemo (Z)V ARG 0 value METHOD c getBlockPos ()Lnone/cn; + METHOD c setWorldHeight (I)V + ARG 0 worldHeight METHOD c setServerIp (Ljava/lang/String;)V ARG 0 serverIp METHOD c setBonusChest (Z)V @@ -106,6 +155,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 msg METHOD f setSpawnNpcs (Z)V ARG 0 value + METHOD g (Ljava/lang/String;)V METHOD g setPvpEnabled (Z)V ARG 0 value METHOD getServerModName getServerModName ()Ljava/lang/String; @@ -118,6 +168,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 value METHOD i_ getNameComponent ()Lnone/fa; METHOD j ()Z + METHOD j setWorldName (Ljava/lang/String;)V + ARG 0 worldName METHOD k getCurrentTaskName ()Ljava/lang/String; METHOD l generateTerrain ()V METHOD l setMotd (Ljava/lang/String;)V @@ -132,6 +184,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD r shouldBroadcastRconToOps ()Z METHOD run run ()V METHOD s shouldBroadcastConsoleToOps ()Z + METHOD t clearSpawnAreaProgress ()V METHOD u shutdown ()V METHOD v getServerIp ()Ljava/lang/String; METHOD w isRunning ()Z diff --git a/mappings/net/minecraft/server/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/ServerConfigurationManager.mapping index 43c5109a6a..c8960faabf 100644 --- a/mappings/net/minecraft/server/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/ServerConfigurationManager.mapping @@ -19,6 +19,7 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager FIELD b BANNED_IPS_FILE Ljava/io/File; FIELD c OPS_FILE Ljava/io/File; FIELD d WHITELIST_FILE Ljava/io/File; + FIELD e maxPlayers I FIELD f LOGGER Lorg/apache/logging/log4j/Logger; FIELD g DATE_FORMATTER Ljava/text/SimpleDateFormat; FIELD h server Lnet/minecraft/server/MinecraftServer; @@ -48,5 +49,7 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager METHOD g getPlayerProfiles ()[Lcom/mojang/authlib/GameProfile; METHOD k getWhitelist ()Lnone/my; METHOD m getOpList ()Lnone/ms; + METHOD o getCurrentPlayerCount ()I + METHOD p getMaxPlayerCount ()I METHOD s getViewDistance ()I METHOD v getPlayerList ()Ljava/util/List; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 5170bf6b66..ae15975283 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -8,6 +8,7 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer METHOD (Ljava/io/File;Lnone/pf;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V ARG 2 authService METHOD B exit ()V + METHOD D doLevelTick ()V METHOD E isNetherAllowed ()Z METHOD U isMonsterSpawningEnabled ()Z METHOD Z isSnooperEnabled ()Z @@ -25,12 +26,14 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer ARG 0 gameMode METHOD aD getMaxWorldBorderRadius ()I METHOD aF getNetworkCompressionThreshold ()I + METHOD aM getConfigManager ()Lnone/le; METHOD aP getMaximumTickTime ()J METHOD a_ executeCommand (Ljava/lang/String;)Ljava/lang/String; ARG 0 command METHOD aa isDedicated ()Z METHOD ae isUsingNativeTransport ()Z METHOD ah areCommandBlocksEnabled ()Z + METHOD al getConfigManager ()Lnone/mr; METHOD as isSpawnProtectionEnabled ()I METHOD ax shouldAnnouncePlayerAchievements ()Z METHOD b getPropertiesFilename ()Ljava/lang/String; diff --git a/mappings/net/minecraft/stat/StatManagerBase.mapping b/mappings/net/minecraft/stat/StatManagerBase.mapping new file mode 100644 index 0000000000..aa43fcb033 --- /dev/null +++ b/mappings/net/minecraft/stat/StatManagerBase.mapping @@ -0,0 +1 @@ +CLASS none/nz net/minecraft/stat/StatManagerBase diff --git a/mappings/net/minecraft/stat/StatManagerServer.mapping b/mappings/net/minecraft/stat/StatManagerServer.mapping new file mode 100644 index 0000000000..16627fa1a8 --- /dev/null +++ b/mappings/net/minecraft/stat/StatManagerServer.mapping @@ -0,0 +1,9 @@ +CLASS none/nt net/minecraft/stat/StatManagerServer + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c server Lnet/minecraft/server/MinecraftServer; + FIELD d statFile Ljava/io/File; + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;)V + ARG 0 server + ARG 1 statFile + METHOD a load ()V + METHOD b save ()V diff --git a/mappings/none/nw.mapping b/mappings/none/nw.mapping new file mode 100644 index 0000000000..e41afb930f --- /dev/null +++ b/mappings/none/nw.mapping @@ -0,0 +1 @@ +CLASS none/nw