Removed IPacketIDReceiver

src/main/scala/edx/basic/blocks/TileImprinter.scala

@@ -22,7 +22,7 @@ import org.lwjgl.opengl.GL11
 import resonant.core.ResonantEngine
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
-import resonant.lib.prefab.tile.spatial.ResonantTile
+import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
 import resonant.lib.render.RenderItemOverlayUtility
 import resonant.lib.transform.vector.{Vector2, Vector3}
 import resonant.lib.utility.inventory.InventoryUtility
@@ -107,18 +107,6 @@ class TileImprinter extends ResonantTile(Material.circuits) with ISidedInventory
 
   }
 
-  /**
-   * Sets the given item stack to the specified slot in the inventory (can be crafting or armor
-   * sections).
-   */
-  def setInventorySlotContents(slot: Int, itemStack: ItemStack)
-  {
-    if (slot < this.getSizeInventory)
-    {
-      inventory(slot) = itemStack
-    }
-  }
-
   /**
    * Inventory methods.
    */
@@ -182,6 +170,18 @@ class TileImprinter extends ResonantTile(Material.circuits) with ISidedInventory
     }
   }
 
+  /**
+   * Sets the given item stack to the specified slot in the inventory (can be crafting or armor
+   * sections).
+   */
+  def setInventorySlotContents(slot: Int, itemStack: ItemStack)
+  {
+    if (slot < this.getSizeInventory)
+    {
+      inventory(slot) = itemStack
+    }
+  }
+
   def openInventory
   {
     this.onInventoryChanged

src/main/scala/edx/basic/blocks/TileTurntable.scala

@@ -10,6 +10,7 @@ import net.minecraft.util.IIcon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.api.tile.IRotatable
+import resonant.lib.prefab.tile.spatial.ResonantBlock
 import resonant.lib.prefab.tile.traits.TRotatable
 import resonant.lib.transform.vector.Vector3
 

src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala

@@ -25,7 +25,7 @@ import resonant.lib.grid.energy.electric.NodeElectricComponent
 import resonant.lib.grid.thermal.{BoilEvent, ThermalPhysics}
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
-import resonant.lib.prefab.tile.spatial.ResonantTile
+import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
 import resonant.lib.transform.vector.Vector3
 import resonant.lib.utility.FluidUtility
 import resonant.lib.wrapper.ByteBufWrapper._
@@ -161,6 +161,11 @@ class TileFirebox extends ResonantTile(Material.rock) with IFluidHandler with TI
     return this.getBlockMetadata == 1
   }
 
+  def canBurn(stack: ItemStack): Boolean =
+  {
+    return TileEntityFurnace.getItemBurnTime(stack) > 0
+  }
+
   override def randomDisplayTick(): Unit =
   {
     if (isBurning)
@@ -202,11 +207,6 @@ class TileFirebox extends ResonantTile(Material.rock) with IFluidHandler with TI
     return i == 0 && canBurn(itemStack)
   }
 
