From 4168fe6623008c0bfe77b6bbd54dea1a3bdac75e Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 19 Sep 2024 01:43:59 +1000 Subject: [PATCH] 24w38a stuff (#3988) Just a first pass, lots of stuff vis-a-vis world creation and realms still to do --- .../net/minecraft/block/AbstractBlock.mapping | 6 +++ .../dispenser/BoatDispenserBehavior.mapping | 2 +- .../MinecartDispenserBehavior.mapping | 7 +++ mappings/net/minecraft/class_10225.mapping | 5 --- .../screen/world/CreateWorldCallback.mapping | 6 +++ .../screen/world/CreateWorldScreen.mapping | 32 +++++++++++++- .../client/realms/UploadStatus.mapping | 9 ++++ .../realms/dto/RealmsWorldOptions.mapping | 20 ++++++++- .../exception/RealmsUploadException.mapping | 3 ++ .../CancelledRealmsUploadException.mapping | 2 + .../CloseFailureRealmsUploadException.mapping | 1 + .../FailedRealmsUploadException.mapping | 6 +++ .../TooBigRealmsUploadException.mapping | 4 ++ .../screen/RealmsConfigureWorldScreen.mapping | 2 + .../screen/RealmsCreateWorldScreen.mapping | 1 + mappings/net/minecraft/data/Main.mapping | 6 +++ .../recipe/TransmuteRecipeJsonBuilder.mapping | 19 ++++++++ .../tag/bundle/BundleItemTagProvider.mapping | 1 + .../entity/passive/SquidEntity.mapping | 1 + .../vehicle/AbstractMinecartEntity.mapping | 13 ++++++ .../vehicle/FurnaceMinecartEntity.mapping | 3 ++ mappings/net/minecraft/item/Items.mapping | 34 +++++++++++++++ .../net/minecraft/item/MinecartItem.mapping | 1 + .../recipe/CraftingTransmuteRecipe.mapping | 38 ++++++++++++++++ .../state/property/EnumProperty.mapping | 2 + .../net/minecraft/village/TradeOffers.mapping | 4 ++ mappings/net/minecraft/world/TickView.mapping | 30 +++++++++++++ .../world/dimension/NetherPortal.mapping | 43 ++++++++++++++++++- 28 files changed, 291 insertions(+), 10 deletions(-) create mode 100644 mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping delete mode 100644 mappings/net/minecraft/class_10225.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/world/CreateWorldCallback.mapping create mode 100644 mappings/net/minecraft/client/realms/exception/RealmsUploadException.mapping create mode 100644 mappings/net/minecraft/client/realms/exception/upload/CancelledRealmsUploadException.mapping create mode 100644 mappings/net/minecraft/client/realms/exception/upload/CloseFailureRealmsUploadException.mapping create mode 100644 mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping create mode 100644 mappings/net/minecraft/client/realms/exception/upload/TooBigRealmsUploadException.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/TransmuteRecipeJsonBuilder.mapping create mode 100644 mappings/net/minecraft/data/server/tag/bundle/BundleItemTagProvider.mapping create mode 100644 mappings/net/minecraft/recipe/CraftingTransmuteRecipe.mapping create mode 100644 mappings/net/minecraft/world/TickView.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 07d22bd83a..9f0850ec4e 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -641,8 +641,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @see Block#FORCE_STATE ARG 1 state COMMENT the state of this block + ARG 2 world + ARG 3 tickView + ARG 4 pos + ARG 5 direction ARG 6 neighborPos COMMENT the position of the neighbor block + ARG 7 neighborState + ARG 8 random 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 diff --git a/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping index 601009225f..74dc3ba40b 100644 --- a/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2967 net/minecraft/block/dispenser/BoatDispenserBehavior - FIELD field_13360 itemDispenser Lnet/minecraft/class_2347; + FIELD field_13360 fallbackBehavior Lnet/minecraft/class_2347; FIELD field_13361 boatType Lnet/minecraft/class_1690$class_1692; FIELD field_38465 chest Z METHOD (Lnet/minecraft/class_1690$class_1692;)V diff --git a/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping new file mode 100644 index 0000000000..72eb05c599 --- /dev/null +++ b/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_10242 net/minecraft/block/dispenser/MinecartDispenserBehavior + FIELD field_54392 fallbackBehavior Lnet/minecraft/class_2347; + FIELD field_54393 minecartEntityType Lnet/minecraft/class_1299; + METHOD (Lnet/minecraft/class_1299;)V + ARG 1 minecartEntityType + METHOD method_64377 getRailShape (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2768; + ARG 0 state diff --git a/mappings/net/minecraft/class_10225.mapping b/mappings/net/minecraft/class_10225.mapping deleted file mode 100644 index 9e0b7a4b0b..0000000000 --- a/mappings/net/minecraft/class_10225.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_10225 - METHOD method_39283 createOrderedTick (Lnet/minecraft/class_2338;Ljava/lang/Object;I)Lnet/minecraft/class_6760; - METHOD method_39284 createOrderedTick (Lnet/minecraft/class_2338;Ljava/lang/Object;ILnet/minecraft/class_1953;)Lnet/minecraft/class_6760; - METHOD method_8397 getBlockTickScheduler ()Lnet/minecraft/class_6756; - METHOD method_8405 getFluidTickScheduler ()Lnet/minecraft/class_6756; diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldCallback.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldCallback.mapping new file mode 100644 index 0000000000..9d7bd5d03e --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldCallback.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_10241 net/minecraft/client/gui/screen/world/CreateWorldCallback + METHOD create (Lnet/minecraft/class_525;Lnet/minecraft/class_7780;Lnet/minecraft/class_31;Ljava/nio/file/Path;)Z + ARG 1 screen + ARG 2 combinedDynamicRegistries + ARG 3 levelProperties + ARG 4 dataPackTempDir diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 2746a11bdc..8d2e59e054 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -16,12 +16,14 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_45568 symlinkFinder Lnet/minecraft/class_8580; FIELD field_49557 layout Lnet/minecraft/class_8132; FIELD field_49902 TAB_HEADER_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_54390 callback Lnet/minecraft/class_10241; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;Lnet/minecraft/class_10241;)V ARG 1 client ARG 2 parent ARG 3 generatorOptionsHolder ARG 4 defaultWorldType ARG 5 seed + ARG 6 callback METHOD method_19921 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19922 (Lnet/minecraft/class_4185;)V @@ -44,7 +46,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 dataPackFile METHOD method_29689 (Ljava/nio/file/Path;)V ARG 0 path - METHOD method_29693 getDataPackTempDir ()Ljava/nio/file/Path; + METHOD method_29693 getOrCreateDataPackTempDir ()Ljava/nio/file/Path; METHOD method_29694 openPackScreen (Lnet/minecraft/class_7712;)V ARG 1 dataConfiguration METHOD method_29695 clearDataPackTempDir ()V @@ -65,7 +67,12 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_40213 createLevelInfo (Z)Lnet/minecraft/class_1940; ARG 1 debugWorld METHOD method_41847 startServer (Lnet/minecraft/class_7780;Lnet/minecraft/class_5219;)Z + ARG 1 combinedDynamicRegistries + ARG 2 saveProperties METHOD method_41848 createSession (Lnet/minecraft/class_310;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/util/Optional; + ARG 0 client + ARG 1 worldDirectoryName + ARG 2 dataPackTempDir METHOD method_41849 createServerConfig (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;)Lnet/minecraft/class_7237$class_6906; ARG 0 dataPackManager ARG 1 dataConfiguration @@ -120,6 +127,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 settingsSupplier ARG 3 generatorOptionsFactory ARG 4 presetKey + ARG 5 callback METHOD method_64245 (Lnet/minecraft/class_10221;Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_7749;)Lnet/minecraft/class_7193; ARG 1 resourceManager ARG 2 dataPackContents @@ -132,6 +140,28 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_64248 showTestWorld (Lnet/minecraft/class_310;Lnet/minecraft/class_437;)V ARG 0 client ARG 1 parent + METHOD method_64368 show (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_10241;)V + ARG 0 client + ARG 1 parent + ARG 2 callback + METHOD method_64369 (Lnet/minecraft/class_525;Lnet/minecraft/class_7780;Lnet/minecraft/class_31;Ljava/nio/file/Path;)Z + ARG 0 screen + ARG 1 combinedDynamicRegistries + ARG 2 levelProperties + ARG 3 dataPackTempDir + METHOD method_64370 createAndClearTempDir (Lnet/minecraft/class_7780;Lnet/minecraft/class_31;)V + ARG 1 combinedDynamicRegistries + ARG 2 levelProperties + METHOD method_64371 (Lnet/minecraft/class_525;Lnet/minecraft/class_7780;Lnet/minecraft/class_31;Ljava/nio/file/Path;)Z + ARG 0 screen + ARG 1 combinedDynamicRegistries + ARG 2 levelProperties + ARG 3 dataPackTempDir + METHOD method_64375 (Lnet/minecraft/class_525;Lnet/minecraft/class_7780;Lnet/minecraft/class_31;Ljava/nio/file/Path;)Z + ARG 0 screen + ARG 1 combinedDynamicRegistries + ARG 2 levelProperties + ARG 3 dataPackTempDir CLASS class_8093 GameTab FIELD field_42175 GAME_TAB_TITLE_TEXT Lnet/minecraft/class_2561; FIELD field_42176 ALLOW_COMMANDS_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/UploadStatus.mapping b/mappings/net/minecraft/client/realms/UploadStatus.mapping index 55a9e409c8..23b247cef1 100644 --- a/mappings/net/minecraft/client/realms/UploadStatus.mapping +++ b/mappings/net/minecraft/client/realms/UploadStatus.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_4351 net/minecraft/client/realms/UploadStatus FIELD field_19601 bytesWritten J FIELD field_19602 totalBytes J + METHOD method_64325 getTotalBytes ()J + METHOD method_64326 setTotalBytes (J)V + ARG 1 totalBytes + METHOD method_64327 getBytesWritten ()J + METHOD method_64328 addBytesWritten (J)V + ARG 1 bytesWritten + METHOD method_64329 hasWrittenBytes ()Z + METHOD method_64330 hasWrittenAllBytes ()Z + METHOD method_64331 getFractionBytesWritten ()D diff --git a/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping b/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping index 975e03518b..bea0f562fd 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsWorldOptions.mapping @@ -17,10 +17,19 @@ CLASS net/minecraft/class_4883 net/minecraft/client/realms/dto/RealmsWorldOption FIELD field_46842 DEFAULT_COMPATIBILITY Lnet/minecraft/class_4877$class_8842; FIELD field_46843 version Ljava/lang/String; FIELD field_46844 compatibility Lnet/minecraft/class_4877$class_8842; + FIELD field_54384 hardcore Z METHOD (ZZIZIIZZLjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4877$class_8842;)V ARG 1 pvp ARG 2 spawnAnimals - ARG 5 spawnProtection + ARG 3 spawnProtection + ARG 4 commandBlocks + ARG 5 difficulty + ARG 6 gameMode + ARG 7 hardcore + ARG 8 forceGameMode + ARG 9 slotName + ARG 10 version + ARG 11 compatibility METHOD method_25076 getDefaults ()Lnet/minecraft/class_4883; METHOD method_25077 getSlotName (I)Ljava/lang/String; ARG 1 index @@ -32,3 +41,12 @@ CLASS net/minecraft/class_4883 net/minecraft/client/realms/dto/RealmsWorldOption METHOD method_25081 getDefaultSlotName (I)Ljava/lang/String; ARG 1 index METHOD method_25082 toJson ()Ljava/lang/String; + METHOD method_64352 create (Lnet/minecraft/class_1934;Lnet/minecraft/class_1267;ZLjava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_4883; + ARG 0 gameMode + ARG 1 difficulty + ARG 2 hardcore + ARG 3 version + ARG 4 slotName + METHOD method_64353 create (Lnet/minecraft/class_1940;Ljava/lang/String;)Lnet/minecraft/class_4883; + ARG 0 levelInfo + ARG 1 version diff --git a/mappings/net/minecraft/client/realms/exception/RealmsUploadException.mapping b/mappings/net/minecraft/client/realms/exception/RealmsUploadException.mapping new file mode 100644 index 0000000000..dc3b50f874 --- /dev/null +++ b/mappings/net/minecraft/client/realms/exception/RealmsUploadException.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_10233 net/minecraft/client/realms/exception/RealmsUploadException + METHOD method_64338 getStatus ()Lnet/minecraft/class_2561; + METHOD method_64339 getStatusTexts ()[Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/exception/upload/CancelledRealmsUploadException.mapping b/mappings/net/minecraft/client/realms/exception/upload/CancelledRealmsUploadException.mapping new file mode 100644 index 0000000000..d9fb55a3f4 --- /dev/null +++ b/mappings/net/minecraft/client/realms/exception/upload/CancelledRealmsUploadException.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_10232 net/minecraft/client/realms/exception/upload/CancelledRealmsUploadException + FIELD field_54365 STATUS_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/exception/upload/CloseFailureRealmsUploadException.mapping b/mappings/net/minecraft/client/realms/exception/upload/CloseFailureRealmsUploadException.mapping new file mode 100644 index 0000000000..ca50ee1507 --- /dev/null +++ b/mappings/net/minecraft/client/realms/exception/upload/CloseFailureRealmsUploadException.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10236 net/minecraft/client/realms/exception/upload/CloseFailureRealmsUploadException diff --git a/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping b/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping new file mode 100644 index 0000000000..3c4adb1c2e --- /dev/null +++ b/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_10234 net/minecraft/client/realms/exception/upload/FailedRealmsUploadException + FIELD field_54366 errorMessage Lnet/minecraft/class_2561; + METHOD (Ljava/lang/String;)V + ARG 1 errorMessage + METHOD (Lnet/minecraft/class_2561;)V + ARG 1 errorMessage diff --git a/mappings/net/minecraft/client/realms/exception/upload/TooBigRealmsUploadException.mapping b/mappings/net/minecraft/client/realms/exception/upload/TooBigRealmsUploadException.mapping new file mode 100644 index 0000000000..13e4e2422f --- /dev/null +++ b/mappings/net/minecraft/client/realms/exception/upload/TooBigRealmsUploadException.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_10235 net/minecraft/client/realms/exception/upload/TooBigRealmsUploadException + FIELD field_54367 maxSizeInBytes J + METHOD (J)V + ARG 1 maxSizeInBytes diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index d98e59207d..cf7db13465 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -101,3 +101,5 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 5 mouseY ARG 6 texture ARG 7 tooltipGetter + METHOD method_64354 setActiveSlotWorldOptions (Lnet/minecraft/class_4883;)V + ARG 1 worldOptions diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping index 18aba7fb80..1760d86c11 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea FIELD field_46126 layout Lnet/minecraft/class_8132; FIELD field_46127 CREATE_REALM_TITLE Lnet/minecraft/class_2561; FIELD field_46709 creationTask Lnet/minecraft/class_4445; + FIELD field_54386 NEW_WORLD_BUTTON_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILnet/minecraft/class_2561;Ljava/lang/Runnable;)V ARG 1 parent ARG 2 serverData diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index b0e6e4fd8a..61f358e1b4 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -28,3 +28,9 @@ CLASS net/minecraft/data/Main ARG 8 ignoreCache METHOD method_52888 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; ARG 0 outputx + METHOD method_62731 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; + ARG 0 outputx + METHOD method_62732 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796; + ARG 0 outputx + METHOD method_64378 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_10244; + ARG 3 outputx diff --git a/mappings/net/minecraft/data/server/recipe/TransmuteRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/TransmuteRecipeJsonBuilder.mapping new file mode 100644 index 0000000000..dc644312c2 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/TransmuteRecipeJsonBuilder.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_10243 net/minecraft/data/server/recipe/TransmuteRecipeJsonBuilder + FIELD field_54396 category Lnet/minecraft/class_7800; + FIELD field_54397 result Lnet/minecraft/class_6880; + FIELD field_54398 input Lnet/minecraft/class_1856; + FIELD field_54399 material Lnet/minecraft/class_1856; + FIELD field_54400 advancementBuilder Ljava/util/Map; + FIELD field_54401 group Ljava/lang/String; + METHOD (Lnet/minecraft/class_7800;Lnet/minecraft/class_6880;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;)V + ARG 1 category + ARG 2 result + ARG 3 input + ARG 4 material + METHOD method_64379 validate (Lnet/minecraft/class_2960;)V + ARG 1 recipeId + METHOD method_64380 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;)Lnet/minecraft/class_10243; + ARG 0 category + ARG 1 input + ARG 2 material + ARG 3 result diff --git a/mappings/net/minecraft/data/server/tag/bundle/BundleItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/bundle/BundleItemTagProvider.mapping new file mode 100644 index 0000000000..4165a97973 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/bundle/BundleItemTagProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10244 net/minecraft/data/server/tag/bundle/BundleItemTagProvider diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index 2a41ee61b1..d952246125 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1477 net/minecraft/entity/passive/SquidEntity + FIELD field_54298 swimVec Lnet/minecraft/class_243; FIELD field_6900 prevTentacleAngle F FIELD field_6901 swimVelocityScale F COMMENT A scale factor for the squid's swimming speed. diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 848f86db85..37a98f370c 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -39,6 +39,14 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti METHOD method_61571 isYawFlipped ()Z METHOD method_62824 isFirstUpdate ()Z METHOD method_62825 getRailOrMinecartPos ()Lnet/minecraft/class_2338; + METHOD method_64274 pushAwayFromMinecart (Lnet/minecraft/class_1688;DD)V + ARG 1 entity + ARG 2 xDiff + ARG 4 zDiff + METHOD method_64275 initPosition (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z METHOD method_7504 getMaxSpeed ()D METHOD method_7506 onActivatorRail (IIIZ)V ARG 1 x @@ -56,9 +64,14 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti METHOD method_7517 getDefaultContainedBlock ()Lnet/minecraft/class_2680; METHOD method_7519 getContainedBlock ()Lnet/minecraft/class_2680; METHOD method_7523 create (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1299;Lnet/minecraft/class_3730;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1688; + ARG 0 world ARG 1 x ARG 3 y ARG 5 z + ARG 7 type + ARG 8 reason + ARG 9 stack + ARG 10 player METHOD method_7525 applySlowdown (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 velocity METHOD method_7526 getDefaultBlockOffset ()I diff --git a/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping index 83f4fa3201..ce9cbbedbc 100644 --- a/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_1696 net/minecraft/entity/vehicle/FurnaceMinecartEntity FIELD field_52521 FUEL_PER_ITEM I FIELD field_52522 MAX_FUEL I + FIELD field_54300 pushVec Lnet/minecraft/class_243; FIELD field_7739 fuel I FIELD field_7740 LIT Lnet/minecraft/class_2940; + METHOD method_64276 (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 velocity METHOD method_7564 setLit (Z)V ARG 1 lit METHOD method_7565 isLit ()Z diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 2c9768139f..ca327cd479 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -1599,6 +1599,40 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items METHOD method_63985 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings + METHOD method_64280 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64281 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64282 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64283 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64284 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64285 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64286 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64287 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64288 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64289 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64290 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64291 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64292 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64293 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64294 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64295 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings + METHOD method_64296 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings METHOD method_7989 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; ARG 0 block METHOD method_7990 register (Ljava/lang/String;)Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/item/MinecartItem.mapping b/mappings/net/minecraft/item/MinecartItem.mapping index d1605c1e16..f50edcb878 100644 --- a/mappings/net/minecraft/item/MinecartItem.mapping +++ b/mappings/net/minecraft/item/MinecartItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1808 net/minecraft/item/MinecartItem FIELD field_8897 type Lnet/minecraft/class_1299; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 type ARG 2 settings diff --git a/mappings/net/minecraft/recipe/CraftingTransmuteRecipe.mapping b/mappings/net/minecraft/recipe/CraftingTransmuteRecipe.mapping new file mode 100644 index 0000000000..ea237dbf36 --- /dev/null +++ b/mappings/net/minecraft/recipe/CraftingTransmuteRecipe.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/class_10223 net/minecraft/recipe/CraftingTransmuteRecipe + FIELD field_54319 group Ljava/lang/String; + FIELD field_54320 category Lnet/minecraft/class_7710; + FIELD field_54321 input Lnet/minecraft/class_1856; + FIELD field_54322 material Lnet/minecraft/class_1856; + FIELD field_54323 result Lnet/minecraft/class_6880; + FIELD field_54324 ingredientPlacement Lnet/minecraft/class_9887; + METHOD (Ljava/lang/String;Lnet/minecraft/class_7710;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V + ARG 1 group + ARG 2 category + ARG 3 input + ARG 4 material + ARG 5 result + CLASS class_10224 Serializer + FIELD field_54325 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_54326 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_64299 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_64300 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_6880; + ARG 0 recipe + METHOD method_64301 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_1856; + ARG 0 recipe + METHOD method_64302 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_1856; + ARG 0 recipe + METHOD method_64303 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_7710; + ARG 0 recipe + METHOD method_64304 (Lnet/minecraft/class_10223;)Ljava/lang/String; + ARG 0 recipe + METHOD method_64305 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_6880; + ARG 0 recipe + METHOD method_64306 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_1856; + ARG 0 recipe + METHOD method_64307 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_1856; + ARG 0 recipe + METHOD method_64308 (Lnet/minecraft/class_10223;)Lnet/minecraft/class_7710; + ARG 0 recipe + METHOD method_64309 (Lnet/minecraft/class_10223;)Ljava/lang/String; + ARG 0 recipe diff --git a/mappings/net/minecraft/state/property/EnumProperty.mapping b/mappings/net/minecraft/state/property/EnumProperty.mapping index faef9256b1..947528366a 100644 --- a/mappings/net/minecraft/state/property/EnumProperty.mapping +++ b/mappings/net/minecraft/state/property/EnumProperty.mapping @@ -17,9 +17,11 @@ CLASS net/minecraft/class_2754 net/minecraft/state/property/EnumProperty COMMENT usages. FIELD field_12595 values Ljava/util/List; FIELD field_12596 byName Ljava/util/Map; + FIELD field_54329 ordinals [I METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/List;)V ARG 1 name ARG 2 type + ARG 3 values METHOD method_11847 of (Ljava/lang/String;Ljava/lang/Class;Ljava/util/List;)Lnet/minecraft/class_2754; COMMENT Creates an enum property with the given values. COMMENT diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index a87718b47e..7dbf5144bb 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -199,11 +199,13 @@ 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_1792;IIIIF)V + ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses @@ -218,11 +220,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 multiplier ARG 7 enchantmentProviderKey METHOD (Lnet/minecraft/class_1799;IIII)V + ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1799;IIIIF)V + ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses diff --git a/mappings/net/minecraft/world/TickView.mapping b/mappings/net/minecraft/world/TickView.mapping new file mode 100644 index 0000000000..90747a54fc --- /dev/null +++ b/mappings/net/minecraft/world/TickView.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_10225 net/minecraft/world/TickView + METHOD method_39283 createOrderedTick (Lnet/minecraft/class_2338;Ljava/lang/Object;I)Lnet/minecraft/class_6760; + ARG 1 pos + ARG 2 type + ARG 3 delay + METHOD method_39284 createOrderedTick (Lnet/minecraft/class_2338;Ljava/lang/Object;ILnet/minecraft/class_1953;)Lnet/minecraft/class_6760; + ARG 1 pos + ARG 2 type + ARG 3 delay + ARG 4 priority + METHOD method_64310 scheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;I)V + ARG 1 pos + ARG 2 block + ARG 3 delay + METHOD method_64311 scheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;ILnet/minecraft/class_1953;)V + ARG 1 pos + ARG 2 block + ARG 3 delay + ARG 4 priority + METHOD method_64312 scheduleFluidTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;I)V + ARG 1 pos + ARG 2 fluid + ARG 3 delay + METHOD method_64313 scheduleFluidTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;ILnet/minecraft/class_1953;)V + ARG 1 pos + ARG 2 fluid + ARG 3 delay + ARG 4 priority + METHOD method_8397 getBlockTickScheduler ()Lnet/minecraft/class_6756; + METHOD method_8405 getFluidTickScheduler ()Lnet/minecraft/class_6756; diff --git a/mappings/net/minecraft/world/dimension/NetherPortal.mapping b/mappings/net/minecraft/world/dimension/NetherPortal.mapping index ac7082983a..8046249094 100644 --- a/mappings/net/minecraft/world/dimension/NetherPortal.mapping +++ b/mappings/net/minecraft/world/dimension/NetherPortal.mapping @@ -12,11 +12,19 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/NetherPortal FIELD field_31826 MIN_HEIGHT I FIELD field_41086 FALLBACK_THRESHOLD F FIELD field_41087 HEIGHT_STRETCH D + METHOD (Lnet/minecraft/class_2350$class_2351;ILnet/minecraft/class_2350;Lnet/minecraft/class_2338;II)V + ARG 1 axis + ARG 2 foundPortalBlocks + ARG 3 negativeDir + ARG 4 lowerCorner + ARG 5 width + ARG 6 height METHOD method_10359 validStateInsidePortal (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_10360 isValid ()Z METHOD method_10362 wasAlreadyValid ()Z METHOD method_10363 createPortal (Lnet/minecraft/class_1936;)V + ARG 1 world METHOD method_30485 getNewPortal (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)Ljava/util/Optional; ARG 0 world ARG 1 pos @@ -33,17 +41,42 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/NetherPortal METHOD method_30489 (Lnet/minecraft/class_2424;)Z ARG 0 areaHelper METHOD method_30490 getPotentialHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338$class_2339;ILorg/apache/commons/lang3/mutable/MutableInt;)I + ARG 0 world + ARG 1 pos + ARG 2 negativeDir + ARG 3 mutablePos + ARG 4 width + ARG 5 height METHOD method_30491 isHorizontalFrameValid (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338$class_2339;II)Z + ARG 0 world + ARG 1 pos + ARG 2 negativeDir + ARG 3 mutablePos + ARG 4 width + ARG 5 height METHOD method_30492 getLowerCorner (Lnet/minecraft/class_1922;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - METHOD method_30493 getWidth (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I + ARG 0 world + ARG 1 negativeDir + ARG 2 pos + METHOD method_30493 getPotentialWidth (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I + ARG 0 world ARG 1 pos - ARG 2 direction + ARG 2 negativeDir METHOD method_30494 entityPosInPortal (Lnet/minecraft/class_5459$class_5460;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_243;Lnet/minecraft/class_4048;)Lnet/minecraft/class_243; ARG 0 portalRect ARG 1 portalAxis ARG 2 entityPos ARG 3 entityDimensions + METHOD method_30495 getWidth (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I + ARG 0 world + ARG 1 pos + ARG 2 negativeDir METHOD method_30496 getHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;ILorg/apache/commons/lang3/mutable/MutableInt;)I + ARG 0 world + ARG 1 pos + ARG 2 negativeDir + ARG 3 width + ARG 4 height METHOD method_47381 (DLnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 2 pos METHOD method_47382 findOpenPosition (Lnet/minecraft/class_243;Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;Lnet/minecraft/class_4048;)Lnet/minecraft/class_243; @@ -51,3 +84,9 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/NetherPortal ARG 1 world ARG 2 entity ARG 3 dimensions + METHOD method_64314 getUnvalidated (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)Lnet/minecraft/class_2424; + ARG 0 world + ARG 1 pos + ARG 2 axis + METHOD method_64315 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V + ARG 2 pos