diff --git a/.gitignore b/.gitignore index c48360fa46..fefee9ffdc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .gradle/ -*-merged.jar \ No newline at end of file +*-merged.jar +*.DS_Store diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 2fb57b810a..898aa51f30 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -108,6 +108,8 @@ CLASS none/se net/minecraft/entity/Entity ARG 0 x ARG 1 y ARG 2 z + METHOD e serializeToTag (Lnone/dt;)Lnone/dt; + ARG 0 compound METHOD equals (Ljava/lang/Object;)Z ARG 0 other METHOD f getEntity ()Lnone/se; @@ -115,6 +117,8 @@ CLASS none/se net/minecraft/entity/Entity ARG 0 x ARG 1 y ARG 2 z + METHOD f deserializeFromTag (Lnone/dt;)V + ARG 0 compound METHOD g getDistanceTo (Lnone/se;)F ARG 0 entity METHOD g setGlowing (Z)V diff --git a/mappings/net/minecraft/server/IntegratedServerConfigurationManager.mapping b/mappings/net/minecraft/server/IntegratedServerConfigurationManager.mapping new file mode 100644 index 0000000000..cade05b279 --- /dev/null +++ b/mappings/net/minecraft/server/IntegratedServerConfigurationManager.mapping @@ -0,0 +1,12 @@ +CLASS none/cai net/minecraft/server/IntegratedServerConfigurationManager + FIELD f userData Lnone/dt; + METHOD (Lnone/caj;)V + ARG 0 integratedServer + METHOD a getConnectMessage (Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Ljava/lang/String; + ARG 0 connectingAddress + ARG 1 gameProfile + METHOD b getServer ()Lnone/caj; + METHOD b savePlayerData (Lnone/lw;)V + ARG 0 entityPlayerServer + METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; + METHOD t getUserData ()Lnone/dt; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index c52943aeaf..538afec346 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -58,6 +58,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD N getCommandManager ()Lnone/m; METHOD O getKeyPair ()Ljava/security/KeyPair; METHOD P getServerPort ()I + METHOD Q getUserName ()Ljava/lang/String; METHOD R isSinglePlayer ()Z METHOD S getWorldName ()Ljava/lang/String; METHOD U isMonsterSpawningEnabled ()Z diff --git a/mappings/net/minecraft/server/ServerConfigurationManager.mapping b/mappings/net/minecraft/server/ServerConfigurationManager.mapping index c8960faabf..b160c396fc 100644 --- a/mappings/net/minecraft/server/ServerConfigurationManager.mapping +++ b/mappings/net/minecraft/server/ServerConfigurationManager.mapping @@ -29,11 +29,17 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager FIELD l bannedIpList Lnone/mo; FIELD m opList Lnone/ms; FIELD n whitelist Lnone/my; + FIELD p playerSaveHandler Lnone/bay; + FIELD q whitelistEnabled Z FIELD r viewDistance I FIELD s gameMode Lnone/ais; FIELD u latencyUpdateTimer I + METHOD a setViewDistance (I)V METHOD a getPlayerByName (Ljava/lang/String;)Lnone/lw; ARG 0 name + METHOD a getConnectMessage (Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Ljava/lang/String; + ARG 0 connectingAddress + ARG 1 gameProfile METHOD a getPlayer (Ljava/util/UUID;)Lnone/lw; ARG 0 uuid METHOD a setGameMode (Lnone/ais;)V @@ -43,13 +49,24 @@ CLASS none/mr net/minecraft/server/ServerConfigurationManager METHOD a sendToWorld (Lnone/fl;I)V ARG 0 packet ARG 1 dimensionId + METHOD a setWhitelistEnabled (Z)V + METHOD b savePlayerData (Lnone/lw;)V + ARG 0 entityPlayerServer METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; METHOD e updatePlayerLatency ()V + METHOD e isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z + ARG 0 profile METHOD f getPlayerNames ()[Ljava/lang/String; METHOD g getPlayerProfiles ()[Lcom/mojang/authlib/GameProfile; + METHOD j saveAllPlayerData ()V METHOD k getWhitelist ()Lnone/my; + METHOD l getWhitelistedNames ()[Ljava/lang/String; METHOD m getOpList ()Lnone/ms; + METHOD n getOppedNames ()[Ljava/lang/String; METHOD o getCurrentPlayerCount ()I METHOD p getMaxPlayerCount ()I + METHOD r isWhitelistEnabled ()Z METHOD s getViewDistance ()I + METHOD t getUserData ()Lnone/dt; + METHOD u disconnectAllPlayers ()V METHOD v getPlayerList ()Ljava/util/List; diff --git a/mappings/net/minecraft/server/config/BanInfo.mapping b/mappings/net/minecraft/server/config/BanInfo.mapping new file mode 100644 index 0000000000..ef7d6a6573 --- /dev/null +++ b/mappings/net/minecraft/server/config/BanInfo.mapping @@ -0,0 +1,16 @@ +CLASS none/mm net/minecraft/server/config/BanInfo + FIELD a DATETIME_FORMAT Ljava/text/SimpleDateFormat; + FIELD b creationDate Ljava/util/Date; + FIELD c source Ljava/lang/String; + FIELD d expirationDate Ljava/util/Date; + FIELD e reason Ljava/lang/String; + METHOD (Ljava/lang/Object;Ljava/util/Date;Ljava/lang/String;Ljava/util/Date;Ljava/lang/String;)V + ARG 1 created + ARG 2 source + ARG 3 expiry + ARG 4 reason + METHOD a serialize (Lcom/google/gson/JsonObject;)V + ARG 0 json + METHOD c getBanExpirationDate ()Ljava/util/Date; + METHOD d getReason ()Ljava/lang/String; + METHOD e isTemporary ()Z diff --git a/mappings/net/minecraft/server/config/BannedIpInfo.mapping b/mappings/net/minecraft/server/config/BannedIpInfo.mapping new file mode 100644 index 0000000000..9ede9b2f13 --- /dev/null +++ b/mappings/net/minecraft/server/config/BannedIpInfo.mapping @@ -0,0 +1,3 @@ +CLASS none/mp net/minecraft/server/config/BannedIpInfo + METHOD a serialize (Lcom/google/gson/JsonObject;)V + ARG 0 json diff --git a/mappings/net/minecraft/server/config/BannedIps.mapping b/mappings/net/minecraft/server/config/BannedIps.mapping index 7e1b18bd58..3c950b9315 100644 --- a/mappings/net/minecraft/server/config/BannedIps.mapping +++ b/mappings/net/minecraft/server/config/BannedIps.mapping @@ -1 +1,6 @@ CLASS none/mo net/minecraft/server/config/BannedIps + METHOD a contains (Ljava/net/SocketAddress;)Z + ARG 0 address + METHOD b get (Ljava/net/SocketAddress;)Lnone/mp; + METHOD c stringifyAddress (Ljava/net/SocketAddress;)Ljava/lang/String; + ARG 0 address diff --git a/mappings/net/minecraft/server/config/BannedPlayerInfo.mapping b/mappings/net/minecraft/server/config/BannedPlayerInfo.mapping new file mode 100644 index 0000000000..f383f43a13 --- /dev/null +++ b/mappings/net/minecraft/server/config/BannedPlayerInfo.mapping @@ -0,0 +1,3 @@ +CLASS none/mx net/minecraft/server/config/BannedPlayerInfo + METHOD a serialize (Lcom/google/gson/JsonObject;)V + ARG 0 json diff --git a/mappings/net/minecraft/server/config/BannedPlayers.mapping b/mappings/net/minecraft/server/config/BannedPlayers.mapping index 9bf828e71b..5d150b081f 100644 --- a/mappings/net/minecraft/server/config/BannedPlayers.mapping +++ b/mappings/net/minecraft/server/config/BannedPlayers.mapping @@ -1 +1,3 @@ CLASS none/mw net/minecraft/server/config/BannedPlayers + METHOD a getNames ()[Ljava/lang/String; + METHOD a contains (Lcom/mojang/authlib/GameProfile;)Z diff --git a/mappings/net/minecraft/server/config/Ops.mapping b/mappings/net/minecraft/server/config/Ops.mapping index beb9b90cc7..63cbe7510b 100644 --- a/mappings/net/minecraft/server/config/Ops.mapping +++ b/mappings/net/minecraft/server/config/Ops.mapping @@ -1 +1,2 @@ CLASS none/ms net/minecraft/server/config/Ops + METHOD a getNames ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/server/config/ProfileList.mapping b/mappings/net/minecraft/server/config/ProfileList.mapping new file mode 100644 index 0000000000..6074b43fa9 --- /dev/null +++ b/mappings/net/minecraft/server/config/ProfileList.mapping @@ -0,0 +1,4 @@ +CLASS none/mv net/minecraft/server/config/ProfileList + METHOD a getNames ()[Ljava/lang/String; + METHOD b get (Ljava/lang/Object;)Lnone/mu; + METHOD d contains (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/server/config/Whitelist.mapping b/mappings/net/minecraft/server/config/Whitelist.mapping index 7ba317a819..560a9623ee 100644 --- a/mappings/net/minecraft/server/config/Whitelist.mapping +++ b/mappings/net/minecraft/server/config/Whitelist.mapping @@ -1 +1,6 @@ CLASS none/my net/minecraft/server/config/Whitelist + METHOD a getNames ()[Ljava/lang/String; + METHOD a getProfileByName (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + ARG 0 name + METHOD b getProfileId (Lcom/mojang/authlib/GameProfile;)Ljava/lang/String; + ARG 0 profile diff --git a/mappings/net/minecraft/stat/StatManager.mapping b/mappings/net/minecraft/stat/StatManager.mapping new file mode 100644 index 0000000000..791589cabf --- /dev/null +++ b/mappings/net/minecraft/stat/StatManager.mapping @@ -0,0 +1 @@ +CLASS none/nz net/minecraft/stat/StatManager diff --git a/mappings/net/minecraft/stat/StatManagerBase.mapping b/mappings/net/minecraft/stat/StatManagerBase.mapping deleted file mode 100644 index aa43fcb033..0000000000 --- a/mappings/net/minecraft/stat/StatManagerBase.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/nz net/minecraft/stat/StatManagerBase diff --git a/mappings/none/cai.mapping b/mappings/none/cai.mapping deleted file mode 100644 index ba789f455d..0000000000 --- a/mappings/none/cai.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/cai - METHOD b getServer ()Lnone/caj; - METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; diff --git a/mappings/none/le.mapping b/mappings/none/le.mapping index 6996822e2e..27850e34fd 100644 --- a/mappings/none/le.mapping +++ b/mappings/none/le.mapping @@ -1,3 +1,6 @@ CLASS none/le + METHOD a setWhitelistEnabled (Z)V METHOD b getServer ()Lnone/lf; METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; + METHOD e isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z + ARG 0 profile