From 09085b2dbb5a2e6870836b061603b05208d33a45 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 10 May 2023 14:10:04 +0100 Subject: [PATCH] 1.20-pre1 --- build.gradle | 2 +- .../blaze3d/platform/GlStateManager.mapping | 4 +- .../net/minecraft/block/AbstractBlock.mapping | 4 +- mappings/net/minecraft/block/Block.mapping | 5 --- .../minecraft/block/DecoratedPotBlock.mapping | 3 -- .../minecraft/block/ShulkerBoxBlock.mapping | 3 -- .../block/entity/PistonBlockEntity.mapping | 4 +- mappings/net/minecraft/class_8566.mapping | 4 ++ mappings/net/minecraft/class_8567.mapping | 2 + .../client/network/ClientPlayerEntity.mapping | 2 - .../client/realms/dto/Backup.mapping | 2 - .../screen/RealmsConfigureWorldScreen.mapping | 1 - .../RealmsLongConfirmationScreen.mapping | 3 +- .../gui/screen/RealmsPlayerScreen.mapping | 1 - .../RealmsSelectFileToUploadScreen.mapping | 2 +- .../RealmsSubscriptionInfoScreen.mapping | 4 -- .../client/realms/util/RealmsUtil.mapping | 4 +- .../data/server/recipe/RecipeProvider.mapping | 12 ----- mappings/net/minecraft/entity/Entity.mapping | 2 - .../net/minecraft/entity/LivingEntity.mapping | 4 -- .../boss/dragon/EnderDragonFight.mapping | 3 +- .../entity/passive/SheepEntity.mapping | 4 +- .../inventory/CraftingInventory.mapping | 3 -- mappings/net/minecraft/item/ItemStack.mapping | 9 ---- mappings/net/minecraft/loot/LootTable.mapping | 12 ++--- .../loot/context/LootContext.mapping | 44 +------------------ .../packet/s2c/play/GameJoinS2CPacket.mapping | 2 +- .../s2c/play/PlayerRespawnS2CPacket.mapping | 2 +- .../recipe/MapExtendingRecipe.mapping | 2 +- .../net/minecraft/recipe/ShapedRecipe.mapping | 2 +- .../screen/CraftingScreenHandler.mapping | 4 +- .../screen/PlayerScreenHandler.mapping | 4 +- .../screen/slot/CraftingResultSlot.mapping | 4 +- .../server/command/LootCommand.mapping | 3 +- .../server/world/ChunkHolder.mapping | 10 +---- .../minecraft/server/world/LevelType.mapping | 3 ++ .../server/world/ServerEntityManager.mapping | 2 +- .../world/ThreadedAnvilChunkStorage.mapping | 4 +- .../net/minecraft/village/TradeOffers.mapping | 2 - .../chunk/ChunkStatusChangeListener.mapping | 2 +- .../minecraft/world/chunk/WorldChunk.mapping | 2 +- .../world/entity/EntityTrackingStatus.mapping | 2 +- 42 files changed, 44 insertions(+), 149 deletions(-) create mode 100644 mappings/net/minecraft/class_8566.mapping create mode 100644 mappings/net/minecraft/class_8567.mapping create mode 100644 mappings/net/minecraft/server/world/LevelType.mapping diff --git a/build.gradle b/build.gradle index c92e6676a2..bf704fe6ae 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w18a" +def minecraft_version = "1.20-pre1" filament { minecraftVersion = minecraft_version diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index fe21e0402b..a3bedef947 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -258,7 +258,7 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 6 format ARG 7 type ARG 8 pixels - METHOD _upload (IIIIILnet/minecraft/class_1011$class_1012;Ljava/nio/IntBuffer;)V + METHOD _upload (IIIIILnet/minecraft/class_1011$class_1012;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V ARG 0 level ARG 1 offsetX ARG 2 offsetY @@ -321,7 +321,7 @@ CLASS com/mojang/blaze3d/platform/GlStateManager METHOD glShaderSource (ILjava/util/List;)V ARG 0 shader ARG 1 strings - METHOD upload (IIIIILnet/minecraft/class_1011$class_1012;Ljava/nio/IntBuffer;)V + METHOD upload (IIIIILnet/minecraft/class_1011$class_1012;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V ARG 0 level ARG 1 offsetX ARG 2 offsetY diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 460d553c82..dfe9b09ea1 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -611,7 +611,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT the position of this block ARG 6 neighborPos COMMENT the position of the neighbor block - METHOD method_9560 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_47$class_48;)Ljava/util/List; + METHOD method_9560 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_8567$class_8568;)Ljava/util/List; COMMENT {@return the block's dropped item stacks} COMMENT COMMENT

