From 3943407bbec8fcfdb106ea2e0bedad45cb5c75de Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 6 Apr 2021 18:51:17 +1000 Subject: [PATCH] world 21w13a stuff (#2277) * world stuff * Update BlockView.mapping * Update mappings/net/minecraft/world/TestableWorld.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- mappings/net/minecraft/world/BlockView.mapping | 3 +++ .../net/minecraft/world/ChunkSerializer.mapping | 1 + .../net/minecraft/world/ChunkUpdateState.mapping | 2 ++ .../net/minecraft/world/ForcedChunkState.mapping | 1 + mappings/net/minecraft/world/GameRules.mapping | 3 +++ mappings/net/minecraft/world/Heightmap.mapping | 2 ++ mappings/net/minecraft/world/SaveProperties.mapping | 2 ++ mappings/net/minecraft/world/TestableWorld.mapping | 6 ++++++ .../net/minecraft/world/border/WorldBorder.mapping | 5 +++++ .../world/chunk/light/LightingView.mapping | 2 ++ .../net/minecraft/world/dimension/YLevels.mapping | 13 +++++++++++++ .../net/minecraft/world/event/GameEvent.mapping | 1 + .../world/level/ServerWorldProperties.mapping | 1 + .../world/level/storage/LevelStorage.mapping | 2 ++ .../world/level/storage/LevelSummary.mapping | 1 + .../world/level/storage/SessionLock.mapping | 1 + .../net/minecraft/world/poi/PointOfInterest.mapping | 1 + .../minecraft/world/poi/PointOfInterestType.mapping | 4 ++++ .../world/storage/EntityChunkDataAccess.mapping | 2 ++ mappings/net/minecraft/world/timer/Timer.mapping | 3 +++ 20 files changed, 56 insertions(+) create mode 100644 mappings/net/minecraft/world/dimension/YLevels.mapping diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index 49c4368be1..9b78adf62a 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -33,6 +33,9 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView ARG 2 pos METHOD method_32882 (Lnet/minecraft/class_5702;)Lnet/minecraft/class_3965; ARG 0 context + METHOD method_35230 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;)Ljava/util/Optional; + ARG 1 pos + ARG 2 type METHOD method_8315 getMaxLightLevel ()I METHOD method_8316 getFluidState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3610; ARG 1 pos diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index 5f5218d375..db6e0d7e7f 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12377 getChunkType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2806$class_2808; ARG 0 nbt METHOD method_12385 writeStructures (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_2487; + ARG 0 world METHOD method_12386 loadEntities (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2818;)V ARG 0 world ARG 1 nbt diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping index d9351d1e59..b709ad5327 100644 --- a/mappings/net/minecraft/world/ChunkUpdateState.mapping +++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState FIELD field_15301 all Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15302 remaining Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_31660 REMAINING_KEY Ljava/lang/String; + FIELD field_31661 ALL_KEY Ljava/lang/String; METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 all ARG 2 remaining diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping index f619fe1e05..5ac11c1a4b 100644 --- a/mappings/net/minecraft/world/ForcedChunkState.mapping +++ b/mappings/net/minecraft/world/ForcedChunkState.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState + FIELD field_30962 FORCED_KEY Ljava/lang/String; FIELD field_9213 chunks Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 chunks diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index b558271f8f..d92fe41ace 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -148,6 +148,9 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_27332 validate (Ljava/lang/String;)Z COMMENT Validates that an input is valid for this rule. ARG 1 input + METHOD method_35236 set (ILnet/minecraft/server/MinecraftServer;)V + ARG 1 value + ARG 2 server CLASS class_4313 Key FIELD field_19413 name Ljava/lang/String; FIELD field_24103 category Lnet/minecraft/class_1928$class_5198; diff --git a/mappings/net/minecraft/world/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping index e089657025..450974ee3b 100644 --- a/mappings/net/minecraft/world/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -29,8 +29,10 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap ARG 2 z METHOD method_16680 (Lnet/minecraft/class_2680;)Z ARG 0 state + METHOD method_16681 getSuffocatesPredicate ()Ljava/util/function/Predicate; METHOD method_16682 (Lnet/minecraft/class_2680;)Z ARG 0 state + METHOD method_16683 getNotAirPredicate ()Ljava/util/function/Predicate; METHOD method_16684 populateHeightmaps (Lnet/minecraft/class_2791;Ljava/util/Set;)V ARG 0 chunk ARG 1 types diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index 19e6204a42..836413bc01 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties + FIELD field_31844 ANVIL_FORMAT_ID I + FIELD field_31845 MCREGION_FORMAT_ID I METHOD method_146 getGameRules ()Lnet/minecraft/class_1928; METHOD method_150 getLevelName ()Ljava/lang/String; METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V diff --git a/mappings/net/minecraft/world/TestableWorld.mapping b/mappings/net/minecraft/world/TestableWorld.mapping index 0e9e2b0fc9..448a4e3b9c 100644 --- a/mappings/net/minecraft/world/TestableWorld.mapping +++ b/mappings/net/minecraft/world/TestableWorld.mapping @@ -2,4 +2,10 @@ CLASS net/minecraft/class_3746 net/minecraft/world/TestableWorld METHOD method_16358 testBlockState (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z ARG 1 pos ARG 2 state + METHOD method_35230 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;)Ljava/util/Optional; + ARG 1 pos + ARG 2 type + METHOD method_35237 testFluidState (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z + ARG 1 pos + ARG 2 state METHOD method_8598 getTopPosition (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index caf6b7ab2f..d6634372a6 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -95,6 +95,11 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_17905 load (Lnet/minecraft/class_2784$class_5200;)V ARG 1 properties METHOD method_27355 write ()Lnet/minecraft/class_2784$class_5200; + METHOD method_35317 contains (DD)Z + ARG 1 x + ARG 3 z + METHOD method_35318 removeListener (Lnet/minecraft/class_2780;)V + ARG 1 listener CLASS class_2785 Area METHOD method_11984 getSize ()D METHOD method_11985 getBoundSouth ()D diff --git a/mappings/net/minecraft/world/chunk/light/LightingView.mapping b/mappings/net/minecraft/world/chunk/light/LightingView.mapping index a07deee102..ae04b8b978 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingView.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_3565 net/minecraft/world/chunk/light/LightingView METHOD method_15512 setColumnEnabled (Lnet/minecraft/class_1923;Z)V METHOD method_15513 checkBlock (Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_15514 addLightSource (Lnet/minecraft/class_2338;I)V + ARG 1 pos METHOD method_15516 doLightUpdates (IZZ)I METHOD method_15518 hasUpdates ()Z METHOD method_15551 setSectionStatus (Lnet/minecraft/class_4076;Z)V diff --git a/mappings/net/minecraft/world/dimension/YLevels.mapping b/mappings/net/minecraft/world/dimension/YLevels.mapping new file mode 100644 index 0000000000..dd2d4b8c5c --- /dev/null +++ b/mappings/net/minecraft/world/dimension/YLevels.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_6101 net/minecraft/world/dimension/YLevels + FIELD field_31428 OVERWORLD_MIN_Y I + FIELD field_31429 OVERWORLD_HEIGHT I + FIELD field_31430 OVERWORLD_GENERATION_HEIGHT I + FIELD field_31431 OVERWORLD_LOGICAL_HEIGHT I + FIELD field_31432 NETHER_MIN_Y I + FIELD field_31433 NETHER_HEIGHT I + FIELD field_31434 NETHER_GENERATION_HEIGHT I + FIELD field_31435 NETHER_LOGICAL_HEIGHT I + FIELD field_31436 END_MIN_Y I + FIELD field_31437 END_HEIGHT I + FIELD field_31438 END_GENERATION_HEIGHT I + FIELD field_31439 END_LOGICAL_HEIGHT I diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index cf97a0304e..2373ac0db0 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent FIELD field_28153 id Ljava/lang/String; FIELD field_28154 range I + FIELD field_31449 DEFAULT_RANGE I METHOD (Ljava/lang/String;I)V ARG 1 id ARG 2 range diff --git a/mappings/net/minecraft/world/level/ServerWorldProperties.mapping b/mappings/net/minecraft/world/level/ServerWorldProperties.mapping index 8876675850..4777502030 100644 --- a/mappings/net/minecraft/world/level/ServerWorldProperties.mapping +++ b/mappings/net/minecraft/world/level/ServerWorldProperties.mapping @@ -34,3 +34,4 @@ CLASS net/minecraft/class_5268 net/minecraft/world/level/ServerWorldProperties ARG 1 time METHOD method_29035 setTimeOfDay (J)V ARG 1 timeOfDay + METHOD method_35506 getWanderingTraderId ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 2b5f3f2911..e9dfbea753 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_17668 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_200 TIME_FORMATTER Ljava/time/format/DateTimeFormatter; FIELD field_25020 GENERATOR_OPTION_KEYS Lcom/google/common/collect/ImmutableList; + FIELD field_31836 DEFAULT_ICON Ljava/lang/String; METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)V ARG 1 savesDirectory ARG 2 backupsDirectory @@ -34,6 +35,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage 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; + METHOD method_35504 getFormatName ()Ljava/lang/String; CLASS class_5143 Session FIELD field_23767 lock Lnet/minecraft/class_5125; FIELD field_23768 directory Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index b6fed9f3fd..b68e1a5d01 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary COMMENT COMMENT

This includes world versions {@code 2692} and earlier (21w05b and earlier). METHOD method_33784 isUnavailable ()Z + METHOD method_35505 getLevelInfo ()Lnet/minecraft/class_1940; CLASS class_5781 ConversionWarning FIELD field_28440 backup Z FIELD field_28441 boldRedFormatting Z diff --git a/mappings/net/minecraft/world/level/storage/SessionLock.mapping b/mappings/net/minecraft/world/level/storage/SessionLock.mapping index 20fbfa5a2c..a2a099e233 100644 --- a/mappings/net/minecraft/world/level/storage/SessionLock.mapping +++ b/mappings/net/minecraft/world/level/storage/SessionLock.mapping @@ -2,6 +2,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; + FIELD field_29838 SESSION_LOCK Ljava/lang/String; METHOD (Ljava/nio/channels/FileChannel;Ljava/nio/channels/FileLock;)V ARG 1 channel ARG 2 lock diff --git a/mappings/net/minecraft/world/poi/PointOfInterest.mapping b/mappings/net/minecraft/world/poi/PointOfInterest.mapping index e2e666db55..47d3985f15 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterest.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterest.mapping @@ -28,3 +28,4 @@ CLASS net/minecraft/class_4156 net/minecraft/world/poi/PointOfInterest ARG 0 poi METHOD method_28362 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_2338; ARG 0 poi + METHOD method_35156 getFreeTickets ()I diff --git a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping index 714d97682d..e13537b3e5 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType FIELD field_20298 searchDistance I FIELD field_25162 REGISTERED_STATES Ljava/util/Set; FIELD field_25163 VILLAGER_WORKSTATIONS Ljava/util/function/Supplier; + FIELD field_30267 CAULDRON_STATES Ljava/util/Set; METHOD (Ljava/lang/String;Ljava/util/Set;II)V ARG 1 id ARG 2 blockStates @@ -51,3 +52,6 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType METHOD method_21648 getSearchDistance ()I METHOD method_29269 (Lnet/minecraft/class_4158;)Z ARG 0 poiType + METHOD method_35158 getId ()Ljava/lang/String; + METHOD method_35159 contains (Lnet/minecraft/class_2680;)Z + ARG 1 state diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index 67f580941c..fe1a6593ef 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess FIELD field_27234 dataLoadWorker Lnet/minecraft/class_4698; FIELD field_27235 emptyChunks Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_27236 executor Ljava/util/concurrent/Executor; + FIELD field_31414 ENTITIES_KEY Ljava/lang/String; + FIELD field_31415 POSITION_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V ARG 1 world ARG 2 chunkFile diff --git a/mappings/net/minecraft/world/timer/Timer.mapping b/mappings/net/minecraft/world/timer/Timer.mapping index f3fb8d28c5..d60945e56f 100644 --- a/mappings/net/minecraft/world/timer/Timer.mapping +++ b/mappings/net/minecraft/world/timer/Timer.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_236 net/minecraft/world/timer/Timer FIELD field_1313 events Ljava/util/Queue; FIELD field_1314 callback Lnet/minecraft/class_233; FIELD field_1315 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_31876 CALLBACK_KEY Ljava/lang/String; + FIELD field_31877 NAME_KEY Ljava/lang/String; + FIELD field_31878 TRIGGER_TIME_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_233;)V ARG 1 timerCallbackSerializer METHOD method_980 serialize (Lnet/minecraft/class_236$class_237;)Lnet/minecraft/class_2487;