mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Village and POI stuff (#2137) 

* POI stuff

* Village stuff

* Rename hasRecentlyWorkedAndSlept

* Update mappings/net/minecraft/world/poi/PointOfInterestType.mapping

Co-authored-by: YanisBft <doublecraft.official@gmail.com>

Co-authored-by: YanisBft <doublecraft.official@gmail.com>
This commit is contained in:
apple502j 2021-03-15 01:20:37 +09:00 committed by GitHub
parent f7e197313f
commit ac8ad7eb8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mappings/net/minecraft/entity/passive/VillagerEntity.mapping
View File

@ -61,10 +61,12 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
ARG 2 time
METHOD method_20690 notifyDeath (Lnet/minecraft/class_1297;)V
ARG 1 killer
METHOD method_20693 (JLnet/minecraft/class_1646;)Z
ARG 2 villager
METHOD method_20696 decayGossip ()V
METHOD method_20697 eatForBreeding ()V
METHOD method_20698 lacksFood ()Z
METHOD method_20741 hasRecentlyWorkedAndSlept (J)Z
METHOD method_20741 hasRecentlySlept (J)Z
ARG 1 worldTime
METHOD method_20821 clearDailyRestockCount ()V
METHOD method_20822 shouldRestock ()Z

4
mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping
View File

@ -5,6 +5,10 @@ CLASS net/minecraft/class_3989 net/minecraft/entity/passive/WanderingTraderEntit
ARG 1 delay
METHOD method_18014 getDespawnDelay ()I
METHOD method_18065 getWanderTarget ()Lnet/minecraft/class_2338;
METHOD method_18067 (Lnet/minecraft/class_3989;)Z
ARG 1 wanderingTrader
METHOD method_18068 (Lnet/minecraft/class_3989;)Z
ARG 1 wanderingTrader
METHOD method_18069 setWanderTarget (Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_20508 tickDespawnDelay ()V

7
mappings/net/minecraft/village/TradeOffers.mapping
View File

@ -43,6 +43,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
ARG 3 maxUses
ARG 4 experience
METHOD method_19200 getDye (Ljava/util/Random;)Lnet/minecraft/class_1769;
ARG 0 random
CLASS class_4161 BuyForOneEmeraldFactory
FIELD field_18548 buy Lnet/minecraft/class_1792;
FIELD field_18549 price I
@ -64,6 +65,10 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
ARG 2 maxUses
ARG 3 experience
ARG 4 map
METHOD method_19201 (Lnet/minecraft/class_3854;)V
ARG 0 villagerType
METHOD method_19202 (Ljava/util/Map;Lnet/minecraft/class_3854;)Z
ARG 1 villagerType
CLASS class_4163 SellEnchantedToolFactory
FIELD field_18558 tool Lnet/minecraft/class_1799;
FIELD field_18559 basePrice I
@ -168,3 +173,5 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
ARG 5 price
ARG 6 maxUses
ARG 7 experience
METHOD method_19203 (Lnet/minecraft/class_1842;)Z
ARG 0 potion

1
mappings/net/minecraft/village/VillagerGossips.mapping
View File

@ -14,6 +14,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips
METHOD method_19066 deserialize (Lcom/mojang/serialization/Dynamic;)V
METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic;
METHOD method_19070 pickGossips (Ljava/util/Random;I)Ljava/util/Collection;
ARG 1 random
ARG 2 count
METHOD method_19071 getReputationFor (Ljava/util/UUID;)Lnet/minecraft/class_4136$class_4137;
ARG 1 target

6
mappings/net/minecraft/world/poi/PointOfInterest.mapping
View File

@ -20,5 +20,11 @@ CLASS net/minecraft/class_4156 net/minecraft/world/poi/PointOfInterest
METHOD method_19140 isOccupied ()Z
METHOD method_19141 getPos ()Lnet/minecraft/class_2338;
METHOD method_19142 getType ()Lnet/minecraft/class_4158;
METHOD method_28358 (Lnet/minecraft/class_4156;)Ljava/lang/Integer;
ARG 0 poi
METHOD method_28359 createCodec (Ljava/lang/Runnable;)Lcom/mojang/serialization/Codec;
ARG 0 updateListener
METHOD method_28361 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_4158;
ARG 0 poi
METHOD method_28362 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_2338;
ARG 0 poi

14
mappings/net/minecraft/world/poi/PointOfInterestSet.mapping
View File

@ -9,21 +9,35 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet
METHOD <init> (Ljava/lang/Runnable;ZLjava/util/List;)V
ARG 1 updateListener
ARG 2 valid
METHOD method_19143 (Lnet/minecraft/class_4158;)Ljava/util/Set;
ARG 0 poiType
METHOD method_19145 remove (Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_19146 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
ARG 1 pos
ARG 2 type
METHOD method_19147 test (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z
ARG 1 pos
ARG 2 predicate
METHOD method_19150 get (Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream;
ARG 2 occupationStatus
METHOD method_19153 releaseTicket (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_19154 getType (Lnet/minecraft/class_2338;)Ljava/util/Optional;
ARG 1 pos
METHOD method_20350 add (Lnet/minecraft/class_4156;)Z
ARG 1 poi
METHOD method_20352 (Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap;Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
ARG 2 pos
ARG 3 poiType
METHOD method_20353 updatePointsOfInterest (Ljava/util/function/Consumer;)V
METHOD method_20395 clear ()V
METHOD method_22444 isValid ()Z
METHOD method_28363 (Lnet/minecraft/class_4157;)Ljava/util/List;
ARG 0 poiSet
METHOD method_28364 createCodec (Ljava/lang/Runnable;)Lcom/mojang/serialization/Codec;
ARG 0 updateListener
METHOD method_28366 (Lnet/minecraft/class_4157;)Ljava/lang/Boolean;
ARG 0 poiSet
METHOD method_33584 get (Lnet/minecraft/class_2338;)Ljava/util/Optional;
ARG 1 pos

25
mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping
View File

@ -2,10 +2,14 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
FIELD field_18484 pointOfInterestDistanceTracker Lnet/minecraft/class_4153$class_4154;
FIELD field_20688 preloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD <init> (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5539;)V
ARG 1 directory
ARG 2 dataFixer
ARG 3 dsync
ARG 4 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_4158;)V
ARG 1 pos
ARG 2 type
@ -14,7 +18,10 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
ARG 2 predicate
METHOD method_19118 getDistanceFromNearestOccupied (Lnet/minecraft/class_4076;)I
ARG 1 pos
METHOD method_19121 (Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;Lnet/minecraft/class_1923;)Ljava/util/stream/Stream;
ARG 3 chunkPos
METHOD method_19123 getInChunk (Ljava/util/function/Predicate;Lnet/minecraft/class_1923;Lnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream;
ARG 2 chunkPos
ARG 3 occupationStatus
METHOD method_19125 getInCircle (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream;
ARG 1 typePredicate
@ -32,8 +39,12 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
ARG 3 pos
ARG 4 radius
ARG 5 occupationStatus
METHOD method_19128 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_2338;
ARG 0 poi
METHOD method_19129 releaseTicket (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_19130 (Ljava/util/function/Predicate;Lnet/minecraft/class_4156;)Z
ARG 1 poi
METHOD method_19132 getType (Lnet/minecraft/class_2338;)Ljava/util/Optional;
ARG 1 pos
METHOD method_19133 isOccupied (J)Z
@ -48,6 +59,9 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
ARG 6 random
METHOD method_20006 getNearestPosition (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
METHOD method_20252 count (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)J
ARG 1 typePredicate
ARG 2 pos
@ -65,6 +79,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
ARG 1 typePredicate
ARG 2 pos
ARG 3 radius
ARG 4 occupationStatus
METHOD method_22439 preloadChunks (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)V
COMMENT Preloads chunks in a square area with the given radius. Loads the chunks with {@code ChunkStatus.EMPTY}.
ARG 1 world
@ -74,6 +89,16 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
METHOD method_26339 hasTypeAt (Lnet/minecraft/class_4158;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;
ARG 1 typePredicate
ARG 2 posPredicate
ARG 3 pos
ARG 4 radius
ARG 5 occupationStatus
METHOD method_33582 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4157;)V
ARG 1 poiSet
CLASS class_4154 PointOfInterestDistanceTracker
FIELD field_18486 distances Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
METHOD method_19134 update ()V

10
mappings/net/minecraft/world/poi/PointOfInterestType.mapping
View File

@ -21,10 +21,16 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType
ARG 3 ticketCount
ARG 4 completionCondition
ARG 5 searchDistance
METHOD method_19156 (Lnet/minecraft/class_4158;)Z
ARG 1 poiType
METHOD method_19161 getTicketCount ()I
METHOD method_19162 (Lnet/minecraft/class_4158;)Z
ARG 0 poiType
METHOD method_19164 getCompletionCondition ()Ljava/util/function/Predicate;
METHOD method_19516 from (Lnet/minecraft/class_2680;)Ljava/util/Optional;
ARG 0 state
METHOD method_19517 (Lnet/minecraft/class_2680;)Z
ARG 0 state
METHOD method_20354 setup (Lnet/minecraft/class_4158;)Lnet/minecraft/class_4158;
ARG 0 poiType
METHOD method_20356 getAllStatesOf (Lnet/minecraft/class_2248;)Ljava/util/Set;
@ -40,4 +46,8 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType
ARG 2 ticketCount
ARG 3 completionCondition
ARG 4 searchDistance
METHOD method_20359 (Lnet/minecraft/class_2248;)Ljava/util/stream/Stream;
ARG 0 block
METHOD method_21648 getSearchDistance ()I
METHOD method_29269 (Lnet/minecraft/class_4158;)Z
ARG 0 poiType