From 90ad7577c17ac116a90f9ec484ad88c5d2bfc5c3 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sat, 12 Oct 2024 01:05:08 +1100 Subject: [PATCH] 1.21.2-pre3 stuff --- .../client/gui/tooltip/BundleTooltipComponent.mapping | 1 + .../component/type/BundleContentsComponent.mapping | 2 ++ .../projectile/PersistentProjectileEntity.mapping | 4 ++++ .../net/minecraft/screen/SmithingScreenHandler.mapping | 2 ++ .../server/world/ServerChunkLoadingManager.mapping | 1 + .../net/minecraft/server/world/ServerWorld.mapping | 2 ++ mappings/net/minecraft/util/Urls.mapping | 1 + mappings/net/minecraft/world/BlockView.mapping | 1 + mappings/net/minecraft/world/chunk/Chunk.mapping | 2 ++ mappings/net/minecraft/world/chunk/WorldChunk.mapping | 10 ++++++++++ 10 files changed, 26 insertions(+) diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index dd0727a721..9ca8891a8e 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom FIELD field_54012 BUNDLE_PROGRESS_BAR_FULL_TEXTURE Lnet/minecraft/class_2960; FIELD field_54270 BUNDLE_SLOT_HIGHLIGHT_BACK_TEXTURE Lnet/minecraft/class_2960; FIELD field_54271 BUNDLE_SLOT_HIGHLIGHT_FRONT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_54972 BUNDLE_SLOT_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_9276;)V ARG 1 bundleContents METHOD method_33290 getRows ()I diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping index a3f18718d0..4c4f698b60 100644 --- a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon ARG 0 stack METHOD method_61668 getSelectedStackIndex ()I METHOD method_61669 hasSelectedStack ()Z + METHOD method_65061 validateOccupancy (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 stacks CLASS class_9277 Builder FIELD field_49296 stacks Ljava/util/List; FIELD field_49297 occupancy Lorg/apache/commons/lang3/math/Fraction; diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index 0bd6a49043..752b174ab0 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject FIELD field_30655 NO_CLIP_FLAG I FIELD field_46970 stack Lnet/minecraft/class_1799; FIELD field_51620 weapon Lnet/minecraft/class_1799; + FIELD field_54969 IN_GROUND Lnet/minecraft/class_2940; FIELD field_7571 damage D FIELD field_7572 pickupType Lnet/minecraft/class_1665$class_1666; FIELD field_7573 PROJECTILE_FLAGS Lnet/minecraft/class_2940; @@ -58,6 +59,9 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject ARG 1 blockHitResult METHOD method_64646 spawnBubbleParticles (Lnet/minecraft/class_243;)V ARG 1 pos + METHOD method_65058 setInGround (Z)V + ARG 1 inGround + METHOD method_65059 isInGround ()Z METHOD method_7433 setNoClip (Z)V ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping index 49c5911949..81b16b27c3 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler FIELD field_54597 basePropertySet Lnet/minecraft/class_10290; FIELD field_54598 templatePropertySet Lnet/minecraft/class_10290; FIELD field_54599 additionPropertySet Lnet/minecraft/class_10290; + FIELD field_54970 invalidRecipe Lnet/minecraft/class_3915; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory @@ -35,3 +36,4 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler ARG 0 recipeManager METHOD method_64653 (Lnet/minecraft/class_9697;Lnet/minecraft/class_8786;)V ARG 2 recipe + METHOD method_65060 hasInvalidRecipe ()Z diff --git a/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping b/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping index 16737b66d2..160ab2351c 100644 --- a/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana FIELD field_54035 lightScheduler Lnet/minecraft/class_10171; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;IZ)V ARG 1 world + ARG 2 session ARG 3 dataFixer ARG 4 structureTemplateManager ARG 5 executor diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 30cb0ed56d..7d844b82c2 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -366,6 +366,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_61270 getDestructionType (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1927$class_4179; ARG 1 decayRule METHOD method_64395 getGameRules ()Lnet/minecraft/class_1928; + METHOD method_65057 (Lnet/minecraft/class_2338;IILnet/minecraft/class_3222;)V + ARG 4 player METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/util/Urls.mapping b/mappings/net/minecraft/util/Urls.mapping index 71281669b5..0f0ecdff0e 100644 --- a/mappings/net/minecraft/util/Urls.mapping +++ b/mappings/net/minecraft/util/Urls.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_8216 net/minecraft/util/Urls FIELD field_44949 MINECRAFT_SYMLINKS Ljava/net/URI; FIELD field_45074 PRIVACY_STATEMENT Ljava/net/URI; FIELD field_46769 MINECRAFT_SUPPORT Ljava/net/URI; + FIELD field_54967 EXTEND_JAVA_REALMS Ljava/lang/String; METHOD method_49719 getExtendJavaRealmsUrl (Ljava/lang/String;Ljava/util/UUID;)Ljava/lang/String; ARG 0 subscriptionId ARG 1 uuid diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index cfb1818613..de5d7b6108 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_1922 net/minecraft/world/BlockView METHOD method_61714 collectCollisionsBetween (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;)Ljava/lang/Iterable; ARG 0 oldPos ARG 1 newPos + ARG 2 boundingBox METHOD method_61715 collectCollisionsBetween (Ljava/util/Set;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;)V ARG 0 result ARG 1 oldPos diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 6d9ad09050..ada4799a7d 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -126,4 +126,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk COMMENT {@return the chunk status or the target status for the retrogen, whichever is later} METHOD method_60791 isSectionEmpty (I)Z ARG 1 sectionCoord + METHOD method_65063 markNeedsSaving ()V + METHOD method_65064 tryMarkSaved ()Z CLASS class_6745 TickSchedulers diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index a5d000fb97..41ec22ec80 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -9,10 +9,12 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_28129 gameEventDispatchers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_35471 blockTickScheduler Lnet/minecraft/class_6755; FIELD field_35472 fluidTickScheduler Lnet/minecraft/class_6755; + FIELD field_54971 unsavedListener Lnet/minecraft/class_2818$class_10368; METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;)V ARG 1 world ARG 2 pos METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_6755;Lnet/minecraft/class_6755;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_2818$class_6829;Lnet/minecraft/class_6749;)V + ARG 1 world ARG 2 pos ARG 3 upgradeData ARG 4 blockTickScheduler @@ -46,6 +48,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 + ARG 3 blockEntityVisitorConsumer METHOD method_12225 getLevelType ()Lnet/minecraft/class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loadedToWorld @@ -94,6 +97,13 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 buf METHOD method_51382 removeGameEventDispatcher (I)V ARG 1 ySectionCoord + METHOD method_65065 (Lnet/minecraft/class_1923;)V + ARG 0 pos + METHOD method_65066 setUnsavedListener (Lnet/minecraft/class_2818$class_10368;)V + ARG 1 unsavedListener + CLASS class_10368 UnsavedListener + METHOD setUnsaved (Lnet/minecraft/class_1923;)V + ARG 1 pos CLASS class_2819 CreationType CLASS class_5563 DirectBlockEntityTickInvoker FIELD field_27223 worldChunk Lnet/minecraft/class_2818;