Fix state values property

Author: adrwa

src/main/kotlin/org/sandboxpowered/fabric/api/PolyglotStateProperty.kt

@@ -5,18 +5,10 @@ import org.graalvm.polyglot.HostAccess.Export
 
 class PolyglotStateProperty private constructor(
     private val property: Property<*>?,
-    @Export val name: String,
-    @Export val type: String,
-    val extra: Array<out Any>
+    @JvmField @Export val name: String,
+    @JvmField @Export val type: String,
+    @JvmField @Export val values: Array<*>
 ) {
-    // TODO: Coded : figure out what to do with this
-    //Int Property
-    @Export
-    fun values(): Array<Int> {
-        if (type == INT) return extra as Array<Int>
-        throw UnsupportedOperationException("Cannot get minimum value of $type property")
-    }
-
     companion object {
         infix fun from(property: Property<*>) = PolyglotStateProperty(
             property = property,
@@ -28,17 +20,17 @@ class PolyglotStateProperty private constructor(
                 is EnumProperty -> ENUM
                 else -> error("Unknown Property type: $property")
             },
-            extra = when (property) {
+            values = when (property) {
                 is BooleanProperty -> emptyArray()
                 else -> property.values.toTypedArray()
             }
         )
 
-        fun from(name: String, type: String, extra: Array<out Any> = emptyArray()) = PolyglotStateProperty(
+        fun from(name: String, type: String, extra: Array<*> = emptyArray<Any>()) = PolyglotStateProperty(
             property = null,
             name = name,
             type = type,
-            extra = extra
+            values = extra
         )
 
         const val BOOLEAN = "boolean"

src/main/kotlin/org/sandboxpowered/fabric/api/SandboxResourcePolyglotContext.kt

@@ -58,7 +58,7 @@ class SandboxResourcePolyglotContext(private val resource: String, private val s
     }
 
     @Export
-    fun getStateProperty(name: String, type: String, vararg extra: Value): PolyglotStateProperty? {
+    fun getStateProperty(name: String, type: String, vararg extra: Value): PolyglotStateProperty {
         return StateManagement.getStateProperty(name, type, *extra)
     }
 }

src/main/kotlin/org/sandboxpowered/fabric/api/StateManagement.kt

@@ -1,9 +1,9 @@
 package org.sandboxpowered.fabric.api
 
-import com.google.common.hash.Hashing
 import net.minecraft.state.property.Property
 import org.graalvm.polyglot.Value
-import java.nio.charset.StandardCharsets
+import org.sandboxpowered.fabric.util.Hash
+import org.sandboxpowered.fabric.util.hash
 
 object StateManagement {
     private val stateMap: MutableMap<String, PolyglotStateProperty> = hashMapOf()
@@ -14,7 +14,10 @@ object StateManagement {
             stateMap.computeIfAbsent(hash(name, type)) { PolyglotStateProperty.from(name, type) }
         }
         PolyglotStateProperty.INT -> {
-            val values = extra.map(Value::asInt).toTypedArray()
+            require(extra.size == 2) { "Invalid number of arguments specified, expected 2 got ${extra.size}" }
+            var values = extra.map(Value::asInt).toTypedArray()
+
+            values = (values[0]..values[1]).toList().toTypedArray()
             stateMap.computeIfAbsent(hash(name, type, values)) {
                 PolyglotStateProperty.from(name, type, values)
             }
@@ -29,9 +32,9 @@ object StateManagement {
     }
 
     private fun PolyglotStateProperty.hash(): String =
-        hash(name, type, extra)
+        hash(name, type, values)
 
-    private fun hash(name: String, type: String, extra: Array<out Any> = emptyArray()): String {
+    private fun hash(name: String, type: String, extra: Array<*> = emptyArray<Any>()): String {
         val compiled = buildString {
             append(name)
             append(type)