diff --git a/build.gradle b/build.gradle index 8ea7c2497e..08d4ff9c25 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.17" +def minecraft_version = "1.17.1-pre1" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/CauldronBlock.mapping b/mappings/net/minecraft/block/CauldronBlock.mapping index 3863bcb557..5003f6d854 100644 --- a/mappings/net/minecraft/block/CauldronBlock.mapping +++ b/mappings/net/minecraft/block/CauldronBlock.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_5546 net/minecraft/block/CauldronBlock - METHOD method_31636 canFillWithPrecipitation (Lnet/minecraft/class_1937;)Z - ARG 0 world + METHOD method_31636 canFillWithPrecipitation (Lnet/minecraft/class_1937;Lnet/minecraft/class_1959$class_1963;)Z diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index c9854a6607..e9945e68ec 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -72,7 +72,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1714 musicTracker Lnet/minecraft/class_1142; FIELD field_1715 resourcePackManager Lnet/minecraft/class_3283; FIELD field_1717 languageManager Lnet/minecraft/class_1076; - FIELD field_1718 memoryReservedForCrash [B FIELD field_1719 cameraEntity Lnet/minecraft/class_1297; FIELD field_1720 versionType Ljava/lang/String; FIELD field_1721 isDemo Z diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 83eb4748d9..d89fd05c6a 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -97,3 +97,4 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3149 isAutoJumpEnabled ()Z METHOD method_3151 getMountJumpStrength ()F METHOD method_33689 init ()V + METHOD method_7290 dropSelectedItem (Z)Z diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping index d5df6d1e26..71e18cf596 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs FIELD field_20155 timeLeftLabelText Lnet/minecraft/class_2561; FIELD field_20156 daysLeftLabelText Lnet/minecraft/class_2561; FIELD field_20157 daysLeft Lnet/minecraft/class_2561; - FIELD field_20158 startDate Ljava/lang/String; + FIELD field_20158 startDate Lnet/minecraft/class_2561; FIELD field_20159 type Lnet/minecraft/class_4887$class_4322; FIELD field_26517 EXPIRED_TEXT Lnet/minecraft/class_2561; FIELD field_26518 EXPIRES_IN_LESS_THAN_A_DAY_TEXT Lnet/minecraft/class_2561; @@ -17,14 +17,13 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs FIELD field_26521 DAY_TEXT Lnet/minecraft/class_2561; FIELD field_26522 DAYS_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V - ARG 1 parent ARG 2 serverData ARG 3 mainScreen METHOD method_21499 daysLeftPresentation (I)Lnet/minecraft/class_2561; ARG 1 daysLeft METHOD method_21500 getSubscription (J)V ARG 1 worldId - METHOD method_21502 localPresentation (J)Ljava/lang/String; + METHOD method_21502 localPresentation (J)Lnet/minecraft/class_2561; METHOD method_25266 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25268 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 4ad1d849c0..c7846d9ffb 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper - METHOD method_17883 (Lnet/minecraft/class_1890$class_1891;ILnet/minecraft/class_1887;)V + METHOD method_17883 (Lnet/minecraft/class_1890$class_1891;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V ARG 2 enchantment METHOD method_17884 (Ljava/util/Map;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V ARG 2 enchantment diff --git a/mappings/net/minecraft/entity/ai/brain/task/RamImpactTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RamImpactTask.mapping index 982e009acd..141e791d69 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RamImpactTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RamImpactTask.mapping @@ -3,18 +3,13 @@ CLASS net/minecraft/class_6338 net/minecraft/entity/ai/brain/task/RamImpactTask FIELD field_33475 SPEED_STRENGTH_MULTIPLIER F FIELD field_33476 cooldownRangeFactory Ljava/util/function/Function; FIELD field_33477 targetPredicate Lnet/minecraft/class_4051; - FIELD field_33478 damage Ljava/util/function/ToIntFunction; FIELD field_33479 speed F FIELD field_33480 strengthMultiplierFactory Ljava/util/function/ToDoubleFunction; FIELD field_33481 direction Lnet/minecraft/class_243; FIELD field_33482 soundFactory Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;Lnet/minecraft/class_4051;Ljava/util/function/ToIntFunction;FLjava/util/function/ToDoubleFunction;Ljava/util/function/Function;)V + METHOD (Ljava/util/function/Function;Lnet/minecraft/class_4051;FLjava/util/function/ToDoubleFunction;Ljava/util/function/Function;)V ARG 1 cooldownRangeFactory ARG 2 targetPredicate - ARG 3 damage - ARG 4 speed - ARG 5 strengthMultiplierFactory - ARG 6 soundFactory METHOD method_36279 finishRam (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;)V ARG 1 world ARG 2 entity diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index f2346630e2..113b84921b 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -60,14 +60,12 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 1 playingDead METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;)V ARG 0 axolotl - METHOD method_35176 isAirLessThanMax ()Z METHOD method_36282 hydrateFromPotion ()V CLASS class_5763 AxolotlData FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767; METHOD ([Lnet/minecraft/class_5762$class_5767;)V ARG 1 variants METHOD method_33232 getRandomVariant (Ljava/util/Random;)Lnet/minecraft/class_5762$class_5767; - ARG 1 random CLASS class_5764 AxolotlLookControl METHOD (Lnet/minecraft/class_5762;Lnet/minecraft/class_5762;I)V ARG 2 axolotl diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index 377d02c0da..5bca763b1f 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain ARG 0 brain METHOD method_36288 addRamActivities (Lnet/minecraft/class_4095;)V ARG 0 brain - METHOD method_36289 (Lnet/minecraft/class_6053;)I + METHOD method_36289 (Lnet/minecraft/class_6053;)D ARG 0 goat METHOD method_36290 (Lnet/minecraft/class_6053;)Lnet/minecraft/class_6019; ARG 0 goat diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 87b6358d1c..d270dee90c 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -148,8 +148,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7287 interact (Lnet/minecraft/class_1297;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 entity ARG 2 hand - METHOD method_7290 dropSelectedItem (Z)Z - ARG 1 dropEntireStack METHOD method_7291 openHorseInventory (Lnet/minecraft/class_1496;Lnet/minecraft/class_1263;)V ARG 1 horse ARG 2 inventory diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index dec897ddb4..72eccc2230 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_24093 holder Lnet/minecraft/class_1297; FIELD field_24671 CODEC Lcom/mojang/serialization/Codec; FIELD field_30890 ENCHANTMENTS_KEY Ljava/lang/String; - FIELD field_30891 ID_KEY Ljava/lang/String; - FIELD field_30892 LVL_KEY Ljava/lang/String; FIELD field_30893 DISPLAY_KEY Ljava/lang/String; FIELD field_30894 NAME_KEY Ljava/lang/String; FIELD field_30895 LORE_KEY Ljava/lang/String; diff --git a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping index 907a87de21..5cd7483eca 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping @@ -1,13 +1,5 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket - FIELD field_12863 book Lnet/minecraft/class_1799; - FIELD field_12864 signed Z FIELD field_26897 slot I - METHOD (Lnet/minecraft/class_1799;ZI)V - ARG 1 book - ARG 2 signed - ARG 3 slot METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12235 getSlot ()I - METHOD method_12237 getBook ()Lnet/minecraft/class_1799; - METHOD method_12238 wasSigned ()Z diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index f66cf58251..43acdd6877 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -5,13 +5,9 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 FIELD field_12818 slot I FIELD field_12819 syncId I FIELD field_29540 modifiedStacks Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - METHOD (IIILnet/minecraft/class_1713;Lnet/minecraft/class_1799;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;)V + METHOD (IIIILnet/minecraft/class_1713;Lnet/minecraft/class_1799;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;)V ARG 1 syncId ARG 2 slot - ARG 3 button - ARG 4 actionType - ARG 5 stack - ARG 6 modifiedStacks METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12190 getStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping index 6d6b13955c..9d9d76a626 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping @@ -4,10 +4,7 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2 FIELD field_12146 syncId I COMMENT The {@link net.minecraft.screen.ScreenHandler#syncId} of a screen handler. FIELD field_12147 contents Ljava/util/List; - METHOD (ILnet/minecraft/class_2371;)V + METHOD (IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V ARG 1 syncId - ARG 2 contents - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11440 getSyncId ()I METHOD method_11441 getContents ()Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping index 38d3da8628..791fb92a3f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping @@ -4,10 +4,9 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl FIELD field_12153 stack Lnet/minecraft/class_1799; FIELD field_33324 UPDATE_CURSOR_SYNC_ID I FIELD field_33325 UPDATE_PLAYER_INVENTORY_SYNC_ID I - METHOD (IILnet/minecraft/class_1799;)V + METHOD (IIILnet/minecraft/class_1799;)V ARG 1 syncId ARG 2 slot - ARG 3 stack METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11449 getItemStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index ed764d1e3f..33e07fcb93 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -125,8 +125,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 0 entity METHOD method_7609 onContentChanged (Lnet/minecraft/class_1263;)V ARG 1 inventory - METHOD method_7610 updateSlotStacks (Ljava/util/List;)V - ARG 1 stacks + METHOD method_7610 updateSlotStacks (ILjava/util/List;Lnet/minecraft/class_1799;)V METHOD method_7611 getSlot (I)Lnet/minecraft/class_1735; ARG 1 index METHOD method_7613 canInsertIntoSlot (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;)Z @@ -146,9 +145,8 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 3 stackSize METHOD method_7618 calculateComparatorOutput (Lnet/minecraft/class_1263;)I ARG 0 inventory - METHOD method_7619 setStackInSlot (ILnet/minecraft/class_1799;)V + METHOD method_7619 setStackInSlot (IILnet/minecraft/class_1799;)V ARG 1 slot - ARG 2 stack METHOD method_7620 unpackQuickCraftButton (I)I ARG 0 quickCraftData METHOD method_7621 addSlot (Lnet/minecraft/class_1735;)Lnet/minecraft/class_1735; diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 5f036ffba2..90267b5df9 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -200,8 +200,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 - METHOD method_34226 sendCursorStackUpdate (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_34227 sendPropertyUpdate (Lnet/minecraft/class_1703;II)V ARG 1 handler ARG 2 property diff --git a/mappings/net/minecraft/world/gen/carver/CarverContext.mapping b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping index 6325f9b709..4673166819 100644 --- a/mappings/net/minecraft/world/gen/carver/CarverContext.mapping +++ b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_5873 net/minecraft/world/gen/carver/CarverContext - FIELD field_29059 generator Lnet/minecraft/class_2794; - METHOD (Lnet/minecraft/class_2794;)V - ARG 1 generator diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping index 9488dda3ff..73eae380e9 100644 --- a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_5444 net/minecraft/world/gen/decorator/DecoratorContext FIELD field_25857 world Lnet/minecraft/class_5281; - FIELD field_25858 generator Lnet/minecraft/class_2794; METHOD (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;)V ARG 1 world ARG 2 generator