tilera
/
electrodynamics
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Removed synthetic multiblocks

This commit is contained in:
Calclavia 2015-01-26 20:29:32 +08:00
parent f8cab1b595
commit 86b43e2f9f
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/edx/electrical/tesla/TileTesla.scala
View File

@ -26,7 +26,7 @@ import resonantengine.lib.modcontent.block.ResonantTile
import resonantengine.lib.render.EnumColor
import resonantengine.lib.transform.vector.{Vector3, VectorWorld}
import resonantengine.lib.utility.{LanguageUtility, LinkUtility}
import resonantengine.prefab.block.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler}
import resonantengine.prefab.block.multiblock.{IMultiBlockStructure, MultiBlockHandler}
import resonantengine.prefab.block.traits.TEnergyProvider
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}

2
src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala
View File

@ -3,7 +3,7 @@ package edx.mechanical.mech.gear
import codechicken.multipart.TileMultipart
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.lib.transform.vector.Vector3
import resonantengine.prefab.block.multiblock.reference.MultiBlockHandler
import resonantengine.prefab.block.multiblock.MultiBlockHandler
class GearMultiBlockHandler(wrapper: PartGear) extends MultiBlockHandler[PartGear](wrapper: PartGear)
{

6
src/main/scala/edx/mechanical/mech/gear/PartGear.scala
View File

@ -17,7 +17,7 @@ import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection
import resonantengine.api.graph.node.INode
import resonantengine.lib.utility.WrenchUtility
import resonantengine.prefab.block.multiblock.reference.IMultiBlockStructure
import resonantengine.prefab.block.multiblock.IMultiBlockStructure
/**
* We assume all the force acting on the gear is 90 degrees.
@ -96,8 +96,6 @@ class PartGear extends PartMechanical with IMultiBlockStructure[PartGear]
return (primaryPos.xi == x && placementSide.offsetX == 0) || (primaryPos.yi == y && placementSide.offsetY == 0) || (primaryPos.zi == z && placementSide.offsetZ == 0)
}
override def getMultiBlock: GearMultiBlockHandler = multiBlock
@SideOnly(Side.CLIENT)
override def renderDynamic(pos: Vector3, frame: Float, pass: Int)
{
@ -117,6 +115,8 @@ class PartGear extends PartMechanical with IMultiBlockStructure[PartGear]
getMultiBlock.save(nbt)
}
override def getMultiBlock: GearMultiBlockHandler = multiBlock
override def getMultiBlockVectors: java.util.List[resonantengine.lib.transform.vector.Vector3] = new resonantengine.lib.transform.vector.Vector3().getAround(this.world, placementSide, 1)
def getWorld: World =

12
src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala
View File

@ -15,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection
import resonantengine.core.network.discriminator.PacketType
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.wrapper.ByteBufWrapper._
import resonantengine.prefab.block.multiblock.reference.IMultiBlockStructure
import resonantengine.prefab.block.multiblock.IMultiBlockStructure
import scala.collection.JavaConversions._
@ -62,6 +62,11 @@ class TileTurbine extends TileMechanical(Material.wood) with IMultiBlockStructur
{
}
def getMultiBlock: TurbineMBlockHandler =
{
return multiBlock
}
def getArea: Int = (((multiBlockRadius + 0.5) * 2) * ((multiBlockRadius + 0.5) * 2)).toInt
@SideOnly(Side.CLIENT)
@ -113,11 +118,6 @@ class TileTurbine extends TileMechanical(Material.wood) with IMultiBlockStructur
getMultiBlock.load(nbt)
}
def getMultiBlock: TurbineMBlockHandler =
{
return multiBlock
}
/** Writes a tile entity to NBT. */
override def writeToNBT(nbt: NBTTagCompound)
{

2
src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala
View File

@ -2,7 +2,7 @@ package edx.mechanical.mech.turbine
import net.minecraft.tileentity.TileEntity
import resonantengine.lib.transform.vector.Vector3
import resonantengine.prefab.block.multiblock.reference.MultiBlockHandler
import resonantengine.prefab.block.multiblock.MultiBlockHandler
class TurbineMBlockHandler(wrapper: TileTurbine) extends MultiBlockHandler[TileTurbine](wrapper)
{

6
src/main/scala/edx/quantum/reactor/TileReactorCell.scala
View File

@ -27,7 +27,7 @@ import resonantengine.lib.render.model.ModelCube
import resonantengine.lib.transform.vector.Vector3
import resonantengine.lib.utility.inventory.InventoryUtility
import resonantengine.prefab.block.mixed.TileInventory
import resonantengine.prefab.block.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler}
import resonantengine.prefab.block.multiblock.{IMultiBlockStructure, MultiBlockHandler}
import resonantengine.prefab.network.{TPacketReceiver, TPacketSender}
import scala.collection.convert.wrapAll._
@ -243,8 +243,6 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc
}
}
override def getMultiBlock: MultiBlockHandler[TileReactorCell] = multiBlock
override def getWorld: World =
{
return worldObj
@ -285,6 +283,8 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc
getMultiBlock.load(nbt)
}
override def getMultiBlock: MultiBlockHandler[TileReactorCell] = multiBlock
override def writeToNBT(nbt: NBTTagCompound)
{
super.writeToNBT(nbt)