Fix: Dictionaries don't work in nbt elements

CHANGELOG.md

@@ -68,4 +68,10 @@
 
 ### Improved
 
-- Error messages
+- Error messages
+
+## 0.0.4
+
+### Fixed
+
+- Dictionaries don't work in nbt elements

src/main/java/com/revolvingmadness/sculk/language/builtins/classes/BuiltinClass.java

@@ -24,10 +24,7 @@
 import net.minecraft.world.GameMode;
 import net.minecraft.world.GameRules;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 public abstract class BuiltinClass extends ExpressionNode {
     public final VariableScope variableScope;
@@ -41,9 +38,7 @@ public BuiltinClass(VariableScope variableScope) {
     }
 
     public static BuiltinClass fromNbtElement(NbtElement result) {
-        if (result instanceof NbtByte nbtByte) {
-            return new IntegerInstance(nbtByte.byteValue());
-        } else if (result instanceof NbtDouble nbtDouble) {
+        if (result instanceof NbtDouble nbtDouble) {
             return new FloatInstance(nbtDouble.doubleValue());
         } else if (result instanceof NbtLong nbtLong) {
             return new IntegerInstance(nbtLong.longValue());
@@ -55,15 +50,23 @@ public static BuiltinClass fromNbtElement(NbtElement result) {
             return new ListInstance(list);
         } else if (result instanceof NbtString nbtString) {
             return new StringInstance(nbtString.asString());
+        } else if (result instanceof NbtCompound nbtCompound) {
+            Map<BuiltinClass, BuiltinClass> dictionary = new HashMap<>();
+
+            Set<String> keys = nbtCompound.getKeys();
+
+            keys.forEach(key -> {
+                BuiltinClass value = BuiltinClass.fromNbtElement(nbtCompound.get(key));
+
+                dictionary.put(new StringInstance(key), value);
+            });
+
+            return new DictionaryInstance(dictionary);
         }
 
         throw new TypeError("Cannot convert nbt element '" + result + "' to class");
     }
 
-    public BuiltinClass absoluteValue(BuiltinType type) {
-        throw ErrorHolder.cannotGetAbsoluteValueOfType(type);
-    }
-
     public BuiltinClass add(BuiltinClass other) {
         throw ErrorHolder.cannotApplyBinaryOperatorToTypes("+", this.getType(), other.getType());
     }

src/main/java/com/revolvingmadness/sculk/language/builtins/classes/instances/BlockPosInstance.java

@@ -20,11 +20,6 @@ public BlockPosInstance(BlockPos value) {
         this.variableScope.declare(List.of(TokenType.CONST), "z", new IntegerInstance(value.getZ()));
     }
 
-    @Override
-    public BuiltinClass absoluteValue(BuiltinType type) {
-        return new BlockPosInstance(new BlockPos(Math.abs(this.value.getX()), Math.abs(this.value.getY()), Math.abs(this.value.getZ())));
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o)

src/main/java/com/revolvingmadness/sculk/language/builtins/classes/instances/FloatInstance.java

@@ -18,11 +18,6 @@ public FloatInstance(double value) {
         this.value = value;
     }
 
-    @Override
-    public BuiltinClass absoluteValue(BuiltinType type) {
-        return new FloatInstance(Math.abs(this.value));
-    }
-
     @Override
     public BuiltinClass add(BuiltinClass other) {
         if (other.instanceOf(new FloatType())) {

src/main/java/com/revolvingmadness/sculk/language/builtins/classes/instances/IntegerInstance.java

@@ -17,11 +17,6 @@ public IntegerInstance(long value) {
         this.value = value;
     }
 
-    @Override
-    public BuiltinClass absoluteValue(BuiltinType type) {
-        return new IntegerInstance(Math.abs(this.value));
-    }
-
     @Override
     public BuiltinClass add(BuiltinClass other) {
         if (other.instanceOf(new IntegerType())) {