diff --git a/predicate/entity.go b/predicate/entity.go index ab79ec5..447c93d 100644 --- a/predicate/entity.go +++ b/predicate/entity.go @@ -1,15 +1,35 @@ package predicate +type minMaxInt struct { + Min int + Max int +} + +type minMaxDouble struct { + Min float64 + Max float64 +} + type Entity struct { type_ []string // components - distance Distance - effects []Effect - equipement []Equipement - flags EntityFlag - location Location - nbt string - passenger *Entity + distance Distance + effects []Effect + equipement []Equipement + flags EntityFlag + location Location + nbt string + passenger *Entity + slots []Slot + steppingOn Location + movementAffectedBy Location + team string + targetedEntity *Entity + vehicle *Entity + movement Movement + periodicTick int + // predicates + } type Distance struct { @@ -84,12 +104,20 @@ type Location struct { Structures []string } -type minMaxInt struct { - Min int - Max int +type Slot struct { + Range string + Items []string + Count minMaxInt + // Components + // Predicatess } -type minMaxDouble struct { - Min float64 - Max float64 +type Movement struct { + X minMaxDouble + Y minMaxDouble + Z minMaxDouble + Speed minMaxDouble + HorizontalSpeed minMaxDouble + VerticalSpeed minMaxDouble + FallDistance minMaxDouble }