mirror of https://github.com/FabricMC/yarn.git
TargetSelectorParser done. (#141)
* TargetSelectorParser * Adjust some entity matching things EntityPredicates.WITHOUT_SPECTATORS => VISIBLE excludedEntity parameter => except Got rid of "Matching" from Method names boundingBox parameter => area Chunk.getEntitiesIn => collectEntitiesIn + entities parameter => resultList + predicate => filter * Remove CommandBase.b (unmapped)
This commit is contained in:
parent
d381decf03
commit
6cc5341d39
|
@ -61,3 +61,4 @@ CLASS j net/minecraft/command/CommandBase
|
||||||
METHOD c toDouble (Ljava/lang/String;)D
|
METHOD c toDouble (Ljava/lang/String;)D
|
||||||
ARG 0 value
|
ARG 0 value
|
||||||
METHOD d toBoolean (Ljava/lang/String;)Z
|
METHOD d toBoolean (Ljava/lang/String;)Z
|
||||||
|
ARG 0 value
|
||||||
|
|
|
@ -0,0 +1,131 @@
|
||||||
|
CLASS p net/minecraft/command/selector/TargetSelectorParser
|
||||||
|
CLASS p$1
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$2
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$3
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$4
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$5
|
||||||
|
METHOD a compare (Lsg;Lsg;)I
|
||||||
|
ARG 0 o1
|
||||||
|
ARG 1 o2
|
||||||
|
CLASS p$6
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$7
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$8
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$9
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$10
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$11
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$12
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
CLASS p$13
|
||||||
|
METHOD a apply (Lsg;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
FIELD a TARGET_SELECTOR_PATTERN Ljava/util/regex/Pattern;
|
||||||
|
FIELD b SPLIT_COMMA Lcom/google/common/base/Splitter;
|
||||||
|
FIELD c SPLIT_EQUALS_PAIR Lcom/google/common/base/Splitter;
|
||||||
|
FIELD d POSITIONAL_ARGUMENTS Ljava/util/Set;
|
||||||
|
METHOD a createBoundingBox (Lcn;III)Lbcs;
|
||||||
|
ARG 0 pos
|
||||||
|
ARG 1 xOffset
|
||||||
|
ARG 2 yOffset
|
||||||
|
ARG 3 zOffset
|
||||||
|
METHOD a canReturnMultiple (Ljava/lang/String;)Z
|
||||||
|
ARG 0 selector
|
||||||
|
METHOD a sortAndLimit (Ljava/util/List;Ljava/util/Map;Ln;Ljava/lang/Class;Ljava/lang/String;Lbcv;)Ljava/util/List;
|
||||||
|
ARG 0 targets
|
||||||
|
ARG 1 rawArguments
|
||||||
|
ARG 2 source
|
||||||
|
ARG 3 clazz
|
||||||
|
ARG 4 variable
|
||||||
|
ARG 5 origin
|
||||||
|
METHOD a extractScoreArguments (Ljava/util/Map;)Ljava/util/Map;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
METHOD a extractRadiusPredicate (Ljava/util/Map;Lbcv;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 origin
|
||||||
|
METHOD a extractCoordinate (Ljava/util/Map;Lcn;)Lcn;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 defaultPos
|
||||||
|
METHOD a getTargetsInWorld (Ljava/util/Map;Ljava/lang/Class;Ljava/util/List;Ljava/lang/String;Laiw;Lcn;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 clazz
|
||||||
|
ARG 2 argumentPredicates
|
||||||
|
ARG 3 variable
|
||||||
|
ARG 4 world
|
||||||
|
ARG 5 sourceBlockPos
|
||||||
|
METHOD a extractEntityTypePredicate (Ljava/util/Map;Ljava/lang/String;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 variable
|
||||||
|
METHOD a extractAxis (Ljava/util/Map;Ljava/lang/String;DZ)D
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 key
|
||||||
|
ARG 2 defaultValue
|
||||||
|
ARG 3 centerBlock
|
||||||
|
METHOD a getInt (Ljava/util/Map;Ljava/lang/String;I)I
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 key
|
||||||
|
ARG 2 defaultValue
|
||||||
|
METHOD a onePlayerOrNull (Ln;Ljava/lang/String;)Llw;
|
||||||
|
ARG 0 source
|
||||||
|
ARG 1 selector
|
||||||
|
METHOD a oneOrNull (Ln;Ljava/lang/String;Ljava/lang/Class;)Lsg;
|
||||||
|
ARG 2 clazz
|
||||||
|
METHOD a extractWorld (Ln;Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 source
|
||||||
|
ARG 1 rawArguments
|
||||||
|
METHOD b isTargetSelector (Ljava/lang/String;)Z
|
||||||
|
ARG 0 input
|
||||||
|
METHOD b extractExperiencePredicate (Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
METHOD b extractCoordinate (Ljava/util/Map;Lbcv;)Lbcv;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 defaultPos
|
||||||
|
METHOD b getString (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
ARG 1 key
|
||||||
|
METHOD b targetsAsText (Ln;Ljava/lang/String;)Lfa;
|
||||||
|
ARG 0 source
|
||||||
|
ARG 1 selector
|
||||||
|
METHOD b calculateTargets (Ln;Ljava/lang/String;Ljava/lang/Class;)Ljava/util/List;
|
||||||
|
ARG 0 source
|
||||||
|
ARG 1 selector
|
||||||
|
ARG 2 clazz
|
||||||
|
METHOD b validateType (Ln;Ljava/util/Map;)Z
|
||||||
|
ARG 0 source
|
||||||
|
ARG 1 rawArguments
|
||||||
|
METHOD c extractArguments (Ljava/lang/String;)Ljava/util/Map;
|
||||||
|
ARG 0 selector
|
||||||
|
METHOD c extractGamemodePredicate (Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
METHOD c extractScoreArgsPredicate (Ln;Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 commandSource
|
||||||
|
ARG 1 rawArguments
|
||||||
|
METHOD d extractTeamPredicate (Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
METHOD e extractNamePredicate (Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
METHOD f extractTagPredicate (Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
METHOD g extractRotationPredicate (Ljava/util/Map;)Ljava/util/List;
|
||||||
|
ARG 0 rawArguments
|
||||||
|
METHOD h isPositional (Ljava/util/Map;)Z
|
||||||
|
ARG 0 rawArguments
|
|
@ -27,6 +27,11 @@ CLASS si net/minecraft/entity/EntityRegistry
|
||||||
ARG 1 world
|
ARG 1 world
|
||||||
METHOD a getId (Lsg;)Lkp;
|
METHOD a getId (Lsg;)Lkp;
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
|
METHOD a matches (Lsg;Lkp;)Z
|
||||||
|
ARG 0 entity
|
||||||
|
ARG 1 identifier
|
||||||
METHOD b registerDefaults ()V
|
METHOD b registerDefaults ()V
|
||||||
|
METHOD b isValidIdentifier (Lkp;)Z
|
||||||
|
ARG 0 identifier
|
||||||
METHOD b getName (Lsg;)Ljava/lang/String;
|
METHOD b getName (Lsg;)Ljava/lang/String;
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
|
|
|
@ -33,7 +33,7 @@ CLASS sk net/minecraft/util/predicate/EntityPredicates
|
||||||
FIELD b NOT_MOUNTED Lcom/google/common/base/Predicate;
|
FIELD b NOT_MOUNTED Lcom/google/common/base/Predicate;
|
||||||
FIELD c WITH_INVENTORY Lcom/google/common/base/Predicate;
|
FIELD c WITH_INVENTORY Lcom/google/common/base/Predicate;
|
||||||
FIELD d MOB_VISIBLE Lcom/google/common/base/Predicate;
|
FIELD d MOB_VISIBLE Lcom/google/common/base/Predicate;
|
||||||
FIELD e WITHOUT_SPECTATORS Lcom/google/common/base/Predicate;
|
FIELD e VISIBLE Lcom/google/common/base/Predicate;
|
||||||
FIELD f SHULKERS Lcom/google/common/base/Predicate;
|
FIELD f SHULKERS Lcom/google/common/base/Predicate;
|
||||||
METHOD a distanceLimit (DDDD)Lcom/google/common/base/Predicate;
|
METHOD a distanceLimit (DDDD)Lcom/google/common/base/Predicate;
|
||||||
ARG 0 x
|
ARG 0 x
|
||||||
|
|
|
@ -213,8 +213,22 @@ CLASS aiw net/minecraft/world/World
|
||||||
ARG 1 ignoreRange
|
ARG 1 ignoreRange
|
||||||
METHOD a sendPacket (Lfl;)V
|
METHOD a sendPacket (Lfl;)V
|
||||||
ARG 0 packet
|
ARG 0 packet
|
||||||
METHOD a getEntitiesIn (Ljava/lang/Class;Lbcs;)Ljava/util/List;
|
METHOD a countTransientEntities (Ljava/lang/Class;)I
|
||||||
|
ARG 0 excluding
|
||||||
|
METHOD a getVisibleEntitiesIn (Ljava/lang/Class;Lbcs;)Ljava/util/List;
|
||||||
|
ARG 0 clazz
|
||||||
|
ARG 1 area
|
||||||
METHOD a getEntitiesIn (Ljava/lang/Class;Lbcs;Lcom/google/common/base/Predicate;)Ljava/util/List;
|
METHOD a getEntitiesIn (Ljava/lang/Class;Lbcs;Lcom/google/common/base/Predicate;)Ljava/util/List;
|
||||||
|
ARG 0 clazz
|
||||||
|
ARG 1 area
|
||||||
|
ARG 2 filter
|
||||||
|
METHOD a getClosestVisibleEntityTo (Ljava/lang/Class;Lbcs;Lsg;)Lsg;
|
||||||
|
ARG 0 clazz
|
||||||
|
ARG 1 area
|
||||||
|
ARG 2 entity
|
||||||
|
METHOD a getEntities (Ljava/lang/Class;Lcom/google/common/base/Predicate;)Ljava/util/List;
|
||||||
|
ARG 0 clazz
|
||||||
|
ARG 1 filter
|
||||||
METHOD a getPlayerByName (Ljava/lang/String;)Laam;
|
METHOD a getPlayerByName (Ljava/lang/String;)Laam;
|
||||||
ARG 0 name
|
ARG 0 name
|
||||||
METHOD a addEntities (Ljava/util/Collection;)V
|
METHOD a addEntities (Ljava/util/Collection;)V
|
||||||
|
@ -236,7 +250,10 @@ CLASS aiw net/minecraft/world/World
|
||||||
ARG 4 power
|
ARG 4 power
|
||||||
ARG 5 createFire
|
ARG 5 createFire
|
||||||
ARG 6 destroyBlocks
|
ARG 6 destroyBlocks
|
||||||
METHOD a (Lsg;Lbcs;Lcom/google/common/base/Predicate;)Ljava/util/List;
|
METHOD a getEntitiesIn (Lsg;Lbcs;Lcom/google/common/base/Predicate;)Ljava/util/List;
|
||||||
|
ARG 0 except
|
||||||
|
ARG 1 area
|
||||||
|
ARG 2 filter
|
||||||
METHOD a tickScheduledBlocks (Z)Z
|
METHOD a tickScheduledBlocks (Z)Z
|
||||||
ARG 0 tickAllNow
|
ARG 0 tickAllNow
|
||||||
METHOD ac ()Ljava/util/Calendar;
|
METHOD ac ()Ljava/util/Calendar;
|
||||||
|
@ -286,13 +303,16 @@ CLASS aiw net/minecraft/world/World
|
||||||
METHOD b (Lcn;Z)Z
|
METHOD b (Lcn;Z)Z
|
||||||
METHOD b getPlayers (Ljava/lang/Class;Lcom/google/common/base/Predicate;)Ljava/util/List;
|
METHOD b getPlayers (Ljava/lang/Class;Lcom/google/common/base/Predicate;)Ljava/util/List;
|
||||||
ARG 0 playerClass
|
ARG 0 playerClass
|
||||||
ARG 1 predicate
|
ARG 1 filter
|
||||||
METHOD b addBlockEntities (Ljava/util/Collection;)V
|
METHOD b addBlockEntities (Ljava/util/Collection;)V
|
||||||
ARG 0 blockEntities
|
ARG 0 blockEntities
|
||||||
METHOD b getPlayerByUuid (Ljava/util/UUID;)Laam;
|
METHOD b getPlayerByUuid (Ljava/util/UUID;)Laam;
|
||||||
ARG 0 uuid
|
ARG 0 uuid
|
||||||
METHOD b onEntityAdded (Lsg;)V
|
METHOD b onEntityAdded (Lsg;)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
|
METHOD b getVisibleEntitiesIn (Lsg;Lbcs;)Ljava/util/List;
|
||||||
|
ARG 0 except
|
||||||
|
ARG 1 area
|
||||||
METHOD c setAmbientDarkness (I)V
|
METHOD c setAmbientDarkness (I)V
|
||||||
ARG 0 value
|
ARG 0 value
|
||||||
METHOD c setBlockBreakingProgress (ILcn;I)V
|
METHOD c setBlockBreakingProgress (ILcn;I)V
|
||||||
|
|
|
@ -70,21 +70,21 @@ CLASS atp net/minecraft/world/chunk/Chunk
|
||||||
ARG 1 mode
|
ARG 1 mode
|
||||||
METHOD a (Les;IZ)V
|
METHOD a (Les;IZ)V
|
||||||
ARG 0 buffer
|
ARG 0 buffer
|
||||||
METHOD a getEntitiesInArea (Ljava/lang/Class;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
METHOD a collectEntitiesIn (Ljava/lang/Class;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
||||||
ARG 0 entityClass
|
ARG 0 clazz
|
||||||
ARG 1 area
|
ARG 1 area
|
||||||
ARG 2 entities
|
ARG 2 resultList
|
||||||
ARG 3 predicate
|
ARG 3 filter
|
||||||
METHOD a addEntity (Lsg;)V
|
METHOD a addEntity (Lsg;)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
METHOD a removeEntity (Lsg;I)V
|
METHOD a removeEntity (Lsg;I)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
ARG 1 chunkY
|
ARG 1 chunkY
|
||||||
METHOD a getEntitiesInArea (Lsg;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
METHOD a collectEntitiesIn (Lsg;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
||||||
ARG 0 excludedEntity
|
ARG 0 except
|
||||||
ARG 1 area
|
ARG 1 area
|
||||||
ARG 2 entities
|
ARG 2 resultList
|
||||||
ARG 3 predicate
|
ARG 3 filter
|
||||||
METHOD a setBiomeMap ([B)V
|
METHOD a setBiomeMap ([B)V
|
||||||
ARG 0 biomeMap
|
ARG 0 biomeMap
|
||||||
METHOD a setHeightMap ([I)V
|
METHOD a setHeightMap ([I)V
|
||||||
|
|
|
@ -21,21 +21,21 @@ CLASS atm net/minecraft/world/chunk/EmptyChunk
|
||||||
METHOD a getBlockEntity (Lcn;Latp$a;)Lare;
|
METHOD a getBlockEntity (Lcn;Latp$a;)Lare;
|
||||||
ARG 0 pos
|
ARG 0 pos
|
||||||
ARG 1 mode
|
ARG 1 mode
|
||||||
METHOD a getEntitiesInArea (Ljava/lang/Class;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
METHOD a collectEntitiesIn (Ljava/lang/Class;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
||||||
ARG 0 entityClass
|
ARG 0 clazz
|
||||||
ARG 1 area
|
ARG 1 area
|
||||||
ARG 2 entities
|
ARG 2 resultList
|
||||||
ARG 3 predicate
|
ARG 3 filter
|
||||||
METHOD a addEntity (Lsg;)V
|
METHOD a addEntity (Lsg;)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
METHOD a removeEntity (Lsg;I)V
|
METHOD a removeEntity (Lsg;I)V
|
||||||
ARG 0 entity
|
ARG 0 entity
|
||||||
ARG 1 chunkY
|
ARG 1 chunkY
|
||||||
METHOD a getEntitiesInArea (Lsg;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
METHOD a collectEntitiesIn (Lsg;Lbcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
|
||||||
ARG 0 excludedEntity
|
ARG 0 except
|
||||||
ARG 1 area
|
ARG 1 area
|
||||||
ARG 2 entities
|
ARG 2 resultList
|
||||||
ARG 3 predicate
|
ARG 3 filter
|
||||||
METHOD b getHeightAt (II)I
|
METHOD b getHeightAt (II)I
|
||||||
ARG 0 x
|
ARG 0 x
|
||||||
ARG 1 z
|
ARG 1 z
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
CLASS p
|
|
||||||
FIELD a TARGET_SELECTOR_PATTERN Ljava/util/regex/Pattern;
|
|
||||||
METHOD a isTargetSelector (Ljava/lang/String;)Z
|
|
||||||
ARG 0 input
|
|
||||||
METHOD b getTargets (Ln;Ljava/lang/String;Ljava/lang/Class;)Ljava/util/List;
|
|
Loading…
Reference in New Issue