diff --git a/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellDatum.kt b/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellDatum.kt index a2edd790..ed56e42e 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellDatum.kt +++ b/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellDatum.kt @@ -52,7 +52,7 @@ class SpellDatum private constructor(val payload: T) { var total1 = total + 1 // make mutable and include the list itself for (elt in pl) { val (t, subtotal) = elt.serializeToNBTWithDepthCheck(depth + 1, total1) ?: return null - total1 += subtotal + total1 = subtotal outList.add(t) } return Pair( @@ -71,7 +71,7 @@ class SpellDatum private constructor(val payload: T) { else -> throw RuntimeException("cannot serialize $pl because it is of type ${pl.javaClass.canonicalName} which is not serializable") } } - return Pair(tag, 1) + return Pair(tag, total + 1) } override fun toString(): String = diff --git a/Common/src/main/resources/assets/hexcasting/blockstates/conjured.json b/Common/src/main/resources/assets/hexcasting/blockstates/conjured.json deleted file mode 100644 index 5e8ffe70..00000000 --- a/Common/src/main/resources/assets/hexcasting/blockstates/conjured.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "hexcasting:block/conjured" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hexcasting/models/block/conjured.json b/Common/src/main/resources/assets/hexcasting/models/block/conjured.json deleted file mode 100644 index 4e90fd01..00000000 --- a/Common/src/main/resources/assets/hexcasting/models/block/conjured.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/amethyst_block" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hexcasting/models/item/conjured.json b/Common/src/main/resources/assets/hexcasting/models/item/conjured.json deleted file mode 100644 index a0bab4ff..00000000 --- a/Common/src/main/resources/assets/hexcasting/models/item/conjured.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/amethyst_shard" - } -} \ No newline at end of file