icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source
This commit is contained in:
gnembon committed 2019-10-19 22:18:14 -03:00
2 parents 3eb38afe3a 0226965ba0
commit 813cb2ab93
13 files changed
+105 -106
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/value/EntityValue.java
+17 -17
View File
@@ -164,7 +164,7 @@ public class EntityValue extends Value
public Value get(String what, Value arg)
{
if (!(featureAccessors.containsKey(what)))
throw new InternalExpressionException("unknown feature of entity: "+what);
throw new InternalExpressionException("Unknown entity feature: "+what);
return featureAccessors.get(what).apply(entity, arg);
}
private static Map<String, EquipmentSlot> inventorySlots = new HashMap<String, EquipmentSlot>(){{
@@ -331,7 +331,7 @@ public class EntityValue extends Value
if (a != null)
index = (6+(int)NumericValue.asNumber(a).getLong())%6;
if (index < 0 || index > 5)
throw new InternalExpressionException("facing order should be between -6 and 5");
throw new InternalExpressionException("Facing order should be between -6 and 5");
return new StringValue(Direction.getEntityFacingOrder(e)[index].asString());
});
@@ -352,7 +352,7 @@ public class EntityValue extends Value
{
List<Value> args = ((ListValue) a).getItems();
if (args.size()==0)
throw new InternalExpressionException("trace needs more arguments");
throw new InternalExpressionException("'trace' needs more arguments");
reach = (float) NumericValue.asNumber(args.get(0)).getDouble();
if (args.size() > 1)
{
@@ -415,7 +415,7 @@ public class EntityValue extends Value
public void set(String what, Value toWhat)
{
if (!(featureModifiers.containsKey(what)))
throw new InternalExpressionException("unknown action on entity: " + what);
throw new InternalExpressionException("Unknown entity action: " + what);
featureModifiers.get(what).accept(entity, toWhat);
}
@@ -443,7 +443,7 @@ public class EntityValue extends Value
{
if (!(v instanceof ListValue))
{
throw new InternalExpressionException("expected a list of 5 parameters as second argument");
throw new InternalExpressionException("Expected a list of 5 parameters as a second argument");
}
List<Value> coords = ((ListValue) v).getItems();
e.pitch = (float) NumericValue.asNumber(coords.get(4)).getDouble();
@@ -461,7 +461,7 @@ public class EntityValue extends Value
{
if (!(v instanceof ListValue))
{
throw new InternalExpressionException("expected a list of 3 parameters as second argument");
throw new InternalExpressionException("Expected a list of 3 parameters as a second argument");
}
List<Value> coords = ((ListValue) v).getItems();
e.setPosition(
@@ -509,7 +509,7 @@ public class EntityValue extends Value
{
if (!(v instanceof ListValue))
{
throw new InternalExpressionException("expected a list of 3 parameters as second argument");
throw new InternalExpressionException("Expected a list of 3 parameters as a second argument");
}
List<Value> coords = ((ListValue) v).getItems();
e.setPosition(NumericValue.asNumber(coords.get(0)).getDouble(),NumericValue.asNumber(coords.get(1)).getDouble(), NumericValue.asNumber(coords.get(2)).getDouble());
@@ -520,7 +520,7 @@ public class EntityValue extends Value
{
if (!(v instanceof ListValue))
{
throw new InternalExpressionException("expected a list of 3 parameters as second argument");
throw new InternalExpressionException("Expected a list of 3 parameters as a second argument");
}
List<Value> coords = ((ListValue) v).getItems();
e.setVelocity(
@@ -553,7 +553,7 @@ public class EntityValue extends Value
{
if (!(v instanceof ListValue))
{
throw new InternalExpressionException("expected a list of 3 parameters as second argument");
throw new InternalExpressionException("Expected a list of 3 parameters as a second argument");
}
List<Value> coords = ((ListValue) v).getItems();
e.addVelocity(
@@ -589,7 +589,7 @@ public class EntityValue extends Value
put("drop_passengers", (e, v) -> e.removeAllPassengers());
put("mount_passengers", (e, v) -> {
if (v==null)
throw new InternalExpressionException("mount_passengers needs entities to ride");
throw new InternalExpressionException("'mount_passengers' needs entities to ride");
if (v instanceof EntityValue)
((EntityValue) v).getEntity().startRiding(e);
else if (v instanceof ListValue)
@@ -599,7 +599,7 @@ public class EntityValue extends Value
});
put("tag", (e, v) -> {
if (v==null)
throw new InternalExpressionException("tag requires parameters");
throw new InternalExpressionException("'tag' requires parameters");
if (v instanceof ListValue)
for (Value element : ((ListValue) v).getItems()) e.addScoreboardTag(element.getString());
else
@@ -607,7 +607,7 @@ public class EntityValue extends Value
});
put("clear_tag", (e, v) -> {
if (v==null)
throw new InternalExpressionException("clear_tag requires parameters");
throw new InternalExpressionException("'clear_tag' requires parameters");
if (v instanceof ListValue)
for (Value element : ((ListValue) v).getItems()) e.removeScoreboardTag(element.getString());
else
@@ -633,7 +633,7 @@ public class EntityValue extends Value
return;
MobEntityWithAi ec = (MobEntityWithAi)e;
if (v == null)
throw new InternalExpressionException("home requires at least one position argument, and optional distance, or null to cancel");
throw new InternalExpressionException("'home' requires at least one position argument, and optional distance, or null to cancel");
if (v instanceof NullValue)
{
ec.setPositionTarget(BlockPos.ORIGIN, -1);
@@ -649,7 +649,7 @@ public class EntityValue extends Value
if (v instanceof BlockValue)
{
pos = ((BlockValue) v).getPos();
if (pos == null) throw new InternalExpressionException("block is not positioned in the world");
if (pos == null) throw new InternalExpressionException("Block is not positioned in the world");
}
else if (v instanceof ListValue)
{
@@ -672,10 +672,10 @@ public class EntityValue extends Value
distance = (int) NumericValue.asNumber(lv.get(4)).getLong();
}
}
else throw new InternalExpressionException("home requires at least one position argument, and optional distance");
else throw new InternalExpressionException("'home' requires at least one position argument, and optional distance");
}
else throw new InternalExpressionException("home requires at least one position argument, and optional distance");
else throw new InternalExpressionException("'home' requires at least one position argument, and optional distance");
ec.setPositionTarget(pos, distance);
Map<String,Goal> tasks = ((MobEntityInterface)ec).getTemporaryTasks();
@@ -716,7 +716,7 @@ public class EntityValue extends Value
public void setEvent(CarpetContext cc, String event, String fun, List<Value> args)
{
if (!(events.containsKey(event)))
throw new InternalExpressionException("unknown entity event: " + event);
throw new InternalExpressionException("Unknown entity event: " + event);
events.get(event).accept(cc, entity, fun, args);
}