From 69f8a7180185447221eeac5ee59c02a8a29fec23 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 19 Dec 2018 16:25:32 -0800 Subject: [PATCH] Mapped some persistence data stuff (#326) I renamed all persisted to persistent, though vanilla fix types enum calls them saved data. Mapped out the persistent data manager that is bound to each dimension and the persistent data updater for stuctures. --- mappings/bbk.mapping | 3 -- mappings/ccl.mapping | 5 --- mappings/cip.mapping | 3 ++ .../net/minecraft/item/map/MapState.mapping | 2 + .../net/minecraft/nbt/PersistedState.mapping | 9 ----- .../scoreboard/ScoreboardState.mapping | 2 + .../server/command/ManagerCommand.mapping | 1 - .../world/ChunkSaveHandlerImpl.mapping | 1 + .../minecraft/world/ChunkUpdateState.mapping | 12 ++++++ .../minecraft/world/FeatureUpdater.mapping | 40 +++++++++++++++++++ .../minecraft/world/ForcedChunkState.mapping | 7 ++++ .../minecraft/world/PersistentState.mapping | 11 +++++ .../world/PersistentStateContainer.mapping | 8 ++++ .../world/PersistentStateManager.mapping | 13 ++++++ mappings/net/minecraft/world/World.mapping | 1 + .../world/WorldVillageManager.mapping | 2 + .../DimensionalPersistentStateManager.mapping | 18 +++++++++ mappings/uy.mapping | 1 + 18 files changed, 121 insertions(+), 18 deletions(-) delete mode 100644 mappings/bbk.mapping delete mode 100644 mappings/ccl.mapping create mode 100644 mappings/cip.mapping delete mode 100644 mappings/net/minecraft/nbt/PersistedState.mapping delete mode 100644 mappings/net/minecraft/server/command/ManagerCommand.mapping create mode 100644 mappings/net/minecraft/world/ChunkUpdateState.mapping create mode 100644 mappings/net/minecraft/world/FeatureUpdater.mapping create mode 100644 mappings/net/minecraft/world/ForcedChunkState.mapping create mode 100644 mappings/net/minecraft/world/PersistentState.mapping create mode 100644 mappings/net/minecraft/world/PersistentStateContainer.mapping create mode 100644 mappings/net/minecraft/world/PersistentStateManager.mapping create mode 100644 mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping diff --git a/mappings/bbk.mapping b/mappings/bbk.mapping deleted file mode 100644 index 6d8570f8eb..0000000000 --- a/mappings/bbk.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS bbk - METHOD a fromTag (Lhs;)V - METHOD b toTag (Lhs;)Lhs; diff --git a/mappings/ccl.mapping b/mappings/ccl.mapping deleted file mode 100644 index 13ac42426e..0000000000 --- a/mappings/ccl.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS ccl - FIELD a all Lit/unimi/dsi/fastutil/longs/LongSet; - FIELD b remaining Lit/unimi/dsi/fastutil/longs/LongSet; - METHOD a fromTag (Lhs;)V - METHOD b toTag (Lhs;)Lhs; diff --git a/mappings/cip.mapping b/mappings/cip.mapping new file mode 100644 index 0000000000..03766812a1 --- /dev/null +++ b/mappings/cip.mapping @@ -0,0 +1,3 @@ +CLASS cip + METHOD a getNextAvailableId (Lbsg;Ljava/lang/String;)I + ARG 2 key diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 369fcfe4a3..f26272c243 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -3,5 +3,7 @@ CLASS chy net/minecraft/item/map/MapState FIELD f scale B FIELD g colorArray [B FIELD i icons Ljava/util/Map; + METHOD (Ljava/lang/String;)V + ARG 1 key METHOD a fromTag (Lhs;)V METHOD b toTag (Lhs;)Lhs; diff --git a/mappings/net/minecraft/nbt/PersistedState.mapping b/mappings/net/minecraft/nbt/PersistedState.mapping deleted file mode 100644 index b5f3a73f49..0000000000 --- a/mappings/net/minecraft/nbt/PersistedState.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS chu net/minecraft/nbt/PersistedState - FIELD a key Ljava/lang/String; - FIELD b dirty Z - METHOD a fromTag (Lhs;)V - METHOD a setDirty (Z)V - METHOD b toTag (Lhs;)Lhs; - METHOD d markDirty ()V - METHOD e getDirty ()Z - METHOD f getKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index 989c2d0fed..f30ed7400d 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -2,6 +2,8 @@ CLASS cne net/minecraft/scoreboard/ScoreboardState FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b scoreboard Lcnd; FIELD c tag Lhs; + METHOD (Ljava/lang/String;)V + ARG 1 key METHOD a serializeTeams ()Lhy; METHOD a deserializeTeamPlayers (Lcnb;Lhy;)V ARG 1 team diff --git a/mappings/net/minecraft/server/command/ManagerCommand.mapping b/mappings/net/minecraft/server/command/ManagerCommand.mapping deleted file mode 100644 index f824975057..0000000000 --- a/mappings/net/minecraft/server/command/ManagerCommand.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bbx net/minecraft/server/command/ManagerCommand diff --git a/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping b/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping index 01951145ac..e47848ebf1 100644 --- a/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping +++ b/mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping @@ -1,4 +1,5 @@ CLASS bry net/minecraft/world/ChunkSaveHandlerImpl + FIELD e featureUpdater Lcbz; METHOD a shortListsToNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lhy; ARG 0 lists METHOD b save ()V diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping new file mode 100644 index 0000000000..237e52e45d --- /dev/null +++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping @@ -0,0 +1,12 @@ +CLASS ccl net/minecraft/world/ChunkUpdateState + FIELD a all Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD b remaining Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD (Ljava/lang/String;)V + ARG 1 key + METHOD a getAll ()Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD a add (J)V + METHOD a fromTag (Lhs;)V + METHOD b contains (J)Z + METHOD b toTag (Lhs;)Lhs; + METHOD c isRemaing (J)Z + METHOD d markResolved (J)V diff --git a/mappings/net/minecraft/world/FeatureUpdater.mapping b/mappings/net/minecraft/world/FeatureUpdater.mapping new file mode 100644 index 0000000000..cd1a9284cd --- /dev/null +++ b/mappings/net/minecraft/world/FeatureUpdater.mapping @@ -0,0 +1,40 @@ +CLASS cbz net/minecraft/world/FeatureUpdater + CLASS cbz$a TheNether + FIELD a NAMES [Ljava/lang/String; + METHOD a getNewNames ()[Ljava/lang/String; + METHOD b getOldNames ()[Ljava/lang/String; + CLASS cbz$b Overworld + FIELD a NEW_NAMES [Ljava/lang/String; + FIELD b OLD_NAMES [Ljava/lang/String; + METHOD a getNewNames ()[Ljava/lang/String; + METHOD b getOldNames ()[Ljava/lang/String; + CLASS cbz$c TheEnd + FIELD a NAMES [Ljava/lang/String; + METHOD a getNewNames ()[Ljava/lang/String; + METHOD b getOldNames ()[Ljava/lang/String; + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b OLD_TO_NEW Ljava/util/Map; + FIELD c ANCIENT_TO_OLD Ljava/util/Map; + FIELD d needsUpdate Z + FIELD e featureIdToChunkTag Ljava/util/Map; + FIELD f updateStates Ljava/util/Map; + METHOD (Lciq;)V + ARG 2 oldName + METHOD a getNewNames ()[Ljava/lang/String; + METHOD a needsUpdate (II)Z + ARG 1 chunkX + ARG 2 chunkZ + METHOD a needsUpdate (IILjava/lang/String;)Z + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 id + METHOD a markResolved (J)V + ARG 1 chunk + METHOD a create (Lbsg;Lciq;)Lcbz; + METHOD a init (Lciq;)V + ARG 6 updatedFeatures + ARG 10 chunk + ARG 12 children + METHOD a getUpdatedReferences (Lhs;)Lhs; + METHOD a getUpdatedStarts (Lhs;Lbbd;)Lhs; + METHOD b getOldNames ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping new file mode 100644 index 0000000000..a448d78f76 --- /dev/null +++ b/mappings/net/minecraft/world/ForcedChunkState.mapping @@ -0,0 +1,7 @@ +CLASS bbk net/minecraft/world/ForcedChunkState + FIELD a chunks Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD (Ljava/lang/String;)V + ARG 1 key + METHOD a getChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD a fromTag (Lhs;)V + METHOD b toTag (Lhs;)Lhs; diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping new file mode 100644 index 0000000000..87da53c232 --- /dev/null +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -0,0 +1,11 @@ +CLASS chu net/minecraft/world/PersistentState + FIELD a key Ljava/lang/String; + FIELD b dirty Z + METHOD (Ljava/lang/String;)V + ARG 1 key + METHOD a fromTag (Lhs;)V + METHOD a setDirty (Z)V + METHOD b toTag (Lhs;)Lhs; + METHOD d markDirty ()V + METHOD e isDirty ()Z + METHOD f getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/PersistentStateContainer.mapping b/mappings/net/minecraft/world/PersistentStateContainer.mapping new file mode 100644 index 0000000000..9dc57d0798 --- /dev/null +++ b/mappings/net/minecraft/world/PersistentStateContainer.mapping @@ -0,0 +1,8 @@ +CLASS bbx net/minecraft/world/PersistentStateContainer + METHOD a getNextAvailableId (Lbsg;Ljava/lang/String;)I + ARG 2 persistentStateKey + METHOD a setPersistentState (Lbsg;Ljava/lang/String;Lchu;)V + ARG 2 key + METHOD a createPersistentState (Lbsg;Ljava/util/function/Function;Ljava/lang/String;)Lchu; + ARG 3 key + METHOD h getPersistentStateManager ()Lciq; diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping new file mode 100644 index 0000000000..43fc867ca7 --- /dev/null +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -0,0 +1,13 @@ +CLASS ciq net/minecraft/world/PersistentStateManager + FIELD a dimensionToManager Ljava/util/Map; + FIELD b saveHandler Lcii; + METHOD a save ()V + METHOD a getNextAvailableId (Lbsg;Ljava/lang/String;)I + ARG 2 key + METHOD a set (Lbsg;Ljava/lang/String;Lchu;)V + ARG 2 key + METHOD a create (Lbsg;Ljava/util/function/Function;Ljava/lang/String;)Lchu; + ARG 3 key + METHOD a update (Ljava/lang/String;I)Lhs; + ARG 1 key + ARG 2 worldVersion diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 395abdd3ee..40f10889a8 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -274,6 +274,7 @@ CLASS bbp net/minecraft/world/World METHOD g getThunderGradient (F)F METHOD g getLocalDifficulty (Let;)Lafn; ARG 1 pos + METHOD h getPersistentStateManager ()Lciq; METHOD h setThunderGradient (F)V METHOD i getSaveHandler ()Lcii; METHOD i getRainGradient (F)F diff --git a/mappings/net/minecraft/world/WorldVillageManager.mapping b/mappings/net/minecraft/world/WorldVillageManager.mapping index 122968661f..a5d6bfc892 100644 --- a/mappings/net/minecraft/world/WorldVillageManager.mapping +++ b/mappings/net/minecraft/world/WorldVillageManager.mapping @@ -4,6 +4,8 @@ CLASS als net/minecraft/world/WorldVillageManager FIELD c recentlySeenDoors Ljava/util/List; FIELD d villages Ljava/util/List; FIELD e tick I + METHOD (Ljava/lang/String;)V + ARG 1 key METHOD a tick ()V METHOD a setWorld (Lbbp;)V METHOD a getBaseTag (Lbsf;)Ljava/lang/String; diff --git a/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping b/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping new file mode 100644 index 0000000000..473c699e74 --- /dev/null +++ b/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping @@ -0,0 +1,18 @@ +CLASS cie net/minecraft/world/dimension/DimensionalPersistentStateManager + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b type Lbsg; + FIELD c keyToState Ljava/util/Map; + FIELD d keyToAvailableId Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD e saveHandler Lcii; + METHOD a readIdCounts ()V + METHOD a save (Lchu;)V + METHOD a update (Lcii;Lbsg;Ljava/lang/String;I)Lhs; + ARG 2 key + ARG 3 worldVersion + METHOD a getNextAvailableId (Ljava/lang/String;)I + ARG 1 key + METHOD a set (Ljava/lang/String;Lchu;)V + ARG 1 key + METHOD a create (Ljava/util/function/Function;Ljava/lang/String;)Lchu; + ARG 2 key + METHOD b save ()V diff --git a/mappings/uy.mapping b/mappings/uy.mapping index 08158f1ee5..5cd7f7ad8c 100644 --- a/mappings/uy.mapping +++ b/mappings/uy.mapping @@ -67,6 +67,7 @@ CLASS uy METHOD g getLevelProperties ()Lcih; METHOD g getLocalDifficulty (Let;)Lafn; ARG 1 pos + METHOD h getPersistentStateManager ()Lciq; METHOD i getSaveHandler ()Lcii; METHOD m getRandom ()Ljava/util/Random; METHOD o getDimension ()Lbsf;