-  def canBurn(stack: ItemStack): Boolean =
-  {
-    return TileEntityFurnace.getItemBurnTime(stack) > 0
-  }
-
   /**
    * Override this method
    * Be sure to super this method or manually write the id into the packet when sending

src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala

@@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess
 import resonant.lib.content.prefab.TInventory
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
-import resonant.lib.prefab.tile.spatial.ResonantTile
+import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
 import resonant.lib.transform.region.Cuboid
 import resonant.lib.transform.vector.{Vector2, Vector3}
 import resonant.lib.wrapper.ByteBufWrapper._
@@ -87,6 +87,20 @@ class TileHotPlate extends ResonantTile(Material.iron) with TInventory with TPac
 
   def canSmelt(stack: ItemStack): Boolean = stack != null && FurnaceRecipes.smelting.getSmeltingResult(stack) != null
 
+  def canRun: Boolean =
+  {
+    val tileEntity = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord)
+
+    if (tileEntity.isInstanceOf[TileFirebox])
+    {
+      if ((tileEntity.asInstanceOf[TileFirebox]).isBurning)
+      {
+        return true
+      }
+    }
+    return false
+  }
+
   override def randomDisplayTick()
   {
     val height = 0.2
@@ -119,6 +133,8 @@ class TileHotPlate extends ResonantTile(Material.iron) with TInventory with TPac
     return smeltTime(i)
   }
 
+  override def getSizeInventory: Int = 4
+
   override def isItemValidForSlot(i: Int, itemStack: ItemStack): Boolean =
   {
     return i < getSizeInventory && canSmelt(itemStack)
@@ -157,8 +173,6 @@ class TileHotPlate extends ResonantTile(Material.iron) with TInventory with TPac
 
   }
 
-  override def getSizeInventory: Int = 4
-
   @SideOnly(Side.CLIENT)
   override def registerIcons(iconReg: IIconRegister)
   {
@@ -175,20 +189,6 @@ class TileHotPlate extends ResonantTile(Material.iron) with TInventory with TPac
     return if (access.getBlockMetadata(xi, yi, zi) == 1) ResonantBlock.icon.get("electricHotPlate") else (if (canRun) ResonantBlock.icon.get("hotPlate_on") else ResonantBlock.icon.get(getTextureName))
   }
 
-  def canRun: Boolean =
-  {
-    val tileEntity = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord)
-
-    if (tileEntity.isInstanceOf[TileFirebox])
-    {
-      if ((tileEntity.asInstanceOf[TileFirebox]).isBurning)
-      {
-        return true
-      }
-    }
-    return false
-  }
-
   @SideOnly(Side.CLIENT)
   override def getIcon(side: Int, meta: Int): IIcon =
   {

src/main/scala/edx/core/resource/content/BlockDecoration.scala

@@ -10,6 +10,7 @@ import net.minecraft.creativetab.CreativeTabs
 import net.minecraft.item.{Item, ItemStack}
 import net.minecraft.util.IIcon
 import resonant.lib.prefab.tile.item.ItemBlockMetadata
+import resonant.lib.prefab.tile.spatial.ResonantBlock
 import resonant.lib.wrapper.CollectionWrapper._
 
 /**

src/main/scala/edx/electrical/generator/TileSolarPanel.scala

@@ -9,7 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.content.prefab.TIO
 import resonant.lib.grid.core.TBlockNodeProvider
 import resonant.lib.grid.energy.electric.NodeElectricComponent
-import resonant.lib.prefab.tile.spatial.ResonantTile
+import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
 import resonant.lib.render.block.RenderConnectedTexture
 import resonant.lib.transform.region.Cuboid
 

src/main/scala/edx/electrical/generator/TileThermopile.scala

@@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.content.prefab.TIO
 import resonant.lib.grid.core.TBlockNodeProvider
 import resonant.lib.grid.energy.electric.NodeElectricComponent
-import resonant.lib.prefab.tile.spatial.ResonantTile
+import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile}
 
 import scala.collection.convert.wrapAll._
 

src/main/scala/edx/mechanical/machine/TileDetector.scala

@@ -10,7 +10,6 @@ import io.netty.buffer.ByteBuf
 import net.minecraft.client.renderer.texture.IIconRegister
 import net.minecraft.entity.Entity
 import net.minecraft.entity.item.EntityItem
-import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.network.Packet
@@ -20,9 +19,10 @@ import net.minecraft.world.IBlockAccess
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.core.ResonantEngine
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
-import resonant.lib.network.handle.IPacketIDReceiver
+import resonant.lib.network.handle.TPacketReceiver
+import resonant.lib.prefab.tile.spatial.ResonantBlock
 
-class TileDetector extends TileFilterable with IPacketIDReceiver
+class TileDetector extends TileFilterable with TPacketReceiver
 {
   private var powering: Boolean = false
 
@@ -112,10 +112,10 @@ class TileDetector extends TileFilterable with IPacketIDReceiver
     return ResonantEngine.packetHandler.toMCPacket(new PacketTile(xi, yi, zi, Array[Any](0, this.isInverted)))
   }
 
-  override def read(data: ByteBuf, id: Int, player: EntityPlayer, `type`: PacketType): Boolean =
+  override def read(buf: ByteBuf, id: Int, packetType: PacketType)
   {
-    if (id == 0) this.setInverted(data.readBoolean)
-    return true
+    if (id == 0)
+      setInverted(buf.readBoolean)
   }
 
   @SideOnly(Side.CLIENT) override def registerIcons(iconReg: IIconRegister)

src/main/scala/edx/quantum/blocks/TileElectromagnet.scala

@@ -13,6 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import org.lwjgl.opengl.GL11._
 import resonant.api.tile.IElectromagnet
 import resonant.lib.prefab.tile.item.ItemBlockMetadata
+import resonant.lib.prefab.tile.spatial.ResonantBlock
 import resonant.lib.render.{RenderBlockUtility, RenderUtility}
 import resonant.lib.transform.vector.Vector3
 import resonant.lib.world.WorldUtility

src/main/scala/edx/quantum/blocks/TileSiren.scala

@@ -5,6 +5,7 @@ import net.minecraft.block.material.Material
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.world.World
 import net.minecraftforge.common.util.ForgeDirection
+import resonant.lib.prefab.tile.spatial.ResonantBlock
 import resonant.lib.transform.vector.Vector3
 
 /**

src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala

@@ -16,7 +16,7 @@ import resonant.api.tile.{IElectromagnet, IRotatable}
 import resonant.lib.content.prefab.TInventory
 import resonant.lib.grid.energy.EnergyStorage
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
-import resonant.lib.network.handle.{TPacketIDReceiver, TPacketSender}
+import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
 import resonant.lib.prefab.tile.spatial.ResonantTile
 import resonant.lib.prefab.tile.traits.TEnergyProvider
 import resonant.lib.transform.vector.Vector3
@@ -24,7 +24,7 @@ import resonant.lib.utility.BlockUtility
 
 import scala.collection.JavaConversions._
 
-class TileAccelerator extends ResonantTile(Material.iron) with TInventory with IElectromagnet with IRotatable with TPacketIDReceiver with TPacketSender with TEnergyProvider
+class TileAccelerator extends ResonantTile(Material.iron) with TInventory with IElectromagnet with IRotatable with TPacketReceiver with TPacketSender with TEnergyProvider
 {
   final val DESC_PACKET_ID = 2
   /**
@@ -231,7 +231,7 @@ class TileAccelerator extends ResonantTile(Material.iron) with TInventory with I
   ///         Save handling             ///
   ////////////////////////////////////////
 
-  override def read(buf: ByteBuf, id: Int, player: EntityPlayer, packet: PacketType): Boolean =
+  override def read(buf: ByteBuf, id: Int, packetType: PacketType)
   {
     //Client only packets
     if (world.isRemote)
@@ -242,11 +242,9 @@ class TileAccelerator extends ResonantTile(Material.iron) with TInventory with I
         this.totalEnergyConsumed = buf.readDouble()
         this.antimatter = buf.readInt()
         this.energy.value = buf.readDouble()
-        return true
       }
     }
 
-    return true
   }
 
   override def readFromNBT(par1NBTTagCompound: NBTTagCompound)

src/main/scala/edx/quantum/reactor/TileControlRod.scala

@@ -1,6 +1,7 @@
 package edx.quantum.reactor
 
 import net.minecraft.block.material.Material
+import resonant.lib.prefab.tile.spatial.ResonantBlock
 import resonant.lib.transform.region.Cuboid
 
 /**