From e02a7e64463ad81bb0cd9260470857bf0effbec9 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 16 May 2023 15:06:26 +0100 Subject: [PATCH] 1.20-pre2 --- build.gradle | 2 +- mappings/net/minecraft/block/CropBlock.mapping | 1 - .../client/gui/screen/ChatInputSuggestor.mapping | 2 +- .../client/gui/screen/ingame/AnvilScreen.mapping | 1 - .../gui/screen/RealmsGenericErrorScreen.mapping | 8 ++++---- .../server/loottable/LootTableProvider.mapping | 5 ----- .../data/server/recipe/RecipeProvider.mapping | 2 -- .../entity/ai/brain/task/TemptTask.mapping | 5 ++--- .../entity/passive/SnifferEntity.mapping | 1 - mappings/net/minecraft/recipe/Ingredient.mapping | 4 ++-- .../minecraft/screen/AnvilScreenHandler.mapping | 3 +-- .../minecraft/server/command/DataCommand.mapping | 5 +---- .../server/command/ServerCommandSource.mapping | 3 +-- .../network/ServerPlayNetworkHandler.mapping | 4 +--- .../minecraft/server/world/ChunkHolder.mapping | 16 +++------------- .../minecraft/server/world/ServerWorld.mapping | 4 +--- .../random/Xoroshiro128PlusPlusRandom.mapping | 1 - 17 files changed, 18 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index 026a1a1f0d..17a8fda245 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20-pre1" +def minecraft_version = "1.20-pre2" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/CropBlock.mapping b/mappings/net/minecraft/block/CropBlock.mapping index 698311e100..eb5f0c31f2 100644 --- a/mappings/net/minecraft/block/CropBlock.mapping +++ b/mappings/net/minecraft/block/CropBlock.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2302 net/minecraft/block/CropBlock FIELD field_31079 MAX_AGE I METHOD method_9824 getAgeProperty ()Lnet/minecraft/class_2758; METHOD method_9825 isMature (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_9826 applyGrowth (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping index e2c65e5e7a..182465a947 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping @@ -52,7 +52,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto ARG 0 parse ARG 1 original ARG 2 firstCharacterIndex - METHOD method_23929 showUsages (Lnet/minecraft/class_124;)V + METHOD method_23929 showUsages (Lnet/minecraft/class_124;)Z ARG 1 formatting METHOD method_23930 getStartOfCurrentWord (Ljava/lang/String;)I ARG 0 input diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping index 4dd7ade8a5..276e280bf7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping @@ -8,4 +8,3 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen ARG 2 inventory ARG 3 title METHOD method_2403 onRenamed (Ljava/lang/String;)V - ARG 1 name diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping index a51cc1aa36..ba98cc5ae0 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4394 net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen FIELD field_22695 parent Lnet/minecraft/class_437; - FIELD field_36321 errorMessages Lcom/mojang/datafixers/util/Pair; + FIELD field_36321 errorMessages Lnet/minecraft/class_4394$class_8570; FIELD field_36322 description Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_437;)V ARG 1 title @@ -12,12 +12,12 @@ CLASS net/minecraft/class_4394 net/minecraft/client/realms/gui/screen/RealmsGene METHOD (Lnet/minecraft/class_4355;Lnet/minecraft/class_437;)V ARG 1 realmsServiceException ARG 2 parent - METHOD method_21282 getErrorMessages (Lnet/minecraft/class_2561;)Lcom/mojang/datafixers/util/Pair; + METHOD method_21282 getErrorMessages (Lnet/minecraft/class_2561;)Lnet/minecraft/class_4394$class_8570; ARG 0 description - METHOD method_21283 getErrorMessages (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lcom/mojang/datafixers/util/Pair; + METHOD method_21283 getErrorMessages (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_4394$class_8570; ARG 0 title ARG 1 description METHOD method_25160 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_39981 getErrorMessages (Lnet/minecraft/class_4355;)Lcom/mojang/datafixers/util/Pair; + METHOD method_39981 getErrorMessages (Lnet/minecraft/class_4355;)Lnet/minecraft/class_4394$class_8570; ARG 0 exception diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index afba11cbb5..4ef47692c7 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -12,12 +12,7 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv ARG 1 message METHOD method_10408 (Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; ARG 2 entry - METHOD method_10410 (Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;)V - ARG 1 lootTypeGenerator METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V ARG 1 id ARG 2 table - METHOD method_10412 (Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V - ARG 2 id - ARG 3 builder CLASS class_7790 LootTypeGenerator diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping index cb1e6a68ed..3323f6bdb1 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -382,5 +382,3 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 2 resource METHOD method_51890 offerDyeableRecipes (Ljava/util/function/Consumer;Ljava/util/List;Ljava/util/List;)V ARG 0 exporter - ARG 1 dyes - ARG 2 dyeables diff --git a/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping index 68a5bcd074..e749e19495 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/TemptTask.mapping @@ -2,12 +2,11 @@ CLASS net/minecraft/class_5754 net/minecraft/entity/ai/brain/task/TemptTask FIELD field_28316 speed Ljava/util/function/Function; FIELD field_30115 TEMPTATION_COOLDOWN_TICKS I FIELD field_30116 DEFAULT_STOP_DISTANCE D - FIELD field_44704 stopDistance D + FIELD field_44704 stopDistance Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 speed - METHOD (Ljava/util/function/Function;D)V + METHOD (Ljava/util/function/Function;Ljava/util/function/Function;)V ARG 1 speed - ARG 2 stopDistance METHOD method_33196 getSpeed (Lnet/minecraft/class_1314;)F ARG 1 entity METHOD method_33198 getTemptingPlayer (Lnet/minecraft/class_1314;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping index 073fa17993..fae46d26f6 100644 --- a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_8153 net/minecraft/entity/passive/SnifferEntity FIELD field_42655 risingAnimationState Lnet/minecraft/class_7094; FIELD field_42662 STATE Lnet/minecraft/class_2940; FIELD field_42663 FINISH_DIG_TIME Lnet/minecraft/class_2940; - FIELD field_43389 babyGrowthAnimationState Lnet/minecraft/class_7094; METHOD method_49131 spawnDiggingParticles (Lnet/minecraft/class_7094;)Lnet/minecraft/class_8153; ARG 1 diggingAnimationState METHOD method_49132 startState (Lnet/minecraft/class_8153$class_8154;)Lnet/minecraft/class_8153; diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 7c9a6da0ee..e1d7657fb3 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -26,13 +26,13 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient METHOD method_8100 getMatchingItemIds ()Lit/unimi/dsi/fastutil/ints/IntList; METHOD method_8101 ofStacks ([Lnet/minecraft/class_1799;)Lnet/minecraft/class_1856; ARG 0 stacks - METHOD method_8102 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_1856; + METHOD method_8102 fromJson (Lcom/google/gson/JsonElement;Z)Lnet/minecraft/class_1856; ARG 0 json METHOD method_8103 isEmpty ()Z METHOD method_8105 getMatchingStacks ()[Lnet/minecraft/class_1799; METHOD method_8106 fromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_1856; ARG 0 tag - METHOD method_8107 entryFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1856$class_1859; + METHOD method_8107 entryFromJson (Lcom/google/gson/JsonObject;Z)Lnet/minecraft/class_1856$class_1859; ARG 0 json METHOD test (Ljava/lang/Object;)Z ARG 1 stack diff --git a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping index 2c906b6617..9e25bc5057 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping @@ -20,5 +20,4 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler ARG 0 stack METHOD method_48351 (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_7625 setNewItemName (Ljava/lang/String;)V - ARG 1 newItemName + METHOD method_7625 setNewItemName (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index b0c52693ca..5f467bf871 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -65,8 +65,6 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_13907 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 nbt METHOD method_13908 executeGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;)I - ARG 0 source - ARG 1 object METHOD method_13909 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context METHOD method_13911 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; @@ -121,9 +119,8 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 0 nbt METHOD method_48094 (Ljava/lang/String;)Ljava/lang/String; ARG 0 value - METHOD method_48095 mapValues (Ljava/util/List;Ljava/util/function/Function;)Ljava/util/List; + METHOD method_48095 mapValues (Ljava/util/List;Lnet/minecraft/class_3164$class_8569;)Ljava/util/List; ARG 0 list - ARG 1 function METHOD method_48096 asString (Lnet/minecraft/class_2520;)Ljava/lang/String; ARG 0 nbt METHOD method_48097 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 8623c14d52..abb012bd67 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -119,8 +119,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 success ARG 2 result METHOD method_9225 getWorld ()Lnet/minecraft/class_3218; - METHOD method_9226 sendFeedback (Lnet/minecraft/class_2561;Z)V - ARG 1 message + METHOD method_9226 sendFeedback (Ljava/util/function/Supplier;Z)V ARG 2 broadcastToOps METHOD method_9227 withWorld (Lnet/minecraft/class_3218;)Lnet/minecraft/class_2168; ARG 1 world diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 7423da7488..fbca2ccf8a 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -82,9 +82,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_17820 (Lnet/minecraft/class_2840;Lnet/minecraft/class_1860;)V ARG 2 recipe METHOD method_19507 isHost ()Z - METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;Lnet/minecraft/class_238;)Z - ARG 1 world - ARG 2 box + METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;Lnet/minecraft/class_238;DDD)Z METHOD method_27913 canPlace (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)Z COMMENT Checks if a player can place a block or fluid from a bucket. COMMENT diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index d31c17ecce..2c124d5a73 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -35,9 +35,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 4 lightingProvider ARG 5 levelUpdateListener ARG 6 playersWatchingChunkProvider - METHOD method_13992 sendPacketToPlayersWatching (Lnet/minecraft/class_2596;Z)V - ARG 1 packet - ARG 2 onlyOnWatchDistanceEdge + METHOD method_13992 sendPacketToPlayersWatching (Ljava/util/List;Lnet/minecraft/class_2596;)V METHOD method_13993 getChunkAt (Lnet/minecraft/class_2806;Lnet/minecraft/class_3898;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus ARG 2 chunkStorage @@ -53,9 +51,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 1 chunk METHOD method_14007 tick (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;)V ARG 1 chunkStorage - METHOD method_14009 sendBlockEntityUpdatePacket (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos + METHOD method_14009 sendBlockEntityUpdatePacket (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V METHOD method_14010 getCurrentChunk ()Lnet/minecraft/class_2791; METHOD method_14012 markForLightUpdate (Lnet/minecraft/class_1944;I)V ARG 1 lightType @@ -82,13 +78,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 1 leastStatus METHOD method_23270 getCurrentStatus ()Lnet/minecraft/class_2806; METHOD method_23271 getLevelType ()Lnet/minecraft/class_3194; - METHOD method_30311 tryUpdateBlockEntityAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 1 world - ARG 2 pos - ARG 3 state - METHOD method_30312 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 2 pos - ARG 3 state + METHOD method_30311 tryUpdateBlockEntityAt (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V METHOD method_39967 combineSavingFuture (Ljava/lang/String;Ljava/util/concurrent/CompletableFuture;)V ARG 1 thenDesc ARG 2 then diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 05c3bb58a1..7ebc58c250 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_41750 RAIN_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; FIELD field_41751 THUNDER_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; FIELD field_44857 randomSequences Lnet/minecraft/class_8565; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;Z)V + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;ZLnet/minecraft/class_8565;)V ARG 1 server ARG 2 workerExecutor ARG 3 session @@ -376,8 +376,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 2 limit METHOD method_47541 (Ljava/util/function/Predicate;Ljava/util/List;ILnet/minecraft/class_1297;)Lnet/minecraft/class_7927$class_7928; ARG 3 entity - METHOD method_51835 (JLnet/minecraft/class_2487;)Lnet/minecraft/class_8565; - ARG 2 nbt METHOD method_51836 getOrCreateRandom (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5819; ARG 1 id METHOD method_51837 setEnderDragonFight (Lnet/minecraft/class_2881;)V diff --git a/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping b/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping index 255eb00a2c..3becc3c7c7 100644 --- a/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping +++ b/mappings/net/minecraft/util/math/random/Xoroshiro128PlusPlusRandom.mapping @@ -26,7 +26,6 @@ CLASS net/minecraft/class_6677 net/minecraft/util/math/random/Xoroshiro128PlusPl METHOD method_51861 (Lnet/minecraft/class_6677;)Lnet/minecraft/class_6676; ARG 0 random CLASS class_6678 Splitter - FIELD field_35152 MD5_HASHER Lcom/google/common/hash/HashFunction; FIELD field_35153 seedLo J FIELD field_35154 seedHi J METHOD (JJ)V