From dd4d52b4419a019bedfb97dce576e3ee96817a88 Mon Sep 17 00:00:00 2001 From: copygirl Date: Mon, 19 Sep 2016 19:19:11 +0200 Subject: [PATCH] Map Level related things and a bunch more (WIP?) (#83) * Map LevelGeneratorType From WorldGenerator * Map LevelInfo From WorldInfo * Map Level related and many more * Fix construct => createProvider * Unfinished stuff please ignore --- .../minecraft/client/MinecraftGame.mapping | 6 +- ...WorldEdit.mapping => GuiLevelEdit.mapping} | 2 +- ...oading.mapping => GuiLevelLoading.mapping} | 2 +- ...dSelect.mapping => GuiLevelSelect.mapping} | 2 +- ...uiNewWorld.mapping => GuiNewLevel.mapping} | 17 ++- ...e.mapping => GuiNewLevelCustomize.mapping} | 2 +- ...pping => GuiNewLevelCustomizeFlat.mapping} | 2 +- ...ng => GuiNewLevelCustomizePresets.mapping} | 2 +- ...ets.mapping => GuiNewLevelPresets.mapping} | 2 +- .../gui/menu/WidgetLevelEntry.mapping} | 10 +- .../world/DummyWorldSaveHandler.mapping | 13 ++- .../client/world/WorldClient.mapping | 7 ++ .../migration/MigrationTypes.mapping | 2 +- .../packet/client/CPacketGameJoin.mapping | 1 + .../minecraft/server/IntegratedServer.mapping | 10 +- .../minecraft/server/MinecraftServer.mapping | 17 +-- .../server/dedicated/IDedicatedServer.mapping | 2 +- .../sortme/BiomeProviderSingle.mapping | 1 + .../sortme/WorldSaveLoadSomething.mapping | 12 -- mappings/net/minecraft/util/ChatUtils.mapping | 2 +- ...ress.mapping => IProgressCallback.mapping} | 2 +- .../net/minecraft/util/NetworkHelper.mapping | 2 +- mappings/net/minecraft/world/GameMode.mapping | 2 + .../minecraft/world/IWorldSaveHandler.mapping | 13 ++- mappings/net/minecraft/world/World.mapping | 21 +++- .../world/WorldSaveHandlerAnvil.mapping | 7 ++ ...er.mapping => WorldSaveHandlerOld.mapping} | 16 +-- .../net/minecraft/world/WorldServer.mapping | 20 +++- ...imensionType.mapping => WorldType.mapping} | 13 ++- .../world/biome/BiomeProvider.mapping | 1 + .../net/minecraft/world/chunk/Chunk.mapping | 17 ++- .../world/chunk/ChunkProviderClient.mapping | 6 + .../world/chunk/ChunkProviderServer.mapping | 17 ++- .../world/chunk/ChunkSaveHandler.mapping | 68 ++++++++++++ .../minecraft/world/chunk/EmptyChunk.mapping | 6 +- .../world/chunk/IChunkProvider.mapping | 1 + .../world/chunk/IChunkSaveHandler.mapping | 13 +++ .../world/generator/WorldGenerator.mapping | 15 --- .../world/level/LevelGeneratorType.mapping | 38 +++++++ .../LevelInfo.mapping} | 18 +-- .../LevelProperties.mapping} | 105 +++++++++--------- .../world/level/storage/ILevelStorage.mapping | 28 +++++ .../level/storage/LevelStorageAnvil.mapping | 39 +++++++ .../storage/LevelStorageException.mapping | 3 + .../level/storage/LevelStorageOld.mapping | 38 +++++++ .../storage/LevelSummary.mapping} | 18 +-- ...Provider.mapping => WorldProvider.mapping} | 6 +- .../impl/DimensionProviderOverworld.mapping | 2 - ...erEnd.mapping => WorldProviderEnd.mapping} | 3 +- ...er.mapping => WorldProviderNether.mapping} | 3 +- .../impl/WorldProviderOverworld.mapping | 2 + .../world/region/RegionFileManager.mapping | 15 +++ .../world/region/RegionSomething.mapping | 4 + .../world/storage/IWorldStorage.mapping | 26 ----- .../world/storage/WorldStorageAnvil.mapping | 18 --- .../storage/WorldStorageException.mapping | 3 - .../world/storage/WorldStorageOld.mapping | 37 ------ mappings/none/bao.mapping | 6 - mappings/none/baq.mapping | 54 ++++----- mappings/none/lq.mapping | 3 +- 60 files changed, 532 insertions(+), 291 deletions(-) rename mappings/net/minecraft/client/gui/menu/{GuiWorldEdit.mapping => GuiLevelEdit.mapping} (87%) rename mappings/net/minecraft/client/gui/menu/{GuiWorldLoading.mapping => GuiLevelLoading.mapping} (73%) rename mappings/net/minecraft/client/gui/menu/{GuiWorldSelect.mapping => GuiLevelSelect.mapping} (87%) rename mappings/net/minecraft/client/gui/menu/{GuiNewWorld.mapping => GuiNewLevel.mapping} (56%) rename mappings/net/minecraft/client/gui/menu/{GuiNewWorldCustomize.mapping => GuiNewLevelCustomize.mapping} (83%) rename mappings/net/minecraft/client/gui/menu/{GuiNewWorldCustomizeFlat.mapping => GuiNewLevelCustomizeFlat.mapping} (89%) rename mappings/net/minecraft/client/gui/menu/{GuiNewWorldCustomizePresets.mapping => GuiNewLevelCustomizePresets.mapping} (90%) rename mappings/net/minecraft/client/gui/menu/{GuiNewWorldPresets.mapping => GuiNewLevelPresets.mapping} (90%) rename mappings/net/minecraft/{sortme/WidgetWorldEntry.mapping => client/gui/menu/WidgetLevelEntry.mapping} (82%) create mode 100644 mappings/net/minecraft/sortme/BiomeProviderSingle.mapping delete mode 100644 mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping rename mappings/net/minecraft/util/{IProgress.mapping => IProgressCallback.mapping} (82%) create mode 100644 mappings/net/minecraft/world/WorldSaveHandlerAnvil.mapping rename mappings/net/minecraft/world/{WorldSaveHandler.mapping => WorldSaveHandlerOld.mapping} (71%) rename mappings/net/minecraft/world/{DimensionType.mapping => WorldType.mapping} (60%) create mode 100644 mappings/net/minecraft/world/biome/BiomeProvider.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkSaveHandler.mapping create mode 100644 mappings/net/minecraft/world/chunk/IChunkSaveHandler.mapping delete mode 100644 mappings/net/minecraft/world/generator/WorldGenerator.mapping create mode 100644 mappings/net/minecraft/world/level/LevelGeneratorType.mapping rename mappings/net/minecraft/world/{WorldInfo.mapping => level/LevelInfo.mapping} (60%) rename mappings/net/minecraft/world/{WorldProperties.mapping => level/LevelProperties.mapping} (72%) create mode 100644 mappings/net/minecraft/world/level/storage/ILevelStorage.mapping create mode 100644 mappings/net/minecraft/world/level/storage/LevelStorageAnvil.mapping create mode 100644 mappings/net/minecraft/world/level/storage/LevelStorageException.mapping create mode 100644 mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping rename mappings/net/minecraft/world/{storage/WorldSummary.mapping => level/storage/LevelSummary.mapping} (65%) rename mappings/net/minecraft/world/provider/{DimensionProvider.mapping => WorldProvider.mapping} (71%) delete mode 100644 mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping rename mappings/net/minecraft/world/provider/impl/{DimensionProviderEnd.mapping => WorldProviderEnd.mapping} (58%) rename mappings/net/minecraft/world/provider/impl/{DimensionProviderNether.mapping => WorldProviderNether.mapping} (71%) create mode 100644 mappings/net/minecraft/world/provider/impl/WorldProviderOverworld.mapping create mode 100644 mappings/net/minecraft/world/region/RegionFileManager.mapping create mode 100644 mappings/net/minecraft/world/region/RegionSomething.mapping delete mode 100644 mappings/net/minecraft/world/storage/IWorldStorage.mapping delete mode 100644 mappings/net/minecraft/world/storage/WorldStorageAnvil.mapping delete mode 100644 mappings/net/minecraft/world/storage/WorldStorageException.mapping delete mode 100644 mappings/net/minecraft/world/storage/WorldStorageOld.mapping delete mode 100644 mappings/none/bao.mapping diff --git a/mappings/net/minecraft/client/MinecraftGame.mapping b/mappings/net/minecraft/client/MinecraftGame.mapping index 2c44454850..3a0bd22c7b 100644 --- a/mappings/net/minecraft/client/MinecraftGame.mapping +++ b/mappings/net/minecraft/client/MinecraftGame.mapping @@ -38,7 +38,7 @@ CLASS none/bdq net/minecraft/client/MinecraftGame FIELD ak assetDirectory Ljava/io/File; FIELD al gameVersion Ljava/lang/String; FIELD an netProxy Ljava/net/Proxy; - FIELD ao worldStorage Lnone/baw; + FIELD ao levelStorage Lnone/baw; FIELD ap currentFps I FIELD ar autoConnectServerIp Ljava/lang/String; FIELD as autoConnectServerPort I @@ -59,6 +59,8 @@ CLASS none/bdq net/minecraft/client/MinecraftGame FIELD u settings Lnone/bds; FIELD w runDirectory Ljava/io/File; FIELD x guiClosed Z + METHOD (Lnone/bjm;)V + ARG 0 args METHOD A scheduleReloadResources ()Lcom/google/common/util/concurrent/ListenableFuture; METHOD B checkMaxTextureSize ()I METHOD C getCurrentServerEntry ()Lnone/bmj; @@ -128,7 +130,7 @@ CLASS none/bdq net/minecraft/client/MinecraftGame ARG 0 snooper METHOD c getGameVersion ()Ljava/lang/String; METHOD f reloadResources ()V - METHOD g getWorldStorage ()Lnone/baw; + METHOD g getLevelStorage ()Lnone/baw; METHOD h stop ()V METHOD k getMaxFps ()I METHOD l limitFramerate ()Z diff --git a/mappings/net/minecraft/client/gui/menu/GuiWorldEdit.mapping b/mappings/net/minecraft/client/gui/menu/GuiLevelEdit.mapping similarity index 87% rename from mappings/net/minecraft/client/gui/menu/GuiWorldEdit.mapping rename to mappings/net/minecraft/client/gui/menu/GuiLevelEdit.mapping index e9d09f433a..3f761c7ac0 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiWorldEdit.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiLevelEdit.mapping @@ -1,4 +1,4 @@ -CLASS none/biw net/minecraft/client/gui/menu/GuiWorldEdit +CLASS none/biw net/minecraft/client/gui/menu/GuiLevelEdit FIELD a parent Lnone/bgm; METHOD (Lnone/bgm;Ljava/lang/String;)V ARG 0 parent diff --git a/mappings/net/minecraft/client/gui/menu/GuiWorldLoading.mapping b/mappings/net/minecraft/client/gui/menu/GuiLevelLoading.mapping similarity index 73% rename from mappings/net/minecraft/client/gui/menu/GuiWorldLoading.mapping rename to mappings/net/minecraft/client/gui/menu/GuiLevelLoading.mapping index ad17b18f7f..d4bc3d7dbe 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiWorldLoading.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiLevelLoading.mapping @@ -1,4 +1,4 @@ -CLASS none/bgl net/minecraft/client/gui/menu/GuiWorldLoading +CLASS none/bgl net/minecraft/client/gui/menu/GuiLevelLoading METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiWorldSelect.mapping b/mappings/net/minecraft/client/gui/menu/GuiLevelSelect.mapping similarity index 87% rename from mappings/net/minecraft/client/gui/menu/GuiWorldSelect.mapping rename to mappings/net/minecraft/client/gui/menu/GuiLevelSelect.mapping index 8da73baaab..13d38879a7 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiWorldSelect.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiLevelSelect.mapping @@ -1,4 +1,4 @@ -CLASS none/bix net/minecraft/client/gui/menu/GuiWorldSelect +CLASS none/bix net/minecraft/client/gui/menu/GuiLevelSelect FIELD a parent Lnone/bgm; FIELD f title Ljava/lang/String; FIELD g LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorld.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewLevel.mapping similarity index 56% rename from mappings/net/minecraft/client/gui/menu/GuiNewWorld.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewLevel.mapping index dea29c54bc..135d6cf771 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorld.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewLevel.mapping @@ -1,13 +1,20 @@ -CLASS none/biv net/minecraft/client/gui/menu/GuiNewWorld +CLASS none/biv net/minecraft/client/gui/menu/GuiNewLevel FIELD A buttonGameModeSwitch Lnone/bek; - FIELD B buttonMoreWorldOptions Lnone/bek; + FIELD B buttonMoreOptions Lnone/bek; FIELD C buttonGenerateStructures Lnone/bek; FIELD D buttonGenerateBonusItems Lnone/bek; FIELD E buttonMapTypeSwitch Lnone/bek; - FIELD F buttonAllowCommands Lnone/bek; - FIELD G buttonCustomizeWorldType Lnone/bek; - FIELD a worldGeneratorSettings Ljava/lang/String; + FIELD F buttonCommandsAllowed Lnone/bek; + FIELD G buttonCustomizeType Lnone/bek; + FIELD J seed Ljava/lang/String; + FIELD K levelName Ljava/lang/String; + FIELD L generatorType I + FIELD M INVALID_LEVEL_NAMES [Ljava/lang/String; + FIELD a generatorOptions Ljava/lang/String; FIELD f parent Lnone/bgm; + FIELD r gameMode Ljava/lang/String; + FIELD t structures Z + FIELD u commandsAllowed Z METHOD (Lnone/bgm;)V ARG 0 parent METHOD a handleKeyPress (CI)V diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomize.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomize.mapping similarity index 83% rename from mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomize.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomize.mapping index fa75de80dc..b98de06736 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomize.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomize.mapping @@ -1,4 +1,4 @@ -CLASS none/bfw net/minecraft/client/gui/menu/GuiNewWorldCustomize +CLASS none/bfw net/minecraft/client/gui/menu/GuiNewLevelCustomize METHOD a handleKeyPress (CI)V ARG 0 keyChar ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomizeFlat.mapping similarity index 89% rename from mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomizeFlat.mapping index 322dda65ac..ac1af67895 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomizeFlat.mapping @@ -1,4 +1,4 @@ -CLASS none/bfu net/minecraft/client/gui/menu/GuiNewWorldCustomizeFlat +CLASS none/bfu net/minecraft/client/gui/menu/GuiNewLevelCustomizeFlat CLASS none/bfu$a METHOD a isSelected (I)Z ARG 0 index diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomizePresets.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomizePresets.mapping index 52a5b0d711..935f3839ed 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewLevelCustomizePresets.mapping @@ -1,4 +1,4 @@ -CLASS none/bfv net/minecraft/client/gui/menu/GuiNewWorldCustomizePresets +CLASS none/bfv net/minecraft/client/gui/menu/GuiNewLevelCustomizePresets CLASS none/bfv$b METHOD a isSelected (I)Z ARG 0 index diff --git a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping b/mappings/net/minecraft/client/gui/menu/GuiNewLevelPresets.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping rename to mappings/net/minecraft/client/gui/menu/GuiNewLevelPresets.mapping index 4de5967366..f4ba4b943f 100644 --- a/mappings/net/minecraft/client/gui/menu/GuiNewWorldPresets.mapping +++ b/mappings/net/minecraft/client/gui/menu/GuiNewLevelPresets.mapping @@ -1,4 +1,4 @@ -CLASS none/bgj net/minecraft/client/gui/menu/GuiNewWorldPresets +CLASS none/bgj net/minecraft/client/gui/menu/GuiNewLevelPresets CLASS none/bgj$b METHOD a isSelected (I)Z ARG 0 index diff --git a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping b/mappings/net/minecraft/client/gui/menu/WidgetLevelEntry.mapping similarity index 82% rename from mappings/net/minecraft/sortme/WidgetWorldEntry.mapping rename to mappings/net/minecraft/client/gui/menu/WidgetLevelEntry.mapping index 77aca8e7d1..16d19dc182 100644 --- a/mappings/net/minecraft/sortme/WidgetWorldEntry.mapping +++ b/mappings/net/minecraft/client/gui/menu/WidgetLevelEntry.mapping @@ -1,4 +1,4 @@ -CLASS none/biy net/minecraft/sortme/WidgetWorldEntry +CLASS none/biy net/minecraft/client/gui/menu/WidgetLevelEntry CLASS none/biy$1 METHOD a handle (ZI)V ARG 0 result @@ -10,14 +10,14 @@ CLASS none/biy net/minecraft/sortme/WidgetWorldEntry FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b DATE_FORMAT Ljava/text/DateFormat; FIELD e game Lnone/bdq; - FIELD f guiWorldSelect Lnone/bix; - FIELD g worldSummary Lnone/bax; + FIELD f guiLevelSelect Lnone/bix; + FIELD g levelSummary Lnone/bax; FIELD h iconLocation Lnone/kp; FIELD j iconFile Ljava/io/File; FIELD k iconTexture Lnone/bwt; METHOD (Lnone/biz;Lnone/bax;Lnone/baw;)V - ARG 1 worldSummary - ARG 2 worldStorage + ARG 1 levelSummary + ARG 2 levelStorage METHOD a (III)V ARG 0 index ARG 1 x diff --git a/mappings/net/minecraft/client/world/DummyWorldSaveHandler.mapping b/mappings/net/minecraft/client/world/DummyWorldSaveHandler.mapping index 51d6edbd25..625aa0a1fb 100644 --- a/mappings/net/minecraft/client/world/DummyWorldSaveHandler.mapping +++ b/mappings/net/minecraft/client/world/DummyWorldSaveHandler.mapping @@ -1,14 +1,15 @@ CLASS none/baz net/minecraft/client/world/DummyWorldSaveHandler - METHOD a getDataFileName (Ljava/lang/String;)Ljava/io/File; + METHOD a saveRegions ()V + METHOD a getDataFile (Ljava/lang/String;)Ljava/io/File; ARG 0 name - METHOD a (Lnone/aue;)Lnone/atw; - ARG 0 dimensionProvider + METHOD a createChunkSaveHandler (Lnone/aue;)Lnone/atw; + ARG 0 worldProvider METHOD a saveWorld (Lnone/bat;)V - ARG 0 worldProperties + ARG 0 properties METHOD a saveWorld (Lnone/bat;Lnone/dt;)V - ARG 0 worldProperties + ARG 0 properties ARG 1 playerTag METHOD b getWorldDir ()Ljava/io/File; METHOD c checkSessionLock ()V - METHOD d readWorldProperties ()Lnone/bat; + METHOD d readProperties ()Lnone/bat; METHOD e getPlayerSaveHandler ()Lnone/bba; diff --git a/mappings/net/minecraft/client/world/WorldClient.mapping b/mappings/net/minecraft/client/world/WorldClient.mapping index dd3fdb523f..10e14b940f 100644 --- a/mappings/net/minecraft/client/world/WorldClient.mapping +++ b/mappings/net/minecraft/client/world/WorldClient.mapping @@ -2,6 +2,12 @@ CLASS none/bmg net/minecraft/client/world/WorldClient FIELD K game Lnone/bdq; FIELD b netHandler Lnone/bme; FIELD c chunkProvider Lnone/bmc; + METHOD (Lnone/bme;Lnone/aiy;ILnone/qy;Lnone/os;)V + ARG 0 netHandler + ARG 1 levelInfo + ARG 2 worldTypeId + ARG 3 difficulty + ARG 4 profiler METHOD a getEntityById (I)Lnone/sf; ARG 0 id METHOD a isChunkLoaded (IIZ)Z @@ -25,5 +31,6 @@ CLASS none/bmg net/minecraft/client/world/WorldClient METHOD b onSpawnEntity (Lnone/sf;)V ARG 0 entity METHOD c getGameInstance (Lnone/bmg;)Lnone/bdq; + METHOD d update ()V METHOD n createChunkProvider ()Lnone/atj; METHOD t updateWeather ()V diff --git a/mappings/net/minecraft/migration/MigrationTypes.mapping b/mappings/net/minecraft/migration/MigrationTypes.mapping index cead083bbc..713e79dc54 100644 --- a/mappings/net/minecraft/migration/MigrationTypes.mapping +++ b/mappings/net/minecraft/migration/MigrationTypes.mapping @@ -1,5 +1,5 @@ CLASS none/pd net/minecraft/migration/MigrationTypes - FIELD a WORLD_PROPERTIES Lnone/pd; + FIELD a LEVEL_PROPERTIES Lnone/pd; FIELD b PLAYER_DATA Lnone/pd; FIELD c LEVEL_DATA Lnone/pd; FIELD d BLOCK_ENTITY Lnone/pd; diff --git a/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping b/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping index ce7f5b52f5..7e3abdafd9 100644 --- a/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping +++ b/mappings/net/minecraft/network/packet/client/CPacketGameJoin.mapping @@ -5,6 +5,7 @@ CLASS none/gy net/minecraft/network/packet/client/CPacketGameJoin FIELD d dimensionId I FIELD e difficulty Lnone/qy; FIELD f maxPlayers I + FIELD g generator Lnone/aja; FIELD h reducedDebugInfo Z METHOD a getEntityId ()I METHOD a readPacket (Lnone/es;)V diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index 94ff20de2b..b4ce376c4a 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -1,12 +1,18 @@ CLASS none/cal net/minecraft/server/IntegratedServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; FIELD l game Lnone/bdq; + FIELD m levelInfo Lnone/aiy; + METHOD (Lnone/bdq;Ljava/lang/String;Ljava/lang/String;Lnone/aiy;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnone/mn;)V + ARG 0 game + ARG 1 levelName + ARG 3 levelInfo METHOD A getRunDirectory ()Ljava/io/File; METHOD C doServerTick ()V METHOD Z isSnooperEnabled ()Z METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aja;Ljava/lang/String;)V - ARG 0 worldName - ARG 4 worldGeneratorSettings + ARG 0 levelName + ARG 3 generatorType + ARG 4 generatorOptions METHOD a setGameMode (Lnone/ait;)V ARG 0 gameMode METHOD a (Lnone/ait;Z)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index e2885c37e5..22d04aeb44 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD F worldHeight I FIELD G playerIdleTimeout I FIELD H keyPair Ljava/security/KeyPair; - FIELD J worldName Ljava/lang/String; + FIELD J levelName Ljava/lang/String; FIELD L demo Z FIELD M bonusChest Z FIELD R currentTaskName Ljava/lang/String; @@ -76,7 +76,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD P getServerPort ()I METHOD Q getUserName ()Ljava/lang/String; METHOD R isSinglePlayer ()Z - METHOD S getWorldName ()Ljava/lang/String; + METHOD S getLevelName ()Ljava/lang/String; METHOD U isMonsterSpawningEnabled ()Z METHOD V isDemo ()Z METHOD Z isSnooperEnabled ()Z @@ -89,8 +89,9 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 runnable METHOD a convertSave (Ljava/lang/String;)V METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aja;Ljava/lang/String;)V - ARG 0 worldName - ARG 4 worldGeneratorSettings + ARG 0 levelName + ARG 3 generatorType + ARG 4 generatorOptions METHOD a loadWorldResourcePack (Ljava/lang/String;Lnone/bau;)V ARG 0 gameDir ARG 1 worldSaveHandler @@ -164,7 +165,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD ay getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD az getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; METHOD b setServerPort (I)V - ARG 0 port + ARG 0 value METHOD b setCurrentTaskName (Ljava/lang/String;)V ARG 0 taskName METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; @@ -175,7 +176,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer ARG 0 value METHOD c getBlockPos ()Lnone/cn; METHOD c setWorldHeight (I)V - ARG 0 worldHeight + ARG 0 value METHOD c setServerIp (Ljava/lang/String;)V ARG 0 serverIp METHOD c setBonusChest (Z)V @@ -213,8 +214,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 j setLevelName (Ljava/lang/String;)V + ARG 0 value METHOD k getCurrentTaskName ()Ljava/lang/String; METHOD l generateTerrain ()V METHOD l setMotd (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping index deb0ac27ea..4e39af7138 100644 --- a/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/IDedicatedServer.mapping @@ -4,7 +4,7 @@ CLASS none/la net/minecraft/server/dedicated/IDedicatedServer METHOD I getMaxPlayerCount ()I METHOD J getPlayerNames ()[Ljava/lang/String; METHOD L isDebuggingEnabled ()Z - METHOD S getWorldName ()Ljava/lang/String; + METHOD S getLevelName ()Ljava/lang/String; METHOD a saveProperties ()V METHOD a getInt (Ljava/lang/String;I)I ARG 0 key diff --git a/mappings/net/minecraft/sortme/BiomeProviderSingle.mapping b/mappings/net/minecraft/sortme/BiomeProviderSingle.mapping new file mode 100644 index 0000000000..852cd28db0 --- /dev/null +++ b/mappings/net/minecraft/sortme/BiomeProviderSingle.mapping @@ -0,0 +1 @@ +CLASS none/ajr net/minecraft/sortme/BiomeProviderSingle diff --git a/mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping b/mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping deleted file mode 100644 index e218159566..0000000000 --- a/mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS none/auc net/minecraft/sortme/WorldSaveLoadSomething - CLASS none/auc$1 - METHOD a upgradeTag (Lnone/pe;Lnone/dt;I)Lnone/dt; - ARG 0 handler - ARG 1 tag - ARG 2 version - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - METHOD a (Lnone/aiv;Lnone/dt;)Lnone/ato; - ARG 0 world - ARG 1 nbt - METHOD a registerTagUpgraders (Lnone/pf;)V - METHOD c run ()Z diff --git a/mappings/net/minecraft/util/ChatUtils.mapping b/mappings/net/minecraft/util/ChatUtils.mapping index ec8ab60c4b..d9e9a55ac4 100644 --- a/mappings/net/minecraft/util/ChatUtils.mapping +++ b/mappings/net/minecraft/util/ChatUtils.mapping @@ -1,7 +1,7 @@ CLASS none/g net/minecraft/util/ChatUtils FIELD a RESOURCE_LEAK_DETECTOR_DISABLED Lio/netty/util/ResourceLeakDetector$Level; FIELD b INVALID_CHARS_STRUCTURE_NAME [C - FIELD c INVALID_CHARS_WORLD_NAME [C + FIELD c INVALID_CHARS_LEVEL_NAME [C METHOD a isValidChar (C)Z ARG 0 chr METHOD a stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/util/IProgress.mapping b/mappings/net/minecraft/util/IProgressCallback.mapping similarity index 82% rename from mappings/net/minecraft/util/IProgress.mapping rename to mappings/net/minecraft/util/IProgressCallback.mapping index 908e805f1e..fbbe025d49 100644 --- a/mappings/net/minecraft/util/IProgress.mapping +++ b/mappings/net/minecraft/util/IProgressCallback.mapping @@ -1,4 +1,4 @@ -CLASS none/ot net/minecraft/util/IProgress +CLASS none/ot net/minecraft/util/IProgressCallback METHOD a finish ()V METHOD a setProgress (I)V ARG 0 percentage diff --git a/mappings/net/minecraft/util/NetworkHelper.mapping b/mappings/net/minecraft/util/NetworkHelper.mapping index 605ded188b..f1526b5f2a 100644 --- a/mappings/net/minecraft/util/NetworkHelper.mapping +++ b/mappings/net/minecraft/util/NetworkHelper.mapping @@ -7,7 +7,7 @@ CLASS none/oj net/minecraft/util/NetworkHelper ARG 1 packUrl ARG 2 requestParams ARG 3 sizeLimit - ARG 4 progressUpdater + ARG 4 progress ARG 5 proxy METHOD a postSnooperData (Ljava/net/URL;Ljava/lang/String;ZLjava/net/Proxy;)Ljava/lang/String; ARG 0 endpoint diff --git a/mappings/net/minecraft/world/GameMode.mapping b/mappings/net/minecraft/world/GameMode.mapping index c58bd6fa5e..cfceb387b0 100644 --- a/mappings/net/minecraft/world/GameMode.mapping +++ b/mappings/net/minecraft/world/GameMode.mapping @@ -21,4 +21,6 @@ CLASS none/ait net/minecraft/world/GameMode METHOD a setAbilitites (Lnone/aaj;)V ARG 0 abilities METHOD b getName ()Ljava/lang/String; + METHOD c isAdventureOrSpectator ()Z METHOD d isCreative ()Z + METHOD e isSurvivalOrAdventure ()Z diff --git a/mappings/net/minecraft/world/IWorldSaveHandler.mapping b/mappings/net/minecraft/world/IWorldSaveHandler.mapping index f3e940b3f9..7b33e5cbeb 100644 --- a/mappings/net/minecraft/world/IWorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/IWorldSaveHandler.mapping @@ -1,14 +1,15 @@ CLASS none/bau net/minecraft/world/IWorldSaveHandler - METHOD a getDataFileName (Ljava/lang/String;)Ljava/io/File; + METHOD a saveRegions ()V + METHOD a getDataFile (Ljava/lang/String;)Ljava/io/File; ARG 0 name - METHOD a (Lnone/aue;)Lnone/atw; - ARG 0 dimensionProvider + METHOD a createChunkSaveHandler (Lnone/aue;)Lnone/atw; + ARG 0 worldProvider METHOD a saveWorld (Lnone/bat;)V - ARG 0 worldProperties + ARG 0 properties METHOD a saveWorld (Lnone/bat;Lnone/dt;)V - ARG 0 worldProperties + ARG 0 properties ARG 1 playerTag METHOD b getWorldDir ()Ljava/io/File; METHOD c checkSessionLock ()V - METHOD d readWorldProperties ()Lnone/bat; + METHOD d readProperties ()Lnone/bat; METHOD e getPlayerSaveHandler ()Lnone/bba; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 4d1011ba7a..d8a543f64b 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -5,12 +5,14 @@ CLASS none/aiv net/minecraft/world/World FIELD L calendar Ljava/util/Calendar; FIELD N border Lnone/atf; FIELD a seaLevel I + FIELD c droppedBlockEntities Ljava/util/List; FIELD e entities Ljava/util/List; + FIELD f droppedEntities Ljava/util/List; FIELD g blockEntities Ljava/util/List; FIELD h tickingBlockEntities Ljava/util/List; FIELD i players Ljava/util/List; FIELD r rand Ljava/util/Random; - FIELD s dimensionProvider Lnone/aue; + FIELD s provider Lnone/aue; FIELD u listeners Ljava/util/List; FIELD v chunkProvider Lnone/atj; FIELD w saveHandler Lnone/bau; @@ -18,9 +20,9 @@ CLASS none/aiv net/minecraft/world/World METHOD (Lnone/bau;Lnone/bat;Lnone/aue;Lnone/os;Z)V ARG 0 saveHandler ARG 1 properties - ARG 2 dimensionProvider + ARG 2 provider ARG 3 profiler - ARG 4 isClient + ARG 4 remote METHOD A ()Lnone/ajm; METHOD A setSpawnPos (Lnone/cn;)V ARG 0 pos @@ -63,6 +65,8 @@ CLASS none/aiv net/minecraft/world/World METHOD a getEntitiesIn (Ljava/lang/Class;Lnone/bcr;Lcom/google/common/base/Predicate;)Ljava/util/List; METHOD a getPlayerByName (Ljava/lang/String;)Lnone/aal; ARG 0 name + METHOD a addEntities (Ljava/util/Collection;)V + ARG 0 entities METHOD a playSound (Lnone/aal;DDDLnone/nk;Lnone/nm;FF)V ARG 0 player ARG 1 x @@ -83,7 +87,7 @@ CLASS none/aiv net/minecraft/world/World ARG 0 listener METHOD a init (Lnone/aiy;)V ARG 0 info - METHOD a (Lnone/ard;)Z + METHOD a addBlockEntity (Lnone/ard;)Z ARG 0 blockEntity METHOD a isAreaLoaded (Lnone/awz;)Z ARG 0 area @@ -134,7 +138,7 @@ CLASS none/aiv net/minecraft/world/World METHOD ae getDifficulty ()Lnone/qy; METHOD aj getWorldBorder ()Lnone/atf; METHOD ak getLootTableHandler ()Lnone/bbl; - METHOD b getWorld ()Lnone/aiv; + METHOD b ()Lnone/aiv; METHOD b setSeaLevel (I)V ARG 0 seaLevel METHOD b setTimeOfDay (J)V @@ -142,10 +146,14 @@ CLASS none/aiv net/minecraft/world/World METHOD b getPlayers (Ljava/lang/Class;Lcom/google/common/base/Predicate;)Ljava/util/List; ARG 0 playerClass ARG 1 predicate + METHOD b addBlockEntities (Ljava/util/Collection;)V + ARG 0 blockEntities METHOD b getPlayerByUuid (Ljava/util/UUID;)Lnone/aal; ARG 0 uuid METHOD b unregisterWorldListener (Lnone/aix;)V ARG 0 listener + METHOD b dropBlockEntity (Lnone/ard;)V + ARG 0 blockEntity METHOD b isAreaLoaded (Lnone/awz;Z)Z ARG 0 area METHOD b getBiome (Lnone/cn;)Lnone/aji; @@ -160,10 +168,13 @@ CLASS none/aiv net/minecraft/world/World ARG 0 entityId ARG 1 pos ARG 2 progress + METHOD c dropEntities (Ljava/util/Collection;)V + ARG 0 entities METHOD c (Lnone/cn;)Lnone/asl; METHOD c getEmittedRedstonePower (Lnone/cn;Lnone/cu;)I ARG 0 pos ARG 1 facingFrom + METHOD d update ()V METHOD d isSpawnChunk (II)Z ARG 0 chunkX ARG 1 chunkY diff --git a/mappings/net/minecraft/world/WorldSaveHandlerAnvil.mapping b/mappings/net/minecraft/world/WorldSaveHandlerAnvil.mapping new file mode 100644 index 0000000000..785dcff7a4 --- /dev/null +++ b/mappings/net/minecraft/world/WorldSaveHandlerAnvil.mapping @@ -0,0 +1,7 @@ +CLASS none/bao net/minecraft/world/WorldSaveHandlerAnvil + METHOD a saveRegions ()V + METHOD a createChunkSaveHandler (Lnone/aue;)Lnone/atw; + ARG 0 worldProvider + METHOD a saveWorld (Lnone/bat;Lnone/dt;)V + ARG 0 properties + ARG 1 playerTag diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandlerOld.mapping similarity index 71% rename from mappings/net/minecraft/world/WorldSaveHandler.mapping rename to mappings/net/minecraft/world/WorldSaveHandlerOld.mapping index ebe515a16a..cd6d1263c6 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandlerOld.mapping @@ -1,4 +1,4 @@ -CLASS none/bar net/minecraft/world/WorldSaveHandler +CLASS none/bar net/minecraft/world/WorldSaveHandlerOld FIELD a migrationHandler Lnone/pf; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c worldDir Ljava/io/File; @@ -9,23 +9,25 @@ CLASS none/bar net/minecraft/world/WorldSaveHandler METHOD (Ljava/io/File;Ljava/lang/String;ZLnone/pf;)V ARG 0 savesDir ARG 1 worldName + ARG 2 dedicated ARG 3 migrationHandler - METHOD a getDataFileName (Ljava/lang/String;)Ljava/io/File; + METHOD a saveRegions ()V + METHOD a getDataFile (Ljava/lang/String;)Ljava/io/File; ARG 0 name METHOD a savePlayerData (Lnone/aal;)V ARG 0 player - METHOD a (Lnone/aue;)Lnone/atw; - ARG 0 dimensionProvider + METHOD a createChunkSaveHandler (Lnone/aue;)Lnone/atw; + ARG 0 worldProvider METHOD a saveWorld (Lnone/bat;)V - ARG 0 worldProperties + ARG 0 properties METHOD a saveWorld (Lnone/bat;Lnone/dt;)V - ARG 0 worldProperties + ARG 0 properties ARG 1 playerTag METHOD b getWorldDir ()Ljava/io/File; METHOD b loadPlayerData (Lnone/aal;)Lnone/dt; ARG 0 player METHOD c checkSessionLock ()V - METHOD d readWorldProperties ()Lnone/bat; + METHOD d readProperties ()Lnone/bat; METHOD e getPlayerSaveHandler ()Lnone/bba; METHOD f getSavedPlayerIds ()[Ljava/lang/String; METHOD i writeSessionLock ()V diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping index 9af8c2c18f..1a40382c1d 100644 --- a/mappings/net/minecraft/world/WorldServer.mapping +++ b/mappings/net/minecraft/world/WorldServer.mapping @@ -2,12 +2,21 @@ CLASS none/lu net/minecraft/world/WorldServer FIELD I server Lnet/minecraft/server/MinecraftServer; FIELD J entityTrackingManager Lnone/lr; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b disableAutoSave Z + FIELD b autoSaveDisabled Z + METHOD (Lnet/minecraft/server/MinecraftServer;Lnone/bau;Lnone/bat;ILnone/os;)V + ARG 0 server + ARG 1 saveHandler + ARG 2 levelProperties + ARG 3 worldTypeId + ARG 4 profiler + METHOD a saveLevel ()V METHOD a isChunkLoaded (IIZ)Z ARG 0 chunkX ARG 1 chunkZ METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; ARG 0 runnable + METHOD a addEntities (Ljava/util/Collection;)V + ARG 0 entities METHOD a getEntityByUuid (Ljava/util/UUID;)Lnone/sf; METHOD a init (Lnone/aiy;)V ARG 0 info @@ -21,15 +30,20 @@ CLASS none/lu net/minecraft/world/WorldServer ARG 4 power ARG 5 createFire ARG 6 destroyBlocks - METHOD a (ZLnone/ot;)V + METHOD a save (ZLnone/ot;)V + ARG 0 entities + ARG 1 progress METHOD aE isMainThread ()Z - METHOD b getWorld ()Lnone/aiv; + METHOD b ()Lnone/aiv; METHOD b onSpawnEntity (Lnone/sf;)V ARG 0 entity + METHOD d update ()V METHOD e updateSleepingStatus ()V METHOD k updateEntities ()V METHOD n createChunkProvider ()Lnone/atj; + METHOD q flushChunks ()V METHOD r getServerChunkProvider ()Lnone/lt; + METHOD s saveRegions ()V METHOD t updateWeather ()V METHOD u getServer ()Lnet/minecraft/server/MinecraftServer; METHOD v getEntityTrackingManager ()Lnone/lr; diff --git a/mappings/net/minecraft/world/DimensionType.mapping b/mappings/net/minecraft/world/WorldType.mapping similarity index 60% rename from mappings/net/minecraft/world/DimensionType.mapping rename to mappings/net/minecraft/world/WorldType.mapping index 9f21bbb683..f78500f1f7 100644 --- a/mappings/net/minecraft/world/DimensionType.mapping +++ b/mappings/net/minecraft/world/WorldType.mapping @@ -1,19 +1,20 @@ -CLASS none/auf net/minecraft/world/DimensionType +CLASS none/auf net/minecraft/world/WorldType FIELD a OVERWORLD Lnone/auf; FIELD b NETHER Lnone/auf; FIELD c END Lnone/auf; FIELD d id I FIELD e name Ljava/lang/String; - FIELD f worldName Ljava/lang/String; + FIELD f suffix Ljava/lang/String; FIELD g providerClass Ljava/lang/Class; METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljava/lang/Class;)V ARG 0 id ARG 1 name - ARG 2 worldName + ARG 2 suffix ARG 3 providerClass METHOD a getID ()I - METHOD a getDimensionByID (I)Lnone/auf; + METHOD a getById (I)Lnone/auf; ARG 0 id METHOD b getName ()Ljava/lang/String; - METHOD c getWorldName ()Ljava/lang/String; - METHOD d constructDimension ()Lnone/aue; + METHOD c getSuffix ()Ljava/lang/String; + METHOD d createProvider ()Lnone/aue; + METHOD values values ()[Lnone/auf; diff --git a/mappings/net/minecraft/world/biome/BiomeProvider.mapping b/mappings/net/minecraft/world/biome/BiomeProvider.mapping new file mode 100644 index 0000000000..159bcdfd3f --- /dev/null +++ b/mappings/net/minecraft/world/biome/BiomeProvider.mapping @@ -0,0 +1 @@ +CLASS none/ajm net/minecraft/world/biome/BiomeProvider diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 178aaa6491..fa39f10b86 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -2,9 +2,11 @@ CLASS none/ato net/minecraft/world/chunk/Chunk FIELD a NULL_CHUNK_SECTION Lnone/atp; FIELD b chunkX I FIELD c chunkZ I + FIELD d dropped Z FIELD e LOGGER Lorg/apache/logging/log4j/Logger; FIELD f sections [Lnone/atp; FIELD g biomeMap [B + FIELD j entitiesLoaded Z FIELD k world Lnone/aiv; FIELD l heightMap [I FIELD n blockEntityMap Ljava/util/Map; @@ -18,7 +20,7 @@ CLASS none/ato net/minecraft/world/chunk/Chunk ARG 2 z METHOD (Lnone/aiv;Lnone/auo;II)V ARG 0 world - METHOD a matches (II)Z + METHOD a matchesPos (II)Z ARG 0 chunkX ARG 1 chunkZ METHOD a getBlockState (III)Lnone/asl; @@ -31,6 +33,11 @@ CLASS none/ato net/minecraft/world/chunk/Chunk ARG 1 pos METHOD a addBlockEntity (Lnone/ard;)V ARG 0 blockEntity + METHOD a populate (Lnone/ati;)V + ARG 0 generator + METHOD a populate (Lnone/atj;Lnone/ati;)V + ARG 0 provider + ARG 1 generator METHOD a getBlockState (Lnone/cn;)Lnone/asl; ARG 0 pos METHOD a (Lnone/cn;I)I @@ -60,9 +67,14 @@ CLASS none/ato net/minecraft/world/chunk/Chunk ARG 1 z METHOD b (Lnone/cn;)I ARG 0 pos + METHOD b update (Z)V + METHOD c addEntities ()V METHOD c setInhabitedTime (J)V ARG 0 inhabitedTime - METHOD d (Lnone/cn;)V + METHOD c setEntitiesLoaded (Z)V + ARG 0 value + METHOD d dropEntities ()V + METHOD d invalidateBlockEntityAt (Lnone/cn;)V ARG 0 pos METHOD d setTerrainPopulated (Z)V ARG 0 terrainPopulated @@ -75,6 +87,7 @@ CLASS none/ato net/minecraft/world/chunk/Chunk METHOD h getSections ()[Lnone/atp; METHOD k getPos ()Lnone/aio; METHOD l getBiomeMap ()[B + METHOD p areEntitiesLoaded ()Z METHOD q getWorld ()Lnone/aiv; METHOD r getHeightMap ()[I METHOD s getBlockEntityMap ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping b/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping index e1cceac0fd..1ccf31d8aa 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping @@ -1,4 +1,6 @@ CLASS none/bmc net/minecraft/world/chunk/ChunkProviderClient + CLASS none/bmc$1 + METHOD rehash rehash (I)V FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b emptyChunk Lnone/ato; FIELD c chunkByIdMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; @@ -8,9 +10,13 @@ CLASS none/bmc net/minecraft/world/chunk/ChunkProviderClient METHOD a getChunk (II)Lnone/ato; ARG 0 x ARG 1 z + METHOD b (II)V + ARG 0 x + ARG 1 y METHOD c provideChunk (II)Lnone/ato; ARG 0 x ARG 1 z + METHOD d update ()Z METHOD d (II)Lnone/ato; ARG 0 x ARG 1 z diff --git a/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping index f48ce39f89..82d8fa547a 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping @@ -1,24 +1,39 @@ CLASS none/lt net/minecraft/world/chunk/ChunkProviderServer FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b loadedChunkIds Ljava/util/Set; + FIELD b droppedChunks Ljava/util/Set; + FIELD c generator Lnone/ati; + FIELD d saveHandler Lnone/atw; FIELD e chunkByIdMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD f world Lnone/lu; + METHOD (Lnone/lu;Lnone/atw;Lnone/ati;)V + ARG 0 world + ARG 1 saveHandler + ARG 2 generator METHOD a getChunks ()Ljava/util/Collection; METHOD a getChunk (II)Lnone/ato; ARG 0 x ARG 1 z + METHOD a dropChunk (Lnone/ato;)V + ARG 0 chunk + METHOD a saveChunks (Z)Z + ARG 0 entities + METHOD b dropAll ()V METHOD b getOrLoadChunk (II)Lnone/ato; ARG 0 x ARG 1 z METHOD b saveEntities (Lnone/ato;)V ARG 0 chunk + METHOD c flushChunks ()V METHOD c provideChunk (II)Lnone/ato; ARG 0 x ARG 1 z METHOD c saveChunk (Lnone/ato;)V ARG 0 chunk + METHOD d update ()Z METHOD d hasChunk (II)Z ARG 0 x ARG 1 z + METHOD e canAutoSave ()Z METHOD e loadChunk (II)Lnone/ato; ARG 0 x ARG 1 z diff --git a/mappings/net/minecraft/world/chunk/ChunkSaveHandler.mapping b/mappings/net/minecraft/world/chunk/ChunkSaveHandler.mapping new file mode 100644 index 0000000000..8cb8c5e0cd --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkSaveHandler.mapping @@ -0,0 +1,68 @@ +CLASS none/auc net/minecraft/world/chunk/ChunkSaveHandler + CLASS none/auc$1 + METHOD a upgradeTag (Lnone/pe;Lnone/dt;I)Lnone/dt; + ARG 0 handler + ARG 1 tag + ARG 2 version + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b chunkData Ljava/util/Map; + FIELD c dirtyChunks Ljava/util/Set; + FIELD d regionFile Ljava/io/File; + FIELD e migrationHandler Lnone/pf; + FIELD f saving Z + METHOD (Ljava/io/File;Lnone/pf;)V + ARG 0 regionFile + ARG 1 migrationHandler + METHOD a ()V + METHOD a markChunkDirty (Lnone/aio;Lnone/dt;)V + ARG 0 pos + ARG 1 tag + METHOD a loadChunk (Lnone/aiv;II)Lnone/ato; + ARG 0 world + ARG 1 x + ARG 2 y + METHOD a loadChunk (Lnone/aiv;IILnone/dt;)Lnone/ato; + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 tag + METHOD a saveChunk (Lnone/aiv;Lnone/ato;)V + ARG 0 world + ARG 1 chunk + METHOD a deserializeChunk (Lnone/aiv;Lnone/dt;)Lnone/ato; + ARG 0 world + ARG 1 tag + METHOD a serializeChunk (Lnone/ato;Lnone/aiv;Lnone/dt;)V + ARG 0 chunk + ARG 1 world + ARG 2 tag + METHOD a deserializeEntity (Lnone/dt;Lnone/aiv;)Lnone/sf; + ARG 0 tag + ARG 1 world + METHOD a loadEntityAndPassengers (Lnone/dt;Lnone/aiv;DDDZ)Lnone/sf; + ARG 0 tag + ARG 1 world + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 spawn + METHOD a loadEntityAndPassengers (Lnone/dt;Lnone/aiv;Lnone/ato;)Lnone/sf; + ARG 0 tag + ARG 1 world + ARG 2 chunk + METHOD a loadEntityAndPassengers (Lnone/dt;Lnone/aiv;Z)Lnone/sf; + ARG 0 tag + ARG 1 world + ARG 2 spawn + METHOD a registerTagUpgraders (Lnone/pf;)V + METHOD a loadPassenger (Lnone/sf;Lnone/aiv;)V + ARG 0 passenger + ARG 1 world + METHOD b flushChunks ()V + METHOD b writeChunk (Lnone/aio;Lnone/dt;)V + ARG 0 pos + ARG 1 tag + METHOD b saveEntities (Lnone/aiv;Lnone/ato;)V + ARG 0 world + ARG 1 chunk + METHOD c run ()Z diff --git a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping index d7c09e1190..72115a7588 100644 --- a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping @@ -1,5 +1,5 @@ CLASS none/atl net/minecraft/world/chunk/EmptyChunk - METHOD a matches (II)Z + METHOD a matchesPos (II)Z ARG 0 chunkX ARG 1 chunkZ METHOD a (Lnone/ajb;Lnone/cn;)I @@ -24,6 +24,8 @@ CLASS none/atl net/minecraft/world/chunk/EmptyChunk ARG 1 z METHOD b (Lnone/cn;)I ARG 0 pos - METHOD d (Lnone/cn;)V + METHOD c addEntities ()V + METHOD d dropEntities ()V + METHOD d invalidateBlockEntityAt (Lnone/cn;)V ARG 0 pos METHOD f isEmpty ()Z diff --git a/mappings/net/minecraft/world/chunk/IChunkProvider.mapping b/mappings/net/minecraft/world/chunk/IChunkProvider.mapping index 3005248c51..1c523de048 100644 --- a/mappings/net/minecraft/world/chunk/IChunkProvider.mapping +++ b/mappings/net/minecraft/world/chunk/IChunkProvider.mapping @@ -5,4 +5,5 @@ CLASS none/atj net/minecraft/world/chunk/IChunkProvider METHOD c provideChunk (II)Lnone/ato; ARG 0 x ARG 1 z + METHOD d update ()Z METHOD f getStatus ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/IChunkSaveHandler.mapping b/mappings/net/minecraft/world/chunk/IChunkSaveHandler.mapping new file mode 100644 index 0000000000..61a3ea77c7 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/IChunkSaveHandler.mapping @@ -0,0 +1,13 @@ +CLASS none/atw net/minecraft/world/chunk/IChunkSaveHandler + METHOD a ()V + METHOD a loadChunk (Lnone/aiv;II)Lnone/ato; + ARG 0 world + ARG 1 x + ARG 2 y + METHOD a saveChunk (Lnone/aiv;Lnone/ato;)V + ARG 0 world + ARG 1 chunk + METHOD b flushChunks ()V + METHOD b saveEntities (Lnone/aiv;Lnone/ato;)V + ARG 0 world + ARG 1 chunk diff --git a/mappings/net/minecraft/world/generator/WorldGenerator.mapping b/mappings/net/minecraft/world/generator/WorldGenerator.mapping deleted file mode 100644 index 64395a65ff..0000000000 --- a/mappings/net/minecraft/world/generator/WorldGenerator.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS none/aja net/minecraft/world/generator/WorldGenerator - FIELD b DEFAULT Lnone/aja; - FIELD c FLAT Lnone/aja; - FIELD d LARGE_BIOMES Lnone/aja; - FIELD e AMPLIFIED Lnone/aja; - FIELD f CUSTOMIZED Lnone/aja; - FIELD g DEBUG_ALL_BLOCK_STATES Lnone/aja; - FIELD h DEFAULT_1_1 Lnone/aja; - FIELD j name Ljava/lang/String; - FIELD k version I - METHOD (ILjava/lang/String;I)V - ARG 1 name - ARG 2 version - METHOD a getName ()Ljava/lang/String; - METHOD d getVersion ()I diff --git a/mappings/net/minecraft/world/level/LevelGeneratorType.mapping b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping new file mode 100644 index 0000000000..5dc7d64121 --- /dev/null +++ b/mappings/net/minecraft/world/level/LevelGeneratorType.mapping @@ -0,0 +1,38 @@ +CLASS none/aja net/minecraft/world/level/LevelGeneratorType + FIELD a TYPES [Lnone/aja; + FIELD b DEFAULT Lnone/aja; + FIELD c FLAT Lnone/aja; + FIELD d LARGE_BIOMES Lnone/aja; + FIELD e AMPLIFIED Lnone/aja; + FIELD f CUSTOMIZED Lnone/aja; + FIELD g DEBUG_ALL_BLOCK_STATES Lnone/aja; + FIELD h DEFAULT_1_1 Lnone/aja; + FIELD i id I + FIELD j name Ljava/lang/String; + FIELD k version I + FIELD l visible Z + FIELD m versioned Z + FIELD n info Z + METHOD (ILjava/lang/String;)V + ARG 0 id + ARG 1 name + METHOD (ILjava/lang/String;I)V + ARG 0 id + ARG 1 name + ARG 2 version + METHOD a getName ()Ljava/lang/String; + METHOD a getTypeForVersion (I)Lnone/aja; + ARG 0 version + METHOD a getTypeFromName (Ljava/lang/String;)Lnone/aja; + ARG 0 name + METHOD a setVisible (Z)Lnone/aja; + ARG 0 value + METHOD b getTranslationKey ()Ljava/lang/String; + METHOD c getInfoTranslationKey ()Ljava/lang/String; + METHOD d getVersion ()I + METHOD e isVisible ()Z + METHOD f isVersioned ()Z + METHOD g getId ()I + METHOD h hasInfo ()Z + METHOD i setVersioned ()Lnone/aja; + METHOD j setHasInfo ()Lnone/aja; diff --git a/mappings/net/minecraft/world/WorldInfo.mapping b/mappings/net/minecraft/world/level/LevelInfo.mapping similarity index 60% rename from mappings/net/minecraft/world/WorldInfo.mapping rename to mappings/net/minecraft/world/level/LevelInfo.mapping index cd63762848..8d35c71d67 100644 --- a/mappings/net/minecraft/world/WorldInfo.mapping +++ b/mappings/net/minecraft/world/level/LevelInfo.mapping @@ -1,31 +1,31 @@ -CLASS none/aiy net/minecraft/world/WorldInfo +CLASS none/aiy net/minecraft/world/level/LevelInfo FIELD a seed J FIELD b gameMode Lnone/ait; FIELD c structures Z FIELD d hardcore Z - FIELD e worldGenerator Lnone/aja; + FIELD e generatorType Lnone/aja; FIELD f commands Z FIELD g bonusChest Z - FIELD h worldGeneratorSettings Ljava/lang/String; + FIELD h generatorOptions Ljava/lang/String; METHOD (JLnone/ait;ZZLnone/aja;)V ARG 0 seed ARG 1 gameMode ARG 2 structures ARG 3 hardcore - ARG 4 worldGenerator + ARG 4 generatorType METHOD (Lnone/bat;)V - ARG 0 worldProperties + ARG 0 properties METHOD a setBonusChest ()Lnone/aiy; METHOD a getGameModeById (I)Lnone/ait; ARG 0 id - METHOD a setWorldGeneratorSettings (Ljava/lang/String;)Lnone/aiy; - ARG 0 newGeneratorSettings + METHOD a setGeneratorOptions (Ljava/lang/String;)Lnone/aiy; + ARG 0 value METHOD b enableCommands ()Lnone/aiy; METHOD c hasBonusChest ()Z METHOD d getSeed ()J METHOD e getGameMode ()Lnone/ait; METHOD f isHardcore ()Z METHOD g hasStructures ()Z - METHOD h getWorldGenerator ()Lnone/aja; + METHOD h getGeneratorType ()Lnone/aja; METHOD i allowCommands ()Z - METHOD j getWorldGeneratorSettings ()Ljava/lang/String; + METHOD j getGeneratorOptions ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/WorldProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping similarity index 72% rename from mappings/net/minecraft/world/WorldProperties.mapping rename to mappings/net/minecraft/world/level/LevelProperties.mapping index 9e74a33c8a..d64ee68ce7 100644 --- a/mappings/net/minecraft/world/WorldProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -1,10 +1,10 @@ -CLASS none/bat net/minecraft/world/WorldProperties +CLASS none/bat net/minecraft/world/level/LevelProperties CLASS none/bat$1 METHOD a upgradeTag (Lnone/pe;Lnone/dt;I)Lnone/dt; ARG 0 handler ARG 1 tag ARG 2 version - FIELD A allowCommands Z + FIELD A commandsAllowed Z FIELD B initialized Z FIELD C difficulty Lnone/qy; FIELD D difficultyLocked Z @@ -17,25 +17,25 @@ CLASS none/bat net/minecraft/world/WorldProperties FIELD K borderDamagePerBlock D FIELD L borderWarningBlocks I FIELD M borderWarningTime I - FIELD N dimensionData Ljava/util/Map; + FIELD N worldData Ljava/util/Map; FIELD O gameRules Lnone/ais; - FIELD a dificulty Lnone/qy; + FIELD a DEFAULT_DIFFICULTY Lnone/qy; FIELD b versionName Ljava/lang/String; FIELD c versionId I FIELD d versionSnapshot Z FIELD e randomSeed J - FIELD f worldGenerator Lnone/aja; + FIELD f generatorType Lnone/aja; FIELD g generatorOptions Ljava/lang/String; FIELD h spawnX I FIELD i spawnY I FIELD j spawnZ I FIELD k time J - FIELD l dayTime J + FIELD l timeOfDay J FIELD m lastPlayed J - FIELD n worldSize J + FIELD n sizeOnDisk J FIELD o playerData Lnone/dt; FIELD p dimension I - FIELD q worldName Ljava/lang/String; + FIELD q levelName Ljava/lang/String; FIELD r version I FIELD s clearWeatherTime I FIELD t raining Z @@ -45,10 +45,13 @@ CLASS none/bat net/minecraft/world/WorldProperties FIELD x gameMode Lnone/ait; FIELD y structures Z FIELD z hardcore Z + METHOD (Lnone/aiy;Ljava/lang/String;)V + ARG 0 info + ARG 1 name METHOD (Lnone/bat;)V ARG 0 properties METHOD (Lnone/dt;)V - ARG 0 nbt + ARG 0 tag METHOD A getGeneratorOptions ()Ljava/lang/String; METHOD B getBorderCenterX ()D METHOD C getBorderCenterZ ()D @@ -64,87 +67,89 @@ CLASS none/bat net/minecraft/world/WorldProperties METHOD M getVersionName ()Ljava/lang/String; METHOD a getSeed ()J METHOD a setBorderSize (D)V - ARG 0 borderSize + ARG 0 value METHOD a setSpawnX (I)V - ARG 0 spawnY - METHOD a setWorldName (Ljava/lang/String;)V - ARG 0 worldName + ARG 0 value + METHOD a setLevelName (Ljava/lang/String;)V + ARG 0 value METHOD a setGameMode (Lnone/ait;)V - ARG 0 gamemode - METHOD a setWorldGenerator (Lnone/aja;)V - ARG 0 worldGenerator - METHOD a getDimensionTag (Lnone/auf;)Lnone/dt; - ARG 0 dimension - METHOD a setDimensionTag (Lnone/auf;Lnone/dt;)V - ARG 0 dimension - ARG 1 tag + ARG 0 value + METHOD a updateFromLevelInfo (Lnone/aiy;)V + ARG 0 info + METHOD a setGeneratorType (Lnone/aja;)V + ARG 0 value + METHOD a getWorldData (Lnone/auf;)Lnone/dt; + ARG 0 type + METHOD a setWorldData (Lnone/auf;Lnone/dt;)V + ARG 0 type + ARG 1 value METHOD a addToReport (Lnone/c;)V ARG 0 report METHOD a setSpawnPos (Lnone/cn;)V - ARG 0 spawnPos + ARG 0 pos METHOD a cloneWorldTag (Lnone/dt;)Lnone/dt; ARG 0 playerTag METHOD a updateProperties (Lnone/dt;Lnone/dt;)V - ARG 0 worldTag + ARG 0 levelTag ARG 1 playerTag METHOD a registerTagUpgraders (Lnone/pf;)V METHOD a setDifficulty (Lnone/qy;)V - ARG 0 difficulty + ARG 0 value METHOD a setThundering (Z)V - ARG 0 thundering + ARG 0 value METHOD b getSpawnX ()I METHOD b setBorderSizeLerpTarget (D)V - ARG 0 borderSizeLerpTarget + ARG 0 value METHOD b setSpawnY (I)V - ARG 0 spawnY + ARG 0 value METHOD b setTime (J)V - ARG 0 time + ARG 0 value METHOD b setRaining (Z)V - ARG 0 raining + ARG 0 value METHOD c getSpawnY ()I METHOD c borderCenterZ (D)V - ARG 0 borderCenterZ + ARG 0 value METHOD c setSpawnZ (I)V - ARG 0 spawnZ + ARG 0 value METHOD c setTimeOfDay (J)V - ARG 0 dayTime - METHOD c setAllowCommands (Z)V - ARG 0 allowCommands + ARG 0 value + METHOD c setCommandsAllowed (Z)V + ARG 0 value METHOD d getSpawnZ ()I METHOD d setBorderCenterX (D)V - ARG 0 borderCenterX + ARG 0 value METHOD d setInitialized (Z)V - ARG 0 initialized + ARG 0 value METHOD e getTime ()J METHOD e setBorderSafeZone (D)V - ARG 0 borderSafeZone + ARG 0 value METHOD e setVersion (I)V ARG 0 version METHOD e setBorderSizeLerpTime (J)V - ARG 0 borderSizeLerpTime + ARG 0 value METHOD e setDifficultyLocked (Z)V - ARG 0 difficultyLocked + ARG 0 value METHOD f getTimeOfDay ()J METHOD f setBorderDamagePerBlock (D)V - ARG 0 damage + ARG 0 value METHOD f setThunderTime (I)V - ARG 0 thunderTime + ARG 0 value METHOD f setStructures (Z)V - ARG 0 structures - METHOD g getWorldSize ()J + ARG 0 value + METHOD g getSizeOnDisk ()J METHOD g setRainTime (I)V - ARG 0 rainTime + ARG 0 value METHOD g setHardcore (Z)V - ARG 0 hardcore + ARG 0 value METHOD h getPlayerData ()Lnone/dt; METHOD i setClearWeatherTime (I)V - ARG 0 clearWeatherTime - METHOD j getWorldName ()Ljava/lang/String; + ARG 0 value + METHOD j getLevelName ()Ljava/lang/String; METHOD j setBorderWarningBlocks (I)V - ARG 0 borderWarningBlocks + ARG 0 value METHOD k getVersion ()I METHOD k setBorderWarningTime (I)V - ARG 0 borderWarningTime + ARG 0 value METHOD l getLastPlayed ()J METHOD m isThundering ()Z METHOD n getThunderTime ()I @@ -153,7 +158,7 @@ CLASS none/bat net/minecraft/world/WorldProperties METHOD q getGameMode ()Lnone/ait; METHOD r hasStructures ()Z METHOD s isHardcore ()Z - METHOD t getWorldGenerator ()Lnone/aja; + METHOD t getGeneratorType ()Lnone/aja; METHOD u areCommandsAllowed ()Z METHOD v isInitialized ()Z METHOD w getGameRules ()Lnone/ais; diff --git a/mappings/net/minecraft/world/level/storage/ILevelStorage.mapping b/mappings/net/minecraft/world/level/storage/ILevelStorage.mapping new file mode 100644 index 0000000000..8e46c5822b --- /dev/null +++ b/mappings/net/minecraft/world/level/storage/ILevelStorage.mapping @@ -0,0 +1,28 @@ +CLASS none/baw net/minecraft/world/level/storage/ILevelStorage + METHOD a getName ()Ljava/lang/String; + METHOD a isConvertible (Ljava/lang/String;)Z + ARG 0 levelName + METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 oldLevelName + ARG 1 newLevelName + METHOD a convert (Ljava/lang/String;Lnone/ot;)Z + ARG 0 levelName + ARG 1 progress + METHOD a getLevelSaveHandler (Ljava/lang/String;Z)Lnone/bau; + ARG 0 levelName + ARG 1 server + METHOD b getAvailableLevels ()Ljava/util/List; + METHOD b requiresConversion (Ljava/lang/String;)Z + ARG 0 levelName + METHOD b getRelativeFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; + ARG 0 levelName + ARG 1 filename + METHOD c getLevelProperties (Ljava/lang/String;)Lnone/bat; + ARG 0 levelName + METHOD d clearAll ()V + METHOD d canCreate (Ljava/lang/String;)Z + ARG 0 levelName + METHOD e delete (Ljava/lang/String;)Z + ARG 0 levelName + METHOD f exists (Ljava/lang/String;)Z + ARG 0 levelName diff --git a/mappings/net/minecraft/world/level/storage/LevelStorageAnvil.mapping b/mappings/net/minecraft/world/level/storage/LevelStorageAnvil.mapping new file mode 100644 index 0000000000..6932861618 --- /dev/null +++ b/mappings/net/minecraft/world/level/storage/LevelStorageAnvil.mapping @@ -0,0 +1,39 @@ +CLASS none/bap net/minecraft/world/level/storage/LevelStorageAnvil + CLASS none/bap$1 + METHOD accept accept (Ljava/io/File;Ljava/lang/String;)Z + ARG 0 dir + ARG 1 name + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/io/File;Lnone/pf;)V + ARG 0 savesDir + ARG 1 handler + METHOD a getName ()Ljava/lang/String; + METHOD a loadRegionFile (Ljava/io/File;Ljava/io/File;Lnone/ajm;IILnone/ot;)V + ARG 0 regionDir + ARG 1 file + ARG 3 progressStart + ARG 4 progressEnd + ARG 5 progress + METHOD a loadRegionFiles (Ljava/io/File;Ljava/lang/Iterable;Lnone/ajm;IILnone/ot;)V + ARG 0 regionDir + ARG 1 files + ARG 3 progressStart + ARG 4 progressEnd + ARG 5 progress + METHOD a getRegionFiles (Ljava/io/File;Ljava/util/Collection;)V + ARG 0 worldDir + METHOD a isConvertible (Ljava/lang/String;)Z + ARG 0 levelName + METHOD a convert (Ljava/lang/String;Lnone/ot;)Z + ARG 0 levelName + ARG 1 progress + METHOD a getLevelSaveHandler (Ljava/lang/String;Z)Lnone/bau; + ARG 0 levelName + ARG 1 server + METHOD b getAvailableLevels ()Ljava/util/List; + METHOD b requiresConversion (Ljava/lang/String;)Z + ARG 0 levelName + METHOD c getVersion ()I + METHOD d clearAll ()V + METHOD g moveLevelDatBackup (Ljava/lang/String;)V + ARG 0 levelName diff --git a/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping new file mode 100644 index 0000000000..14f9a94ce7 --- /dev/null +++ b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping @@ -0,0 +1,3 @@ +CLASS none/bav net/minecraft/world/level/storage/LevelStorageException + METHOD (Ljava/lang/String;)V + ARG 0 message diff --git a/mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping b/mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping new file mode 100644 index 0000000000..24d7110987 --- /dev/null +++ b/mappings/net/minecraft/world/level/storage/LevelStorageOld.mapping @@ -0,0 +1,38 @@ +CLASS none/bas net/minecraft/world/level/storage/LevelStorageOld + FIELD a savesDir Ljava/io/File; + FIELD b migrationHandler Lnone/pf; + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/io/File;Lnone/pf;)V + ARG 0 savesDir + ARG 1 migrationHandler + METHOD a getName ()Ljava/lang/String; + METHOD a getLevelProperties (Ljava/io/File;Lnone/pf;)Lnone/bat; + ARG 0 levelDat + METHOD a isConvertible (Ljava/lang/String;)Z + ARG 0 levelName + METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 oldLevelName + ARG 1 newLevelName + METHOD a convert (Ljava/lang/String;Lnone/ot;)Z + ARG 0 levelName + ARG 1 progress + METHOD a getLevelSaveHandler (Ljava/lang/String;Z)Lnone/bau; + ARG 0 levelName + ARG 1 server + METHOD a deleteRecursive ([Ljava/io/File;)Z + ARG 0 files + METHOD b getAvailableLevels ()Ljava/util/List; + METHOD b requiresConversion (Ljava/lang/String;)Z + ARG 0 levelName + METHOD b getRelativeFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; + ARG 0 levelName + ARG 1 filename + METHOD c getLevelProperties (Ljava/lang/String;)Lnone/bat; + ARG 0 levelName + METHOD d clearAll ()V + METHOD d canCreate (Ljava/lang/String;)Z + ARG 0 levelName + METHOD e delete (Ljava/lang/String;)Z + ARG 0 levelName + METHOD f exists (Ljava/lang/String;)Z + ARG 0 levelName diff --git a/mappings/net/minecraft/world/storage/WorldSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping similarity index 65% rename from mappings/net/minecraft/world/storage/WorldSummary.mapping rename to mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 2236896b98..f54767bd26 100644 --- a/mappings/net/minecraft/world/storage/WorldSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -1,6 +1,6 @@ -CLASS none/bax net/minecraft/world/storage/WorldSummary - FIELD a id Ljava/lang/String; - FIELD b name Ljava/lang/String; +CLASS none/bax net/minecraft/world/level/storage/LevelSummary + FIELD a name Ljava/lang/String; + FIELD b displayName Ljava/lang/String; FIELD c lastPlayed J FIELD d getSizeOnDisk J FIELD e requiresConversion Z @@ -12,19 +12,19 @@ CLASS none/bax net/minecraft/world/storage/WorldSummary FIELD k versionSnapshot Z METHOD (Lnone/bat;Ljava/lang/String;Ljava/lang/String;JZ)V ARG 0 properties - ARG 1 worldId - ARG 2 worldName + ARG 1 name + ARG 2 displayName ARG 3 size ARG 4 requiresConversion - METHOD a getId ()Ljava/lang/String; + METHOD a getName ()Ljava/lang/String; METHOD a compareTo (Lnone/bax;)I - ARG 0 to - METHOD b getName ()Ljava/lang/String; + ARG 0 other + METHOD b getDisplayName ()Ljava/lang/String; METHOD c getSizeOnDisk ()J METHOD d requiresConversion ()Z METHOD e lastPlayed ()J METHOD f getGameMode ()Lnone/ait; METHOD g isHardcore ()Z METHOD h areCommandsAllowed ()Z - METHOD i getDisplayName ()Ljava/lang/String; + METHOD i getVersionName ()Ljava/lang/String; METHOD m isTooNew ()Z diff --git a/mappings/net/minecraft/world/provider/DimensionProvider.mapping b/mappings/net/minecraft/world/provider/WorldProvider.mapping similarity index 71% rename from mappings/net/minecraft/world/provider/DimensionProvider.mapping rename to mappings/net/minecraft/world/provider/WorldProvider.mapping index 2cb380fc7e..e93b4f742f 100644 --- a/mappings/net/minecraft/world/provider/DimensionProvider.mapping +++ b/mappings/net/minecraft/world/provider/WorldProvider.mapping @@ -1,12 +1,14 @@ -CLASS none/aue net/minecraft/world/provider/DimensionProvider +CLASS none/aue net/minecraft/world/provider/WorldProvider FIELD b world Lnone/aiv; + FIELD c biomeProvider Lnone/ajm; FIELD f lightValues [F - FIELD g generator Lnone/aja; + FIELD g generatorType Lnone/aja; FIELD h generatorOptions Ljava/lang/String; METHOD a (J)I ARG 0 time METHOD a init (Lnone/aiv;)V ARG 0 world + METHOD b setupBiomeProvider ()V METHOD b getFogColor (FF)Lnone/bcu; METHOD c getChunkGenerator ()Lnone/ati; METHOD d hasClouds ()Z diff --git a/mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping b/mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping deleted file mode 100644 index 04102d0d54..0000000000 --- a/mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/auh net/minecraft/world/provider/impl/DimensionProviderOverworld - METHOD p getDimensionType ()Lnone/auf; diff --git a/mappings/net/minecraft/world/provider/impl/DimensionProviderEnd.mapping b/mappings/net/minecraft/world/provider/impl/WorldProviderEnd.mapping similarity index 58% rename from mappings/net/minecraft/world/provider/impl/DimensionProviderEnd.mapping rename to mappings/net/minecraft/world/provider/impl/WorldProviderEnd.mapping index c619e2c49d..02530ccdd4 100644 --- a/mappings/net/minecraft/world/provider/impl/DimensionProviderEnd.mapping +++ b/mappings/net/minecraft/world/provider/impl/WorldProviderEnd.mapping @@ -1,4 +1,5 @@ -CLASS none/auk net/minecraft/world/provider/impl/DimensionProviderEnd +CLASS none/auk net/minecraft/world/provider/impl/WorldProviderEnd + METHOD b setupBiomeProvider ()V METHOD b getFogColor (FF)Lnone/bcu; METHOD c getChunkGenerator ()Lnone/ati; METHOD d hasClouds ()Z diff --git a/mappings/net/minecraft/world/provider/impl/DimensionProviderNether.mapping b/mappings/net/minecraft/world/provider/impl/WorldProviderNether.mapping similarity index 71% rename from mappings/net/minecraft/world/provider/impl/DimensionProviderNether.mapping rename to mappings/net/minecraft/world/provider/impl/WorldProviderNether.mapping index 8713d8146c..9ccc2b0858 100644 --- a/mappings/net/minecraft/world/provider/impl/DimensionProviderNether.mapping +++ b/mappings/net/minecraft/world/provider/impl/WorldProviderNether.mapping @@ -1,7 +1,8 @@ -CLASS none/aug net/minecraft/world/provider/impl/DimensionProviderNether +CLASS none/aug net/minecraft/world/provider/impl/WorldProviderNether CLASS none/aug$1 METHOD f getCenterX ()D METHOD g getCenterZ ()D + METHOD b setupBiomeProvider ()V METHOD b getFogColor (FF)Lnone/bcu; METHOD c getChunkGenerator ()Lnone/ati; METHOD d hasClouds ()Z diff --git a/mappings/net/minecraft/world/provider/impl/WorldProviderOverworld.mapping b/mappings/net/minecraft/world/provider/impl/WorldProviderOverworld.mapping new file mode 100644 index 0000000000..bf24238136 --- /dev/null +++ b/mappings/net/minecraft/world/provider/impl/WorldProviderOverworld.mapping @@ -0,0 +1,2 @@ +CLASS none/auh net/minecraft/world/provider/impl/WorldProviderOverworld + METHOD p getDimensionType ()Lnone/auf; diff --git a/mappings/net/minecraft/world/region/RegionFileManager.mapping b/mappings/net/minecraft/world/region/RegionFileManager.mapping new file mode 100644 index 0000000000..165c23f2ad --- /dev/null +++ b/mappings/net/minecraft/world/region/RegionFileManager.mapping @@ -0,0 +1,15 @@ +CLASS none/aub net/minecraft/world/region/RegionFileManager + FIELD a openRegionFiles Ljava/util/Map; + METHOD a closeAll ()V + METHOD a open (Ljava/io/File;II)Lnone/aua; + ARG 0 worldDir + ARG 1 x + ARG 2 y + METHOD c readChunkData (Ljava/io/File;II)Ljava/io/DataInputStream; + ARG 0 worldDir + ARG 1 x + ARG 2 y + METHOD d writeChunkData (Ljava/io/File;II)Ljava/io/DataOutputStream; + ARG 0 worldDir + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/world/region/RegionSomething.mapping b/mappings/net/minecraft/world/region/RegionSomething.mapping new file mode 100644 index 0000000000..e342fa57c4 --- /dev/null +++ b/mappings/net/minecraft/world/region/RegionSomething.mapping @@ -0,0 +1,4 @@ +CLASS none/aua net/minecraft/world/region/RegionSomething + CLASS none/aua$a RegionOutputStream + METHOD close close ()V + METHOD c close ()V diff --git a/mappings/net/minecraft/world/storage/IWorldStorage.mapping b/mappings/net/minecraft/world/storage/IWorldStorage.mapping deleted file mode 100644 index 95b2c22923..0000000000 --- a/mappings/net/minecraft/world/storage/IWorldStorage.mapping +++ /dev/null @@ -1,26 +0,0 @@ -CLASS none/baw net/minecraft/world/storage/IWorldStorage - METHOD a getName ()Ljava/lang/String; - METHOD a isConvertible (Ljava/lang/String;)Z - ARG 0 name - METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 from - ARG 1 to - METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z - ARG 0 name - METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bau; - ARG 0 name - METHOD b getAvailableWorlds ()Ljava/util/List; - METHOD b requiresConversion (Ljava/lang/String;)Z - ARG 0 name - METHOD b getFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; - ARG 0 worldName - ARG 1 filename - METHOD c getWorldProperties (Ljava/lang/String;)Lnone/bat; - ARG 0 worldName - METHOD d clearAll ()V - METHOD d canCreate (Ljava/lang/String;)Z - ARG 0 worldName - METHOD e delete (Ljava/lang/String;)Z - ARG 0 name - METHOD f worldExists (Ljava/lang/String;)Z - ARG 0 name diff --git a/mappings/net/minecraft/world/storage/WorldStorageAnvil.mapping b/mappings/net/minecraft/world/storage/WorldStorageAnvil.mapping deleted file mode 100644 index 92f17051d1..0000000000 --- a/mappings/net/minecraft/world/storage/WorldStorageAnvil.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS none/bap net/minecraft/world/storage/WorldStorageAnvil - FIELD c LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Ljava/io/File;Lnone/pf;)V - ARG 0 saveDir - ARG 1 handler - METHOD a getName ()Ljava/lang/String; - METHOD a isConvertible (Ljava/lang/String;)Z - ARG 0 name - METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z - ARG 0 name - METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bau; - ARG 0 name - ARG 1 hasStructureLoader - METHOD b getAvailableWorlds ()Ljava/util/List; - METHOD b requiresConversion (Ljava/lang/String;)Z - ARG 0 name - METHOD c getVersion ()I - METHOD d clearAll ()V diff --git a/mappings/net/minecraft/world/storage/WorldStorageException.mapping b/mappings/net/minecraft/world/storage/WorldStorageException.mapping deleted file mode 100644 index 4401cb8c2d..0000000000 --- a/mappings/net/minecraft/world/storage/WorldStorageException.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bav net/minecraft/world/storage/WorldStorageException - METHOD (Ljava/lang/String;)V - ARG 0 message diff --git a/mappings/net/minecraft/world/storage/WorldStorageOld.mapping b/mappings/net/minecraft/world/storage/WorldStorageOld.mapping deleted file mode 100644 index b47262561a..0000000000 --- a/mappings/net/minecraft/world/storage/WorldStorageOld.mapping +++ /dev/null @@ -1,37 +0,0 @@ -CLASS none/bas net/minecraft/world/storage/WorldStorageOld - FIELD a saveDir Ljava/io/File; - FIELD b migrationHandler Lnone/pf; - FIELD c LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Ljava/io/File;Lnone/pf;)V - ARG 0 saveDir - ARG 1 migrationHandler - METHOD a getName ()Ljava/lang/String; - METHOD a getWorldProperties (Ljava/io/File;Lnone/pf;)Lnone/bat; - ARG 0 levelDat - METHOD a isConvertible (Ljava/lang/String;)Z - ARG 0 name - METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V - ARG 0 from - ARG 1 to - METHOD a convertLevel (Ljava/lang/String;Lnone/ot;)Z - ARG 0 name - METHOD a getSaveWorldHandler (Ljava/lang/String;Z)Lnone/bau; - ARG 0 name - ARG 1 hasStructureLoader - METHOD a deleteRecursive ([Ljava/io/File;)Z - ARG 0 files - METHOD b getAvailableWorlds ()Ljava/util/List; - METHOD b requiresConversion (Ljava/lang/String;)Z - ARG 0 name - METHOD b getFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; - ARG 0 worldName - ARG 1 filename - METHOD c getWorldProperties (Ljava/lang/String;)Lnone/bat; - ARG 0 worldName - METHOD d clearAll ()V - METHOD d canCreate (Ljava/lang/String;)Z - ARG 0 worldName - METHOD e delete (Ljava/lang/String;)Z - ARG 0 name - METHOD f worldExists (Ljava/lang/String;)Z - ARG 0 name diff --git a/mappings/none/bao.mapping b/mappings/none/bao.mapping deleted file mode 100644 index 80fe435048..0000000000 --- a/mappings/none/bao.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/bao - METHOD a (Lnone/aue;)Lnone/atw; - ARG 0 dimensionProvider - METHOD a saveWorld (Lnone/bat;Lnone/dt;)V - ARG 0 worldProperties - ARG 1 playerTag diff --git a/mappings/none/baq.mapping b/mappings/none/baq.mapping index db6956d2db..789150d9e8 100644 --- a/mappings/none/baq.mapping +++ b/mappings/none/baq.mapping @@ -1,54 +1,54 @@ CLASS none/baq METHOD a getSeed ()J METHOD a setSpawnX (I)V - ARG 0 spawnY - METHOD a setWorldName (Ljava/lang/String;)V - ARG 0 worldName - METHOD a setWorldGenerator (Lnone/aja;)V - ARG 0 worldGenerator - METHOD a getDimensionTag (Lnone/auf;)Lnone/dt; - ARG 0 dimension - METHOD a setDimensionTag (Lnone/auf;Lnone/dt;)V - ARG 0 dimension - ARG 1 tag + ARG 0 value + METHOD a setLevelName (Ljava/lang/String;)V + ARG 0 value + METHOD a setGeneratorType (Lnone/aja;)V + ARG 0 value + METHOD a getWorldData (Lnone/auf;)Lnone/dt; + ARG 0 type + METHOD a setWorldData (Lnone/auf;Lnone/dt;)V + ARG 0 type + ARG 1 value METHOD a setSpawnPos (Lnone/cn;)V - ARG 0 spawnPos + ARG 0 pos METHOD a cloneWorldTag (Lnone/dt;)Lnone/dt; ARG 0 playerTag METHOD a setDifficulty (Lnone/qy;)V - ARG 0 difficulty + ARG 0 value METHOD a setThundering (Z)V - ARG 0 thundering + ARG 0 value METHOD b getSpawnX ()I METHOD b setSpawnY (I)V - ARG 0 spawnY + ARG 0 value METHOD b setTime (J)V - ARG 0 time + ARG 0 value METHOD b setRaining (Z)V - ARG 0 raining + ARG 0 value METHOD c getSpawnY ()I METHOD c setSpawnZ (I)V - ARG 0 spawnZ + ARG 0 value METHOD c setTimeOfDay (J)V - ARG 0 dayTime - METHOD c setAllowCommands (Z)V - ARG 0 allowCommands + ARG 0 value + METHOD c setCommandsAllowed (Z)V + ARG 0 value METHOD d getSpawnZ ()I METHOD d setInitialized (Z)V - ARG 0 initialized + ARG 0 value METHOD e getTime ()J METHOD e setVersion (I)V ARG 0 version METHOD e setDifficultyLocked (Z)V - ARG 0 difficultyLocked + ARG 0 value METHOD f getTimeOfDay ()J METHOD f setThunderTime (I)V - ARG 0 thunderTime - METHOD g getWorldSize ()J + ARG 0 value + METHOD g getSizeOnDisk ()J METHOD g setRainTime (I)V - ARG 0 rainTime + ARG 0 value METHOD h getPlayerData ()Lnone/dt; - METHOD j getWorldName ()Ljava/lang/String; + METHOD j getLevelName ()Ljava/lang/String; METHOD k getVersion ()I METHOD l getLastPlayed ()J METHOD m isThundering ()Z @@ -58,7 +58,7 @@ CLASS none/baq METHOD q getGameMode ()Lnone/ait; METHOD r hasStructures ()Z METHOD s isHardcore ()Z - METHOD t getWorldGenerator ()Lnone/aja; + METHOD t getGeneratorType ()Lnone/aja; METHOD u areCommandsAllowed ()Z METHOD v isInitialized ()Z METHOD w getGameRules ()Lnone/ais; diff --git a/mappings/none/lq.mapping b/mappings/none/lq.mapping index 27525171d9..7135628c29 100644 --- a/mappings/none/lq.mapping +++ b/mappings/none/lq.mapping @@ -24,4 +24,5 @@ CLASS none/lq METHOD c onSetSafeZone (Lnone/atf;D)V ARG 0 border ARG 1 safeZone - METHOD b getWorld ()Lnone/aiv; + METHOD a saveLevel ()V + METHOD b ()Lnone/aiv;