The default implementation uses loot tables. Blocks with custom drops should @@ -1116,7 +1116,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 direction METHOD method_26188 canBucketPlace (Lnet/minecraft/class_3611;)Z ARG 1 fluid - METHOD method_26189 getDroppedStacks (Lnet/minecraft/class_47$class_48;)Ljava/util/List; + METHOD method_26189 getDroppedStacks (Lnet/minecraft/class_8567$class_8568;)Ljava/util/List; ARG 1 builder METHOD method_26190 getRenderingSeed (Lnet/minecraft/class_2338;)J ARG 1 pos diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 969a1141a2..2cd64756fc 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -87,11 +87,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_34725 getStateWithProperties (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; COMMENT Gets a block state with all properties that both this block and the source block state have. ARG 1 state - METHOD method_35257 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 2 stack - METHOD method_35258 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_47$class_48;)V - ARG 0 state - ARG 1 lootContext METHOD method_36992 dropStack (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/DecoratedPotBlock.mapping b/mappings/net/minecraft/block/DecoratedPotBlock.mapping index b454d4e560..8040c3fa11 100644 --- a/mappings/net/minecraft/block/DecoratedPotBlock.mapping +++ b/mappings/net/minecraft/block/DecoratedPotBlock.mapping @@ -4,8 +4,5 @@ CLASS net/minecraft/class_8168 net/minecraft/block/DecoratedPotBlock FIELD field_42756 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_43236 SHERDS_NBT_KEY Lnet/minecraft/class_2960; FIELD field_43237 CRACKED Lnet/minecraft/class_2746; - METHOD method_49815 (Lnet/minecraft/class_8172;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V - ARG 1 context - ARG 2 consumer METHOD method_51510 (Ljava/util/List;Lnet/minecraft/class_1792;)V ARG 1 sherd diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping index 2f160de013..e56b42e519 100644 --- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping +++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)V ARG 1 color ARG 2 settings - METHOD method_10524 (Lnet/minecraft/class_2627;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V - ARG 1 context - ARG 2 consumer METHOD method_10525 get (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2248; ARG 0 dyeColor METHOD method_10526 getColor (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index af1cdd90ae..037eb18a69 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -53,15 +53,13 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity ARG 3 amount METHOD method_11515 isSource ()Z METHOD method_23364 isPushingHoneyBlock ()Z - METHOD method_23671 canMoveEntity (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z + METHOD method_23671 canMoveEntity (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)Z ARG 0 box ARG 1 entity METHOD method_23672 moveEntity (Lnet/minecraft/class_2350;Lnet/minecraft/class_1297;DLnet/minecraft/class_2350;)V ARG 0 direction ARG 1 entity ARG 4 movementDirection - METHOD method_23673 (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;)Z - ARG 1 entity METHOD method_23674 moveEntitiesInHoneyBlock (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLnet/minecraft/class_2669;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/class_8566.mapping b/mappings/net/minecraft/class_8566.mapping new file mode 100644 index 0000000000..3c9608435c --- /dev/null +++ b/mappings/net/minecraft/class_8566.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8566 + METHOD method_17397 getHeight ()I + METHOD method_17398 getWidth ()I + METHOD method_51305 getInputStacks ()Ljava/util/List; diff --git a/mappings/net/minecraft/class_8567.mapping b/mappings/net/minecraft/class_8567.mapping new file mode 100644 index 0000000000..acfb4fcef4 --- /dev/null +++ b/mappings/net/minecraft/class_8567.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8567 + CLASS class_49 Dropper diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 009cb3cab4..2b68f6f429 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_23093 inSneakingPose Z FIELD field_36194 MAX_SOFT_COLLISION_RADIANS D FIELD field_39078 LOGGER Lorg/slf4j/Logger; - FIELD field_3911 lastNauseaStrength F FIELD field_3912 clientPermissionLevel I FIELD field_3913 input Lnet/minecraft/class_744; FIELD field_3914 lastRenderPitch F @@ -21,7 +20,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3926 lastX D FIELD field_3927 autoJumpEnabled Z FIELD field_3928 statHandler Lnet/minecraft/class_3469; - FIELD field_3929 nextNauseaStrength F FIELD field_3930 recipeBook Lnet/minecraft/class_299; FIELD field_3931 lastRenderYaw F FIELD field_3932 renderYaw F diff --git a/mappings/net/minecraft/client/realms/dto/Backup.mapping b/mappings/net/minecraft/client/realms/dto/Backup.mapping index b5ef031500..117e299c1a 100644 --- a/mappings/net/minecraft/client/realms/dto/Backup.mapping +++ b/mappings/net/minecraft/client/realms/dto/Backup.mapping @@ -9,7 +9,5 @@ CLASS net/minecraft/class_4867 net/minecraft/client/realms/dto/Backup METHOD method_25032 isUploadedVersion ()Z METHOD method_25033 parse (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4867; ARG 0 node - METHOD method_25034 format (Ljava/lang/String;)Ljava/lang/String; - ARG 0 key METHOD method_25035 setUploadedVersion (Z)V ARG 1 uploadedVersion diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index 71fc32be2a..97589eec19 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf FIELD field_22691 EXPIRES_SOON_ICON Lnet/minecraft/class_2960; FIELD field_26479 WORLDS_TITLE Lnet/minecraft/class_2561; FIELD field_26480 CONFIGURE_REALM_TITLE Lnet/minecraft/class_2561; - FIELD field_26481 CURRENT_MINIGAME_TEXT Lnet/minecraft/class_2561; FIELD field_26482 EXPIRED_TEXT Lnet/minecraft/class_2561; FIELD field_26483 EXPIRES_SOON_TEXT Lnet/minecraft/class_2561; FIELD field_26484 EXPIRES_IN_A_DAY_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping index cab38c87eb..10080d3e12 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping @@ -21,8 +21,7 @@ CLASS net/minecraft/class_4396 net/minecraft/client/realms/gui/screen/RealmsLong FIELD field_19904 INFO Lnet/minecraft/class_4396$class_4397; FIELD field_19905 colorCode I FIELD field_19906 text Lnet/minecraft/class_2561; - METHOD (Ljava/lang/String;ILjava/lang/String;I)V - ARG 3 text + METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;I)V ARG 4 colorCode METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4396$class_4397; ARG 0 name diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index 675fdaf253..2560b08439 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay FIELD field_26498 NORMAL_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26499 OPERATOR_TOOLTIP Lnet/minecraft/class_2561; FIELD field_26500 REMOVE_TOOLTIP Lnet/minecraft/class_2561; - FIELD field_26501 INVITED_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;)V ARG 1 parent ARG 2 serverData diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index c3a9723185..28f8b4ab51 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele CLASS class_4417 WorldListEntry FIELD field_22718 summary Lnet/minecraft/class_34; FIELD field_26509 displayName Ljava/lang/String; - FIELD field_26510 nameAndLastPlayed Ljava/lang/String; + FIELD field_26510 nameAndLastPlayed Lnet/minecraft/class_2561; FIELD field_26511 details Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4416;Lnet/minecraft/class_34;)V ARG 2 summary diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping index 76bd238b68..01dcd2deca 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping @@ -12,10 +12,6 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs 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; - FIELD field_26519 MONTH_TEXT Lnet/minecraft/class_2561; - FIELD field_26520 MONTHS_TEXT Lnet/minecraft/class_2561; - FIELD field_26521 DAY_TEXT Lnet/minecraft/class_2561; - FIELD field_26522 DAYS_TEXT Lnet/minecraft/class_2561; FIELD field_34033 UNKNOWN_TEXT Lnet/minecraft/class_2561; FIELD field_43152 RECURRING_INFO_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V diff --git a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping index f2a14a00f4..760a505fc9 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping @@ -4,11 +4,11 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil FIELD field_32129 SECONDS_PER_MINUTE I FIELD field_32130 SECONDS_PER_HOUR I FIELD field_32131 SECONDS_PER_DAY I - METHOD method_21567 convertToAgePresentation (J)Ljava/lang/String; + METHOD method_21567 convertToAgePresentation (J)Lnet/minecraft/class_2561; ARG 0 milliseconds METHOD method_21568 uuidToName (Ljava/lang/String;)Ljava/lang/String; ARG 0 uuid - METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Ljava/lang/String; + METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Lnet/minecraft/class_2561; ARG 0 date METHOD method_48972 drawPlayerHead (Lnet/minecraft/class_332;IIILjava/lang/String;)V ARG 0 context diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping index 72a6fa53b9..c6d072be46 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -39,26 +39,14 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 0 exporter ARG 1 output ARG 2 input - METHOD method_24884 offerWoolDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input METHOD method_24885 offerCarpetRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter ARG 1 output ARG 2 input - METHOD method_24886 offerCarpetDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input METHOD method_24887 offerBedRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter ARG 1 output ARG 2 input - METHOD method_24888 offerBedDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V - ARG 0 exporter - ARG 1 output - ARG 2 input METHOD method_24889 offerBannerRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter ARG 1 output diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index ba2c1e2068..d8fcc7aa67 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -136,8 +136,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_29989 MAX_COMMAND_TAGS I COMMENT @see Entity#addCommandTag COMMENT @see Entity#readNbt - FIELD field_29990 VELOCITY_AFFECTING_POS_Y_OFFSET D - COMMENT @see Entity#getVelocityAffectingPos FIELD field_29992 DEFAULT_MIN_FREEZE_DAMAGE_TICKS I COMMENT @see Entity#getMinFreezeDamageTicks FIELD field_29993 FREEZING_DAMAGE_INTERVAL I diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index ca58c8a7d5..ec4df7fa0f 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -91,12 +91,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6285 effectsChanged Z FIELD field_6287 movementSpeed F METHOD method_16077 dropLoot (Lnet/minecraft/class_1282;Z)V - ARG 1 source ARG 2 causedByPlayer METHOD method_16078 dropInventory ()V - METHOD method_16079 getLootContextBuilder (ZLnet/minecraft/class_1282;)Lnet/minecraft/class_47$class_48; - ARG 1 causedByPlayer - ARG 2 source METHOD method_16080 drop (Lnet/minecraft/class_1282;)V ARG 1 source METHOD method_16826 setDespawnCounter (I)V diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index 8e87d85aa0..7020c66975 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_13110 endPortalPattern Lnet/minecraft/class_2700; FIELD field_13111 doLegacyCheck Z FIELD field_13112 LOGGER Lorg/slf4j/Logger; - FIELD field_13113 VALID_ENTITY Ljava/util/function/Predicate; FIELD field_13114 previouslyKilled Z FIELD field_13115 dragonKilled Z FIELD field_13116 dragonUuid Ljava/util/UUID; @@ -22,7 +21,7 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_31444 CRYSTAL_COUNTING_INTERVAL I FIELD field_31446 ISLAND_SIZE I FIELD field_31447 PLAYER_COUNTING_INTERVAL I - METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 gatewaysSeed ARG 4 nbt diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 8b1db6e11e..732cf8eaca 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -5,9 +5,9 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity FIELD field_6868 DROPS Ljava/util/Map; FIELD field_6869 eatGrassGoal Lnet/minecraft/class_1345; FIELD field_6870 COLOR Lnet/minecraft/class_2940; - METHOD method_17689 (Lnet/minecraft/class_1715;Lnet/minecraft/class_3955;)Lnet/minecraft/class_1799; + METHOD method_17689 (Lnet/minecraft/class_8566;Lnet/minecraft/class_3955;)Lnet/minecraft/class_1799; ARG 2 recipe - METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1715; + METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_8566; ARG 0 firstColor ARG 1 secondColor METHOD method_20254 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/inventory/CraftingInventory.mapping b/mappings/net/minecraft/inventory/CraftingInventory.mapping index b3a2f2c5d2..c34f23c0d7 100644 --- a/mappings/net/minecraft/inventory/CraftingInventory.mapping +++ b/mappings/net/minecraft/inventory/CraftingInventory.mapping @@ -7,6 +7,3 @@ CLASS net/minecraft/class_1715 net/minecraft/inventory/CraftingInventory ARG 1 handler ARG 2 width ARG 3 height - METHOD method_17397 getHeight ()I - METHOD method_17398 getWidth ()I - METHOD method_51305 getInputStacks ()Ljava/util/List; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 854f1e1f42..2dadee2b10 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -464,8 +464,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #setHolder COMMENT @see #getFrame COMMENT @see #getHolder - METHOD method_7962 isItemEqual (Lnet/minecraft/class_1799;)Z - ARG 1 stack METHOD method_7963 isDamageable ()Z COMMENT {@return whether the item can be damaged (lose durability)} COMMENT @@ -481,9 +479,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7966 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_7967 isUsedOnRelease ()Z - METHOD method_7968 isEqual (Lnet/minecraft/class_1799;)Z - COMMENT {@return whether this stack and {@code stack} are equal, including the item count and NBT} - ARG 1 stack METHOD method_7969 getNbt ()Lnet/minecraft/class_2487; COMMENT {@return the custom NBT of this item stack, may be {@code null}} COMMENT @@ -545,10 +540,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #damage(int, Random, ServerPlayerEntity) COMMENT @see #damage(int, LivingEntity, Consumer) ARG 1 damage - METHOD method_7975 areNbtEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - COMMENT {@return whether the given item stacks have equivalent NBT data} - ARG 0 left - ARG 1 right METHOD method_7976 getUseAction ()Lnet/minecraft/class_1839; METHOD method_7977 setCustomName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_1799; COMMENT Sets the custom name of this item stack to {@code name}. If {@code null} is diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 0ca503221a..263c558c60 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -6,10 +6,8 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable FIELD field_946 LOGGER Lorg/slf4j/Logger; FIELD field_947 GENERIC Lnet/minecraft/class_176; FIELD field_948 EMPTY Lnet/minecraft/class_52; - METHOD (Lnet/minecraft/class_176;[Lnet/minecraft/class_55;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_176;Lnet/minecraft/class_2960;[Lnet/minecraft/class_55;[Lnet/minecraft/class_117;)V ARG 1 type - ARG 2 pools - ARG 3 functions METHOD method_319 generateLoot (Lnet/minecraft/class_47;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; ARG 1 context METHOD method_320 generateLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V @@ -23,15 +21,13 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable METHOD method_328 generateUnprocessedLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V ARG 1 context ARG 2 lootConsumer - METHOD method_329 supplyInventory (Lnet/minecraft/class_1263;Lnet/minecraft/class_47;)V + METHOD method_329 supplyInventory (Lnet/minecraft/class_1263;Lnet/minecraft/class_8567;J)V ARG 1 inventory - ARG 2 context METHOD method_330 validate (Lnet/minecraft/class_58;)V ARG 1 reporter - METHOD method_331 (Lnet/minecraft/class_47;Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)V + METHOD method_331 (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_332 processStacks (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Ljava/util/function/Consumer; - ARG 0 context + METHOD method_332 processStacks (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;)Ljava/util/function/Consumer; ARG 1 consumer METHOD method_333 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;ILnet/minecraft/class_5819;)V ARG 1 drops diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index 94f85a1a90..866176a6f2 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -1,18 +1,7 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext FIELD field_44490 dataLookup Lnet/minecraft/class_8489; FIELD field_923 random Lnet/minecraft/class_5819; - FIELD field_925 parameters Ljava/util/Map; - FIELD field_926 luck F FIELD field_927 activeEntries Ljava/util/Set; - FIELD field_928 world Lnet/minecraft/class_3218; - FIELD field_929 drops Ljava/util/Map; - METHOD (Lnet/minecraft/class_5819;FLnet/minecraft/class_3218;Lnet/minecraft/class_8489;Ljava/util/Map;Ljava/util/Map;)V - ARG 1 random - ARG 2 luck - ARG 3 world - ARG 4 dataLookup - ARG 5 parameters - ARG 6 drops METHOD method_294 getRandom ()Lnet/minecraft/class_5819; METHOD method_295 markInactive (Lnet/minecraft/class_47$class_8487;)V ARG 1 entry @@ -39,42 +28,11 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext METHOD method_51187 predicate (Lnet/minecraft/class_5341;)Lnet/minecraft/class_47$class_8487; ARG 0 predicate CLASS class_48 Builder - FIELD field_930 world Lnet/minecraft/class_3218; - FIELD field_931 luck F - FIELD field_932 parameters Ljava/util/Map; - FIELD field_933 drops Ljava/util/Map; FIELD field_934 random Lnet/minecraft/class_5819; - METHOD (Lnet/minecraft/class_3218;)V - ARG 1 world - METHOD method_303 luck (F)Lnet/minecraft/class_47$class_48; - ARG 1 luck METHOD method_304 random (J)Lnet/minecraft/class_47$class_48; ARG 1 seed - METHOD method_305 getNullable (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter - METHOD method_306 optionalParameter (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_47$class_48; - ARG 1 key - ARG 2 value - METHOD method_307 putDrop (Lnet/minecraft/class_2960;Lnet/minecraft/class_47$class_49;)Lnet/minecraft/class_47$class_48; - ARG 1 id - ARG 2 value - METHOD method_308 get (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter - METHOD method_309 build (Lnet/minecraft/class_176;)Lnet/minecraft/class_47; - ARG 1 type - METHOD method_310 random (JLnet/minecraft/class_5819;)Lnet/minecraft/class_47$class_48; - ARG 1 seed - ARG 3 random - METHOD method_311 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_47$class_48; - ARG 1 random - METHOD method_312 parameter (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_47$class_48; - ARG 1 key - ARG 2 value + METHOD method_309 build (Lnet/minecraft/class_2960;)Lnet/minecraft/class_47; METHOD method_313 getWorld ()Lnet/minecraft/class_3218; - CLASS class_49 Dropper - METHOD add (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V - ARG 1 context - ARG 2 consumer CLASS class_50 EntityTarget FIELD field_938 parameter Lnet/minecraft/class_169; FIELD field_941 type Ljava/lang/String; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 052ca7924e..06e86ab5ca 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z FIELD field_42104 REGISTRY_OPS Lnet/minecraft/class_6903; - METHOD (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JIIIZZZZLjava/util/Optional;)V + METHOD (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JIIIZZZZLjava/util/Optional;I)V ARG 1 playerEntityId ARG 3 previousGameMode ARG 11 maxPlayers diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index f90370d0a4..b2e3b92483 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa FIELD field_41733 flag B METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZBLjava/util/Optional;)V + METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZBLjava/util/Optional;I)V ARG 1 dimensionType ARG 2 dimension ARG 3 sha256Seed diff --git a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping index f6a5aab7de..747779f2a7 100644 --- a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping +++ b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_1861 net/minecraft/recipe/MapExtendingRecipe METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_7710;)V ARG 1 id ARG 2 category - METHOD method_51165 findFilledMap (Lnet/minecraft/class_1715;)Lnet/minecraft/class_1799; + METHOD method_51165 findFilledMap (Lnet/minecraft/class_8566;)Lnet/minecraft/class_1799; ARG 0 inventory diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index e8ec0eb59a..cc8495b3ec 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe COMMENT @return a mapping from a symbol to the ingredient it represents ARG 0 json METHOD method_8158 getHeight ()I - METHOD method_8161 matchesPattern (Lnet/minecraft/class_1715;IIZ)Z + METHOD method_8161 matchesPattern (Lnet/minecraft/class_8566;IIZ)Z ARG 1 inv ARG 2 offsetX ARG 3 offsetY diff --git a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping index 520886b1ab..267919d731 100644 --- a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler FIELD field_7797 player Lnet/minecraft/class_1657; FIELD field_7799 context Lnet/minecraft/class_3914; FIELD field_7800 result Lnet/minecraft/class_1731; - FIELD field_7801 input Lnet/minecraft/class_1715; + FIELD field_7801 input Lnet/minecraft/class_8566; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler ARG 1 syncId ARG 2 playerInventory ARG 3 context - METHOD method_17399 updateResult (Lnet/minecraft/class_1703;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1731;)V + METHOD method_17399 updateResult (Lnet/minecraft/class_1703;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_8566;Lnet/minecraft/class_1731;)V ARG 0 handler ARG 1 world ARG 2 player diff --git a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping index 1857c5900e..a7d095d421 100644 --- a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping @@ -9,13 +9,13 @@ CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler FIELD field_7828 owner Lnet/minecraft/class_1657; FIELD field_7829 EMPTY_ARMOR_SLOT_TEXTURES [Lnet/minecraft/class_2960; FIELD field_7830 craftingResult Lnet/minecraft/class_1731; - FIELD field_7831 craftingInput Lnet/minecraft/class_1715; + FIELD field_7831 craftingInput Lnet/minecraft/class_8566; FIELD field_7832 EQUIPMENT_SLOT_ORDER [Lnet/minecraft/class_1304; METHOD (Lnet/minecraft/class_1661;ZLnet/minecraft/class_1657;)V ARG 1 inventory ARG 2 onServer ARG 3 owner - METHOD method_29281 getCraftingInput ()Lnet/minecraft/class_1715; + METHOD method_29281 getCraftingInput ()Lnet/minecraft/class_8566; METHOD method_36211 isInHotbar (I)Z ARG 0 slot METHOD method_48930 onEquipStack (Lnet/minecraft/class_1657;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping index 3eec30ec24..1bbe316ffa 100644 --- a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping +++ b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_1734 net/minecraft/screen/slot/CraftingResultSlot FIELD field_7868 player Lnet/minecraft/class_1657; FIELD field_7869 amount I - FIELD field_7870 input Lnet/minecraft/class_1715; - METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1263;III)V + FIELD field_7870 input Lnet/minecraft/class_8566; + METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_8566;Lnet/minecraft/class_1263;III)V ARG 1 player ARG 2 input ARG 3 inventory diff --git a/mappings/net/minecraft/server/command/LootCommand.mapping b/mappings/net/minecraft/server/command/LootCommand.mapping index fdad15799b..be0cc323a5 100644 --- a/mappings/net/minecraft/server/command/LootCommand.mapping +++ b/mappings/net/minecraft/server/command/LootCommand.mapping @@ -9,10 +9,9 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand ARG 1 slot METHOD method_13179 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1799;)V ARG 2 stack - METHOD method_13180 getFeedbackMessageSingle (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;Lnet/minecraft/class_47;Lnet/minecraft/class_3039$class_3041;)I + METHOD method_13180 getFeedbackMessageSingle (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;Lnet/minecraft/class_8567;Lnet/minecraft/class_3039$class_3041;)I ARG 0 context ARG 1 lootTable - ARG 2 lootContext ARG 3 constructor METHOD method_13181 (Lnet/minecraft/class_2168;)Z ARG 0 source diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index a4139cb0a3..d31c17ecce 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder FIELD field_13868 CHUNK_STATUSES Ljava/util/List; FIELD field_13870 skyLightUpdateBits Ljava/util/BitSet; FIELD field_13871 blockLightUpdateBits Ljava/util/BitSet; - FIELD field_13873 LEVEL_TYPES [Lnet/minecraft/class_3193$class_3194; FIELD field_16425 futuresByStatus Ljava/util/concurrent/atomic/AtomicReferenceArray; FIELD field_16426 UNLOADED_CHUNK Lcom/mojang/datafixers/util/Either; FIELD field_16427 UNLOADED_WORLD_CHUNK Lcom/mojang/datafixers/util/Either; @@ -54,14 +53,10 @@ 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_14008 getLevelType (I)Lnet/minecraft/class_3193$class_3194; - ARG 0 distance METHOD method_14009 sendBlockEntityUpdatePacket (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos METHOD method_14010 getCurrentChunk ()Lnet/minecraft/class_2791; - METHOD method_14011 getTargetStatusForLevel (I)Lnet/minecraft/class_2806; - ARG 0 level METHOD method_14012 markForLightUpdate (Lnet/minecraft/class_1944;I)V ARG 1 lightType ARG 2 y @@ -86,7 +81,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_21737 getValidFutureFor (Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; ARG 1 leastStatus METHOD method_23270 getCurrentStatus ()Lnet/minecraft/class_2806; - METHOD method_23271 getLevelType ()Lnet/minecraft/class_3193$class_3194; + 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 @@ -98,9 +93,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 1 thenDesc ARG 2 then METHOD method_40066 collectFuturesByStatus ()Ljava/util/List; - CLASS class_3194 LevelType - METHOD method_14014 isAfter (Lnet/minecraft/class_3193$class_3194;)Z - ARG 1 levelType CLASS class_3724 Unloaded COMMENT Used to represent a chunk that has not been loaded yet. FIELD field_16433 INSTANCE Lnet/minecraft/class_3193$class_3724; diff --git a/mappings/net/minecraft/server/world/LevelType.mapping b/mappings/net/minecraft/server/world/LevelType.mapping new file mode 100644 index 0000000000..c447b86e60 --- /dev/null +++ b/mappings/net/minecraft/server/world/LevelType.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_3194 net/minecraft/server/world/LevelType + METHOD method_14014 isAfter (Lnet/minecraft/class_3194;)Z + ARG 1 levelType diff --git a/mappings/net/minecraft/server/world/ServerEntityManager.mapping b/mappings/net/minecraft/server/world/ServerEntityManager.mapping index 3b6a1b8316..25f220213b 100644 --- a/mappings/net/minecraft/server/world/ServerEntityManager.mapping +++ b/mappings/net/minecraft/server/world/ServerEntityManager.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager ARG 2 chunkPos METHOD method_31814 (Lnet/minecraft/class_4456;Lnet/minecraft/class_5579$class_5581;J)V ARG 3 sectionPos - METHOD method_31815 updateTrackingStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V + METHOD method_31815 updateTrackingStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_3194;)V COMMENT Updates the tracking status of tracking sections in a chunk at {@code COMMENT chunkPos} given the {@code levelType}. COMMENT diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 9b090ec6ed..f04ba759f6 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -17,8 +17,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_17705 persistentStateManagerFactory Ljava/util/function/Supplier; FIELD field_17706 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_17707 saveDir Ljava/lang/String; - FIELD field_18239 MAX_LEVEL I - COMMENT Specifies the maximum ticket level a chunk can be before a chunk's {@link net.minecraft.server.world.ChunkHolder.LevelType} is {@link net.minecraft.server.world.ChunkHolder.LevelType#BORDER}. FIELD field_18241 playerChunkWatchingManager Lnet/minecraft/class_3210; FIELD field_18242 entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_18243 watchDistance I @@ -228,7 +226,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_31413 addEntitiesFromNbt (Lnet/minecraft/class_3218;Ljava/util/List;)V ARG 0 world ARG 1 nbt - METHOD method_31414 onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V + METHOD method_31414 onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3194;)V ARG 1 chunkPos ARG 2 levelType METHOD method_31415 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2818;)V diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index cf6327b929..6d7b2c1ff0 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -139,13 +139,11 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V - ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1799;IIII)V - ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses diff --git a/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping b/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping index e80603d0f2..359378add2 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatusChangeListener.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_5567 net/minecraft/world/chunk/ChunkStatusChangeListener - METHOD onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V + METHOD onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3194;)V ARG 1 pos ARG 2 levelType diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 232eedd78b..93fdcc080a 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12224 loadFromPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;)V ARG 1 buf ARG 2 nbt - METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; + METHOD method_12225 getLevelType ()Lnet/minecraft/class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loadedToWorld METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; diff --git a/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping b/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping index 3b582e20e0..10378145be 100644 --- a/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping +++ b/mappings/net/minecraft/world/entity/EntityTrackingStatus.mapping @@ -8,6 +8,6 @@ CLASS net/minecraft/class_5584 net/minecraft/world/entity/EntityTrackingStatus ARG 3 tracked ARG 4 tick METHOD method_31883 shouldTick ()Z - METHOD method_31884 fromLevelType (Lnet/minecraft/class_3193$class_3194;)Lnet/minecraft/class_5584; + METHOD method_31884 fromLevelType (Lnet/minecraft/class_3194;)Lnet/minecraft/class_5584; ARG 0 levelType METHOD method_31885 shouldTrack ()Z