Merge branch 'master' into more-throwables

src/main/java/carpet/script/value/BooleanValue.java

@@ -0,0 +1,58 @@
+package carpet.script.value;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import net.minecraft.nbt.ByteTag;
+import net.minecraft.nbt.Tag;
+
+public class BooleanValue extends NumericValue
+{
+    public static final BooleanValue FALSE = new BooleanValue(false);
+    public static final BooleanValue TRUE = new BooleanValue(true);
+
+    boolean boolValue;
+    private BooleanValue(boolean boolval) {
+        super(boolval);
+        boolValue = boolval;
+    }
+
+    @Override
+    public String getString() {
+        return boolValue?"true":"false";
+    }
+
+    @Override
+    public String getPrettyString() {
+        return getString();
+    }
+
+    @Override
+    public String getTypeString() {
+        return "bool";
+    }
+
+    @Override
+    public Value clone() {
+        return new BooleanValue(boolValue);
+    }
+
+    @Override
+    public int hashCode() {
+        return Boolean.hashCode(boolValue);
+    }
+
+    @Override
+    public Tag toTag(boolean force) {
+        return ByteTag.of(boolValue);
+    }
+
+    @Override
+    public JsonElement toJson() {
+        return new JsonPrimitive(boolValue);
+    }
+
+    @Override
+    public boolean isInteger() {
+        return true;
+    }
+}

src/main/java/carpet/script/value/EntityValue.java

@@ -416,7 +416,7 @@ public class EntityValue extends Value
         put("motion_z", (e, a) -> new NumericValue(e.getVelocity().z));
         put("on_ground", (e, a) -> new NumericValue(e.isOnGround()));
         put("name", (e, a) -> new StringValue(e.getName().getString()));
-        put("display_name", (e, a) -> new StringValue(e.getDisplayName().getString()));
+        put("display_name", (e, a) -> new FormattedTextValue(e.getDisplayName()));
         put("command_name", (e, a) -> new StringValue(e.getEntityName()));
         put("custom_name", (e, a) -> e.hasCustomName()?new StringValue(e.getCustomName().getString()):Value.NULL);
         put("type", (e, a) -> new StringValue(nameFromRegistryId(Registry.ENTITY_TYPE.getId(e.getType()))));
@@ -429,7 +429,7 @@ public class EntityValue extends Value
         put("tags", (e, a) -> ListValue.wrap(e.getScoreboardTags().stream().map(StringValue::new).collect(Collectors.toList())));
 
         put("scoreboard_tags", (e, a) -> ListValue.wrap(e.getScoreboardTags().stream().map(StringValue::new).collect(Collectors.toList())));
-        put("entity_tags", (e, a) -> ListValue.wrap(e.getServer().getTagManager().getEntityTypes().getTagsFor(e.getType()).stream().map(ValueConversions::of).collect(Collectors.toList())));
+        put("entity_tags", (e, a) -> ListValue.wrap(e.getServer().getTagManager().getEntityTypes().getTags().entrySet().stream().filter(entry -> entry.getValue().contains(e.getType())).map(entry -> ValueConversions.of(entry.getKey())).collect(Collectors.toList())));
         // deprecated
         put("has_tag", (e, a) -> new NumericValue(e.getScoreboardTags().contains(a.getString())));
 
@@ -462,7 +462,7 @@ public class EntityValue extends Value
             return ListValue.of(new NumericValue(look.x),new NumericValue(look.y),new NumericValue(look.z));
         });
         put("is_burning", (e, a) -> new NumericValue(e.isOnFire()));
-        //put("fire", (e, a) -> new NumericValue(e.getFire())); needs mixing
+        put("fire", (e, a) -> new NumericValue(e.getFireTicks()));
         put("silent", (e, a)-> new NumericValue(e.isSilent()));
         put("gravity", (e, a) -> new NumericValue(!e.hasNoGravity()));
         put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune()));

src/main/java/carpet/script/value/ListValue.java

@@ -341,7 +341,7 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
         int from = normalizeIndex(fromDesc, size);
         if (toDesc == null)
             return new ListValue((Collection<? extends Value>) getItems().subList(from, size));
-        int to = normalizeIndex(toDesc, size);
+        int to = normalizeIndex(toDesc, size+1);
         if (from > to)
             return ListValue.of();
         return new ListValue((Collection<? extends Value>) getItems().subList(from, to));

src/main/java/carpet/script/value/MapValue.java

@@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -16,7 +17,7 @@ import java.util.stream.Collectors;
 
 public class MapValue extends AbstractListValue implements ContainerValueInterface
 {
-    private Map<Value, Value> map;
+    private final Map<Value, Value> map;
 
     private MapValue()
     {
@@ -268,7 +269,9 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
     public JsonElement toJson()
     {
         JsonObject jsonMap = new JsonObject();
-        map.forEach((k, v) -> jsonMap.add(k.getString(), v.toJson()));
+        List<Value> keys = new ArrayList<>(map.keySet());
+        Collections.sort(keys);
+        keys.forEach( k -> jsonMap.add(k.getString(), map.get(k).toJson()));
         return jsonMap;
     }
 }

src/main/java/carpet/script/value/NullValue.java

@@ -9,6 +9,7 @@ import net.minecraft.nbt.Tag;
 
 public class NullValue extends NumericValue // TODO check nonsingleton code
 {
+    public static final NullValue NULL = new NullValue();
     @Override
     public String getString()
     {
@@ -32,7 +33,7 @@ public class NullValue extends NumericValue // TODO check nonsingleton code
     {
         return new NullValue();
     }
-    public NullValue() {super(0.0D);}
+    private NullValue() {super(false);}
 
     @Override
     public boolean equals(final Object o)

src/main/java/carpet/script/value/Value.java

@@ -15,12 +15,12 @@ import java.util.stream.Collectors;
 
 public abstract class Value implements Comparable<Value>, Cloneable
 {
-    public static NumericValue FALSE = new NumericValue(0);
-    public static NumericValue TRUE = new NumericValue(1);
-    public static NumericValue ZERO = FALSE;
-    public static NumericValue ONE = TRUE;
+    public static NumericValue FALSE = BooleanValue.FALSE;
+    public static NumericValue TRUE = BooleanValue.TRUE;
+    public static NumericValue ZERO = new NumericValue(0);
+    public static NumericValue ONE = new NumericValue(1);
 
-    public static NullValue NULL = new NullValue();
+    public static NullValue NULL = NullValue.NULL;
 
     public String boundVariable;
 
@@ -186,7 +186,7 @@ public abstract class Value implements Comparable<Value>, Cloneable
         int size = value.length();
         int from = ListValue.normalizeIndex(fromDesc, size);
         if (toDesc == null) return new StringValue(value.substring(from));
-        int to = ListValue.normalizeIndex(toDesc, size);
+        int to = ListValue.normalizeIndex(toDesc, size+1);
         if (from > to) return StringValue.EMPTY;
         return new StringValue(value.substring(from, to));
     }