Fixed WCT integration and recipe. Fixes #619

build.gradle

@@ -142,10 +142,11 @@ dependencies {
 	runtime name: "buildcraft", version: "${config.version.bc}", ext: 'jar'
 
 	deobfCompile "igwmod:IGW-Mod-${config.version.minecraft}:${config.version.igw}:universal"
-
-    deobfCompile "p455w0rds-library:p455w0rdslib:${config.version.pl}"
-    deobfCompile "mekanism:Mekanism:${config.version.me}"
-	deobfCompile "wireless-crafting-terminal:WirelessCraftingTerminal:${config.version.wc}"
+
+	deobfCompile "mekanism:Mekanism:${config.version.me}"
+    deobfCompile "p455w0rd:p455w0rdslib:${config.version.pl}"
+    deobfCompile "p455w0rd:AE2WTLib:${config.version.wt}"
+	deobfCompile "p455w0rd:WirelessCraftingTerminal:${config.version.wc}"
 
 	deobfCompile ("appeng:appliedenergistics2:${config.version.ae}"){
 		transitive = false

build.properties

@@ -2,18 +2,19 @@ dir.development=./
 dir.mcp=${dir.development}forge/mcp
 version.minecraft=1.12.2
 version.mappings=snapshot_20171003
-version.forge=14.23.3.2655
+version.forge=14.23.5.2768
 version.mod.major=2
 version.mod.minor=6
 version.mod.revis=1
-version.ae=rv6-beta-1
+version.ae=rv6-stable-4
 version.oc=MC1.12.2-1.7.+
 version.bc=7.99.15
 version.waila=1.8.25-B40_1.12
 version.jei=+
-version.pl=1.12:2.0.29
 version.me=1.12.2:9.4.6.341
-version.wc=1.12.2:3.9.64
+version.pl=1.12.2-2.0.36
+version.wt=1.12.2-1.0.3
+version.wc=1.12.2-3.11.84
 version.mcmp=2.5.0
 version.rf=1.12-+
 version.cofh=1.12-+

src/main/scala/extracells/integration/wct/WirelessCrafting.scala

@@ -2,15 +2,16 @@ package extracells.integration.wct
 
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.{Item, ItemStack}
+import p455w0rd.ae2wtlib.api.WTApi
 import p455w0rd.wct.api.WCTApi
 
 
 object WirelessCrafting {
-  def openCraftingTerminal(player: EntityPlayer) = WCTApi.instance.openWirelessCraftingTerminalGui(player)
+  def openCraftingTerminal(player: EntityPlayer, slot: Int) = WCTApi.instance.openWCTGui(player, false, slot)
 
   def getBoosterItem = new ItemStack(Item.getByNameOrId("wct:infinity_booster_card"))
 
-  def isBoosterEnabled = WCTApi.instance().isInfinityBoosterCardEnabled
+  def isBoosterEnabled = WTApi.instance().getConfig.isInfinityBoosterCardEnabled
 
   def getCraftingTerminal = new ItemStack(Item.getByNameOrId("wct:wct"))
 

src/main/scala/extracells/item/CraftingTerminal.scala

@@ -7,11 +7,11 @@ import p455w0rd.wct.api.IWirelessCraftingTerminalItem
 @Optional.Interface(iface = "p455w0rd.wct.api.IWirelessCraftingTerminalItem", modid = "wct", striprefs = true)
 trait CraftingTerminal extends Item with IWirelessCraftingTerminalItem {
 
-  @Optional.Method(modid = "wct")
-  override def isWirelessCraftingEnabled(itemStack: ItemStack): Boolean = {
-    if (this == ItemWirelessTerminalUniversal)
-      ItemWirelessTerminalUniversal.isInstalled(itemStack, WirelessTerminalType.CRAFTING)
-    else
-      true
-  }
+  //@Optional.Method(modid = "wct")
+  //override def isWirelessCraftingEnabled(itemStack: ItemStack): Boolean = {
+  //  if (this == ItemWirelessTerminalUniversal)
+  //    ItemWirelessTerminalUniversal.isInstalled(itemStack, WirelessTerminalType.CRAFTING)
+  //  else
+  //    true
+  //}
 }

src/main/scala/extracells/item/ItemWirelessTerminalUniversal.scala

@@ -7,13 +7,15 @@ import appeng.api.AEApi
 import appeng.api.config.Actionable
 import appeng.api.features.IWirelessTermHandler
 import appeng.api.util.IConfigManager
+import baubles.api.BaubleType
 import extracells.api.{ECApi, IWirelessFluidTermHandler, IWirelessGasTermHandler}
 import extracells.integration.Integration
 import extracells.integration.wct.WirelessCrafting
 import extracells.item.ItemWirelessTerminalFluid.isInCreativeTab
 import extracells.models.ModelManager
 import extracells.util.HandlerUniversalWirelessTerminal
 import extracells.wireless.ConfigManager
+import net.minecraft.client.renderer.block.model.ModelResourceLocation
 import net.minecraft.client.util.ITooltipFlag
 import net.minecraft.creativetab.CreativeTabs
 import net.minecraft.entity.player.EntityPlayer
@@ -23,6 +25,7 @@ import net.minecraft.util.text.translation.I18n
 import net.minecraft.util.{ActionResult, EnumActionResult, EnumHand, NonNullList}
 import net.minecraft.world.World
 import net.minecraftforge.fml.relauncher.{Side, SideOnly}
+import p455w0rd.ae2wtlib.api.IBaubleRender
 
 object ItemWirelessTerminalUniversal extends ItemECBase with WirelessTermBase with IWirelessFluidTermHandler with IWirelessGasTermHandler with IWirelessTermHandler /*with EssensiaTerminal*/ with CraftingTerminal {
   val isTeEnabled = Integration.Mods.THAUMATICENERGISTICS.isEnabled
@@ -74,7 +77,7 @@ object ItemWirelessTerminalUniversal extends ItemECBase with WirelessTermBase wi
       if (!tag.hasKey("type"))
         tag.setByte("type", 0)
       if (tag.getByte("type") == 4 && isWcEnabled)
-        WirelessCrafting.openCraftingTerminal(entityPlayer)
+        WirelessCrafting.openCraftingTerminal(entityPlayer, entityPlayer.inventory.currentItem)
       return new ActionResult(EnumActionResult.SUCCESS, itemStack)
     }
 
@@ -234,4 +237,13 @@ object ItemWirelessTerminalUniversal extends ItemECBase with WirelessTermBase wi
 
   override def isInCreativeTab2(targetTab: CreativeTabs): Boolean = isInCreativeTab(targetTab)
 
+  override def getRender: IBaubleRender = null
+
+  override def getBaubleType(itemStack: ItemStack): BaubleType = BaubleType.TRINKET
+
+  override def initModel(): Unit = {
+
+  }
+
+  override def getModelResource: ModelResourceLocation = null
 }

src/main/scala/extracells/util/UniversalTerminal.scala

@@ -73,6 +73,9 @@ object UniversalTerminal {
     val ectermgas = ItemEnum.PARTITEM.getDamagedStack(PartEnum.GASTERMINAL.ordinal)
     if (item == ectermgas.getItem && meta == ectermgas.getItemDamage)
       return true
+    val aetermcrafting = AEApi.instance.definitions.parts.craftingTerminal.maybeStack(1).get
+    if (item == aetermcrafting.getItem && meta == aetermcrafting.getItemDamage)
+      return true
     /*if(Mods.THAUMATICENERGISTICS.isEnabled){
       val thterm = ThaumaticEnergistics.getTerminal
       if(item == thterm.getItem && meta == thterm.getItemDamage)
@@ -146,6 +149,9 @@ object UniversalTerminal {
         return TerminalType.ESSENTIA
     }*/
     if(isWcLLoaded){
+      val aetermcrafting = AEApi.instance.definitions.parts.craftingTerminal.maybeStack(1).get
+      if (item == aetermcrafting.getItem && meta == aetermcrafting.getItemDamage)
+        return WirelessTerminalType.CRAFTING
       val wcTerm = WirelessCrafting.getCraftingTerminal
       if(item == wcTerm.getItem && meta == wcTerm.getItemDamage)
         return WirelessTerminalType.CRAFTING