diff --git a/src/main/scala/edx/basic/blocks/TileTurntable.scala b/src/main/scala/edx/basic/blocks/TileTurntable.scala index 61b208ab2..927b95855 100644 --- a/src/main/scala/edx/basic/blocks/TileTurntable.scala +++ b/src/main/scala/edx/basic/blocks/TileTurntable.scala @@ -12,7 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection import resonantengine.api.tile.IRotatable import resonantengine.lib.modcontent.block.ResonantBlock import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.TRotatable object TileTurntable { diff --git a/src/main/scala/edx/basic/fluid/grate/TileGrate.scala b/src/main/scala/edx/basic/fluid/grate/TileGrate.scala index e3aea82db..c83909a8c 100644 --- a/src/main/scala/edx/basic/fluid/grate/TileGrate.scala +++ b/src/main/scala/edx/basic/fluid/grate/TileGrate.scala @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, import resonantengine.lib.mod.config.Config import resonantengine.lib.transform.vector.Vector3 import resonantengine.lib.utility.FluidUtility -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.TRotatable object TileGrate { diff --git a/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala b/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala index fdc342f94..ca1c7ad49 100644 --- a/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala +++ b/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala @@ -20,7 +20,6 @@ import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ import resonantengine.core.network.discriminator.PacketType import resonantengine.lib.content.prefab.{TIO, TInventory} -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.grid.thermal.{BoilEvent, ThermalPhysics} @@ -29,6 +28,7 @@ import resonantengine.lib.transform.vector.Vector3 import resonantengine.lib.utility.FluidUtility import resonantengine.lib.wrapper.ByteBufWrapper._ import resonantengine.lib.wrapper.CollectionWrapper._ +import resonantengine.prefab.block.impl.TBlockNodeProvider import resonantengine.prefab.network.{TPacketReceiver, TPacketSender} /** @@ -191,8 +191,6 @@ class TileFirebox extends ResonantTile(Material.rock) with IFluidHandler with TI } } - def isBurning: Boolean = burnTime > 0 - override def getSizeInventory = 1 def getMeltIronEnergy(volume: Float): Double = @@ -297,6 +295,8 @@ class TileFirebox extends ResonantTile(Material.rock) with IFluidHandler with TI return if (isBurning) (if (isElectric) ResonantBlock.icon.get("firebox_electric_side_on") else ResonantBlock.icon.get("firebox_side_on")) else (if (isElectric) ResonantBlock.icon.get("firebox_electric_side_off") else ResonantBlock.icon.get("firebox_side_off")) } + def isBurning: Boolean = burnTime > 0 + override def click(player: EntityPlayer) { if (server) diff --git a/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala b/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala index 37869a6b8..1402acc53 100644 --- a/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala +++ b/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala @@ -6,10 +6,10 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ import resonantengine.core.network.discriminator.PacketType -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.prefab.fluid.NodeFluid import resonantengine.lib.wrapper.ByteBufWrapper._ +import resonantengine.prefab.block.impl.TBlockNodeProvider import resonantengine.prefab.network.{TPacketReceiver, TPacketSender} /** @@ -52,20 +52,6 @@ abstract class TileFluidProvider(material: Material) extends ResonantTile(materi } } - def fluidNode = _fluidNode - - def fluidNode_=(newNode: NodeFluid) - { - _fluidNode = newNode - fluidNode.onConnectionChanged = () => - { - clientRenderMask = fluidNode.connectedMask - sendPacket(0) - } - fluidNode.onFluidChanged = () => if (!world.isRemote) sendPacket(1) - nodes.add(fluidNode) - } - override def read(buf: ByteBuf, id: Int, packet: PacketType) { super.read(buf, id, packet) @@ -90,6 +76,8 @@ abstract class TileFluidProvider(material: Material) extends ResonantTile(materi } } + def fluidNode = _fluidNode + override def readFromNBT(nbt: NBTTagCompound) { super.readFromNBT(nbt) @@ -97,6 +85,18 @@ abstract class TileFluidProvider(material: Material) extends ResonantTile(materi colorID = nbt.getInteger("colorID") } + def fluidNode_=(newNode: NodeFluid) + { + _fluidNode = newNode + fluidNode.onConnectionChanged = () => + { + clientRenderMask = fluidNode.connectedMask + sendPacket(0) + } + fluidNode.onFluidChanged = () => if (!world.isRemote) sendPacket(1) + nodes.add(fluidNode) + } + override def writeToNBT(nbt: NBTTagCompound) { super.writeToNBT(nbt) @@ -115,4 +115,5 @@ abstract class TileFluidProvider(material: Material) extends ResonantTile(materi override def fill(from: ForgeDirection, resource: FluidStack, doFill: Boolean): Int = fluidNode.fill(from, resource, doFill) override def getTankInfo(from: ForgeDirection): Array[FluidTankInfo] = fluidNode.getTankInfo(from) + } \ No newline at end of file diff --git a/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala b/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala index 0f7b5e429..cce78f2ff 100644 --- a/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala +++ b/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala @@ -5,7 +5,7 @@ import codechicken.multipart.{IRedstonePart, TMultiPart} import edx.core.ResonantPartFactory import net.minecraft.item.ItemStack import net.minecraft.util.MovingObjectPosition -import resonantengine.prefab.block.traits.TTicker +import resonantengine.prefab.block.impl.TTicker import scala.collection.convert.wrapAll._ import scala.collection.mutable diff --git a/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala b/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala index 9c810c6fe..5989bb801 100644 --- a/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala +++ b/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala @@ -1,11 +1,9 @@ package edx.core.prefab.part.connector -import java.util.{List => JList} - import codechicken.multipart.TMultiPart import net.minecraft.nbt.NBTTagCompound import resonantengine.api.misc.ISave -import resonantengine.lib.grid.core.TNodeProvider +import resonantengine.prefab.block.impl.TNodeProvider import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/electrical/battery/TileBattery.scala b/src/main/scala/edx/electrical/battery/TileBattery.scala index 179aba0d6..910ead878 100644 --- a/src/main/scala/edx/electrical/battery/TileBattery.scala +++ b/src/main/scala/edx/electrical/battery/TileBattery.scala @@ -18,7 +18,6 @@ import org.lwjgl.opengl.GL11._ import resonantengine.api.item.ISimpleItemRenderer import resonantengine.core.network.discriminator.PacketType import resonantengine.lib.content.prefab.TIO -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.ResonantTile @@ -26,7 +25,7 @@ import resonantengine.lib.render.RenderUtility import resonantengine.lib.transform.vector.Vector3 import resonantengine.lib.utility.science.UnitDisplay import resonantengine.lib.wrapper.ByteBufWrapper._ -import resonantengine.prefab.block.traits.TEnergyProvider +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TEnergyProvider} import resonantengine.prefab.network.{TPacketReceiver, TPacketSender} /** A modular battery box that allows shared connections with boxes next to it. diff --git a/src/main/scala/edx/electrical/generator/TileMotor.scala b/src/main/scala/edx/electrical/generator/TileMotor.scala index d8e354881..4ca804047 100644 --- a/src/main/scala/edx/electrical/generator/TileMotor.scala +++ b/src/main/scala/edx/electrical/generator/TileMotor.scala @@ -11,12 +11,11 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import resonantengine.lib.content.prefab.TIO -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.render.RenderUtility import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TRotatable} /** * A kinetic energy to electrical energy converter. diff --git a/src/main/scala/edx/electrical/generator/TileSolarPanel.scala b/src/main/scala/edx/electrical/generator/TileSolarPanel.scala index 7d00d7857..c08528053 100644 --- a/src/main/scala/edx/electrical/generator/TileSolarPanel.scala +++ b/src/main/scala/edx/electrical/generator/TileSolarPanel.scala @@ -7,11 +7,11 @@ import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection import resonantengine.lib.content.prefab.TIO -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.{ResonantBlock, ResonantTile} import resonantengine.lib.render.block.RenderConnectedTexture import resonantengine.lib.transform.region.Cuboid +import resonantengine.prefab.block.impl.TBlockNodeProvider import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/electrical/generator/TileThermopile.scala b/src/main/scala/edx/electrical/generator/TileThermopile.scala index da087e0bf..2a395483e 100644 --- a/src/main/scala/edx/electrical/generator/TileThermopile.scala +++ b/src/main/scala/edx/electrical/generator/TileThermopile.scala @@ -8,9 +8,9 @@ import net.minecraft.init.Blocks import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection import resonantengine.lib.content.prefab.TIO -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.{ResonantBlock, ResonantTile} +import resonantengine.prefab.block.impl.TBlockNodeProvider import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/electrical/tesla/TileTesla.scala b/src/main/scala/edx/electrical/tesla/TileTesla.scala index cd339355d..646eacea3 100644 --- a/src/main/scala/edx/electrical/tesla/TileTesla.scala +++ b/src/main/scala/edx/electrical/tesla/TileTesla.scala @@ -19,15 +19,14 @@ import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection import resonantengine.core.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.content.prefab.TIO -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.electric.NodeElectricComponent 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.impl.{TBlockNodeProvider, TEnergyProvider} import resonantengine.prefab.block.multiblock.{IMultiBlockStructure, MultiBlockHandler} -import resonantengine.prefab.block.traits.TEnergyProvider import resonantengine.prefab.network.{TPacketReceiver, TPacketSender} import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala b/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala index 0e7696c35..8e62a6dd9 100644 --- a/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala +++ b/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala @@ -20,7 +20,7 @@ import resonantengine.core.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.transform.vector.{Vector3, VectorWorld} import resonantengine.lib.utility.inventory.InternalInventoryHandler -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.TRotatable /** * @author tgame14 diff --git a/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala b/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala index d115eda98..9e75385f2 100644 --- a/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala +++ b/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala @@ -20,7 +20,7 @@ import resonantengine.lib.render.RenderItemOverlayUtility import resonantengine.lib.transform.vector.Vector3 import resonantengine.lib.utility.LanguageUtility import resonantengine.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility} -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.TRotatable import resonantengine.prefab.network.TPacketSender /** @@ -53,6 +53,11 @@ class TilePlacer extends ResonantTile(Material.rock) with TInventory with TRotat work } + override def onNeighborChanged(block: Block) + { + work + } + def work { if (isIndirectlyPowered) @@ -62,11 +67,6 @@ class TilePlacer extends ResonantTile(Material.rock) with TInventory with TRotat } } - override def onNeighborChanged(block: Block) - { - work - } - override def start { super.start diff --git a/src/main/scala/edx/mechanical/mech/TileMechanical.scala b/src/main/scala/edx/mechanical/mech/TileMechanical.scala index 80cdf60c6..35e56cd4d 100644 --- a/src/main/scala/edx/mechanical/mech/TileMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/TileMechanical.scala @@ -6,11 +6,10 @@ import net.minecraft.block.material.Material import net.minecraft.entity.player.EntityPlayer import net.minecraftforge.common.util.ForgeDirection import resonantengine.core.network.discriminator.PacketType -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.transform.vector.Vector3 import resonantengine.lib.wrapper.ByteBufWrapper._ -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TRotatable} import resonantengine.prefab.network.{TPacketReceiver, TPacketSender} import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala b/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala index e953cdf17..2c9cdf5f5 100644 --- a/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala +++ b/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala @@ -13,12 +13,11 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11._ -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.render.RenderUtility import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TRotatable} import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala b/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala index d98d1e8bc..d4ea3f8d7 100644 --- a/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala +++ b/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala @@ -11,12 +11,11 @@ import net.minecraft.util.{MovingObjectPosition, ResourceLocation} import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.render.RenderUtility import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.TRotatable +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TRotatable} import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala b/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala index 135f4b380..fa84bdb20 100644 --- a/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala +++ b/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala @@ -19,7 +19,7 @@ import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.transform.vector.Vector3 import resonantengine.lib.utility.BlockUtility -import resonantengine.prefab.block.traits.TEnergyProvider +import resonantengine.prefab.block.impl.TEnergyProvider import resonantengine.prefab.network.{TPacketReceiver, TPacketSender} import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala b/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala index 8cb89e4ba..fd2f98c13 100644 --- a/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala +++ b/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala @@ -14,12 +14,11 @@ import resonantengine.api.network.IPacketReceiver import resonantengine.core.ResonantEngine import resonantengine.core.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.content.prefab.{TIO, TInventory} -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.{TEnergyProvider, TRotatable} +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TEnergyProvider, TRotatable} /** * Nuclear boiler TileEntity diff --git a/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala b/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala index b5e3dd5a6..c08215f05 100644 --- a/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala +++ b/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala @@ -14,13 +14,12 @@ import net.minecraftforge.fluids._ import resonantengine.api.network.IPacketReceiver import resonantengine.core.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.content.prefab.{TIO, TInventory} -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.mod.compat.energy.Compatibility import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.{TEnergyProvider, TRotatable} +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TEnergyProvider, TRotatable} /** * Centrifuge TileEntity diff --git a/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala b/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala index 9a67e83d4..7dd559207 100644 --- a/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala +++ b/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala @@ -12,7 +12,7 @@ import resonantengine.lib.content.prefab.TIO import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.mod.compat.energy.Compatibility import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.{TEnergyProvider, TRotatable} +import resonantengine.prefab.block.impl.{TEnergyProvider, TRotatable} /** * Chemical extractor TileEntity diff --git a/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala b/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala index c5cd6d8ef..7f11e2d37 100644 --- a/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala +++ b/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala @@ -5,8 +5,8 @@ import net.minecraft.item.ItemStack import net.minecraftforge.fluids.{FluidContainerRegistry, FluidStack, FluidTank} import resonantengine.api.edx.recipe.{MachineRecipes, RecipeResource} import resonantengine.lib.content.prefab.TInventory -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.modcontent.block.ResonantTile +import resonantengine.prefab.block.impl.TBlockNodeProvider /** * General class for all machines that do traditional recipe processing diff --git a/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala b/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala index 14fdcb9f6..30502f308 100644 --- a/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala +++ b/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala @@ -3,7 +3,7 @@ package edx.quantum.machine.fulmination import net.minecraft.block.material.Material import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.modcontent.block.ResonantTile -import resonantengine.prefab.block.traits.TEnergyProvider +import resonantengine.prefab.block.impl.TEnergyProvider /** * Fulmination TileEntity diff --git a/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala b/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala index 04636d596..abb08c25e 100644 --- a/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala +++ b/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala @@ -14,7 +14,6 @@ import net.minecraftforge.fluids._ import resonantengine.api.network.IPacketReceiver import resonantengine.core.ResonantEngine import resonantengine.core.network.discriminator.{PacketTile, PacketType} -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.mod.config.Config @@ -22,7 +21,7 @@ import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.transform.vector.Vector3 import resonantengine.lib.utility.science.UnitDisplay import resonantengine.lib.utility.{FluidUtility, LanguageUtility} -import resonantengine.prefab.block.traits.TEnergyProvider +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TEnergyProvider} object TilePlasmaHeater { diff --git a/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala b/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala index 00f285a0c..bca83676c 100644 --- a/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala +++ b/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala @@ -12,12 +12,11 @@ import resonantengine.api.edx.recipe.QuantumAssemblerRecipes import resonantengine.api.network.IPacketReceiver import resonantengine.core.network.discriminator.{PacketTile, PacketType} import resonantengine.lib.content.prefab.TInventory -import resonantengine.lib.grid.core.TBlockNodeProvider import resonantengine.lib.grid.energy.EnergyStorage import resonantengine.lib.grid.energy.electric.NodeElectricComponent import resonantengine.lib.modcontent.block.ResonantTile import resonantengine.lib.transform.vector.Vector3 -import resonantengine.prefab.block.traits.TEnergyProvider +import resonantengine.prefab.block.impl.{TBlockNodeProvider, TEnergyProvider} /** * Atomic assembler of items *