From defc875022c62d363972c61caba24ae416ea7d92 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Sat, 9 Jan 2021 20:58:01 +0100 Subject: [PATCH] World stuff (#1953) --- mappings/net/minecraft/server/MinecraftServer.mapping | 1 + .../net/minecraft/server/function/CommandFunction.mapping | 2 -- .../net/minecraft/structure/MineshaftGenerator.mapping | 2 +- .../minecraft/structure/NetherFortressGenerator.mapping | 2 +- .../net/minecraft/structure/SimpleStructurePiece.mapping | 1 + .../net/minecraft/structure/StrongholdGenerator.mapping | 3 ++- mappings/net/minecraft/structure/StructurePiece.mapping | 3 +++ mappings/net/minecraft/world/SaveProperties.mapping | 2 ++ .../minecraft/world/dimension/DimensionOptions.mapping | 3 ++- .../net/minecraft/world/dimension/DimensionType.mapping | 8 ++++++++ mappings/net/minecraft/world/gen/GeneratorOptions.mapping | 1 + .../net/minecraft/world/gen/feature/FlowerFeature.mapping | 2 ++ .../minecraft/world/gen/feature/HugeFungusFeature.mapping | 2 ++ .../world/gen/feature/HugeMushroomFeature.mapping | 1 + .../world/gen/feature/RuinedPortalFeature.mapping | 1 + .../net/minecraft/world/level/LevelProperties.mapping | 3 +++ .../minecraft/world/level/storage/LevelStorage.mapping | 4 ++++ .../net/minecraft/world/level/storage/SessionLock.mapping | 1 + .../world/storage/SerializingRegionBasedStorage.mapping | 3 +++ .../net/minecraft/world/storage/StorageIoWorker.mapping | 5 +++++ 20 files changed, 44 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 227eb37a9f..d3828590a4 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_17439 worldGenerationProgressListenerFactory Lnet/minecraft/class_3950; FIELD field_17601 serverId Ljava/lang/String; FIELD field_17704 DEMO_LEVEL_INFO Lnet/minecraft/class_1940; + FIELD field_19248 nextTickTimestamp J FIELD field_19249 waitingForNextTick Z FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; FIELD field_22250 tickTimeTracker Lnet/minecraft/class_4757; diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index e5e4650a69..f17eff636c 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -41,5 +41,3 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction FIELD field_9812 function Lnet/minecraft/class_2158$class_2159; METHOD (Lnet/minecraft/class_2158;)V ARG 1 function - METHOD method_17914 (ILjava/util/ArrayDeque;Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;)V - ARG 4 actual diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 2ab2a6d937..30bc11a188 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 2 boundingBox ARG 3 orientation ARG 4 type - METHOD method_14716 generateCrossingPilliar (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)V + METHOD method_14716 generateCrossingPillar (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIII)V ARG 2 boundingBox ARG 3 x ARG 4 minY diff --git a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping index e4f91dfd66..b2b8ae6fcb 100644 --- a/mappings/net/minecraft/structure/NetherFortressGenerator.mapping +++ b/mappings/net/minecraft/structure/NetherFortressGenerator.mapping @@ -180,7 +180,7 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator ARG 4 heightOffset ARG 5 leftRightOffset ARG 6 inside - METHOD method_14809 isInbounds (Lnet/minecraft/class_3341;)Z + METHOD method_14809 isInBounds (Lnet/minecraft/class_3341;)Z ARG 0 boundingBox METHOD method_14810 checkRemainingPieces (Ljava/util/List;)I ARG 1 possiblePieces diff --git a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping index 5a7e13ce3c..56da64deac 100644 --- a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping +++ b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece METHOD method_15026 handleMetadata (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_5425;Ljava/util/Random;Lnet/minecraft/class_3341;)V ARG 1 metadata ARG 2 pos + ARG 3 world ARG 4 random ARG 5 boundingBox METHOD method_15027 setStructureData (Lnet/minecraft/class_3499;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;)V diff --git a/mappings/net/minecraft/structure/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/StrongholdGenerator.mapping index 2d75a35af9..de70376c8c 100644 --- a/mappings/net/minecraft/structure/StrongholdGenerator.mapping +++ b/mappings/net/minecraft/structure/StrongholdGenerator.mapping @@ -244,9 +244,10 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator ARG 3 random ARG 4 heightOffset ARG 5 leftRightOffset - METHOD method_14871 isInbounds (Lnet/minecraft/class_3341;)Z + METHOD method_14871 isInBounds (Lnet/minecraft/class_3341;)Z ARG 0 boundingBox METHOD method_14872 generateEntrance (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_3421$class_3437$class_3438;III)V + ARG 1 world ARG 2 random ARG 3 boundingBox ARG 4 type diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index d8947489f3..8a5f8147ec 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -71,10 +71,13 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 7 facing ARG 8 lootTableId METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z + ARG 1 world ARG 2 structureAccessor ARG 3 chunkGenerator ARG 4 random ARG 5 boundingBox + ARG 6 chunkPos + ARG 7 pos METHOD method_14932 getOverlappingPiece (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443; ARG 0 pieces METHOD method_14933 fillWithOutlineUnderSeaLevel (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index b1f5eaebd8..0211ba2df5 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V METHOD method_152 isHardcore ()Z METHOD method_163 cloneWorldTag (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 registryManager + ARG 2 playerTag METHOD method_168 getVersion ()I METHOD method_186 setDifficultyLocked (Z)V ARG 1 locked diff --git a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping index 8535ed09c2..257d6bd071 100644 --- a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping @@ -10,7 +10,8 @@ CLASS net/minecraft/class_5363 net/minecraft/world/dimension/DimensionOptions ARG 1 typeSupplier ARG 2 chunkGenerator METHOD method_29566 getDimensionTypeSupplier ()Ljava/util/function/Supplier; - METHOD method_29567 (JLnet/minecraft/class_2370;)Z + METHOD method_29567 hasDefaultSettings (JLnet/minecraft/class_2370;)Z ARG 0 seed + ARG 2 options METHOD method_29570 getDimensionType ()Lnet/minecraft/class_2874; METHOD method_29571 getChunkGenerator ()Lnet/minecraft/class_2794; diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 65f2b5e36f..21bf554595 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType FIELD field_24762 natural Z FIELD field_24764 hasEnderDragonFight Z FIELD field_24766 ambientLight F + FIELD field_24767 brightnessByLightLevel [F FIELD field_25407 OVERWORLD Lnet/minecraft/class_2874; FIELD field_25408 THE_NETHER Lnet/minecraft/class_2874; FIELD field_25409 THE_END Lnet/minecraft/class_2874; @@ -75,11 +76,17 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_22415 getBiomeAccessType ()Lnet/minecraft/class_4545; METHOD method_27998 hasCeiling ()Z METHOD method_27999 isUltrawarm ()Z + METHOD method_28515 computeBrightnessByLightLevel (F)[F + ARG 0 ambientLight + METHOD method_28516 getBrightness (I)F + ARG 1 lightLevel METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2370; ARG 0 dimensionRegistry ARG 1 biomeRegistry ARG 2 chunkGeneratorSettingsRegistry ARG 3 seed + METHOD method_28521 worldFromDimensionTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; + ARG 0 tag METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5455$class_5457; ARG 0 registryManager METHOD method_28528 getSkyAngle (J)F @@ -109,6 +116,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_29961 getInfiniburnBlocks ()Lnet/minecraft/class_3494; METHOD method_31108 equals (Lnet/minecraft/class_2874;)Z ARG 1 dimensionType + METHOD method_31109 getCoordinateScaleFactor (Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)D METHOD method_31110 getCoordinateScale ()D METHOD method_31181 getSkyProperties ()Lnet/minecraft/class_2960; METHOD method_32922 create (Ljava/util/OptionalLong;ZZZZDZZZZZIIILnet/minecraft/class_4545;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_2874; diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index ee26605c6f..6c5f8af806 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -37,5 +37,6 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 1 chunkGeneratorSettingsRegistry ARG 2 seed METHOD method_28609 getDimensions ()Lnet/minecraft/class_2370; + METHOD method_28610 validate ()Lcom/mojang/serialization/DataResult; METHOD method_28611 isStable ()Z METHOD method_29575 getWorlds ()Lcom/google/common/collect/ImmutableSet; diff --git a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping b/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping index 0fe91abfec..5f5f8ade7d 100644 --- a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4624 net/minecraft/world/gen/feature/FlowerFeature METHOD method_13175 getFlowerState (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Lnet/minecraft/class_2680; + ARG 1 random ARG 2 pos ARG 3 config METHOD method_23369 isPosValid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z @@ -9,5 +10,6 @@ CLASS net/minecraft/class_4624 net/minecraft/world/gen/feature/FlowerFeature METHOD method_23370 getFlowerAmount (Lnet/minecraft/class_3037;)I ARG 1 config METHOD method_23371 getPos (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Lnet/minecraft/class_2338; + ARG 1 random ARG 2 pos ARG 3 config diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping index 2295433e0b..8fb8d57c2b 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature ARG 1 world ARG 2 random ARG 3 config + ARG 4 pos ARG 5 stemHeight ARG 6 thickStem METHOD method_24441 tryGenerateVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V @@ -26,5 +27,6 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature ARG 1 world ARG 2 random ARG 3 config + ARG 4 pos ARG 5 hatHeight ARG 6 thickStem diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping index e7797592e0..f9cde08026 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_4625 net/minecraft/world/gen/feature/HugeMushroomFeatu ARG 6 config METHOD method_23376 generateStem (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4635;ILnet/minecraft/class_2338$class_2339;)V ARG 1 world + ARG 2 random ARG 3 pos ARG 4 config ARG 5 height diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping index ba7650c4bf..e3685a40f7 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu FIELD field_23998 RARE_PORTAL_STRUCTURE_IDS [Ljava/lang/String; FIELD field_23999 COMMON_PORTAL_STRUCTURE_IDS [Ljava/lang/String; METHOD method_27210 choosePlacementHeight (Ljava/util/Random;II)I + ARG 0 random ARG 1 min ARG 2 max METHOD method_27211 (Ljava/util/Random;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;)I diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 2c32e14010..14673f07cc 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -64,6 +64,9 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 2 generatorOptions ARG 3 lifecycle METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V + ARG 1 registryManager + ARG 2 levelTag + ARG 3 playerTag METHOD method_185 loadPlayerData ()V METHOD method_29029 readProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_31; ARG 0 dynamic diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index fb078865f7..2b5f3f2911 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -26,7 +26,11 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 directoryName METHOD method_27004 getTimeFormatter ()Ljava/time/format/DateTimeFormatter; METHOD method_29010 readGeneratorProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/datafixers/util/Pair; + ARG 0 levelData + ARG 1 dataFixer + ARG 2 version METHOD method_29014 createLevelDataParser (Ljava/io/File;Z)Ljava/util/function/BiFunction; + ARG 1 file ARG 2 locked METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359; METHOD method_29583 readDataPackSettings (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; diff --git a/mappings/net/minecraft/world/level/storage/SessionLock.mapping b/mappings/net/minecraft/world/level/storage/SessionLock.mapping index 3a0447720b..20fbfa5a2c 100644 --- a/mappings/net/minecraft/world/level/storage/SessionLock.mapping +++ b/mappings/net/minecraft/world/level/storage/SessionLock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5125 net/minecraft/world/level/storage/SessionLock FIELD field_23692 channel Ljava/nio/channels/FileChannel; FIELD field_23693 lock Ljava/nio/channels/FileLock; + FIELD field_25353 SNOWMAN Ljava/nio/ByteBuffer; METHOD (Ljava/nio/channels/FileChannel;Ljava/nio/channels/FileLock;)V ARG 1 channel ARG 2 lock diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index 51a946137d..cd0e59e55e 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 directory ARG 2 codecFactory ARG 3 factory + ARG 6 dsync METHOD method_19288 onUpdate (J)V ARG 1 pos METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V @@ -31,5 +32,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 3 data METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I METHOD method_20370 save (Lnet/minecraft/class_1923;)V + METHOD method_20436 saveChunk (Lnet/minecraft/class_1923;)V + ARG 1 pos METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index ae8330f3f9..a54f7bcab9 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -3,6 +3,11 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker FIELD field_21497 closed Ljava/util/concurrent/atomic/AtomicBoolean; FIELD field_21499 storage Lnet/minecraft/class_2867; FIELD field_21500 results Ljava/util/Map; + FIELD field_24468 executor Lnet/minecraft/class_3846; + METHOD (Ljava/io/File;ZLjava/lang/String;)V + ARG 1 directory + ARG 2 dsync + ARG 3 name METHOD method_23698 completeAll ()Ljava/util/concurrent/CompletableFuture; METHOD method_23700 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos