diff --git a/build.gradle b/build.gradle index 7004cb7de9..fe5df59f2b 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-pre2" +def minecraft_version = "1.18.2-pre3" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index 9ac67bd4b3..438d1a3f2b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -27,7 +27,6 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr FIELD field_2849 cancelButton Lnet/minecraft/class_4185; FIELD field_32323 MAX_TEXT_WIDTH I FIELD field_32324 MAX_TEXT_HEIGHT I - FIELD field_32325 DOUBLE_CLICK_MAX_DELAY I FIELD field_32326 WIDTH I FIELD field_32327 HEIGHT I METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping index 20df71d709..d6bdb8152e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping @@ -32,7 +32,6 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre FIELD field_2802 touchDropOriginSlot Lnet/minecraft/class_1735; FIELD field_2803 draggedStackRemainder I FIELD field_29347 playerInventoryTitle Lnet/minecraft/class_2561; - FIELD field_32320 DOUBLE_CLICK_TIMEOUT I METHOD (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index d23e7cf2de..594a2d7c7d 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_19463 realmsGenericErrorScreen Lnet/minecraft/class_437; FIELD field_19464 regionsPinged Z FIELD field_19465 keyCombos Ljava/util/List; - FIELD field_19466 clicks I FIELD field_19467 connectLock Ljava/util/concurrent/locks/ReentrantLock; FIELD field_19469 showPopupButton Lnet/minecraft/class_4185; FIELD field_19470 pendingInvitesButton Lnet/minecraft/class_4325$class_4328; diff --git a/mappings/net/minecraft/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping index 50063f4bf9..28dd60f5de 100644 --- a/mappings/net/minecraft/command/CommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -57,9 +57,8 @@ CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource ARG 1 candidates ARG 2 builder ARG 3 predicate - METHOD method_9261 getCompletions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9261 getCompletions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/concurrent/CompletableFuture; ARG 1 context - ARG 2 builder METHOD method_9262 getPlayerNames ()Ljava/util/Collection; METHOD method_9263 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id diff --git a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping index 7ae88ab204..d7180ca423 100644 --- a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping @@ -1,34 +1,17 @@ CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgumentType 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_36371 UNKNOWN_FEATURE_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; METHOD method_23727 getPredicateArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_5341; ARG 0 context ARG 1 argumentName - METHOD method_27573 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - METHOD method_27575 getAttributeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1320; - ARG 0 context - ARG 1 argumentName METHOD method_32687 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_32688 getItemModifierArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_117; ARG 0 context ARG 1 argumentName - METHOD method_40042 getFromRegistry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_2232$class_6855; - ARG 0 context - ARG 1 argumentName - ARG 2 registryRef - ARG 3 exceptionType - METHOD method_40045 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - 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_9439 getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_161; ARG 0 context ARG 1 argumentName @@ -47,4 +30,3 @@ CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgument ARG 0 id METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader - CLASS class_6855 RegistryEntry diff --git a/mappings/net/minecraft/command/argument/RegistryPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryPredicateArgumentType.mapping index 1e9f71f3e9..550ad1228d 100644 --- a/mappings/net/minecraft/command/argument/RegistryPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/RegistryPredicateArgumentType.mapping @@ -16,8 +16,6 @@ CLASS net/minecraft/class_7066 net/minecraft/command/argument/RegistryPredicateA ARG 1 name ARG 2 registryRef ARG 3 invalidException - METHOD method_41168 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)V - ARG 1 registry METHOD method_41169 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id METHOD method_41170 registryPredicate (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7066; diff --git a/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping b/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping index dadb758b11..7d5b44161f 100644 --- a/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping +++ b/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping @@ -5,7 +5,6 @@ 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_36376 AVAILABLE_FEATURES 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 @@ -29,9 +28,6 @@ CLASS net/minecraft/class_2321 net/minecraft/command/suggestion/SuggestionProvid METHOD method_10030 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder - METHOD method_24473 (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/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 50d25da133..902748d3c1 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -17,11 +17,10 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 4 showIcons ARG 5 unlimitedTracking ARG 6 dimension - METHOD method_38988 isAquaticBiome ([ZIII)Z + METHOD method_38988 isAquaticBiome ([ZII)Z ARG 0 biomes ARG 1 scale ARG 2 x - ARG 3 z METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 world ARG 2 state diff --git a/mappings/net/minecraft/server/command/AttributeCommand.mapping b/mappings/net/minecraft/server/command/AttributeCommand.mapping index c38fc44db8..65c4ca21f9 100644 --- a/mappings/net/minecraft/server/command/AttributeCommand.mapping +++ b/mappings/net/minecraft/server/command/AttributeCommand.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand - FIELD field_24375 SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; FIELD field_24376 ENTITY_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_24377 NO_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_24378 NO_MODIFIER_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; @@ -13,9 +12,6 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand ARG 0 dispatcher METHOD method_27736 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_27737 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 builder METHOD method_27738 (Lnet/minecraft/class_2168;)Z ARG 0 source METHOD method_27739 executeValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I diff --git a/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping b/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping index a47bba1898..888fb53ffd 100644 --- a/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping @@ -6,9 +6,8 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceFeatureCommand ARG 0 context METHOD method_39988 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_39989 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2232$class_6855;Lnet/minecraft/class_2338;)I + METHOD method_39989 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I ARG 0 source - ARG 1 configuredFeatureEntry ARG 2 pos METHOD method_39990 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 0c96acabd8..7d1613d2e7 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -63,4 +63,4 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa ARG 0 type METHOD method_41186 (Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 0 generatorSettings - CLASS class_7044 WorldGenProperties \ No newline at end of file + CLASS class_7044 WorldGenProperties diff --git a/mappings/net/minecraft/server/filter/TextFilterer.mapping b/mappings/net/minecraft/server/filter/TextFilterer.mapping index df56aeeb57..057958ffeb 100644 --- a/mappings/net/minecraft/server/filter/TextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/TextFilterer.mapping @@ -11,14 +11,6 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer FIELD field_26832 ignorer Lnet/minecraft/class_5514$class_5515; FIELD field_26833 executor Ljava/util/concurrent/ExecutorService; FIELD field_36318 roomId Ljava/lang/String; - METHOD (Ljava/net/URI;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_5514$class_5515;I)V - ARG 1 apiUrl - ARG 2 apiKey - ARG 3 ruleId - ARG 4 serverId - ARG 5 roomId - ARG 6 ignorer - ARG 7 parallelism METHOD method_31295 sendJsonRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)Lcom/google/gson/JsonObject; ARG 1 payload ARG 2 endpoint diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 0a7cb3af51..fcbf762a96 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT

This is used by {@link FlatChunkGenerator} to overwrite biome properties like whether lakes generate, while preserving the original biome ID. FIELD field_24746 CODEC Lcom/mojang/serialization/Codec; FIELD field_24747 biomeSource Lnet/minecraft/class_1966; - FIELD field_36406 generationSeed J FIELD field_37254 LOGGER Lorg/slf4j/Logger; METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config. @@ -116,7 +115,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 structurePlacement METHOD method_40149 filterBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; ARG 1 biome - METHOD method_40154 getSeed ()J METHOD method_40450 getDebugHudText (Ljava/util/List;Lnet/minecraft/class_2338;)V ARG 1 text ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping index 4058479007..26f47dca1f 100644 --- a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping @@ -6,11 +6,9 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf FIELD comp_177 bottomSlide Lnet/minecraft/class_5310; FIELD comp_178 horizontalSize I FIELD comp_179 verticalSize I - FIELD comp_182 islandNoiseOverride Z - FIELD comp_183 amplified Z FIELD comp_247 terrainParameters Lnet/minecraft/class_6555; FIELD field_24804 CODEC Lcom/mojang/serialization/Codec; - METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIZZZLnet/minecraft/class_6555;)V + METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IILnet/minecraft/class_6555;)V ARG 1 minimumY ARG 2 height ARG 3 sampling @@ -25,12 +23,10 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf METHOD comp_177 bottomSlide ()Lnet/minecraft/class_5310; METHOD comp_178 horizontalSize ()I METHOD comp_179 verticalSize ()I - METHOD comp_182 islandNoiseOverride ()Z - METHOD comp_183 amplified ()Z METHOD comp_247 terrainParameters ()Lnet/minecraft/class_6555; METHOD method_28582 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIZZZLnet/minecraft/class_6555;)Lnet/minecraft/class_5309; + METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IILnet/minecraft/class_6555;)Lnet/minecraft/class_5309; ARG 0 minimumY ARG 1 height ARG 2 sampling @@ -38,10 +34,6 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf ARG 4 bottomSlide ARG 5 horizontalSize ARG 6 verticalSize - ARG 7 islandNoiseOverride - ARG 8 amplified - ARG 9 largeBiomes - ARG 10 terrainParameters METHOD method_32995 checkHeight (Lnet/minecraft/class_5309;)Lcom/mojang/serialization/DataResult; ARG 0 config METHOD method_39545 verticalBlockSize ()I diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping index 4178774405..7c164ca9c3 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/StructurePlacement FIELD field_36428 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD method_40166 getType ()Lnet/minecraft/class_6875; - METHOD method_40168 isStartChunk (Lnet/minecraft/class_2794;II)Z + METHOD method_40168 isStartChunk (Lnet/minecraft/class_2794;JII)Z ARG 1 chunkGenerator - ARG 2 x - ARG 3 z diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 3c10d17979..8c7ea9f6d7 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_24833 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_25833 CODEC Lcom/mojang/serialization/Codec; FIELD field_26756 LIST_CODEC Lcom/mojang/serialization/Codec; - FIELD field_36386 NETWORK_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)V ARG 1 feature ARG 2 config