From 283f41bd21196530bada818378f445ba3293b281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erlend=20=C3=85mdal?= Date: Tue, 5 Feb 2019 11:49:34 +0100 Subject: [PATCH] DimensionalPersistentStateManager -> PersistentStateManager (#438) --- .../net/minecraft/server/world/ServerChunkManager.mapping | 4 ++-- mappings/net/minecraft/server/world/ServerWorld.mapping | 2 +- .../minecraft/server/world/ThreadedAnvilChunkStorage.mapping | 2 +- ...entStateManager.mapping => PersistentStateManager.mapping} | 2 +- .../world/chunk/storage/VersionedRegionFileCache.mapping | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename mappings/net/minecraft/world/{dimension/DimensionalPersistentStateManager.mapping => PersistentStateManager.mapping} (72%) diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 13ea09ed76..b03b04ca6d 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -10,7 +10,7 @@ CLASS uq net/minecraft/server/world/ServerChunkManager FIELD i genQueue Ljava/util/Queue; FIELD j players Luo; FIELD k threadedAnvilChunkStorage Luf; - FIELD l dimensionalPersistentStateManager Lcjb; + FIELD l persistentStateManager Lcjb; FIELD m maxWatchDistance I FIELD n lastMobSpawningTime J FIELD o spawnMonsters Z @@ -60,6 +60,6 @@ CLASS uq net/minecraft/server/world/ServerChunkManager METHOD d doesNotGenerateChunks (Lut;)Z ARG 1 player METHOD g getLoadedChunkCount ()I - METHOD h getDimensionalPersistentStateManager ()Lcjb; + METHOD h getPersistentStateManager ()Lcjb; METHOD k update ()Z METHOD l doMobSpawning ()V diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 4a0cf8628a..6f3854690a 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -10,7 +10,7 @@ CLASS ur net/minecraft/server/world/ServerWorld FIELD z LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lcjd;Lcjc;Lbti;Laff;Lvc;)V ARG 1 server - METHOD B getDimensionalPersistentStateManager ()Lcjb; + METHOD B getPersistentStateManager ()Lcjb; METHOD a init (Lbcv;)V ARG 1 levelInfo METHOD a save (Lzc;ZZ)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 6c83487cf5..ff83628805 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -9,7 +9,7 @@ CLASS uf net/minecraft/server/world/ThreadedAnvilChunkStorage FIELD g genQueueAdder Ljava/util/concurrent/Executor; FIELD h playersWatchingChunkProvider Lue$d; FIELD i chunkGenerator Lbse; - FIELD j dimensionalPersistentStateManagerFactory Ljava/util/function/Supplier; + FIELD j persistentStateManagerFactory Ljava/util/function/Supplier; FIELD k posToHolderCopy Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD m posToHolderCopyOutdated Z FIELD n chunkTaskPrioritySystem Luh; diff --git a/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping similarity index 72% rename from mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping rename to mappings/net/minecraft/world/PersistentStateManager.mapping index a89c1e196d..9b583002da 100644 --- a/mappings/net/minecraft/world/dimension/DimensionalPersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -1,4 +1,4 @@ -CLASS cjb net/minecraft/world/dimension/DimensionalPersistentStateManager +CLASS cjb net/minecraft/world/PersistentStateManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b keyToState Ljava/util/Map; METHOD a save ()V diff --git a/mappings/net/minecraft/world/chunk/storage/VersionedRegionFileCache.mapping b/mappings/net/minecraft/world/chunk/storage/VersionedRegionFileCache.mapping index ad5312af01..b3a12270ee 100644 --- a/mappings/net/minecraft/world/chunk/storage/VersionedRegionFileCache.mapping +++ b/mappings/net/minecraft/world/chunk/storage/VersionedRegionFileCache.mapping @@ -5,7 +5,7 @@ CLASS btc net/minecraft/world/chunk/storage/VersionedRegionFileCache ARG 1 dataFixer METHOD a updateChunkTag (Lbti;Ljava/util/function/Supplier;Lhr;)Lhr; ARG 1 dimensionType - ARG 2 dimensionalPersistentStateManagerFactory + ARG 2 persistentStateManagerFactory ARG 3 tag METHOD a getDataVersion (Lhr;)I ARG 0 tag