From e5317a6f29b8da244b0cb866453af1cf3fafa639 Mon Sep 17 00:00:00 2001 From: Nameless-123 <53367549+Nameless-123@users.noreply.github.com> Date: Fri, 24 Apr 2020 11:52:18 +0200 Subject: [PATCH 1/4] Very useful indeed --- src/main/java/carpet/script/value/EntityValue.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index a0237460..faa76d40 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -479,6 +479,8 @@ public class EntityValue extends Value return new NBTSerializableValue(nbttagcompound); return new NBTSerializableValue(nbttagcompound).get(a); }); + + put("category",(e,a)->{return new StringValue(e.getType().getCategory().toString());}); }}; public void set(String what, Value toWhat) From 3790889b6d73bf9fd2ae07e071cd35d49be591be Mon Sep 17 00:00:00 2001 From: Nameless-123 <53367549+Nameless-123@users.noreply.github.com> Date: Fri, 24 Apr 2020 12:02:57 +0200 Subject: [PATCH 2/4] made it lowercase more inkeeping with rest of scarpet Ill remove if u want --- src/main/java/carpet/script/value/EntityValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index faa76d40..18f0d4f4 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -480,7 +480,7 @@ public class EntityValue extends Value return new NBTSerializableValue(nbttagcompound).get(a); }); - put("category",(e,a)->{return new StringValue(e.getType().getCategory().toString());}); + put("category",(e,a)->{return new StringValue(e.getType().getCategory().toString().toLowerCase());}); }}; public void set(String what, Value toWhat) From c8f31a3f891be7d52016ddab0c99d9e4cce89bcc Mon Sep 17 00:00:00 2001 From: Nameless-123 <53367549+Nameless-123@users.noreply.github.com> Date: Fri, 24 Apr 2020 16:35:07 +0200 Subject: [PATCH 3/4] added to docs --- docs/scarpet/Full.md | 3 +++ docs/scarpet/api/Entities.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docs/scarpet/Full.md b/docs/scarpet/Full.md index 45d8eb9e..68206456 100644 --- a/docs/scarpet/Full.md +++ b/docs/scarpet/Full.md @@ -2532,6 +2532,9 @@ Returns `null` if the argument is not a player, otherwise: * `shadow`: any carpet-shadowed real player * `realms`: ? +### `query(e, 'category')` +Returns a lowercase string containing the category of the entity (hostile, passive, water, ambient, misc) + ### `query(e, 'team')` Team name for entity, or `null` if no team is assigned. diff --git a/docs/scarpet/api/Entities.md b/docs/scarpet/api/Entities.md index 3bd7634f..9b808752 100644 --- a/docs/scarpet/api/Entities.md +++ b/docs/scarpet/api/Entities.md @@ -275,6 +275,9 @@ Returns `null` if the argument is not a player, otherwise: * `shadow`: any carpet-shadowed real player * `realms`: ? +### `query(e, 'category')` +Returns a lowercase string containing the category of the entity (hostile, passive, water, ambient, misc) + ### `query(e, 'team')` Team name for entity, or `null` if no team is assigned. From 4f6ebb49271f8f096676586d18c44fdaaef8ed18 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Sat, 25 Apr 2020 16:23:59 -0400 Subject: [PATCH 4/4] Update src/main/java/carpet/script/value/EntityValue.java Added locale --- src/main/java/carpet/script/value/EntityValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 18f0d4f4..3ec78696 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -480,7 +480,7 @@ public class EntityValue extends Value return new NBTSerializableValue(nbttagcompound).get(a); }); - put("category",(e,a)->{return new StringValue(e.getType().getCategory().toString().toLowerCase());}); + put("category",(e,a)->{return new StringValue(e.getType().getCategory().toString().toLowerCase(Locale.ROOT));}); }}; public void set(String what, Value toWhat)