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

Fixed traits package bad compilation name

This commit is contained in:
Calclavia 2015-01-26 20:32:49 +08:00
parent 86b43e2f9f
commit 0ceae615a7
24 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/edx/basic/blocks/TileTurntable.scala
View File

@ -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
{

2
src/main/scala/edx/basic/fluid/grate/TileGrate.scala
View File

@ -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
{

6
src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala
View File

@ -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)

31
src/main/scala/edx/core/prefab/node/TileFluidProvider.scala
View File

@ -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)
}

2
src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala
View File

@ -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

4
src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala
View File

@ -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._

3
src/main/scala/edx/electrical/battery/TileBattery.scala
View File

@ -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.

3
src/main/scala/edx/electrical/generator/TileMotor.scala
View File

@ -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.

2
src/main/scala/edx/electrical/generator/TileSolarPanel.scala
View File

@ -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._

2
src/main/scala/edx/electrical/generator/TileThermopile.scala
View File

@ -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._

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

@ -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._

2
src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala
View File

@ -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

12
src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala
View File

@ -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

3
src/main/scala/edx/mechanical/mech/TileMechanical.scala
View File

@ -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._

3
src/main/scala/edx/quantum/laser/TileLaserEmitter.scala
View File

@ -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._

3
src/main/scala/edx/quantum/laser/TileLaserReceiver.scala
View File

@ -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._

2
src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala
View File

@ -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._

3
src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala
View File

@ -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

3
src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala
View File

@ -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

2
src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala
View File

@ -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

2
src/main/scala/edx/quantum/machine/extractor/TileProcess.scala
View File

@ -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

2
src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala
View File

@ -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

3
src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala
View File

@ -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
{

3
src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala
View File

@ -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 *