From e268e3d95856b17003be0fe834e23efbdad4b4db Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 18 Feb 2022 17:15:29 +0000 Subject: [PATCH] 1.18.2-pre1 --- build.gradle | 2 +- .../client/gui/screen/PresetsScreen.mapping | 7 +-- .../MultiplayerWarningScreen.mapping | 7 --- .../command/argument/ArgumentTypes.mapping | 5 -- .../argument/IdentifierArgumentType.mapping | 12 ---- .../suggestion/SuggestionProviders.mapping | 8 --- .../ExplorationMapLootFunction.mapping | 14 ++--- .../play/EntityStatusEffectS2CPacket.mapping | 4 +- .../entity/LocationPredicate.mapping | 13 ++--- .../server/command/LocateBiomeCommand.mapping | 3 +- .../server/command/LocateCommand.mapping | 8 +-- .../server/world/ServerWorld.mapping | 9 +-- .../structure/StructureStart.mapping | 7 +-- .../noise/DoublePerlinNoiseSampler.mapping | 17 ++---- .../registry/DynamicRegistryManager.mapping | 7 +-- .../net/minecraft/village/TradeOffers.mapping | 8 +-- .../minecraft/world/ChunkSerializer.mapping | 6 +- .../minecraft/world/StructureHolder.mapping | 12 ++-- .../minecraft/world/StructureLocator.mapping | 25 +++----- .../world/StructureWorldAccess.mapping | 3 - .../world/biome/source/BiomeSource.mapping | 5 +- .../util/VanillaTerrainParameters.mapping | 12 ++-- .../world/gen/GeneratorOptions.mapping | 3 +- .../world/gen/StructureAccessor.mapping | 21 +++---- .../net/minecraft/world/gen/YOffset.mapping | 4 -- .../world/gen/chunk/ChunkGenerator.mapping | 12 +--- .../gen/chunk/ChunkGeneratorSettings.mapping | 57 +++++++------------ .../world/gen/chunk/ChunkNoiseSampler.mapping | 2 +- .../chunk/FlatChunkGeneratorConfig.mapping | 15 ++--- .../gen/chunk/NoiseChunkGenerator.mapping | 1 - .../gen/chunk/NoiseSamplingConfig.mapping | 16 +++--- .../chunk/placement/StructuresConfig.mapping | 28 --------- .../gen/feature/BastionRemnantFeature.mapping | 2 - .../ConfiguredStructureFeature.mapping | 3 +- .../ConfiguredStructureFeatures.mapping | 3 +- .../feature/MarginedStructureFeature.mapping | 1 - .../gen/feature/OceanMonumentFeature.mapping | 1 - .../feature/PillagerOutpostFeature.mapping | 5 -- .../gen/feature/StructureFeature.mapping | 17 ------ .../world/gen/feature/SwampHutFeature.mapping | 2 - 40 files changed, 100 insertions(+), 287 deletions(-) delete mode 100644 mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/MarginedStructureFeature.mapping diff --git a/build.gradle b/build.gradle index 37b6c90137..80414f4630 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "22w07a" +def minecraft_version = "1.18.2-pre1" 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 f61bb5dda7..46486701d3 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -24,15 +24,12 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen 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/List;ZZZ[Lnet/minecraft/class_3229;)V + 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 ARG 0 presetName ARG 1 icon ARG 2 presetBiome - ARG 3 structures ARG 4 generateStronghold ARG 5 generateFeatures - ARG 6 generateLakes - ARG 7 layers METHOD method_29058 parsePresetLayersString (Ljava/lang/String;)Ljava/util/List; COMMENT Parse a string like {@code "minecraft:bedrock,3*minecraft:dirt,minecraft:grass_block"} COMMENT to a list of {@link FlatChunkGeneratorLayer}. @@ -47,8 +44,6 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen ARG 2 generatorConfig METHOD method_29062 getGeneratorConfigString (Lnet/minecraft/class_3232;)Ljava/lang/String; ARG 0 config - METHOD method_31127 (Ljava/util/List;ZZZ[Lnet/minecraft/class_3229;Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; - ARG 6 biomeRegistry CLASS class_431 SuperflatPreset FIELD field_25045 generatorConfigProvider Ljava/util/function/Function; FIELD field_2527 icon Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping index a4f6f4bd76..2a143474cb 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping @@ -1,14 +1,7 @@ CLASS net/minecraft/class_4749 net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen - FIELD field_21842 parent Lnet/minecraft/class_437; FIELD field_21843 HEADER Lnet/minecraft/class_2561; FIELD field_21844 MESSAGE Lnet/minecraft/class_2561; FIELD field_21845 CHECK_MESSAGE Lnet/minecraft/class_2561; FIELD field_21846 PROCEED_TEXT Lnet/minecraft/class_2561; - FIELD field_21848 checkbox Lnet/minecraft/class_4286; - FIELD field_21849 lines Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent - METHOD method_24291 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_24292 (Lnet/minecraft/class_4185;)V - ARG 1 button diff --git a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping index 181cfd8cee..1821314bd6 100644 --- a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping +++ b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping @@ -35,10 +35,5 @@ CLASS net/minecraft/class_2316 net/minecraft/command/argument/ArgumentTypes METHOD method_30926 (Ljava/util/Set;Ljava/util/Set;Lcom/mojang/brigadier/tree/CommandNode;)V ARG 2 node CLASS class_2317 Entry - FIELD field_10924 argClass Ljava/lang/Class; FIELD field_10925 id Lnet/minecraft/class_2960; FIELD field_10926 serializer Lnet/minecraft/class_2314; - METHOD (Ljava/lang/Class;Lnet/minecraft/class_2314;Lnet/minecraft/class_2960;)V - ARG 1 argClass - ARG 2 serializer - ARG 3 id diff --git a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping index 46cd682860..7ae88ab204 100644 --- a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping @@ -2,9 +2,7 @@ CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgument FIELD field_21506 UNKNOWN_PREDICATE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_24267 UNKNOWN_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_28002 UNKNOWN_ITEM_MODIFIER_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_36370 UNKNOWN_BIOME_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_36371 UNKNOWN_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_36372 UNKNOWN_STRUCTURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9945 UNKNOWN_ADVANCEMENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9946 EXAMPLES Ljava/util/Collection; FIELD field_9947 UNKNOWN_RECIPE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; @@ -26,21 +24,11 @@ CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgument ARG 1 argumentName ARG 2 registryRef ARG 3 exceptionType - METHOD method_40044 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id METHOD method_40045 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_40046 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - METHOD method_40047 getBiomeEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2232$class_6855; - ARG 0 context - ARG 1 argumentName METHOD method_40048 getConfiguredFeatureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2232$class_6855; ARG 0 context ARG 1 argumentName - METHOD method_40049 getStructureFeatureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2232$class_6855; - ARG 0 context - ARG 1 argumentName METHOD method_9439 getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_161; ARG 0 context ARG 1 argumentName diff --git a/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping b/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping index ef618a860b..dadb758b11 100644 --- a/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping +++ b/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping @@ -5,9 +5,7 @@ CLASS net/minecraft/class_2321 net/minecraft/command/suggestion/SuggestionProvid FIELD field_10933 ASK_SERVER Lcom/mojang/brigadier/suggestion/SuggestionProvider; FIELD field_10934 AVAILABLE_SOUNDS Lcom/mojang/brigadier/suggestion/SuggestionProvider; FIELD field_10935 SUMMONABLE_ENTITIES Lcom/mojang/brigadier/suggestion/SuggestionProvider; - FIELD field_22245 AVAILABLE_BIOMES Lcom/mojang/brigadier/suggestion/SuggestionProvider; FIELD field_36376 AVAILABLE_FEATURES Lcom/mojang/brigadier/suggestion/SuggestionProvider; - FIELD field_36377 AVAILABLE_STRUCTURES Lcom/mojang/brigadier/suggestion/SuggestionProvider; METHOD method_10022 register (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lcom/mojang/brigadier/suggestion/SuggestionProvider; ARG 0 name ARG 1 provider @@ -34,12 +32,6 @@ CLASS net/minecraft/class_2321 net/minecraft/command/suggestion/SuggestionProvid METHOD method_24473 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder - METHOD method_40052 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 builder - METHOD method_40053 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 builder CLASS class_2322 LocalProvider FIELD field_10936 name Lnet/minecraft/class_2960; FIELD field_10937 provider Lcom/mojang/brigadier/suggestion/SuggestionProvider; diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 13829f5505..17472942a0 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -2,22 +2,21 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc FIELD field_1032 searchRadius I FIELD field_1033 skipExistingChunks Z FIELD field_1034 DEFAULT_DECORATION Lnet/minecraft/class_20$class_21; - FIELD field_1035 destination Lnet/minecraft/class_3195; + FIELD field_1035 destination Lnet/minecraft/class_6862; FIELD field_1036 decoration Lnet/minecraft/class_20$class_21; FIELD field_1037 zoom B FIELD field_1038 LOGGER Lorg/slf4j/Logger; - FIELD field_25032 DEFAULT_DESTINATION Lnet/minecraft/class_3195; + FIELD field_25032 DEFAULT_DESTINATION Lnet/minecraft/class_6862; FIELD field_31850 MANSION Ljava/lang/String; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_3195;Lnet/minecraft/class_20$class_21;BIZ)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V ARG 1 conditions - ARG 2 destination ARG 3 decoration ARG 4 zoom ARG 5 searchRadius ARG 6 skipExistingChunks METHOD method_492 builder ()Lnet/minecraft/class_111$class_112; CLASS class_112 Builder - FIELD field_1039 destination Lnet/minecraft/class_3195; + FIELD field_1039 destination Lnet/minecraft/class_6862; FIELD field_1040 searchRadius I FIELD field_1041 skipExistingChunks Z FIELD field_1042 decoration Lnet/minecraft/class_20$class_21; @@ -28,10 +27,9 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc ARG 1 decoration METHOD method_500 withZoom (B)Lnet/minecraft/class_111$class_112; ARG 1 zoom - METHOD method_502 withDestination (Lnet/minecraft/class_3195;)Lnet/minecraft/class_111$class_112; - ARG 1 destination + METHOD method_502 withDestination (Lnet/minecraft/class_6862;)Lnet/minecraft/class_111$class_112; METHOD method_503 withSkipExistingChunks (Z)Lnet/minecraft/class_111$class_112; ARG 1 skipExistingChunks CLASS class_113 Serializer - METHOD method_29039 getDestination (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3195; + METHOD method_29039 getDestination (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_6862; ARG 0 json diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 2e17c0e215..0e9594aca6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket - FIELD field_12725 effectId B + FIELD field_12725 effectId I FIELD field_12726 duration I FIELD field_12727 entityId I FIELD field_12728 flags B @@ -16,7 +16,7 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11943 getEntityId ()I METHOD method_11944 getDuration ()I METHOD method_11945 getAmplifier ()B - METHOD method_11946 getEffectId ()B + METHOD method_11946 getEffectId ()I METHOD method_11947 isPermanent ()Z METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 8cfdd0f9e0..84219eeb0b 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -10,13 +10,12 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_9684 y Lnet/minecraft/class_2096$class_2099; FIELD field_9685 ANY Lnet/minecraft/class_2090; FIELD field_9686 dimension Lnet/minecraft/class_5321; - FIELD field_9687 feature Lnet/minecraft/class_3195; - METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_5321;Lnet/minecraft/class_3195;Lnet/minecraft/class_5321;Ljava/lang/Boolean;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V + FIELD field_9687 feature Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Ljava/lang/Boolean;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V ARG 1 x ARG 2 y ARG 3 z ARG 4 biome - ARG 5 feature ARG 6 dimension ARG 7 smokey ARG 8 light @@ -26,8 +25,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 0 y METHOD method_9016 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; ARG 0 dimension - METHOD method_9017 feature (Lnet/minecraft/class_3195;)Lnet/minecraft/class_2090; - ARG 0 feature + METHOD method_9017 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; METHOD method_9018 test (Lnet/minecraft/class_3218;DDD)Z ARG 1 world ARG 2 x @@ -43,7 +41,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_20718 block Lnet/minecraft/class_4550; FIELD field_20719 fluid Lnet/minecraft/class_4551; FIELD field_24501 smokey Ljava/lang/Boolean; - FIELD field_9688 feature Lnet/minecraft/class_3195; + FIELD field_9688 feature Lnet/minecraft/class_5321; FIELD field_9689 y Lnet/minecraft/class_2096$class_2099; FIELD field_9690 biome Lnet/minecraft/class_5321; FIELD field_9691 dimension Lnet/minecraft/class_5321; @@ -60,8 +58,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 1 light METHOD method_35276 x (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 x - METHOD method_35277 feature (Lnet/minecraft/class_3195;)Lnet/minecraft/class_2090$class_2091; - ARG 1 feature + METHOD method_35277 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; METHOD method_35278 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 y METHOD method_35279 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; diff --git a/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping b/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping index 6ab98796c2..982caafe69 100644 --- a/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping @@ -8,8 +8,7 @@ CLASS net/minecraft/class_4799 net/minecraft/server/command/LocateBiomeCommand ARG 0 context METHOD method_24494 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_24495 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2232$class_6855;)I + METHOD method_24495 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I ARG 0 source - ARG 1 biomeEntry METHOD method_24496 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 3601984452..75d4993b0b 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -11,12 +11,8 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 1 style METHOD method_13448 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_13457 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2232$class_6855;)I + METHOD method_13457 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I ARG 0 source - ARG 1 structureFeatureEntry - METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/lang/String;)I + METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;)I ARG 0 source - ARG 1 structure - ARG 2 sourcePos - ARG 3 structurePos ARG 4 successMessage diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 7330b1afeb..791fc16192 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -244,8 +244,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_23659 (Lnet/minecraft/class_3341;Lnet/minecraft/class_1919;)Z ARG 1 event METHOD method_23660 wakeSleepingPlayers ()V - METHOD method_24500 locateBiome (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; - ARG 1 biomeKey + METHOD method_24500 locateBiome (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;II)Lcom/mojang/datafixers/util/Pair; ARG 2 pos ARG 3 radius ARG 4 blockCheckInterval @@ -304,8 +303,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT COMMENT @see net.minecraft.world.ServerWorldAccess#spawnEntityAndPassengers ARG 1 entity - METHOD method_31071 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z - ARG 1 entry METHOD method_31268 getDebugString ()Ljava/lang/String; METHOD method_31270 getTopFive (Ljava/lang/Iterable;Ljava/util/function/Function;)Ljava/lang/String; COMMENT Categories {@code items} with the {@code classifier} and reports a message @@ -363,7 +360,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_39999 shouldTick (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_8448 updateSleepingPlayers ()V - METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; + METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. COMMENT

COMMENT New chunks will only be generated up to the {@link net.minecraft.world.chunk.ChunkStatus#STRUCTURE_STARTS} phase by this method. @@ -373,8 +370,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT @return the position of the structure, or {@code null} if no structure could be found within the given search radius COMMENT COMMENT @see ChunkGenerator#locateStructure - ARG 1 feature - COMMENT the structure feature to search for ARG 2 pos COMMENT the position to start the searching at ARG 3 radius diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index d6c23b3076..6749ca93ef 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -11,13 +11,12 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart COMMENT is created in such chunks (when they enter the corresponding chunk generation COMMENT phase). FIELD field_16713 DEFAULT Lnet/minecraft/class_3449; - FIELD field_16714 feature Lnet/minecraft/class_3195; + FIELD field_16714 feature Lnet/minecraft/class_5312; FIELD field_29070 pos Lnet/minecraft/class_1923; FIELD field_31662 INVALID Ljava/lang/String; FIELD field_31663 boundingBox Lnet/minecraft/class_3341; FIELD field_34940 children Lnet/minecraft/class_6624; - METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;ILnet/minecraft/class_6624;)V - ARG 1 feature + METHOD (Lnet/minecraft/class_5312;Lnet/minecraft/class_1923;ILnet/minecraft/class_6624;)V ARG 2 pos ARG 3 references ARG 4 children @@ -36,7 +35,7 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart ARG 5 chunkBox ARG 6 chunkPos METHOD method_14979 isInExistingChunk ()Z - METHOD method_16656 getFeature ()Lnet/minecraft/class_3195; + METHOD method_16656 getFeature ()Lnet/minecraft/class_5312; METHOD method_16657 hasChildren ()Z METHOD method_23676 getReferences ()I METHOD method_34000 getPos ()Lnet/minecraft/class_1923; diff --git a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping index 93d8fac74b..83bed447d7 100644 --- a/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/DoublePerlinNoiseSampler.mapping @@ -3,21 +3,14 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa FIELD field_24176 firstSampler Lnet/minecraft/class_3537; FIELD field_24177 secondSampler Lnet/minecraft/class_3537; FIELD field_31702 DOMAIN_SCALE D - METHOD (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;Z)V + METHOD (Lnet/minecraft/class_5819;Lnet/minecraft/class_5216$class_5487;Z)V ARG 1 random - ARG 2 offset - ARG 3 octaves - ARG 4 xoroshiro METHOD method_27406 sample (DDD)D ARG 1 x ARG 3 y ARG 5 z METHOD method_27407 createAmplitude (I)D ARG 0 octaves - METHOD method_30846 create (Lnet/minecraft/class_5819;ILit/unimi/dsi/fastutil/doubles/DoubleList;)Lnet/minecraft/class_5216; - ARG 0 random - ARG 1 offset - ARG 2 octaves METHOD method_31927 create (Lnet/minecraft/class_5819;I[D)Lnet/minecraft/class_5216; ARG 0 random ARG 1 offset @@ -32,9 +25,9 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa ARG 0 random ARG 1 parameters CLASS class_5487 NoiseParameters + FIELD comp_516 firstOctave I + FIELD comp_517 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; FIELD field_26438 CODEC Lcom/mojang/serialization/Codec; - FIELD field_26439 firstOctave I - FIELD field_26440 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; METHOD (ID[D)V ARG 1 firstOctave ARG 2 firstAmplitude @@ -42,7 +35,7 @@ CLASS net/minecraft/class_5216 net/minecraft/util/math/noise/DoublePerlinNoiseSa METHOD (ILjava/util/List;)V ARG 1 firstOctave ARG 2 amplitudes - METHOD method_30832 getFirstOctave ()I + METHOD comp_516 firstOctave ()I + METHOD comp_517 amplitudes ()Lit/unimi/dsi/fastutil/doubles/DoubleList; METHOD method_30833 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_30834 getAmplitudes ()Lit/unimi/dsi/fastutil/doubles/DoubleList; diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 7344ebc59c..9699442a70 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -43,10 +43,7 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage ARG 1 registryRef ARG 2 entryCodec ARG 3 networkEntryCodec - METHOD method_31141 addEntriesToLoad (Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V - ARG 0 registryManager - ARG 1 entryLoader - ARG 2 info + METHOD method_31141 addEntriesToLoad (Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V METHOD method_33309 getManaged (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; COMMENT Retrieves a registry from this manager, COMMENT or throws an exception when the registry does not exist. @@ -87,8 +84,6 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage ARG 0 entry METHOD method_40313 streamSyncedRegistries ()Ljava/util/stream/Stream; METHOD method_40314 createAndLoad ()Lnet/minecraft/class_5455$class_6893; - METHOD method_40315 shouldSkipLoading (Lnet/minecraft/class_5321;)Z - ARG 0 registryRef METHOD method_40316 toImmutable ()Lnet/minecraft/class_5455$class_6890; METHOD method_40317 createSimpleRegistry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385; ARG 0 registryRef diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 9a37168445..4e9abd9476 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -36,13 +36,9 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_18590 maxUses I FIELD field_18591 experience I FIELD field_7473 iconType Lnet/minecraft/class_20$class_21; - FIELD field_7474 structure Lnet/minecraft/class_3195; - METHOD (ILnet/minecraft/class_3195;Lnet/minecraft/class_20$class_21;II)V + FIELD field_7474 structure Lnet/minecraft/class_6862; + METHOD (ILnet/minecraft/class_6862;Ljava/lang/String;Lnet/minecraft/class_20$class_21;II)V ARG 1 price - ARG 2 feature - ARG 3 iconType - ARG 4 maxUses - ARG 5 experience CLASS class_4160 SellDyedArmorFactory FIELD field_18544 sell Lnet/minecraft/class_1792; FIELD field_18545 price I diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index 7ee75fe2f8..308dfbb50a 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -14,9 +14,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12386 getEntityLoadingCallback (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2818$class_6829; ARG 0 world ARG 1 nbt - METHOD method_12387 readStructureReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map; - ARG 0 pos - ARG 1 nbt + METHOD method_12387 readStructureReferences (Lnet/minecraft/class_5455;Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map; METHOD method_12392 readStructureStarts (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Ljava/util/Map; ARG 0 context ARG 1 nbt @@ -31,7 +29,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12410 serialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2487; ARG 0 world ARG 1 chunk - METHOD method_24029 (Lnet/minecraft/class_1923;Ljava/lang/String;J)Z + METHOD method_24029 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2960;J)Z ARG 2 packedPos METHOD method_39035 logRecoverableError (Lnet/minecraft/class_1923;ILjava/lang/String;)V ARG 0 chunkPos diff --git a/mappings/net/minecraft/world/StructureHolder.mapping b/mappings/net/minecraft/world/StructureHolder.mapping index 134057352b..e77f7b5484 100644 --- a/mappings/net/minecraft/world/StructureHolder.mapping +++ b/mappings/net/minecraft/world/StructureHolder.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_2810 net/minecraft/world/StructureHolder METHOD method_12179 getStructureReferences ()Ljava/util/Map; - METHOD method_12180 getStructureReferences (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; - ARG 1 structure - METHOD method_12181 getStructureStart (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; - ARG 1 structure - METHOD method_12182 addStructureReference (Lnet/minecraft/class_3195;J)V - ARG 1 structure + METHOD method_12180 getStructureReferences (Lnet/minecraft/class_5312;)Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD method_12181 getStructureStart (Lnet/minecraft/class_5312;)Lnet/minecraft/class_3449; + METHOD method_12182 addStructureReference (Lnet/minecraft/class_5312;J)V ARG 2 reference METHOD method_12183 setStructureReferences (Ljava/util/Map;)V ARG 1 structureReferences - METHOD method_12184 setStructureStart (Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V - ARG 1 structure + METHOD method_12184 setStructureStart (Lnet/minecraft/class_5312;Lnet/minecraft/class_3449;)V ARG 2 start diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index 3c2ab11450..7eb4b52518 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -35,39 +35,28 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator COMMENT

This method only performs simple checks like biomes. ARG 1 pos ARG 2 feature - METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)V + METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;)V ARG 1 pos - ARG 2 feature - METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; - ARG 1 pos - ARG 2 feature + METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;Z)Lnet/minecraft/class_6833; ARG 3 skipExistingChunk - METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;ZJ)Lnet/minecraft/class_6833; + METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;ZJ)Lnet/minecraft/class_6833; ARG 1 pos - ARG 2 feature ARG 3 skipExistingChunk ARG 4 posLong METHOD method_39833 cache (Lnet/minecraft/class_1923;Ljava/util/Map;)V ARG 1 pos ARG 2 structureStarts - METHOD method_39834 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/Long2BooleanMap; - ARG 0 feature - METHOD method_39835 (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;J)Z - ARG 3 pos - METHOD method_39836 (Lnet/minecraft/class_3195;Ljava/lang/Integer;)Ljava/lang/Integer; - ARG 0 feature + METHOD method_39836 (Lnet/minecraft/class_5312;Ljava/lang/Integer;)Ljava/lang/Integer; ARG 1 references - METHOD method_39837 (Lnet/minecraft/class_3195;Ljava/lang/Long;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD method_39837 (Lnet/minecraft/class_5312;Ljava/lang/Long;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 1 pos ARG 2 referencesByStructure METHOD method_39838 createMapIfEmpty (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 0 map - METHOD method_39839 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V + METHOD method_39839 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5312;Lnet/minecraft/class_3449;)V ARG 0 feature - ARG 1 start - METHOD method_39840 getStructurePresence (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; + METHOD method_39840 getStructurePresence (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5312;Z)Lnet/minecraft/class_6833; ARG 1 referencesByStructure - ARG 2 feature ARG 3 skipExistingChunk METHOD method_39842 collectStructuresAndReferences (Lnet/minecraft/class_2487;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 1 nbt diff --git a/mappings/net/minecraft/world/StructureWorldAccess.mapping b/mappings/net/minecraft/world/StructureWorldAccess.mapping index 19daa2db14..a4f5fa2ac5 100644 --- a/mappings/net/minecraft/world/StructureWorldAccess.mapping +++ b/mappings/net/minecraft/world/StructureWorldAccess.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_5281 net/minecraft/world/StructureWorldAccess - METHOD method_30275 getStructures (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)Ljava/util/List; - ARG 1 pos - ARG 2 feature METHOD method_36972 setCurrentlyGeneratingStructureName (Ljava/util/function/Supplier;)V ARG 1 structureName METHOD method_37368 isValidForSetBlock (Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index e07434f8fc..27ebbf8869 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -3,13 +3,12 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource FIELD field_24713 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;)V ARG 1 biomes - METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Ljava/util/Random;ZLnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_2338; + METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Ljava/util/Random;ZLnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair; ARG 1 x ARG 2 y ARG 3 z ARG 4 radius ARG 5 blockCheckInterval - ARG 6 predicate ARG 7 random ARG 9 noiseSampler METHOD method_27985 withSeed (J)Lnet/minecraft/class_1966; @@ -22,7 +21,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 3 noiseSampler METHOD method_39525 (Ljava/util/List;Z)Ljava/util/List; ARG 1 biomes - METHOD method_8762 locateBiome (IIIILjava/util/function/Predicate;Ljava/util/Random;Lnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_2338; + METHOD method_8762 locateBiome (IIIILjava/util/function/Predicate;Ljava/util/Random;Lnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair; ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index 2d085d2f38..8acdc99f33 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -1,14 +1,16 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerrainParameters - FIELD field_34528 offsetSpline Lnet/minecraft/class_6492; - FIELD field_34529 factorSpline Lnet/minecraft/class_6492; - FIELD field_34530 peakSpline Lnet/minecraft/class_6492; + FIELD comp_464 offsetSpline Lnet/minecraft/class_6492; + FIELD comp_465 factorSpline Lnet/minecraft/class_6492; + FIELD comp_466 peakSpline Lnet/minecraft/class_6492; FIELD field_34531 OFFSET_VALUE_OFFSET F FIELD field_35456 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;)V ARG 1 offsetSpline ARG 2 factorSpline ARG 3 peakSpline - METHOD method_38207 getOffsetSpline ()Lnet/minecraft/class_6492; + METHOD comp_464 offsetSpline ()Lnet/minecraft/class_6492; + METHOD comp_465 factorSpline ()Lnet/minecraft/class_6492; + METHOD comp_466 peakSpline ()Lnet/minecraft/class_6492; METHOD method_38208 getNormalizedWeirdness (F)F ARG 0 weirdness METHOD method_38209 createNoisePoint (FFF)Lnet/minecraft/class_6555$class_6556; @@ -20,7 +22,6 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr ARG 1 point METHOD method_38215 writeDebugBiomes (Ljava/util/function/Consumer;)V ARG 1 parameters - METHOD method_38216 getFactorSpline ()Lnet/minecraft/class_6492; METHOD method_38217 (F)F ARG 0 continentalness METHOD method_38218 getOffsetValue (FFF)F @@ -31,7 +32,6 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr ARG 1 point METHOD method_38221 getPeak (Lnet/minecraft/class_6555$class_6556;)F ARG 1 point - METHOD method_39288 getPeakSpline ()Lnet/minecraft/class_6492; METHOD method_39457 createSurfaceParameters (Z)Lnet/minecraft/class_6555; ARG 0 amplified CLASS class_6556 NoisePoint diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index df468abb47..b12bc9a707 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -17,9 +17,8 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 6 legacyCustomOptions METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; ARG 0 registryManager - METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Ljava/util/Properties;)Lnet/minecraft/class_5285; + METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_3806$class_7044;)Lnet/minecraft/class_5285; ARG 0 registryManager - ARG 1 properties METHOD method_28024 withHardcore (ZLjava/util/OptionalLong;)Lnet/minecraft/class_5285; ARG 1 hardcore ARG 2 seed diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index 892f275a69..2d4a9ed21b 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -6,43 +6,36 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 1 world ARG 2 options ARG 3 locator - METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;JLnet/minecraft/class_2810;)V + METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;JLnet/minecraft/class_2810;)V ARG 1 pos - ARG 2 feature ARG 3 reference ARG 5 holder - METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449; + METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 feature ARG 3 holder - METHOD method_26976 setStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;Lnet/minecraft/class_2810;)V + METHOD method_26976 setStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;Lnet/minecraft/class_3449;Lnet/minecraft/class_2810;)V ARG 1 pos - ARG 2 feature ARG 3 structureStart ARG 4 holder METHOD method_27834 shouldGenerateStructures ()Z - METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; + METHOD method_28388 getStructureAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_5312;)Lnet/minecraft/class_3449; ARG 1 pos - ARG 2 structure METHOD method_29951 forRegion (Lnet/minecraft/class_3233;)Lnet/minecraft/class_5138; ARG 1 region METHOD method_38852 hasStructureReferences (Lnet/minecraft/class_2338;)Z ARG 1 pos - METHOD method_38853 getStructureStarts (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)Ljava/util/List; + METHOD method_38853 getStructureStarts (Lnet/minecraft/class_4076;Lnet/minecraft/class_5312;)Ljava/util/List; COMMENT {@return a list of structure starts for this chunk} The structure starts COMMENT are computed from the structure references of the given section's chunk. ARG 1 sectionPos - ARG 2 feature - METHOD method_38854 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; + METHOD method_38854 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_5312;)Lnet/minecraft/class_3449; COMMENT {@return a structure that contains the given {@code pos}} Compared to COMMENT {@link #getStructureAt}, this does not return a structure if the given COMMENT position is in the expanded bounding box of the structure but not in any COMMENT child piece of it. ARG 1 pos - ARG 2 structure - METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Z)Lnet/minecraft/class_6833; + METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;Z)Lnet/minecraft/class_6833; ARG 1 chunkPos - ARG 2 structure ARG 3 skipExistingChunk METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V ARG 1 structureStart diff --git a/mappings/net/minecraft/world/gen/YOffset.mapping b/mappings/net/minecraft/world/gen/YOffset.mapping index 16cbe53266..1995b404e6 100644 --- a/mappings/net/minecraft/world/gen/YOffset.mapping +++ b/mappings/net/minecraft/world/gen/YOffset.mapping @@ -2,9 +2,6 @@ CLASS net/minecraft/class_5843 net/minecraft/world/gen/YOffset FIELD field_28915 OFFSET_CODEC Lcom/mojang/serialization/Codec; FIELD field_28916 BOTTOM Lnet/minecraft/class_5843; FIELD field_28917 TOP Lnet/minecraft/class_5843; - FIELD field_28918 offset I - METHOD (I)V - ARG 1 offset METHOD method_33840 getBottom ()Lnet/minecraft/class_5843; METHOD method_33841 fixed (I)Lnet/minecraft/class_5843; ARG 0 offset @@ -17,7 +14,6 @@ CLASS net/minecraft/class_5843 net/minecraft/world/gen/YOffset METHOD method_33845 getTop ()Lnet/minecraft/class_5843; METHOD method_33846 aboveBottom (I)Lnet/minecraft/class_5843; ARG 0 offset - METHOD method_33848 getOffset ()I METHOD method_33849 belowTop (I)Lnet/minecraft/class_5843; ARG 0 offset CLASS class_5844 AboveBottom diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 852e824596..74efe75a7b 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT Used to control the population step without replacing the actual biome that comes from the original {@link #biomeSource}. COMMENT COMMENT

