equality issues and docs

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

@@ -9,5 +9,5 @@ public interface ContainerValueInterface
     }
     public Value get(Value where);
     public boolean has(Value where);
-    public Value remove(Value where);
+    public Value delete(Value where);
 }

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

@@ -101,13 +101,13 @@ public class EntityValue extends Value
     }
 
     @Override
-    public boolean equals(Value v)
+    public boolean equals(Object v)
     {
         if (v instanceof EntityValue)
         {
             return entity.getEntityId()==((EntityValue) v).entity.getEntityId();
         }
-        return super.equals(v);
+        return super.equals((Value)v);
     }
 
     @Override

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

@@ -121,7 +121,7 @@ public abstract class LazyListValue extends AbstractListValue implements Iterato
     }
 
     @Override
-    public boolean equals(final Value o)
+    public boolean equals(final Object o)
     {
         return false;
     }

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

@@ -212,7 +212,7 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
     }
 
     @Override
-    public boolean equals(final Value o)
+    public boolean equals(final Object o)
     {
         if (o instanceof ListValue)
         {
@@ -346,7 +346,7 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
     }
 
     @Override
-    public Value remove(Value where)
+    public Value delete(Value where)
     {
         long index = NumericValue.asNumber(where).getLong();
         int numitems = items.size();

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

@@ -120,7 +120,7 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
     }
 
     @Override
-    public boolean equals(final Value o)
+    public boolean equals(final Object o)
     {
         if (o instanceof MapValue)
         {
@@ -177,7 +177,7 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
     }
 
     @Override
-    public Value remove(Value where)
+    public Value delete(Value where)
     {
         return map.remove(where);
     }

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

@@ -202,11 +202,11 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
     }
 
     @Override
-    public boolean equals(final Value o)
+    public boolean equals(final Object o)
     {
         if (o instanceof NBTSerializableValue)
             return getTag().equals(((NBTSerializableValue) o).getTag());
-        return super.equals(o);
+        return super.equals((Value)o);
     }
 
     @Override
@@ -408,17 +408,13 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
     }
 
     @Override
-    public Value remove(Value where)
+    public Value delete(Value where)
     {
         NbtPathArgumentType.NbtPath path = cachePath(where.getString());
         Tag tag = getTag().copy();
         int removed = path.remove(tag);
-        if (removed > 0)
-        {
-            replaceTag(tag);
-            return Value.TRUE;
-        }
-        return Value.FALSE;
+        if (removed > 0) replaceTag(tag);
+        return new NumericValue(removed);
     }
 
     public static class InventoryLocator

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

@@ -28,7 +28,7 @@ public class NullValue extends NumericValue // TODO check nonsingleton code
     public NullValue() {super(0.0D);}
 
     @Override
-    public boolean equals(final Value o)
+    public boolean equals(final Object o)
     {
         return o instanceof NullValue;
     }

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

@@ -125,7 +125,7 @@ public class NumericValue extends Value
         return getString().compareTo(o.getString());
     }
     @Override
-    public boolean equals(Value o)
+    public boolean equals(Object o)
     {
         if (o instanceof NullValue)
         {
@@ -133,7 +133,7 @@ public class NumericValue extends Value
         }
         if (o instanceof NumericValue)
         {
-            return !this.subtract(o).getBoolean();
+            return !this.subtract((Value) o).getBoolean();
         }
         return super.equals(o);
     }

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

@@ -115,6 +115,16 @@ public abstract class Value implements Comparable<Value>, Cloneable
         }
         return getString().compareTo(o.getString());
     }
+
+    @Override // for hashmap key access
+    public boolean equals(final Object o)
+    {
+        if (o instanceof Value)
+            return this.compareTo((Value) o)==0;
+        return false;
+    }
+
+    // for general use
     public boolean equals(final Value o)
     {
         return this.compareTo(o)==0;