From ceb3a205fba7e648afb5671ed0843ea61ec6cd37 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 21 Feb 2022 16:09:06 +0000 Subject: [PATCH] 1.18.2-pre2 --- build.gradle | 2 +- .../net/minecraft/client/gui/screen/PresetsScreen.mapping | 6 +----- .../net/minecraft/client/gui/screen/TitleScreen.mapping | 4 +--- mappings/net/minecraft/util/Util.mapping | 8 ++++---- mappings/net/minecraft/village/raid/RaidManager.mapping | 3 +-- .../net/minecraft/world/dimension/DimensionType.mapping | 3 --- .../net/minecraft/world/gen/chunk/ChunkGenerator.mapping | 4 +--- .../world/gen/chunk/ChunkGeneratorSettings.mapping | 2 -- .../world/gen/chunk/FlatChunkGeneratorConfig.mapping | 2 +- .../minecraft/world/level/storage/LevelStorage.mapping | 7 ++----- 10 files changed, 12 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 80414f4630..7004cb7de9 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.18.2-pre1" +def minecraft_version = "1.18.2-pre2" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index 46486701d3..f2e5df6cd8 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -20,8 +20,6 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen ARG 1 parent METHOD method_19846 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_19847 (Lnet/minecraft/class_2378;Lnet/minecraft/class_4185;)V - ARG 2 button METHOD method_20102 updateSelectButton (Z)V ARG 1 hasSelected METHOD method_2195 addPreset (Lnet/minecraft/class_2561;Lnet/minecraft/class_1935;Lnet/minecraft/class_5321;Ljava/util/Set;ZZ[Lnet/minecraft/class_3229;)V @@ -38,10 +36,8 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen COMMENT Parse a string like {@code "60*minecraft:stone"} to a {@link FlatChunkGeneratorLayer}. ARG 0 layer ARG 1 layerStartHeight - METHOD method_29060 parsePresetString (Lnet/minecraft/class_2378;Ljava/lang/String;Lnet/minecraft/class_3232;)Lnet/minecraft/class_3232; + METHOD method_29060 parsePresetString (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Ljava/lang/String;Lnet/minecraft/class_3232;)Lnet/minecraft/class_3232; ARG 0 biomeRegistry - ARG 1 preset - ARG 2 generatorConfig METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String; ARG 0 config CLASS class_431 SuperflatPreset diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index 630b8bc99b..6815d9e993 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -7,14 +7,12 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen FIELD field_19102 ACCESSIBILITY_ICON_TEXTURE Lnet/minecraft/class_2960; FIELD field_23775 LOGGER Lorg/slf4j/Logger; FIELD field_2583 MINECRAFT_TITLE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2584 copyrightTextWidth I FIELD field_2585 backgroundRenderer Lnet/minecraft/class_766; FIELD field_2586 splashText Ljava/lang/String; FIELD field_2590 buttonResetDemo Lnet/minecraft/class_4185; FIELD field_2592 realmsNotificationGui Lnet/minecraft/class_437; FIELD field_2594 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2606 copyrightTextX I - FIELD field_32271 COPYRIGHT Ljava/lang/String; + FIELD field_32271 COPYRIGHT Lnet/minecraft/class_2561; FIELD field_32272 DEMO_WORLD_NAME Ljava/lang/String; METHOD (Z)V ARG 1 doBackgroundFade diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 616a2bd21e..9cfcc1353b 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -190,13 +190,13 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_666 (Ljava/lang/String;)Z ARG 0 runtimeArg METHOD method_668 getOperatingSystem ()Lnet/minecraft/class_156$class_158; - CLASS 1 + CLASS 2 + FIELD field_29657 cache Ljava/util/Map; + CLASS 3 METHOD onTermination (Ljava/lang/Throwable;)V ARG 1 throwable - CLASS 7 + CLASS 9 FIELD field_29655 cache Ljava/util/Map; - CLASS 8 - FIELD field_29657 cache Ljava/util/Map; CLASS class_157 IdentityHashStrategy CLASS class_158 OperatingSystem FIELD field_34894 name Ljava/lang/String; diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index d7d9444241..de592a2707 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -9,8 +9,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager METHOD method_16532 getOrCreateRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3765; ARG 1 world ARG 2 pos - METHOD method_16533 nameFor (Lnet/minecraft/class_2874;)Ljava/lang/String; - ARG 0 dimensionType + METHOD method_16533 nameFor (Lnet/minecraft/class_6880;)Ljava/lang/String; METHOD method_16534 nextId ()I METHOD method_16539 tick ()V METHOD method_16540 startRaid (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3765; diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 3495313b8e..89b3da3c97 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -71,7 +71,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_12488 getSaveDirectory (Lnet/minecraft/class_5321;Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 worldRef ARG 1 worldDirectory - METHOD method_12489 getSuffix ()Ljava/lang/String; METHOD method_12491 hasSkyLight ()Z METHOD method_27998 hasCeiling ()Z METHOD method_27999 isUltrawarm ()Z @@ -105,8 +104,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_29959 getMinimumY ()I METHOD method_29960 hasFixedTime ()Z METHOD method_29961 getInfiniburnBlocks ()Lnet/minecraft/class_6862; - 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 ARG 0 fromDimension ARG 1 toDimension diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 06059deb73..53e063d325 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -94,9 +94,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_27997 withSeed (J)Lnet/minecraft/class_2794; ARG 1 seed METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_28509 generateStrongholdPositions (Lnet/minecraft/class_7059;Lnet/minecraft/class_6871;)V - ARG 1 structureFeature - ARG 2 structurePlacement + METHOD method_28509 generateStrongholdPositions (Lnet/minecraft/class_6880;Lnet/minecraft/class_6871;)Ljava/util/concurrent/CompletableFuture; METHOD method_33730 getMinimumY ()I METHOD method_38264 getStructureReferences (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;)I ARG 0 structureAccessor diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 607bbb7a3c..d095831a91 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -36,8 +36,6 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD comp_481 aquifers ()Z METHOD comp_482 oreVeins ()Z METHOD comp_483 usesLegacyRandom ()Z - METHOD method_28555 equals (Lnet/minecraft/class_5321;)Z - ARG 1 registryKey METHOD method_28558 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_30641 createNetherSettings ()Lnet/minecraft/class_5284; diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index 67f9a2fe44..6d455d6783 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC ARG 4 hasLakes ARG 5 hasFeatures ARG 6 biome - METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; + METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; ARG 0 biomeRegistry METHOD method_14312 getLayerBlocks ()Ljava/util/List; METHOD method_14325 setBiome (Lnet/minecraft/class_6880;)V diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 669dcbe1e0..75e3aea9b2 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 savesDirectory ARG 2 backupsDirectory ARG 3 dataFixer - METHOD method_17926 createLevelDataParser (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;)Ljava/util/function/BiFunction; + METHOD method_17926 createLevelDataParser (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;)Ljava/util/function/BiFunction; ARG 0 ops ARG 1 dataPackSettings METHOD method_17931 getCurrentVersion ()I @@ -41,9 +41,6 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 4 dataFixer METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359; ARG 0 dynamic - METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31; - ARG 2 file - ARG 3 dataFixer METHOD method_29583 readDataPackSettings (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; ARG 0 file ARG 1 dataFixer @@ -65,7 +62,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 name METHOD method_27010 getDirectory (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; ARG 1 savePath - METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;)Lnet/minecraft/class_5219; + METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_5219; ARG 1 ops ARG 2 dataPackSettings METHOD method_27014 getIconFile ()Ljava/util/Optional;