Add support for querying aspects in Thaumcraft wands, close #3524

Author: asiekierka

changelog.md

@@ -1,5 +1,6 @@
 ## Fixes/improvements
 
+* (1.7.10) [#3524] Add support for reading Thaumcraft aspect information from Wands. (repo-alt)
 * (1.12.2) [#3659] Fixed bug when programatically transferring fluids from specific tanks. (yut23)
 * [#3664] Fixed client-side errors when using third-party mod energy integration on an integrated server.
 * [#3677] Fixed crash when showing error containing a percent sign with the Analyzer item.
@@ -9,4 +10,4 @@
 
 ## List of contributors
 
-asie, Computerdores, Glease, Hawk777, yut23
+asie, Computerdores, Glease, Hawk777, repo-alt, yut23

src/main/scala/li/cil/oc/integration/thaumcraft/ConverterAspectItem.scala

@@ -1,19 +1,35 @@
 package li.cil.oc.integration.thaumcraft
 
-import java.util
-
 import li.cil.oc.api.driver.Converter
 import net.minecraft.item.ItemStack
 import thaumcraft.api.aspects.AspectList
 
+import java.util
 import scala.collection.convert.WrapAsScala._
 
 object ConverterAspectItem extends Converter {
   override def convert(value: scala.Any, output: util.Map[AnyRef, AnyRef]): Unit = value match {
     case stack: ItemStack if stack.hasTagCompound =>
+      stack.getItem.getClass.getName match {
+        case "thaumcraft.common.items.wands.ItemWandCasting" =>
+          try {
+            stack.getItem.getClass.getMethod("getAllVis", classOf[ItemStack]).invoke(stack.getItem, stack) match {
+              case aspects: AspectList =>
+                if (aspects.size() > 0)
+                  output += "aspects" -> aspects
+                return
+              case _ => return
+            }
+          } catch {
+            case _: Throwable =>
+          }
+        case _ =>
+      }
+
       val aspects = new AspectList()
       aspects.readFromNBT(stack.getTagCompound)
-      output += "aspects" -> aspects
+      if (aspects.size() > 0)
+        output += "aspects" -> aspects
     case _ =>
   }
 }