From 86b43e2f9f212ebee3a5d14f69e014a1aef34c56 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 26 Jan 2015 20:29:32 +0800 Subject: [PATCH] Removed synthetic multiblocks --- src/main/scala/edx/electrical/tesla/TileTesla.scala | 2 +- .../mechanical/mech/gear/GearMultiBlockHandler.scala | 2 +- .../scala/edx/mechanical/mech/gear/PartGear.scala | 6 +++--- .../edx/mechanical/mech/turbine/TileTurbine.scala | 12 ++++++------ .../mech/turbine/TurbineMBlockHandler.scala | 2 +- .../scala/edx/quantum/reactor/TileReactorCell.scala | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/scala/edx/electrical/tesla/TileTesla.scala b/src/main/scala/edx/electrical/tesla/TileTesla.scala index 065426fe3..cd339355d 100644 --- a/src/main/scala/edx/electrical/tesla/TileTesla.scala +++ b/src/main/scala/edx/electrical/tesla/TileTesla.scala @@ -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} diff --git a/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala b/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala index 321df508f..6dcb6d7f9 100644 --- a/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala +++ b/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala @@ -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) { diff --git a/src/main/scala/edx/mechanical/mech/gear/PartGear.scala b/src/main/scala/edx/mechanical/mech/gear/PartGear.scala index fb2b05d52..908d1854f 100644 --- a/src/main/scala/edx/mechanical/mech/gear/PartGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/PartGear.scala @@ -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 = diff --git a/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala b/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala index 1b017dab1..22cd213ab 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala @@ -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) { diff --git a/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala b/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala index 245633053..b4d92f0e5 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala @@ -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) { diff --git a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala index c206e1131..bfba0da11 100644 --- a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala +++ b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala @@ -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)