From 93c00dbd711d268e12e234bdc4226ca239b272ed Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 16 May 2022 21:08:07 +1000 Subject: [PATCH] 22w19a stuff (#3156) * 22w19a stuff Tags, Commands, Points of Interest, Datagen Path Resolvers, and a couple of tidbits * suggestions --- .../entity/SculkShriekerBlockEntity.mapping | 13 ++++++++ .../argument/BlockMirrorArgumentType.mapping | 5 +++ .../BlockRotationArgumentType.mapping | 5 +++ .../command/argument/EnumArgumentType.mapping | 10 ++++++ .../net/minecraft/data/DataGenerator.mapping | 21 +++++++++++++ .../data/client/ModelProvider.mapping | 6 ++++ .../data/server/AbstractTagProvider.mapping | 1 + .../data/server/AdvancementProvider.mapping | 1 + .../server/BiomeParametersProvider.mapping | 3 ++ .../data/server/LootTableProvider.mapping | 1 + .../PointOfInterestTypeTagProvider.mapping | 3 ++ .../data/server/RecipeProvider.mapping | 2 ++ .../entity/ai/WardenAngerManager.mapping | 5 ++- .../task/FindPointOfInterestTask.mapping | 9 +++++- .../ai/brain/task/FindWalkTargetTask.mapping | 4 +++ .../brain/task/ForgetAttackTargetTask.mapping | 10 ++++-- ...ForgetCompletedPointOfInterestTask.mapping | 3 +- .../ai/brain/task/GiveGiftsToHeroTask.mapping | 1 + .../ai/brain/task/GoToCelebrateTask.mapping | 5 +++ .../ai/brain/task/GoToIfNearbyTask.mapping | 2 ++ .../brain/task/GoToNearbyPositionTask.mapping | 2 ++ .../ai/brain/task/HideInHomeTask.mapping | 8 +++++ .../entity/ai/brain/task/RoarTask.mapping | 1 + .../entity/ai/brain/task/SniffTask.mapping | 4 +++ .../ai/brain/task/SonicBoomTask.mapping | 2 ++ .../ai/brain/task/TakeJobSiteTask.mapping | 1 + .../ai/brain/task/VillagerBreedTask.mapping | 6 ++++ .../ai/brain/task/VillagerWorkTask.mapping | 2 ++ .../entity/ai/brain/task/WalkHomeTask.mapping | 4 +++ .../brain/task/WalkTowardJobSiteTask.mapping | 4 +++ .../task/WorkStationCompetitionTask.mapping | 2 ++ .../ai/goal/MoveThroughVillageGoal.mapping | 4 +++ .../entity/damage/DamageSource.mapping | 2 ++ .../minecraft/entity/mob/WardenEntity.mapping | 2 ++ .../entity/passive/BeeEntity.mapping | 2 ++ .../net/minecraft/item/GoatHornItem.mapping | 1 + .../server/command/LocateCommand.mapping | 30 ++++++++++++++++++ .../server/command/PlaceCommand.mapping | 12 +++++++ .../tag/PointOfInterestTypeTags.mapping | 3 ++ .../{Builder.mapping => TagBuilder.mapping} | 3 +- mappings/net/minecraft/tag/TagEntry.mapping | 26 +++++++++++++++- .../net/minecraft/tag/TagGroupLoader.mapping | 2 ++ .../net/minecraft/util/BlockMirror.mapping | 3 ++ .../net/minecraft/util/BlockRotation.mapping | 5 +++ .../net/minecraft/util/dynamic/Codecs.mapping | 6 ++++ .../village/VillagerProfession.mapping | 29 +++++++++++++++-- .../village/raid/RaidManager.mapping | 2 ++ .../world/poi/PointOfInterestStorage.mapping | 31 ++++++++++++++++++- .../world/poi/PointOfInterestType.mapping | 3 ++ .../world/poi/PointOfInterestTypes.mapping | 23 ++++++++++++++ 50 files changed, 325 insertions(+), 10 deletions(-) create mode 100644 mappings/net/minecraft/command/argument/BlockMirrorArgumentType.mapping create mode 100644 mappings/net/minecraft/command/argument/BlockRotationArgumentType.mapping create mode 100644 mappings/net/minecraft/command/argument/EnumArgumentType.mapping create mode 100644 mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping create mode 100644 mappings/net/minecraft/tag/PointOfInterestTypeTags.mapping rename mappings/net/minecraft/tag/{Builder.mapping => TagBuilder.mapping} (90%) create mode 100644 mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping diff --git a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping index 874e6c1149..8b73ed65ab 100644 --- a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping @@ -10,11 +10,24 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti ARG 1 vibrationListener METHOD method_42325 getVibrationListener ()Lnet/minecraft/class_5718; METHOD method_43141 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;)V + ARG 1 world + ARG 2 player METHOD method_43142 trySyncWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;)Z + ARG 1 world + ARG 2 player METHOD method_43146 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 warningSounds METHOD method_43147 warn (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_43148 trySpawnWarden (Lnet/minecraft/class_3218;)Z + ARG 1 world METHOD method_43150 canWarn (Lnet/minecraft/class_3218;)Z ARG 1 world METHOD method_43151 playWarningSound ()V + METHOD method_44016 (I)V + ARG 1 warningLevel + METHOD method_44017 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V + ARG 1 world + ARG 2 entity + METHOD method_44018 findResponsiblePlayerFromEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_3222; + ARG 0 entity diff --git a/mappings/net/minecraft/command/argument/BlockMirrorArgumentType.mapping b/mappings/net/minecraft/command/argument/BlockMirrorArgumentType.mapping new file mode 100644 index 0000000000..1c9ceb1852 --- /dev/null +++ b/mappings/net/minecraft/command/argument/BlockMirrorArgumentType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7486 net/minecraft/command/argument/BlockMirrorArgumentType + METHOD method_44100 blockMirror ()Lnet/minecraft/class_7485; + METHOD method_44101 getBlockMirror (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2415; + ARG 0 context + ARG 1 id diff --git a/mappings/net/minecraft/command/argument/BlockRotationArgumentType.mapping b/mappings/net/minecraft/command/argument/BlockRotationArgumentType.mapping new file mode 100644 index 0000000000..7cd8384de7 --- /dev/null +++ b/mappings/net/minecraft/command/argument/BlockRotationArgumentType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7487 net/minecraft/command/argument/BlockRotationArgumentType + METHOD method_44102 blockRotation ()Lnet/minecraft/class_7487; + METHOD method_44103 getBlockRotation (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2470; + ARG 0 context + ARG 1 id diff --git a/mappings/net/minecraft/command/argument/EnumArgumentType.mapping b/mappings/net/minecraft/command/argument/EnumArgumentType.mapping new file mode 100644 index 0000000000..159b947eea --- /dev/null +++ b/mappings/net/minecraft/command/argument/EnumArgumentType.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_7485 net/minecraft/command/argument/EnumArgumentType + FIELD field_39361 INVALID_ENUM_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39362 codec Lcom/mojang/serialization/Codec; + FIELD field_39363 valuesSupplier Ljava/util/function/Supplier; + METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)V + ARG 1 codec + ARG 2 valuesSupplier + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder diff --git a/mappings/net/minecraft/data/DataGenerator.mapping b/mappings/net/minecraft/data/DataGenerator.mapping index 304e776262..22d794f0b9 100644 --- a/mappings/net/minecraft/data/DataGenerator.mapping +++ b/mappings/net/minecraft/data/DataGenerator.mapping @@ -17,3 +17,24 @@ CLASS net/minecraft/class_2403 net/minecraft/data/DataGenerator ARG 1 shouldRun ARG 2 provider METHOD method_10315 run ()V + METHOD method_44105 resolveRootDirectoryPath (Lnet/minecraft/class_2403$class_7490;)Ljava/nio/file/Path; + ARG 1 outputType + METHOD method_44106 createPathResolver (Lnet/minecraft/class_2403$class_7490;Ljava/lang/String;)Lnet/minecraft/class_2403$class_7489; + ARG 1 outputType + ARG 2 directoryName + CLASS class_7489 PathResolver + FIELD field_39365 rootPath Ljava/nio/file/Path; + FIELD field_39366 directoryName Ljava/lang/String; + METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2403$class_7490;Ljava/lang/String;)V + ARG 1 dataGenerator + ARG 2 outputType + ARG 3 directoryName + METHOD method_44107 resolveJson (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + ARG 1 id + METHOD method_44108 resolve (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 id + ARG 2 fileExtension + CLASS class_7490 OutputType + FIELD field_39370 path Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 path diff --git a/mappings/net/minecraft/data/client/ModelProvider.mapping b/mappings/net/minecraft/data/client/ModelProvider.mapping index 955bb41b50..331c9e7227 100644 --- a/mappings/net/minecraft/data/client/ModelProvider.mapping +++ b/mappings/net/minecraft/data/client/ModelProvider.mapping @@ -1,8 +1,14 @@ CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider FIELD field_22845 LOGGER Lorg/slf4j/Logger; + FIELD field_39375 blockstatesPathResolver Lnet/minecraft/class_2403$class_7489; + FIELD field_39376 modelsPathResolver Lnet/minecraft/class_2403$class_7489; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/util/Map;Ljava/util/function/Function;)V ARG 1 cache + METHOD method_25738 (Ljava/util/Map;Lnet/minecraft/class_2248;)Z + ARG 1 block METHOD method_25741 (Ljava/util/Set;Ljava/util/Map;Lnet/minecraft/class_2248;)V ARG 2 block + METHOD method_44110 (Lnet/minecraft/class_2248;)Ljava/nio/file/Path; + ARG 1 block diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index bb98349e1c..b347a6c4ea 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider FIELD field_11479 LOGGER Lorg/slf4j/Logger; FIELD field_11481 tagBuilders Ljava/util/Map; FIELD field_11482 registry Lnet/minecraft/class_2378; + FIELD field_39380 pathResolver Lnet/minecraft/class_2403$class_7489; METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V ARG 1 root ARG 2 registry diff --git a/mappings/net/minecraft/data/server/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/AdvancementProvider.mapping index 524e1cd4ce..04aab33c27 100644 --- a/mappings/net/minecraft/data/server/AdvancementProvider.mapping +++ b/mappings/net/minecraft/data/server/AdvancementProvider.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementProvider FIELD field_11289 tabGenerators Ljava/util/List; FIELD field_11290 LOGGER Lorg/slf4j/Logger; + FIELD field_39372 pathResolver Lnet/minecraft/class_2403$class_7489; METHOD (Lnet/minecraft/class_2403;)V ARG 1 root METHOD method_10333 (Ljava/util/Set;Lnet/minecraft/class_7403;Lnet/minecraft/class_161;)V diff --git a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping index c12b867ee1..37a1b3e0a7 100644 --- a/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping +++ b/mappings/net/minecraft/data/server/BiomeParametersProvider.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_7228 net/minecraft/data/server/BiomeParametersProvider FIELD field_38012 LOGGER Lorg/slf4j/Logger; + FIELD field_39373 path Ljava/nio/file/Path; METHOD (Lnet/minecraft/class_2403;)V ARG 1 dataGenerator + METHOD method_42032 resolvePath (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + ARG 1 id diff --git a/mappings/net/minecraft/data/server/LootTableProvider.mapping b/mappings/net/minecraft/data/server/LootTableProvider.mapping index 0aa2cf3e74..3ef45c8146 100644 --- a/mappings/net/minecraft/data/server/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/LootTableProvider.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider FIELD field_11354 lootTypeGenerators Ljava/util/List; FIELD field_11355 LOGGER Lorg/slf4j/Logger; + FIELD field_39374 pathResolver Lnet/minecraft/class_2403$class_7489; METHOD (Lnet/minecraft/class_2403;)V ARG 1 root METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping b/mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping new file mode 100644 index 0000000000..132be96e29 --- /dev/null +++ b/mappings/net/minecraft/data/server/PointOfInterestTypeTagProvider.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7491 net/minecraft/data/server/PointOfInterestTypeTagProvider + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 dataGenerator diff --git a/mappings/net/minecraft/data/server/RecipeProvider.mapping b/mappings/net/minecraft/data/server/RecipeProvider.mapping index 660253000b..1cff03e689 100644 --- a/mappings/net/minecraft/data/server/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipeProvider.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider FIELD field_33425 LAPIS_ORES Lcom/google/common/collect/ImmutableList; FIELD field_33426 REDSTONE_ORES Lcom/google/common/collect/ImmutableList; FIELD field_33427 EMERALD_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_39378 recipesPathResolver Lnet/minecraft/class_2403$class_7489; + FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_2403$class_7489; METHOD (Lnet/minecraft/class_2403;)V ARG 1 root METHOD method_10419 generate (Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping index b71aef3567..0724ee9fd8 100644 --- a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping +++ b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager FIELD field_38737 SUSPECT_CODEC Lcom/mojang/serialization/Codec; FIELD field_39114 suspectPredicate Ljava/util/function/Predicate; FIELD field_39115 suspectComparator Lnet/minecraft/class_7254$class_7379; + FIELD field_39304 primeAnger I METHOD (Ljava/util/function/Predicate;Ljava/util/List;)V ARG 1 suspectPredicate ARG 2 suspectUuidsToAngerLevel @@ -23,7 +24,8 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager ARG 1 entity ARG 2 amount METHOD method_42181 getPrimeSuspect ()Ljava/util/Optional; - METHOD method_42185 getPrimeSuspectAnger (Lnet/minecraft/class_1297;)I + METHOD method_42185 getAngerFor (Lnet/minecraft/class_1297;)I + ARG 1 entity METHOD method_42186 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; ARG 0 suspect METHOD method_42187 getPrimeSuspect ()Lnet/minecraft/class_1297; @@ -34,6 +36,7 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager METHOD method_43108 getSuspects ()Ljava/util/List; METHOD method_43109 (Lnet/minecraft/class_1297;)Lcom/mojang/datafixers/util/Pair; ARG 1 suspect + METHOD method_43998 updatePrimeAnger ()V CLASS class_7379 SuspectComparator METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I ARG 1 first diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index 8ee435d511..1d368ce5f1 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInterestTask FIELD field_18332 positionExpireTimeLimit J FIELD field_18854 onlyRunIfChild Z - FIELD field_19287 poiType Ljava/util/function/Predicate; + FIELD field_19287 poiTypePredicate Ljava/util/function/Predicate; FIELD field_19289 foundPositionsToExpiry Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_20287 targetMemoryModuleType Lnet/minecraft/class_4140; FIELD field_25812 entityStatus Ljava/util/Optional; @@ -9,17 +9,24 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt FIELD field_30099 MAX_POSITIONS_PER_RUN I FIELD field_30100 POSITION_EXPIRE_INTERVAL I METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V + ARG 1 poiTypePredicate ARG 2 moduleType ARG 3 targetMemoryModuleType ARG 4 onlyRunIfChild ARG 5 entityStatus METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V + ARG 1 poiTypePredicate ARG 2 moduleType ARG 3 onlyRunIfChild ARG 4 entityStatus METHOD method_29245 create (Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;)Lcom/google/common/collect/ImmutableMap; ARG 0 firstModule ARG 1 secondModule + METHOD method_29924 (JLnet/minecraft/class_2338;)Z + ARG 3 pos + METHOD method_43965 findPathToPoi (Lnet/minecraft/class_1308;Ljava/util/Set;)Lnet/minecraft/class_11; + ARG 0 entity + ARG 1 pois CLASS class_5397 RetryMarker FIELD field_25600 random Lnet/minecraft/class_5819; FIELD field_25601 previousAttemptAt J diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping index 5e4576df18..caff55578a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindWalkTargetTask.mapping @@ -15,3 +15,7 @@ CLASS net/minecraft/class_4117 net/minecraft/entity/ai/brain/task/FindWalkTarget METHOD method_20430 updateWalkTarget (Lnet/minecraft/class_1314;Lnet/minecraft/class_4076;)V ARG 1 entity ARG 2 pos + METHOD method_20431 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; + ARG 1 pos + METHOD method_20432 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping index d6342f31ff..5ee9ae0902 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping @@ -3,10 +3,16 @@ CLASS net/minecraft/class_4828 net/minecraft/entity/ai/brain/task/ForgetAttackTa FIELD field_30177 REMEMBER_TIME I FIELD field_30178 forgetCallback Ljava/util/function/BiConsumer; FIELD field_38102 shouldForgetIfTargetUnreachable Z + METHOD (Ljava/util/function/BiConsumer;)V + ARG 1 forgetCallback METHOD (Ljava/util/function/Predicate;)V - ARG 1 alternativeCondition + ARG 1 alternativePredicate + METHOD (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V + ARG 1 alternativePredicate + ARG 2 forgetCallback METHOD (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)V - ARG 1 condition + ARG 1 alternativePredicate + ARG 2 forgetCallback ARG 3 shouldForgetIfTargetUnreachable METHOD method_24621 cannotReachTarget (Lnet/minecraft/class_1309;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping index 728ad5c508..60cc1c385a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_4128 net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask FIELD field_18390 memoryModule Lnet/minecraft/class_4140; - FIELD field_18391 condition Ljava/util/function/Predicate; + FIELD field_18391 poiTypePredicate Ljava/util/function/Predicate; FIELD field_30185 MAX_RANGE I METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;)V + ARG 1 poiTypePredicate ARG 2 memoryModule METHOD method_20499 hasCompletedPointOfInterest (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world diff --git a/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping index 344aff9156..ad521163b7 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4243 net/minecraft/entity/ai/brain/task/GiveGiftsToHer FIELD field_18987 startTime J FIELD field_30117 MAX_DISTANCE I FIELD field_30118 DEFAULT_DURATION I + FIELD field_30119 MAX_NEXT_GIFT_DELAY I FIELD field_30120 RUN_TIME I FIELD field_30121 WALK_SPEED F METHOD (I)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping index e18a46a0ba..fa4394c6b4 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping @@ -2,7 +2,12 @@ CLASS net/minecraft/class_4814 net/minecraft/entity/ai/brain/task/GoToCelebrateT FIELD field_22304 completionRange I FIELD field_23130 speed F FIELD field_38101 memoryModuleType Lnet/minecraft/class_4140; + METHOD (Lnet/minecraft/class_4140;IF)V + ARG 1 memoryModuleType + ARG 2 completionRange + ARG 3 speed METHOD method_24576 getCelebrateLocation (Lnet/minecraft/class_1308;)Lnet/minecraft/class_2338; + ARG 1 entity METHOD method_24577 fuzz (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 mob ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping index e520bb07b9..f547fee1ed 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_4116 net/minecraft/entity/ai/brain/task/GoToIfNearbyTa ARG 1 target ARG 2 walkSpeed ARG 3 maxDistance + METHOD method_18992 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping index 0c8f5e64a5..a63a56f4c6 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_4219 net/minecraft/entity/ai/brain/task/GoToNearbyPosi ARG 2 walkSpeed ARG 3 completionRange ARG 4 maxDistance + METHOD method_19606 (Lnet/minecraft/class_4095;Lnet/minecraft/class_4208;)V + ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping index 250e8452a3..aa55539e93 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping @@ -7,3 +7,11 @@ CLASS net/minecraft/class_4246 net/minecraft/entity/ai/brain/task/HideInHomeTask ARG 1 maxDistance ARG 2 walkSpeed ARG 3 preferredDistance + METHOD method_19983 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_19985 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_20211 (Lnet/minecraft/class_2338;)Z + ARG 0 pos + METHOD method_20212 (Lnet/minecraft/class_2338;)Z + ARG 0 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/RoarTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RoarTask.mapping index b7e7d657b8..a4d4554bef 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RoarTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RoarTask.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_7255 net/minecraft/entity/ai/brain/task/RoarTask FIELD field_38131 SOUND_DELAY I + FIELD field_39276 ANGER_INCREASE I diff --git a/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping index e939361340..59489d62b9 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_7251 net/minecraft/entity/ai/brain/task/SniffTask FIELD field_38708 HORIZONTAL_RADIUS D FIELD field_38848 VERTICAL_RADIUS D + METHOD (I)V + ARG 1 runTime + METHOD method_42159 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)V + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/SonicBoomTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SonicBoomTask.mapping index 61c858b8eb..69fe450c4f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SonicBoomTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SonicBoomTask.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_7396 net/minecraft/entity/ai/brain/task/SonicBoomTask ARG 2 target METHOD method_43266 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)Z ARG 1 target + METHOD method_43973 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)V + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping index 2f1a53bb97..c893326732 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5327 net/minecraft/entity/ai/brain/task/TakeJobSiteTas METHOD (F)V ARG 1 speed METHOD method_29260 canUseJobSite (Lnet/minecraft/class_6880;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)Z + ARG 1 poiType ARG 2 villager ARG 3 pos METHOD method_29261 forgetJobSiteAndWalkTarget (Lnet/minecraft/class_1646;)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping index f638d538c9..41545ecacf 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping @@ -18,7 +18,13 @@ CLASS net/minecraft/class_4111 net/minecraft/entity/ai/brain/task/VillagerBreedT METHOD method_20642 canReachHome (Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z ARG 1 villager ARG 2 pos + ARG 3 poiType METHOD method_20643 goHome (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)V ARG 1 world ARG 2 first ARG 3 second + METHOD method_20644 (Lnet/minecraft/class_1646;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)Z + ARG 2 poiType + ARG 3 pos + METHOD method_43972 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping index c595cdb967..6965e17e50 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_4133 net/minecraft/entity/ai/brain/task/VillagerWorkTa FIELD field_19426 lastCheckedTime J FIELD field_30192 RUN_TIME I FIELD field_30193 MAX_DISTANCE D + METHOD method_19613 (Lnet/minecraft/class_4095;Lnet/minecraft/class_4208;)V + ARG 1 pos METHOD method_26335 performAdditionalWork (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;)V ARG 1 world ARG 2 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping index a644fe53e8..edaebbc3f0 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping @@ -13,3 +13,7 @@ CLASS net/minecraft/class_4290 net/minecraft/entity/ai/brain/task/WalkHomeTask ARG 1 speed METHOD method_21639 (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_43966 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_43967 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping index 9ff0d20157..4ae51c5a3c 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping @@ -3,3 +3,7 @@ CLASS net/minecraft/class_5325 net/minecraft/entity/ai/brain/task/WalkTowardJobS FIELD field_30122 RUN_TIME I METHOD (F)V ARG 1 speed + METHOD method_29250 (Lnet/minecraft/class_4168;)Ljava/lang/Boolean; + ARG 0 activity + METHOD method_29524 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4208;)V + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping index a3cca4128e..5885085be7 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5326 net/minecraft/entity/ai/brain/task/WorkStationCom METHOD (Lnet/minecraft/class_3852;)V ARG 1 profession METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z + ARG 1 poiType ARG 2 profession METHOD method_29254 hasJobSite (Lnet/minecraft/class_1646;)Z ARG 1 villager @@ -11,4 +12,5 @@ CLASS net/minecraft/class_5326 net/minecraft/entity/ai/brain/task/WorkStationCom ARG 1 second METHOD method_29257 isUsingWorkStationAt (Lnet/minecraft/class_4208;Lnet/minecraft/class_6880;Lnet/minecraft/class_1646;)Z ARG 1 pos + ARG 2 poiType ARG 3 villager diff --git a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping index 2fedd5948a..514cc67d7c 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping @@ -17,4 +17,8 @@ CLASS net/minecraft/class_1368 net/minecraft/entity/ai/goal/MoveThroughVillageGo ARG 1 pos METHOD method_19053 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)D ARG 3 pos + METHOD method_43975 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_43976 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType METHOD method_6297 forgetOldTarget ()V diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 8f2be6f206..da9ef44496 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -57,6 +57,8 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource METHOD method_33330 setFromFalling ()Lnet/minecraft/class_1282; METHOD method_37353 setNeutral ()Lnet/minecraft/class_1282; METHOD method_37354 isNeutral ()Z + METHOD method_43964 sonicBoom (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 0 attacker METHOD method_5504 isUnblockable ()Z METHOD method_5505 setOutOfWorld ()Lnet/minecraft/class_1282; METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index 34255d7eb0..c35ae89381 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -43,3 +43,5 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity ARG 1 tickDelta METHOD method_43113 isDiggingOrEmerging ()Z METHOD method_43274 updateAttackTarget (Lnet/minecraft/class_1309;)V + ARG 1 target + METHOD method_43999 getAngerAtTarget ()I diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index b4f1fb6f24..344509eb8c 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -135,6 +135,8 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity ARG 2 bee CLASS class_4476 FindHiveGoal METHOD method_23742 getNearbyFreeHives ()Ljava/util/List; + METHOD method_23743 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType CLASS class_4477 BeeLookControl METHOD (Lnet/minecraft/class_4466;Lnet/minecraft/class_1308;)V ARG 2 entity diff --git a/mappings/net/minecraft/item/GoatHornItem.mapping b/mappings/net/minecraft/item/GoatHornItem.mapping index cad07e9904..66dc4f1141 100644 --- a/mappings/net/minecraft/item/GoatHornItem.mapping +++ b/mappings/net/minecraft/item/GoatHornItem.mapping @@ -21,3 +21,4 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem METHOD method_43710 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; ARG 1 entryList METHOD method_43711 getInstrument (Lnet/minecraft/class_1799;)Ljava/util/Optional; + ARG 1 stack diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 36f87c3983..90fe97d1ca 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand + FIELD field_39245 STRUCTURE_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39246 STRUCTURE_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39247 BIOME_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39248 BIOME_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39249 POI_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39250 POI_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD method_13439 getDistance (IIII)F ARG 0 x1 ARG 1 y1 @@ -24,3 +30,27 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 0 key METHOD method_41004 (Lnet/minecraft/class_5321;)Ljava/lang/String; ARG 0 key + METHOD method_43905 executeLocateStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I + ARG 0 source + ARG 1 predicate + METHOD method_43907 getStructureListForPredicate (Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2378;)Ljava/util/Optional; + ARG 0 predicate + ARG 1 structureTypeRegistry + METHOD method_43908 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6885$class_6886; + ARG 0 entry + METHOD method_43909 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key + METHOD method_43910 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + METHOD method_43912 executeLocateBiome (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I + ARG 0 source + ARG 1 predicate + METHOD method_43913 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + METHOD method_43915 executeLocatePoi (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I + ARG 0 source + ARG 1 predicate + METHOD method_43916 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + METHOD method_43917 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id diff --git a/mappings/net/minecraft/server/command/PlaceCommand.mapping b/mappings/net/minecraft/server/command/PlaceCommand.mapping index 3569d13fc4..9c12b59df8 100644 --- a/mappings/net/minecraft/server/command/PlaceCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaceCommand.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand FIELD field_36324 FEATURE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_39091 JIGSAW_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_39092 STRUCTURE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_39256 TEMPLATE_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_39257 TEMPLATE_FAILED_EXPECTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_39986 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_39987 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -35,3 +37,13 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand ARG 0 source ARG 1 structureType ARG 2 pos + METHOD method_43919 executePlaceTemplate (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;FI)I + ARG 0 source + ARG 1 id + ARG 2 pos + ARG 3 rotation + ARG 4 mirror + ARG 5 integrity + ARG 6 seed + METHOD method_43920 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id diff --git a/mappings/net/minecraft/tag/PointOfInterestTypeTags.mapping b/mappings/net/minecraft/tag/PointOfInterestTypeTags.mapping new file mode 100644 index 0000000000..1b82edbc75 --- /dev/null +++ b/mappings/net/minecraft/tag/PointOfInterestTypeTags.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7473 net/minecraft/tag/PointOfInterestTypeTags + METHOD method_43935 of (Ljava/lang/String;)Lnet/minecraft/class_6862; + ARG 0 id diff --git a/mappings/net/minecraft/tag/Builder.mapping b/mappings/net/minecraft/tag/TagBuilder.mapping similarity index 90% rename from mappings/net/minecraft/tag/Builder.mapping rename to mappings/net/minecraft/tag/TagBuilder.mapping index f3d87f9fed..b91011d63c 100644 --- a/mappings/net/minecraft/tag/Builder.mapping +++ b/mappings/net/minecraft/tag/TagBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3495 net/minecraft/tag/Builder +CLASS net/minecraft/class_3495 net/minecraft/tag/TagBuilder COMMENT A builder class to ease the creation of tags. It can also be used as a COMMENT mutable form of a tag. FIELD field_23688 entries Ljava/util/List; @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3495 net/minecraft/tag/Builder METHOD method_26787 addTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; ARG 1 id METHOD method_27064 add (Lnet/minecraft/class_3497;)Lnet/minecraft/class_3495; + ARG 1 entry METHOD method_34891 addOptional (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; ARG 1 id METHOD method_34892 addOptionalTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; diff --git a/mappings/net/minecraft/tag/TagEntry.mapping b/mappings/net/minecraft/tag/TagEntry.mapping index 8020f355f5..2fa30376df 100644 --- a/mappings/net/minecraft/tag/TagEntry.mapping +++ b/mappings/net/minecraft/tag/TagEntry.mapping @@ -1,7 +1,31 @@ CLASS net/minecraft/class_3497 net/minecraft/tag/TagEntry FIELD field_15584 id Lnet/minecraft/class_2960; + FIELD field_39267 tag Z + FIELD field_39268 required Z METHOD (Lnet/minecraft/class_2960;ZZ)V ARG 1 id + ARG 2 tag + ARG 3 required + METHOD (Lnet/minecraft/class_5699$class_7476;Z)V + ARG 1 id + ARG 2 required METHOD method_26790 resolve (Lnet/minecraft/class_3497$class_7474;Ljava/util/function/Consumer;)Z - METHOD method_32831 forEachTagId (Ljava/util/function/Consumer;)V + METHOD method_32831 forEachRequiredTagId (Ljava/util/function/Consumer;)V METHOD method_32832 canAdd (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Z + ARG 1 directEntryPredicate + ARG 2 tagEntryPredicate + METHOD method_43936 getIdForCodec ()Lnet/minecraft/class_5699$class_7476; + METHOD method_43937 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3497; + ARG 0 id + METHOD method_43942 createOptional (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3497; + ARG 0 id + METHOD method_43944 forEachOptionalTagId (Ljava/util/function/Consumer;)V + METHOD method_43945 createTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3497; + ARG 0 id + METHOD method_43947 createOptionalTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3497; + ARG 0 id + CLASS class_7474 ValueGetter + METHOD method_43948 direct (Lnet/minecraft/class_2960;)Ljava/lang/Object; + ARG 1 id + METHOD method_43949 tag (Lnet/minecraft/class_2960;)Ljava/util/Collection; + ARG 1 id diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index 2e1e1aa579..c5af71c7c4 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader METHOD (Ljava/util/function/Function;Ljava/lang/String;)V ARG 1 registryGetter ARG 2 dataType + METHOD method_15194 (Lnet/minecraft/class_2960;)Z + ARG 0 id METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map; METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; ARG 1 manager diff --git a/mappings/net/minecraft/util/BlockMirror.mapping b/mappings/net/minecraft/util/BlockMirror.mapping index d87e9e0339..1fc399edf7 100644 --- a/mappings/net/minecraft/util/BlockMirror.mapping +++ b/mappings/net/minecraft/util/BlockMirror.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_2415 net/minecraft/util/BlockMirror FIELD field_23263 directionTransformation Lnet/minecraft/class_4990; FIELD field_27883 name Lnet/minecraft/class_2561; + FIELD field_39311 CODEC Lcom/mojang/serialization/Codec; + FIELD field_39312 id Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4990;)V + ARG 3 id ARG 4 directionTransformation METHOD method_10343 apply (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; ARG 1 direction diff --git a/mappings/net/minecraft/util/BlockRotation.mapping b/mappings/net/minecraft/util/BlockRotation.mapping index f92ad8bec0..fcd7169345 100644 --- a/mappings/net/minecraft/util/BlockRotation.mapping +++ b/mappings/net/minecraft/util/BlockRotation.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation FIELD field_23264 directionTransformation Lnet/minecraft/class_4990; + FIELD field_39313 CODEC Lcom/mojang/serialization/Codec; + FIELD field_39314 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4990;)V + ARG 3 id + ARG 4 directionTransformation METHOD method_10501 rotate (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2470; ARG 1 rotation METHOD method_10502 rotate (II)I diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index fe4afe29e6..540b005762 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_37408 REGULAR_EXPRESSION Lcom/mojang/serialization/Codec; FIELD field_38081 UUID Lcom/mojang/serialization/Codec; FIELD field_39042 INSTANT Lcom/mojang/serialization/Codec; + FIELD field_39273 BASE_64 Lcom/mojang/serialization/Codec; + FIELD field_39274 TAG_ENTRY Lcom/mojang/serialization/Codec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT @@ -131,6 +133,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 pattern METHOD method_42114 exceptionCatching (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 codec + METHOD method_43532 instant (Ljava/time/format/DateTimeFormatter;)Lcom/mojang/serialization/Codec; + ARG 0 formatter CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -237,3 +241,5 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 prefix METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops + CLASS class_7476 TagEntryId + METHOD method_43963 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/village/VillagerProfession.mapping b/mappings/net/minecraft/village/VillagerProfession.mapping index b96f5c2135..5ebbdda9ca 100644 --- a/mappings/net/minecraft/village/VillagerProfession.mapping +++ b/mappings/net/minecraft/village/VillagerProfession.mapping @@ -1,21 +1,46 @@ CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession FIELD comp_818 id Ljava/lang/String; - FIELD comp_819 workStation Ljava/util/function/Predicate; + FIELD comp_819 heldWorkstation Ljava/util/function/Predicate; + COMMENT A predicate for the workstation currently held by the villager profession. + FIELD comp_820 acquirableWorkstation Ljava/util/function/Predicate; + COMMENT A predicate for a workstation that could be acquired by the villager profession. FIELD comp_821 gatherableItems Lcom/google/common/collect/ImmutableSet; FIELD comp_822 secondaryJobSites Lcom/google/common/collect/ImmutableSet; FIELD comp_823 workSound Lnet/minecraft/class_3414; + FIELD field_39308 IS_ACQUIRABLE_JOB_SITE Ljava/util/function/Predicate; METHOD (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)V ARG 1 id METHOD comp_818 id ()Ljava/lang/String; - METHOD comp_819 workStation ()Ljava/util/function/Predicate; + METHOD comp_819 heldWorkstation ()Ljava/util/function/Predicate; + METHOD comp_820 acquirableWorkstation ()Ljava/util/function/Predicate; METHOD comp_821 gatherableItems ()Lcom/google/common/collect/ImmutableSet; METHOD comp_822 secondaryJobSites ()Lcom/google/common/collect/ImmutableSet; METHOD comp_823 workSound ()Lnet/minecraft/class_3414; METHOD method_16926 register (Ljava/lang/String;Lnet/minecraft/class_5321;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; ARG 0 id + ARG 1 heldWorkstation ARG 2 workSound METHOD method_19197 register (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; ARG 0 id + ARG 1 heldWorkstation ARG 2 gatherableItems ARG 3 secondaryJobSites ARG 4 workSound + METHOD method_44005 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z + ARG 1 entry + METHOD method_44006 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType + METHOD method_44007 register (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; + ARG 0 id + ARG 1 heldWorkstation + ARG 2 acquirableWorkstation + ARG 3 workSound + METHOD method_44008 register (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; + ARG 0 id + ARG 1 heldWorkstation + ARG 2 acquirableWorkstation + ARG 3 gatherableItems + ARG 4 secondaryJobSites + ARG 5 workSound + METHOD method_44009 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z + ARG 1 entry diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index 07694857de..06f194c6be 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager METHOD method_19209 getRaidAt (Lnet/minecraft/class_2338;I)Lnet/minecraft/class_3765; ARG 1 pos ARG 2 searchDistance + METHOD method_44012 (Lnet/minecraft/class_6880;)Z + ARG 0 poiType METHOD method_77 fromNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; ARG 0 world ARG 1 nbt diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index e91899f6d7..92302ecc37 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -5,12 +5,15 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 1 path ARG 2 dataFixer ARG 3 dsync + ARG 4 registryManager + ARG 5 world METHOD method_19112 remove (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_19113 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z ARG 2 poi METHOD method_19115 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V ARG 1 pos + ARG 2 type METHOD method_19116 test (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z ARG 1 pos ARG 2 predicate @@ -54,6 +57,8 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 2 chunkSection METHOD method_19511 (Lnet/minecraft/class_2826;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V ARG 2 pos + METHOD method_19512 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 2 poiType METHOD method_20004 (Ljava/util/function/Predicate;Lnet/minecraft/class_4156;)Z ARG 1 poi METHOD method_20005 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;Lnet/minecraft/class_2338;ILnet/minecraft/class_5819;)Ljava/util/Optional; @@ -104,10 +109,11 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage METHOD method_22443 (Lnet/minecraft/class_4076;)Lcom/mojang/datafixers/util/Pair; ARG 1 sectionPos METHOD method_26339 hasTypeAt (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)Z + ARG 1 type ARG 2 pos METHOD method_30335 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z ARG 2 poi - METHOD method_30957 getSortedPositions (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; + METHOD method_30957 getSortedTypesAndPositions (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; ARG 1 typePredicate ARG 2 posPredicate ARG 3 pos @@ -129,6 +135,29 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 1 poiSet METHOD method_35155 getFreeTickets (Lnet/minecraft/class_2338;)I ARG 1 pos + METHOD method_43978 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z + ARG 1 entry + METHOD method_43979 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4156;)D + ARG 1 poi + METHOD method_43980 (Lnet/minecraft/class_6880;)Z + ARG 0 entry + METHOD method_43981 (Lnet/minecraft/class_4156;)Lcom/mojang/datafixers/util/Pair; + ARG 0 poi + METHOD method_43982 (Ljava/util/function/Predicate;Lnet/minecraft/class_4156;)Z + ARG 1 poi + METHOD method_43983 getTypesAndPositions (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; + ARG 1 typePredicate + ARG 2 posPredicate + ARG 3 pos + ARG 4 radius + ARG 5 occupationStatus + METHOD method_43984 (Lnet/minecraft/class_4156;)Lcom/mojang/datafixers/util/Pair; + ARG 0 poi + METHOD method_43985 getNearestTypeAndPosition (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/Optional; + ARG 1 typePredicate + ARG 2 pos + ARG 3 radius + ARG 4 occupationStatus CLASS class_4154 PointOfInterestDistanceTracker FIELD field_18486 distances Lit/unimi/dsi/fastutil/longs/Long2ByteMap; METHOD method_19134 update ()V diff --git a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping index cfe7e258f6..307e1a501c 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping @@ -2,8 +2,11 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType FIELD comp_815 blockStates Ljava/util/Set; FIELD comp_816 ticketCount I FIELD comp_817 searchDistance I + FIELD field_39277 NONE Ljava/util/function/Predicate; METHOD comp_815 blockStates ()Ljava/util/Set; METHOD comp_816 ticketCount ()I METHOD comp_817 searchDistance ()I METHOD method_35159 contains (Lnet/minecraft/class_2680;)Z ARG 1 state + METHOD method_43987 (Lnet/minecraft/class_6880;)Z + ARG 0 type diff --git a/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping b/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping new file mode 100644 index 0000000000..1ccf30cd06 --- /dev/null +++ b/mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_7477 net/minecraft/world/poi/PointOfInterestTypes + FIELD field_39298 POI_STATES Ljava/util/Set; + FIELD field_39299 BED_HEADS Ljava/util/Set; + FIELD field_39300 CAULDRONS Ljava/util/Set; + FIELD field_39301 POI_STATES_TO_TYPE Ljava/util/Map; + METHOD method_43988 getStatesOfBlock (Lnet/minecraft/class_2248;)Ljava/util/Set; + ARG 0 block + METHOD method_43989 getTypeForState (Lnet/minecraft/class_2680;)Ljava/util/Optional; + ARG 0 state + METHOD method_43990 registerStates (Lnet/minecraft/class_6880;)V + ARG 0 poiType + METHOD method_43991 (Lnet/minecraft/class_6880;Lnet/minecraft/class_2680;)V + ARG 1 state + METHOD method_43992 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4158; + ARG 0 registry + METHOD method_43993 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/util/Set;II)Lnet/minecraft/class_4158; + ARG 0 registry + ARG 1 key + ARG 2 states + ARG 3 ticketCount + ARG 4 searchDistance + METHOD method_43994 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id