From 4c54af09c15b003faacf6d11680e1506c67e1900 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 25 Aug 2016 11:46:44 +0200 Subject: [PATCH] map out more of WorldSaveHandler --- .../net/minecraft/client/Minecraft.mapping | 4 +-- .../world/DummyWorldSaveHandler.mapping} | 7 +++-- mappings/net/minecraft/entity/Entity.mapping | 1 + .../net/minecraft/nbt/TagCompound.mapping | 6 ++-- .../world/IPlayerSaveHandler.mapping | 6 ++++ ...dler.mapping => IWorldSaveHandler.mapping} | 7 +++-- .../minecraft/world/WorldSaveHandler.mapping | 29 +++++++++++++++++++ .../world/save/impl/SaveHandler.mapping | 11 ------- 8 files changed, 51 insertions(+), 20 deletions(-) rename mappings/net/minecraft/{world/save/impl/ClientSaveHandler.mapping => client/world/DummyWorldSaveHandler.mapping} (55%) create mode 100644 mappings/net/minecraft/world/IPlayerSaveHandler.mapping rename mappings/net/minecraft/world/{ISaveHandler.mapping => IWorldSaveHandler.mapping} (56%) create mode 100644 mappings/net/minecraft/world/WorldSaveHandler.mapping delete mode 100644 mappings/net/minecraft/world/save/impl/SaveHandler.mapping diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index aba79279c4..5734049ae0 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -46,10 +46,10 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD a swizzle (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; ARG 0 stream METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; - METHOD a setGuiScreen (Lnone/bgk;)V - ARG 0 screen METHOD a checkGLError (Ljava/lang/String;)V ARG 0 title + METHOD a setGuiScreen (Lnone/bgk;)V + ARG 0 screen METHOD a drawLogo (Lnone/bxc;)V ARG 0 tm METHOD aB handleMouseEvents ()V diff --git a/mappings/net/minecraft/world/save/impl/ClientSaveHandler.mapping b/mappings/net/minecraft/client/world/DummyWorldSaveHandler.mapping similarity index 55% rename from mappings/net/minecraft/world/save/impl/ClientSaveHandler.mapping rename to mappings/net/minecraft/client/world/DummyWorldSaveHandler.mapping index dc81264b9a..c95c8772f4 100644 --- a/mappings/net/minecraft/world/save/impl/ClientSaveHandler.mapping +++ b/mappings/net/minecraft/client/world/DummyWorldSaveHandler.mapping @@ -1,4 +1,6 @@ -CLASS none/bax net/minecraft/world/save/impl/ClientSaveHandler +CLASS none/bax net/minecraft/client/world/DummyWorldSaveHandler + METHOD a getDataFileName (Ljava/lang/String;)Ljava/io/File; + ARG 0 name METHOD a (Lnone/auc;)Lnone/atu; ARG 0 dimensionProvider METHOD a saveWorld (Lnone/bar;)V @@ -6,6 +8,7 @@ CLASS none/bax net/minecraft/world/save/impl/ClientSaveHandler METHOD a saveWorld (Lnone/bar;Lnone/dt;)V ARG 0 worldProperties ARG 1 playerTag - METHOD b getWorldFolder ()Ljava/io/File; + METHOD b getWorldDir ()Ljava/io/File; METHOD c checkSessionLock ()V METHOD d readWorldProperties ()Lnone/bar; + METHOD e getPlayerSaveHandler ()Lnone/bay; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index fa5b852649..3d95219630 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -87,6 +87,7 @@ CLASS none/se net/minecraft/entity/Entity METHOD bB getVehicle ()Lnone/se; METHOD bC getSoundCategory ()Lnone/nm; METHOD be getUuid ()Ljava/util/UUID; + METHOD bf getUuidAsString ()Ljava/lang/String; METHOD bi getCustomName ()Ljava/lang/String; METHOD bj isCustomNameVisible ()Z METHOD bx getPassengerList ()Ljava/util/List; diff --git a/mappings/net/minecraft/nbt/TagCompound.mapping b/mappings/net/minecraft/nbt/TagCompound.mapping index 4e3cf54a63..23810d8e31 100644 --- a/mappings/net/minecraft/nbt/TagCompound.mapping +++ b/mappings/net/minecraft/nbt/TagCompound.mapping @@ -16,7 +16,7 @@ CLASS none/dt net/minecraft/nbt/TagCompound ARG 1 tracker METHOD a write (Ljava/io/DataOutput;)V ARG 0 output - METHOD a getUUID (Ljava/lang/String;)Ljava/util/UUID; + METHOD a getUuid (Ljava/lang/String;)Ljava/util/UUID; ARG 0 key METHOD a setByte (Ljava/lang/String;B)V ARG 0 key @@ -40,7 +40,7 @@ CLASS none/dt net/minecraft/nbt/TagCompound METHOD a setString (Ljava/lang/String;Ljava/lang/String;)V ARG 0 key ARG 1 value - METHOD a setUUID (Ljava/lang/String;Ljava/util/UUID;)V + METHOD a setUuid (Ljava/lang/String;Ljava/util/UUID;)V ARG 0 key ARG 1 value METHOD a setTag (Ljava/lang/String;Lnone/eh;)V @@ -68,7 +68,7 @@ CLASS none/dt net/minecraft/nbt/TagCompound METHOD b readString (Ljava/io/DataInput;Lnone/eb;)Ljava/lang/String; ARG 0 input ARG 1 tracker - METHOD b hasUUID (Ljava/lang/String;)Z + METHOD b hasUuid (Ljava/lang/String;)Z ARG 0 key METHOD b hasKey (Ljava/lang/String;I)Z ARG 0 key diff --git a/mappings/net/minecraft/world/IPlayerSaveHandler.mapping b/mappings/net/minecraft/world/IPlayerSaveHandler.mapping new file mode 100644 index 0000000000..40220466a7 --- /dev/null +++ b/mappings/net/minecraft/world/IPlayerSaveHandler.mapping @@ -0,0 +1,6 @@ +CLASS none/bay net/minecraft/world/IPlayerSaveHandler + METHOD a savePlayerData (Lnone/aak;)V + ARG 0 player + METHOD b loadPlayerData (Lnone/aak;)Lnone/dt; + ARG 0 player + METHOD f getSavedPlayerIds ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/world/ISaveHandler.mapping b/mappings/net/minecraft/world/IWorldSaveHandler.mapping similarity index 56% rename from mappings/net/minecraft/world/ISaveHandler.mapping rename to mappings/net/minecraft/world/IWorldSaveHandler.mapping index c30ca9a8f5..918d4d9ffe 100644 --- a/mappings/net/minecraft/world/ISaveHandler.mapping +++ b/mappings/net/minecraft/world/IWorldSaveHandler.mapping @@ -1,4 +1,6 @@ -CLASS none/bas net/minecraft/world/ISaveHandler +CLASS none/bas net/minecraft/world/IWorldSaveHandler + METHOD a getDataFileName (Ljava/lang/String;)Ljava/io/File; + ARG 0 name METHOD a (Lnone/auc;)Lnone/atu; ARG 0 dimensionProvider METHOD a saveWorld (Lnone/bar;)V @@ -6,6 +8,7 @@ CLASS none/bas net/minecraft/world/ISaveHandler METHOD a saveWorld (Lnone/bar;Lnone/dt;)V ARG 0 worldProperties ARG 1 playerTag - METHOD b getWorldFolder ()Ljava/io/File; + METHOD b getWorldDir ()Ljava/io/File; METHOD c checkSessionLock ()V METHOD d readWorldProperties ()Lnone/bar; + METHOD e getPlayerSaveHandler ()Lnone/bay; diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping new file mode 100644 index 0000000000..3576ea7edf --- /dev/null +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -0,0 +1,29 @@ +CLASS none/bap net/minecraft/world/WorldSaveHandler + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c worldDir Ljava/io/File; + FIELD d playerDataDir Ljava/io/File; + FIELD e worldDataDir Ljava/io/File; + FIELD f saveStartTime J + FIELD g worldName Ljava/lang/String; + METHOD (Ljava/io/File;Ljava/lang/String;ZLnone/pf;)V + ARG 0 savesDir + ARG 1 worldName + METHOD a getDataFileName (Ljava/lang/String;)Ljava/io/File; + ARG 0 name + METHOD a savePlayerData (Lnone/aak;)V + ARG 0 player + METHOD a (Lnone/auc;)Lnone/atu; + ARG 0 dimensionProvider + METHOD a saveWorld (Lnone/bar;)V + ARG 0 worldProperties + METHOD a saveWorld (Lnone/bar;Lnone/dt;)V + ARG 0 worldProperties + ARG 1 playerTag + METHOD b getWorldDir ()Ljava/io/File; + METHOD b loadPlayerData (Lnone/aak;)Lnone/dt; + ARG 0 player + METHOD c checkSessionLock ()V + METHOD d readWorldProperties ()Lnone/bar; + METHOD e getPlayerSaveHandler ()Lnone/bay; + METHOD f getSavedPlayerIds ()[Ljava/lang/String; + METHOD i writeSessionLock ()V diff --git a/mappings/net/minecraft/world/save/impl/SaveHandler.mapping b/mappings/net/minecraft/world/save/impl/SaveHandler.mapping deleted file mode 100644 index aa489d3fe2..0000000000 --- a/mappings/net/minecraft/world/save/impl/SaveHandler.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS none/bap net/minecraft/world/save/impl/SaveHandler - METHOD a (Lnone/auc;)Lnone/atu; - ARG 0 dimensionProvider - METHOD a saveWorld (Lnone/bar;)V - ARG 0 worldProperties - METHOD a saveWorld (Lnone/bar;Lnone/dt;)V - ARG 0 worldProperties - ARG 1 playerTag - METHOD b getWorldFolder ()Ljava/io/File; - METHOD c checkSessionLock ()V - METHOD d readWorldProperties ()Lnone/bar;