This is used by {@link FlatChunkGenerator} to overwrite biome properties like whether lakes generate, while preserving the original biome ID. - FIELD field_16567 structuresConfig Lnet/minecraft/class_5311; FIELD field_24746 CODEC Lcom/mojang/serialization/Codec; FIELD field_24747 biomeSource Lnet/minecraft/class_1966; METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; @@ -22,7 +21,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 world ARG 2 chunk ARG 3 structureAccessor - METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; + METHOD method_12103 locateStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_6885;Lnet/minecraft/class_2338;IZ)Lcom/mojang/datafixers/util/Pair; COMMENT Tries to find the closest structure of a given type near a given block. COMMENT

COMMENT New chunks will only be generated up to the {@link net.minecraft.world.chunk.ChunkStatus#STRUCTURE_STARTS} phase by this method. @@ -30,8 +29,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT The radius is ignored for strongholds. COMMENT COMMENT @return {@code null} if no structure could be found within the given search radius - ARG 1 world - ARG 2 feature ARG 3 center ARG 4 radius COMMENT the search radius in chunks around the chunk the given block position is in; a radius of 0 will only search in the given chunk @@ -48,7 +45,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 5 structureAccessor ARG 6 chunk ARG 7 generationStep - METHOD method_12109 getStructuresConfig ()Lnet/minecraft/class_5311; METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Places the surface blocks of the biomes after the noise has been generated. ARG 1 region @@ -60,7 +56,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 4 pos METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V COMMENT Determines which structures should start in the given chunk and creates their starting points. - ARG 1 registryManager ARG 3 chunk ARG 4 structureManager ARG 5 worldSeed @@ -95,13 +90,12 @@ 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_3195;Lnet/minecraft/class_6871;)V + METHOD method_28509 generateStrongholdPositions (Lnet/minecraft/class_7059;Lnet/minecraft/class_6871;)V METHOD method_33730 getMinimumY ()I - METHOD method_38264 getStructureReferences (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;)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 ARG 1 chunk ARG 2 sectionPos - ARG 3 structureFeature METHOD method_38275 populateBiomes (Lnet/minecraft/class_2378;Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 biomeRegistry ARG 3 blender diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 7222f86207..607bbb7a3c 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -1,51 +1,45 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSettings - FIELD field_24514 defaultBlock Lnet/minecraft/class_2680; - FIELD field_24515 defaultFluid Lnet/minecraft/class_2680; - FIELD field_24516 structuresConfig Lnet/minecraft/class_5311; + FIELD comp_474 generationShapeConfig Lnet/minecraft/class_5309; + FIELD comp_475 defaultBlock Lnet/minecraft/class_2680; + FIELD comp_476 defaultFluid Lnet/minecraft/class_2680; + FIELD comp_478 surfaceRule Lnet/minecraft/class_6686$class_6708; + FIELD comp_479 seaLevel I + FIELD comp_480 mobGenerationDisabled Z + FIELD comp_481 aquifers Z + FIELD comp_482 oreVeins Z + FIELD comp_483 usesLegacyRandom Z FIELD field_24780 CODEC Lcom/mojang/serialization/Codec; FIELD field_24781 REGISTRY_CODEC Lcom/mojang/serialization/Codec; - FIELD field_24782 generationShapeConfig Lnet/minecraft/class_5309; - FIELD field_24785 seaLevel I - FIELD field_24786 mobGenerationDisabled Z FIELD field_26355 OVERWORLD Lnet/minecraft/class_5321; FIELD field_26356 AMPLIFIED Lnet/minecraft/class_5321; FIELD field_26357 NETHER Lnet/minecraft/class_5321; FIELD field_26358 END Lnet/minecraft/class_5321; FIELD field_26359 CAVES Lnet/minecraft/class_5321; FIELD field_26360 FLOATING_ISLANDS Lnet/minecraft/class_5321; - FIELD field_28846 aquifers Z - FIELD field_28847 noiseCaves Z - FIELD field_33587 oreVeins Z - FIELD field_33651 noodleCaves Z FIELD field_35051 LARGE_BIOMES Lnet/minecraft/class_5321; - FIELD field_35130 randomProvider Lnet/minecraft/class_2919$class_6675; - FIELD field_35184 surfaceRule Lnet/minecraft/class_6686$class_6708; - METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6686$class_6708;IZZZZZZ)V - ARG 1 structuresConfig - ARG 2 generationShapeConfig - ARG 3 defaultBlock - ARG 4 defaultFluid + METHOD (Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_7056;Lnet/minecraft/class_6686$class_6708;IZZZZ)V ARG 5 surfaceRule ARG 6 seaLevel ARG 7 mobGenerationDisabled ARG 8 aquifers ARG 9 noiseCaves ARG 10 oreVeins - ARG 11 noodleCaves - ARG 12 useLegacyRandom - METHOD method_28005 getDefaultBlock ()Lnet/minecraft/class_2680; - METHOD method_28006 getDefaultFluid ()Lnet/minecraft/class_2680; - METHOD method_28007 getStructuresConfig ()Lnet/minecraft/class_5311; + METHOD comp_474 generationShapeConfig ()Lnet/minecraft/class_5309; + METHOD comp_475 defaultBlock ()Lnet/minecraft/class_2680; + METHOD comp_476 defaultFluid ()Lnet/minecraft/class_2680; + METHOD comp_478 surfaceRule ()Lnet/minecraft/class_6686$class_6708; + METHOD comp_479 seaLevel ()I + METHOD comp_480 mobGenerationDisabled ()Z + COMMENT Whether entities will be generated during chunk population. + COMMENT + COMMENT

It does not control whether spawns will occur during gameplay. + 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_28559 getGenerationShapeConfig ()Lnet/minecraft/class_5309; - METHOD method_28561 getSeaLevel ()I - METHOD method_28562 isMobGenerationDisabled ()Z - COMMENT Whether entities will be generated during chunk population. - COMMENT - COMMENT

It does not control whether spawns will occur during gameplay. METHOD method_30641 createNetherSettings ()Lnet/minecraft/class_5284; METHOD method_30642 createEndSettings ()Lnet/minecraft/class_5284; METHOD method_30643 createSurfaceSettings (ZZ)Lnet/minecraft/class_5284; @@ -56,13 +50,6 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti ARG 1 settings METHOD method_31111 getInstance ()Lnet/minecraft/class_6880; METHOD method_33757 hasAquifers ()Z - METHOD method_33758 hasNoiseCaves ()Z - METHOD method_36396 hasOreVeins ()Z - METHOD method_36468 hasNoodleCaves ()Z - METHOD method_38997 createRandom (J)Lnet/minecraft/class_5819; - ARG 1 seed - METHOD method_38998 usesLegacyRandom ()Z METHOD method_38999 getRandomProvider ()Lnet/minecraft/class_2919$class_6675; - METHOD method_39042 getSurfaceRule ()Lnet/minecraft/class_6686$class_6708; METHOD method_39901 createCavesSettings ()Lnet/minecraft/class_5284; METHOD method_39902 createFloatingIslandsSettings ()Lnet/minecraft/class_5284; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping index 2198dfbdbd..0ac7e938ec 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_34613 aquiferSampler Lnet/minecraft/class_6350; FIELD field_35487 blender Lnet/minecraft/class_6748; FIELD field_35674 generationShapeConfig Lnet/minecraft/class_5309; - METHOD (IIILnet/minecraft/class_6953;IILnet/minecraft/class_6910;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V + METHOD (IIILnet/minecraft/class_6953;IILnet/minecraft/class_6916$class_7050;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V ARG 1 horizontalNoiseResolution ARG 2 verticalNoiseResolution ARG 3 horizontalSize diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index 01ebe664b4..67f9a2fe44 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -4,21 +4,18 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC FIELD field_14077 hasNoTerrain Z FIELD field_14081 biome Lnet/minecraft/class_6880; FIELD field_14082 layerBlocks Ljava/util/List; - FIELD field_24560 structuresConfig Lnet/minecraft/class_5311; FIELD field_24975 CODEC Lcom/mojang/serialization/Codec; FIELD field_24976 hasFeatures Z FIELD field_24977 hasLakes Z FIELD field_26748 biomeRegistry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_5311;Ljava/util/List;ZZLjava/util/Optional;)V + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2378;)V + ARG 2 biomeRegistry + METHOD (Lnet/minecraft/class_2378;Ljava/util/Optional;Ljava/util/List;ZZLjava/util/Optional;)V ARG 1 biomeRegistry - ARG 2 structuresConfig ARG 3 layers ARG 4 hasLakes ARG 5 hasFeatures ARG 6 biome - METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_2378;)V - ARG 1 structuresConfig - ARG 2 biomeRegistry METHOD method_14309 getDefaultConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3232; ARG 0 biomeRegistry METHOD method_14312 getLayerBlocks ()Ljava/util/List; @@ -26,17 +23,13 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC METHOD method_14326 getBiome ()Lnet/minecraft/class_6880; METHOD method_14327 getLayers ()Ljava/util/List; METHOD method_14330 updateLayerBlocks ()V - METHOD method_28051 getStructuresConfig ()Lnet/minecraft/class_5311; METHOD method_28911 enableFeatures ()V - METHOD method_28912 withStructuresConfig (Lnet/minecraft/class_5311;)Lnet/minecraft/class_3232; - ARG 1 structuresConfig METHOD method_28913 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_28916 enableLakes ()V METHOD method_28917 createBiome ()Lnet/minecraft/class_6880; - METHOD method_29965 withLayers (Ljava/util/List;Lnet/minecraft/class_5311;)Lnet/minecraft/class_3232; + METHOD method_29965 withLayers (Ljava/util/List;Ljava/util/Optional;)Lnet/minecraft/class_3232; ARG 1 layers - ARG 2 structuresConfig METHOD method_33067 checkHeight (Lnet/minecraft/class_3232;)Lcom/mojang/serialization/DataResult; ARG 0 config METHOD method_34741 (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 6ece821c3a..33c736785c 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -12,7 +12,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V ARG 1 noiseRegistry METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V - ARG 1 noiseRegistry ARG 3 biomeSource METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt; ARG 3 states diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseSamplingConfig.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseSamplingConfig.mapping index 4cdd652df3..0b845468bf 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseSamplingConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseSamplingConfig.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/class_5308 net/minecraft/world/gen/chunk/NoiseSamplingConfig + FIELD comp_503 xzScale D + FIELD comp_504 yScale D + FIELD comp_505 xzFactor D + FIELD comp_506 yFactor D FIELD field_24799 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24800 xzScale D - FIELD field_24801 yScale D - FIELD field_24802 xzFactor D - FIELD field_24803 yFactor D FIELD field_25188 CODEC_RANGE Lcom/mojang/serialization/Codec; METHOD (DDDD)V ARG 1 xzScale ARG 3 yScale ARG 5 xzFactor ARG 7 yFactor - METHOD method_28576 getXZScale ()D + METHOD comp_503 xzScale ()D + METHOD comp_504 yScale ()D + METHOD comp_505 xzFactor ()D + METHOD comp_506 yFactor ()D METHOD method_28577 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28578 getYScale ()D - METHOD method_28579 getXZFactor ()D - METHOD method_28580 getYFactor ()D diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping deleted file mode 100644 index f0b7350de5..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping +++ /dev/null @@ -1,28 +0,0 @@ -CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/placement/StructuresConfig - COMMENT Contains the configuration for placement of each structure type during chunk generation. - FIELD field_24821 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24822 DEFAULT_PLACEMENTS Lcom/google/common/collect/ImmutableMap; - COMMENT Default {@linkplain StructurePlacement structure placements} for each known structure type. - COMMENT At startup, Minecraft validates that each registered structure has a default - COMMENT placement in this map. If mods register structures after this class - COMMENT has been initialized, the check will already have been made and a - COMMENT bad default configuration will be used instead (see below). - FIELD field_24823 STRONGHOLD_PLACEMENT Lnet/minecraft/class_6871; - COMMENT Default structure placement for the stronghold. - FIELD field_24824 placements Ljava/util/Map; - FIELD field_36413 DEFAULT_PLACEMENTS_WITH_STRONGHOLD Lcom/google/common/collect/ImmutableMap; - METHOD (Ljava/util/Map;)V - ARG 1 placements - METHOD (Z)V - COMMENT Creates a new structure placement configuration with default values. - ARG 1 withStronghold - COMMENT determines if the default stronghold configuration should be included - METHOD method_28598 getStructures ()Ljava/util/Map; - METHOD method_28599 (Lnet/minecraft/class_5311;)Ljava/util/Map; - ARG 0 config - METHOD method_28600 getForType (Lnet/minecraft/class_3195;)Lnet/minecraft/class_6874; - COMMENT Gets the structure placement for a specific structure type, or - COMMENT a default placement if placement for the structure was not explicitly configured. - ARG 1 structureType - METHOD method_28601 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping index 2af1afd89b..c45e458058 100644 --- a/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BastionRemnantFeature.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/class_5175 net/minecraft/world/gen/feature/BastionRemnantFea FIELD field_31499 STRUCTURE_START_Y I METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec - METHOD method_28617 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z - ARG 0 context diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping index ff70cb30d5..6dfbb8a21f 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu FIELD field_24836 config Lnet/minecraft/class_3037; FIELD field_25834 CODEC Lcom/mojang/serialization/Codec; FIELD field_26757 REGISTRY_ELEMENT_CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;Lnet/minecraft/class_6885;)V + METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;Lnet/minecraft/class_6885;ZLjava/util/Map;)V ARG 1 feature ARG 2 config METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; @@ -12,7 +12,6 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu ARG 1 registryManager ARG 2 chunkGenerator ARG 3 biomeSource - ARG 4 structureManager ARG 5 worldSeed ARG 7 chunkPos ARG 8 structureReferences diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping index c83244827c..538e7d3def 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructureFeatures - METHOD method_30603 register (Ljava/lang/String;Lnet/minecraft/class_5312;)Lnet/minecraft/class_6880; - ARG 0 id + METHOD method_30603 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5312;)Lnet/minecraft/class_6880; ARG 1 configuredStructureFeature METHOD method_38569 getDefault ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/MarginedStructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/MarginedStructureFeature.mapping deleted file mode 100644 index 9396957b70..0000000000 --- a/mappings/net/minecraft/world/gen/feature/MarginedStructureFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4183 net/minecraft/world/gen/feature/MarginedStructureFeature diff --git a/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping index a5a99f2351..09e87fa6b2 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3116 net/minecraft/world/gen/feature/OceanMonumentFeature - FIELD field_13716 MONSTER_SPAWNS Lnet/minecraft/class_6012; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec METHOD method_28642 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z diff --git a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping index 49a5d3c503..002453aec6 100644 --- a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_3770 net/minecraft/world/gen/feature/PillagerOutpostFeature - FIELD field_16656 MONSTER_SPAWNS Lnet/minecraft/class_6012; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec METHOD method_28644 canGenerate (Lnet/minecraft/class_6834$class_6835;)Z ARG 0 context - METHOD method_30845 isVillageNearby (Lnet/minecraft/class_2794;JLnet/minecraft/class_1923;)Z - ARG 0 chunkGenerator - ARG 1 seed - ARG 3 chunkPos diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index eb17c4012c..403c4ce8a1 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature FIELD field_13879 LOGGER Lorg/slf4j/Logger; - FIELD field_24842 STRUCTURES Lcom/google/common/collect/BiMap; FIELD field_24851 SWAMP_HUT Lnet/minecraft/class_3195; - FIELD field_24861 LAND_MODIFYING_STRUCTURES Ljava/util/List; FIELD field_24862 STRUCTURE_TO_GENERATION_STEP Ljava/util/Map; FIELD field_24863 codec Lcom/mojang/serialization/Codec; FIELD field_34929 piecesGenerator Lnet/minecraft/class_6834; @@ -13,19 +11,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature METHOD (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_6834;Lnet/minecraft/class_6621;)V ARG 2 piecesGenerator ARG 3 postPlacementProcessor - METHOD method_14019 getName ()Ljava/lang/String; - METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; - COMMENT Tries to place a starting point for this type of structure in the given chunk. - COMMENT

