From 4a74cfdf1cd3efcf161d5ceff690e059223c3b71 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 13 Nov 2021 22:54:41 +0900 Subject: [PATCH] 1.18-pre1 stuff (#2823) * 1.18-pre1 stuff * Update mappings/net/minecraft/util/math/Vec3i.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Fix some wrong mappings * client stuff, related to amplified * client world stuff * WorldgenListProvider * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../screen/world/MoreOptionsDialog.mapping | 5 +++ .../client/world/BiomeColorCache.mapping | 13 ++++++++ .../client/world/ClientWorld.mapping | 7 ++++ .../client/world/GeneratorType.mapping | 8 +++++ .../data/report/BiomeListProvider.mapping | 8 ----- .../data/report/WorldgenListProvider.mapping | 33 +++++++++++++++++++ .../fix/ChunkHeightAndBiomeFix.mapping | 3 ++ .../entity/FallingBlockEntity.mapping | 1 + .../server/world/ServerWorld.mapping | 1 + .../util/dynamic/EntryLoader.mapping | 23 +++++++++++++ .../minecraft/util/math/MathHelper.mapping | 5 +++ .../net/minecraft/util/math/Vec3i.mapping | 6 ++++ .../net/minecraft/world/CollisionView.mapping | 3 ++ mappings/net/minecraft/world/World.mapping | 2 ++ .../world/border/WorldBorder.mapping | 5 +++ .../gen/random/GaussianGenerator.mapping | 1 + 16 files changed, 116 insertions(+), 8 deletions(-) delete mode 100644 mappings/net/minecraft/data/report/BiomeListProvider.mapping create mode 100644 mappings/net/minecraft/data/report/WorldgenListProvider.mapping diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping index 929c7ae6ac..133176ed9f 100644 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping @@ -15,6 +15,9 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions FIELD field_25483 registryManager Lnet/minecraft/class_5455$class_5457; FIELD field_26604 MAP_FEATURES_INFO_TEXT Lnet/minecraft/class_2561; FIELD field_28000 SELECT_SETTINGS_FILE_TEXT Lnet/minecraft/class_2561; + FIELD field_28001 unchangeableMapTypeButton Lnet/minecraft/class_4185; + FIELD field_35754 AMPLIFIED_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_35755 amplifiedInfoText Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;Ljava/util/Optional;Ljava/util/OptionalLong;)V ARG 1 registryManager ARG 2 generatorOptions @@ -74,3 +77,5 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions ARG 1 visible METHOD method_32684 enableBonusItems ()V METHOD method_37090 tickSeedTextField ()V + METHOD method_39664 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250; + ARG 0 button diff --git a/mappings/net/minecraft/client/world/BiomeColorCache.mapping b/mappings/net/minecraft/client/world/BiomeColorCache.mapping index 8aeef1e9b9..e4de1a0760 100644 --- a/mappings/net/minecraft/client/world/BiomeColorCache.mapping +++ b/mappings/net/minecraft/client/world/BiomeColorCache.mapping @@ -2,6 +2,10 @@ CLASS net/minecraft/class_4700 net/minecraft/client/world/BiomeColorCache FIELD field_21519 last Ljava/lang/ThreadLocal; FIELD field_21520 colors Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD field_21521 lock Ljava/util/concurrent/locks/ReentrantReadWriteLock; + FIELD field_32164 MAX_ENTRY_SIZE I + FIELD field_34795 colorFactory Ljava/util/function/ToIntFunction; + METHOD (Ljava/util/function/ToIntFunction;)V + ARG 1 colorFactory METHOD method_23768 reset ()V METHOD method_23769 reset (II)V ARG 1 chunkX @@ -15,3 +19,12 @@ CLASS net/minecraft/class_4700 net/minecraft/client/world/BiomeColorCache FIELD field_21522 x I FIELD field_21523 z I FIELD field_21524 colors Lnet/minecraft/class_4700$class_6598; + CLASS class_6598 Colors + FIELD field_34796 colors Lit/unimi/dsi/fastutil/ints/Int2ObjectArrayMap; + FIELD field_34797 lock Ljava/util/concurrent/locks/ReentrantReadWriteLock; + FIELD field_34798 XZ_COLORS_SIZE I + METHOD method_38527 createDefault ()[I + METHOD method_38528 get (I)[I + ARG 1 y + METHOD method_38529 (I)[I + ARG 1 y diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 932abaea2a..49f2b55160 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -50,6 +50,9 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 2 passenger METHOD method_23778 (Lit/unimi/dsi/fastutil/objects/Object2ObjectArrayMap;)V ARG 1 map + METHOD method_23779 (Lnet/minecraft/class_6539;Lnet/minecraft/class_4700;)V + ARG 0 resolver + ARG 1 cache METHOD method_23780 calculateColor (Lnet/minecraft/class_2338;Lnet/minecraft/class_6539;)I ARG 1 pos ARG 2 colorResolver @@ -116,6 +119,9 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 3 shape ARG 4 y METHOD method_30671 getSpawnAngle ()F + METHOD method_32121 (Lnet/minecraft/class_1923;Lnet/minecraft/class_6539;Lnet/minecraft/class_4700;)V + ARG 1 resolver + ARG 2 cache METHOD method_32124 (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_35752 getBlockParticle ()Lnet/minecraft/class_2248; @@ -131,6 +137,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 pos METHOD method_38538 (Lnet/minecraft/class_2338;)I ARG 1 pos + METHOD method_38743 hasNoChunkUpdaters ()Z METHOD method_39023 setSimulationDistance (I)V ARG 1 simulationDistance METHOD method_39024 getSimulationDistance ()I diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index 909c9c3876..12d634129f 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -6,10 +6,14 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType FIELD field_25056 SINGLE_BIOME_SURFACE Lnet/minecraft/class_5317; FIELD field_25059 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_5317; FIELD field_25060 displayName Lnet/minecraft/class_2561; + FIELD field_35756 LARGE_BIOMES Lnet/minecraft/class_5317; + FIELD field_35757 AMPLIFIED Lnet/minecraft/class_5317; METHOD (Ljava/lang/String;)V ARG 1 translationKeySuffix METHOD method_29075 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_29076 getChunkGenerator (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2794; + ARG 1 registryManager + ARG 2 seed METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455$class_5457;JZZ)Lnet/minecraft/class_5285; ARG 1 registryManager ARG 2 seed @@ -37,6 +41,10 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType ARG 1 generatorOptions METHOD method_32685 isNotDebug (Lnet/minecraft/class_5317;)Z ARG 0 generatorType + METHOD method_39194 createNoiseChunkGenerator (Lnet/minecraft/class_5455;JLnet/minecraft/class_5321;)Lnet/minecraft/class_3754; + ARG 0 registryManager + ARG 1 seed + ARG 3 settingsKey CLASS class_5293 ScreenProvider METHOD createEditScreen (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; ARG 1 screen diff --git a/mappings/net/minecraft/data/report/BiomeListProvider.mapping b/mappings/net/minecraft/data/report/BiomeListProvider.mapping deleted file mode 100644 index 1ae27ce25e..0000000000 --- a/mappings/net/minecraft/data/report/BiomeListProvider.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_5475 net/minecraft/data/report/BiomeListProvider - FIELD field_26377 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_26378 GSON Lcom/google/gson/Gson; - FIELD field_26379 generator Lnet/minecraft/class_2403; - METHOD (Lnet/minecraft/class_2403;)V - ARG 1 generator - METHOD method_30682 getPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Ljava/nio/file/Path; - ARG 0 root diff --git a/mappings/net/minecraft/data/report/WorldgenListProvider.mapping b/mappings/net/minecraft/data/report/WorldgenListProvider.mapping new file mode 100644 index 0000000000..f4516c72f1 --- /dev/null +++ b/mappings/net/minecraft/data/report/WorldgenListProvider.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenListProvider + FIELD field_26377 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_26378 GSON Lcom/google/gson/Gson; + FIELD field_26379 generator Lnet/minecraft/class_2403; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 generator + METHOD method_30682 getPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + ARG 0 root + ARG 1 rootId + ARG 2 id + METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_2408;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V + ARG 0 cache + ARG 1 path + ARG 2 registryManager + ARG 3 json + ARG 4 info + METHOD method_39679 getRootPath (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 0 path + METHOD method_39680 writeToPath (Ljava/nio/file/Path;Lnet/minecraft/class_2408;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)V + ARG 0 path + ARG 1 cache + ARG 2 json + ARG 3 encoder + ARG 4 value + METHOD method_39681 writeRegistryEntries (Ljava/nio/file/Path;Lnet/minecraft/class_2408;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Encoder;)V + ARG 0 path + ARG 1 cache + ARG 2 json + ARG 3 registryKey + ARG 4 registry + ARG 5 encoder + METHOD method_39682 (Lnet/minecraft/class_2408;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V + ARG 4 info diff --git a/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping index 27d1f2c1c4..e3641da1ec 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_6637 net/minecraft/datafixer/fix/ChunkHeightAndBiomeFi FIELD field_35025 HEIGHTMAP_KEYS [Ljava/lang/String; FIELD field_35029 RAW_BIOME_IDS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_35444 CONTEXT Ljava/lang/String; + FIELD field_35667 STATUSES_TO_SKIP_UPDATE Ljava/util/Set; + FIELD field_35669 SURFACE_BLOCKS Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 schema METHOD method_38793 ceilLog2 (I)I @@ -21,3 +23,4 @@ CLASS net/minecraft/class_6637 net/minecraft/datafixer/fix/ChunkHeightAndBiomeFi METHOD method_38812 fixHeightmap (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_38813 fixPalette (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_38816 fixPalette (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_39517 fixStatus (Lcom/mojang/serialization/Dynamic;Ljava/util/Set;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping index 75e2dbb71e..a36d6c9eef 100644 --- a/mappings/net/minecraft/entity/FallingBlockEntity.mapping +++ b/mappings/net/minecraft/entity/FallingBlockEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1540 net/minecraft/entity/FallingBlockEntity + FIELD field_35671 discardTime J FIELD field_7187 fallHurtAmount F FIELD field_7188 block Lnet/minecraft/class_2680; FIELD field_7189 destroyedOnLanding Z diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 0b202b4813..d7d19c1c7f 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -246,6 +246,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 pos METHOD method_39223 disableTickSchedulers (Lnet/minecraft/class_2818;)V ARG 1 chunk + METHOD method_39501 tickWeather ()V METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; ARG 1 feature diff --git a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping index 117ab48db9..f1f59bb5a8 100644 --- a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping +++ b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping @@ -2,20 +2,43 @@ CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader METHOD method_31154 resourceBacked (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5506; ARG 0 resourceManager METHOD method_31155 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Decoder;)Ljava/util/Optional; + ARG 1 json ARG 2 registryId ARG 3 entryId + ARG 4 decoder METHOD method_31156 getKnownEntryPaths (Lnet/minecraft/class_5321;)Ljava/util/Collection; COMMENT @return A collection of file Identifiers of all known entries of the given registry. COMMENT Note that these are file Identifiers for use in a resource manager, not the logical names of the entries. ARG 1 key CLASS 1 + FIELD field_36186 JSON Ljava/lang/String; METHOD method_31158 (Ljava/lang/String;)Z ARG 0 name + METHOD method_39745 (Ljava/lang/String;Ljava/util/Set;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)V + ARG 3 id + METHOD method_39746 createId (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960; + ARG 0 rootKey + ARG 1 key + METHOD method_39747 getPath (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 registryKey CLASS class_5507 Impl FIELD field_26741 values Ljava/util/Map; + FIELD field_36187 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_31159 add (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V ARG 1 registryManager ARG 2 key + ARG 3 encoder ARG 4 rawId ARG 5 entry ARG 6 lifecycle + METHOD method_39748 (Lnet/minecraft/class_5506$class_5507$class_6821;Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822; + ARG 1 value + METHOD method_39749 (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Ljava/util/stream/Stream; + ARG 1 registryKey + CLASS class_6821 Element + CLASS class_6822 Entry + METHOD method_39750 of (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822; + ARG 0 value + METHOD method_39751 of (Ljava/lang/Object;I)Lnet/minecraft/class_5506$class_6822; + ARG 0 value + ARG 1 id diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 8f22862bde..90d4415c4d 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -314,6 +314,9 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_33723 square (D)D ARG 0 n METHOD method_33825 magnitude (DDD)D + ARG 0 a + ARG 2 b + ARG 4 c METHOD method_34939 clamp (BBB)B ARG 0 value ARG 1 min @@ -387,3 +390,5 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 a ARG 2 b METHOD method_39241 hypot (DD)D + ARG 0 a + ARG 2 b diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 1525a34daa..98e8d61e66 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -96,3 +96,9 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i METHOD method_35861 north ()Lnet/minecraft/class_2382; METHOD method_35862 multiply (I)Lnet/minecraft/class_2382; ARG 1 scale + METHOD method_39675 createRangeValidator (I)Ljava/util/function/Function; + ARG 0 maxAbsValue + METHOD method_39676 (ILnet/minecraft/class_2382;)Lcom/mojang/serialization/DataResult; + ARG 1 vec + METHOD method_39677 createOffsetCodec (I)Lcom/mojang/serialization/Codec; + ARG 0 maxAbsValue diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index d181b62cb4..df79056d63 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -19,6 +19,9 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView ARG 4 x ARG 6 y ARG 8 z + METHOD method_39454 canCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z + ARG 1 entity + ARG 2 box METHOD method_39455 getWorldBorderCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Lnet/minecraft/class_265; ARG 1 entity ARG 2 box diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 5e7ceae3fd..94c6e67a90 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -107,6 +107,8 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 entity METHOD method_39425 shouldTickBlocksInChunk (J)Z ARG 1 chunkPos + METHOD method_39522 shouldRemoveEntityLater (Lnet/minecraft/class_1297$class_5529;)Z + ARG 1 reason METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index 35074995ea..646982df3a 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -103,9 +103,14 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_39458 contains (DDD)Z ARG 1 x ARG 3 z + ARG 5 margin METHOD method_39459 canCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 box + METHOD method_39538 clamp (DDD)Lnet/minecraft/class_2338; + ARG 1 x + ARG 3 y + ARG 5 z CLASS class_2785 Area METHOD method_11984 getSize ()D METHOD method_11985 getBoundSouth ()D diff --git a/mappings/net/minecraft/world/gen/random/GaussianGenerator.mapping b/mappings/net/minecraft/world/gen/random/GaussianGenerator.mapping index edb52915ec..ea0ea339f5 100644 --- a/mappings/net/minecraft/world/gen/random/GaussianGenerator.mapping +++ b/mappings/net/minecraft/world/gen/random/GaussianGenerator.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_6672 net/minecraft/world/gen/random/GaussianGenerator METHOD (Lnet/minecraft/class_5819;)V ARG 1 baseRandom METHOD method_38996 next ()D + METHOD method_39541 reset ()V