- COMMENT If this structure doesn't have a starting point in the chunk, {@link StructureStart#DEFAULT} - COMMENT will be returned. - ARG 1 registryManager - ARG 2 chunkGenerator - ARG 3 biomeSource - ARG 4 structureManager - ARG 5 worldSeed - ARG 7 pos - ARG 8 structureReferences METHOD method_28659 configure (Lnet/minecraft/class_3037;Lnet/minecraft/class_6862;)Lnet/minecraft/class_5312; ARG 1 config METHOD method_28660 readStructureStart (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449; @@ -41,8 +26,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature COMMENT Structures will generate before other features in the same generation step. METHOD method_28664 init ()V METHOD method_28665 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_36217 calculateBoundingBox (Lnet/minecraft/class_3341;)Lnet/minecraft/class_3341; - ARG 1 box METHOD method_38671 getLocatedPos (Lnet/minecraft/class_6872;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2338; COMMENT {@return a block position for feature location} ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping index fbe25ad052..6182fa8fb2 100644 --- a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_3197 net/minecraft/world/gen/feature/SwampHutFeature - FIELD field_13882 MONSTER_SPAWNS Lnet/minecraft/class_6012; - FIELD field_16435 CREATURE_SPAWNS Lnet/minecraft/class_6012; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec METHOD method_38693 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_6622$class_6623;)V