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

Update for new RE, no longer requires UE-Core

Browse source
This commit is contained in:
Robert S 2014-10-27 13:31:42 -04:00
parent 1c1affbe62
commit 5348ef9f77
108 changed files with 160 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala
View file

@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection
import resonant.api.{IFilterable, IRotatable}
import resonant.lib.content.prefab.java.TileInventory
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
object TileFilterable
{

2
src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala
View file

@ -26,7 +26,7 @@ import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.render.RenderItemOverlayUtility
import resonant.lib.utility.inventory.InventoryUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.{Vector2, Vector3}
import resonant.lib.transform.vector.{Vector2, Vector3}
import scala.collection.JavaConversions._

2
src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala
View file

@ -12,7 +12,7 @@ import resonant.api.IRotatable
import resonant.content.spatial.block.SpatialBlock
import resonant.lib.content.prefab.TRotatable
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
object TileTurntable
{

2
src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.scala
View file

@ -4,7 +4,7 @@ import java.util.{ArrayList, List}
import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import universalelectricity.core.transform.vector.VectorWorld
import resonant.lib.transform.vector.VectorWorld
/**
* A class that allows flexible path finding in Minecraft Blocks. Back Ported from UE 1.3.0.

4
src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala
View file

@ -37,8 +37,8 @@ import resonant.lib.utility.inventory.AutoCraftingManager.IAutoCrafter
import resonant.lib.utility.inventory.{AutoCraftingManager, InventoryUtility}
import resonantinduction.archaic.blocks.ItemImprint
import resonantinduction.core.{Reference, ResonantInduction}
import universalelectricity.core.transform.region.Cuboid
import universalelectricity.core.transform.vector.{Vector2, Vector3}
import resonant.lib.transform.region.Cuboid
import resonant.lib.transform.vector.{Vector2, Vector3}
import scala.collection.JavaConversions._
/**

2
src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala
View file

@ -28,7 +28,7 @@ import resonant.lib.network.discriminator.PacketType
import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.utility.FluidUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import java.util.List
import resonant.lib.wrapper.WrapList._

4
src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala
View file

@ -18,8 +18,8 @@ import resonant.lib.content.prefab.java.TileInventory
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonantinduction.core.Reference
import universalelectricity.core.transform.region.Cuboid
import universalelectricity.core.transform.vector.{Vector2, Vector3}
import resonant.lib.transform.region.Cuboid
import resonant.lib.transform.vector.{Vector2, Vector3}
/**
* For smelting items.

2
src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala
View file

@ -17,7 +17,7 @@ import resonant.lib.utility.FluidUtility
import resonantinduction.archaic.fluid.grate.TileGrate._
import resonantinduction.core.Reference
import resonantinduction.core.prefab.node.TilePressureNode
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
object TileGrate
{

4
src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala
View file

@ -22,8 +22,8 @@ import resonant.lib.utility.inventory.InventoryUtility
import resonant.lib.wrapper.BitmaskWrapper._
import resonantinduction.core.Reference
import resonantinduction.core.prefab.node.TilePressureNode
import universalelectricity.core.transform.region.Cuboid
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.region.Cuboid
import resonant.lib.transform.vector.Vector3
object TileGutter
{

4
src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala
View file

@ -9,10 +9,10 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World
import net.minecraftforge.fluids.{FluidStack, IFluidContainerItem}
import resonant.lib.science.UnitDisplay
import resonant.lib.utility.LanguageUtility
import resonant.lib.wrapper.WrapList._
import universalelectricity.api.UnitDisplay
import universalelectricity.api.UnitDisplay.Unit
import UnitDisplay.Unit
/**
* @author Darkguardsman

2
src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala
View file

@ -20,7 +20,7 @@ import resonant.lib.utility.render.RenderBlockUtility
import resonantinduction.archaic.ArchaicContent
import resonantinduction.core.Reference
import resonantinduction.core.prefab.node.TileTankNode
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Tile/Block class for basic Dynamic tanks

2
src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala
View file

@ -18,7 +18,7 @@ import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.utility.FluidUtility
import resonant.lib.utility.inventory.InventoryUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Turns molten fuilds into ingots.

2
src/main/scala/resonantinduction/archaic/process/TileMillstone.scala
View file

@ -19,7 +19,7 @@ import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.utility.inventory.InventoryUtility
import resonantinduction.core.Reference
import resonantinduction.mechanical.mech.gear.ItemHandCrank
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
class TileMillstone extends TileInventory(Material.rock) with IPacketReceiver
{

2
src/main/scala/resonantinduction/atomic/AtomicContent.scala
View file

@ -45,7 +45,7 @@ import resonantinduction.atomic.machine.reactor.{TileControlRod, TileReactorCell
import resonantinduction.atomic.machine.thermometer.TileThermometer
import resonantinduction.atomic.schematic.{SchematicAccelerator, SchematicBreedingReactor, SchematicFissionReactor, SchematicFusionReactor}
import resonantinduction.core.{Reference, ResonantInduction, RICreativeTab, Settings}
import universalelectricity.core.transform.vector.VectorWorld
import resonant.lib.transform.vector.VectorWorld
import scala.collection.JavaConversions._

2
src/main/scala/resonantinduction/atomic/blocks/BlockRadioactive.scala
View file

@ -13,7 +13,7 @@ import net.minecraft.init.Blocks
import net.minecraft.util.{AxisAlignedBB, IIcon}
import net.minecraft.world.World
import resonant.lib.prefab.poison.PoisonRadiation
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import scala.collection.JavaConversions._
class BlockRadioactive(material: Material) extends Block(material)

2
src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.scala
View file

@ -9,7 +9,7 @@ import net.minecraft.world.World
import net.minecraftforge.fluids.BlockFluidClassic
import resonant.lib.prefab.poison.PoisonRadiation
import resonantinduction.atomic.AtomicContent
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
class BlockToxicWaste extends BlockFluidClassic(AtomicContent.getFluidToxicWaste, Material.water)
{

2
src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala
View file

@ -18,7 +18,7 @@ import resonant.lib.render.RenderUtility
import resonant.lib.utility.WorldUtility
import resonant.lib.utility.render.RenderBlockUtility
import resonant.lib.wrapper.WrapList._
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Electromagnet block

2
src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala
View file

@ -6,7 +6,7 @@ import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection
import resonant.content.spatial.block.SpatialBlock
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Siren block

2
src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala
View file

@ -16,7 +16,7 @@ import net.minecraft.util.{ChatComponentText, MovingObjectPosition}
import resonant.api.blocks.IBlockFrequency
import resonant.api.mffs.fortron.FrequencyGridRegistry
import resonantinduction.electrical.ElectricalContent
import universalelectricity.core.transform.vector.VectorWorld
import resonant.lib.transform.vector.VectorWorld
import scala.collection.JavaConversions._

2
src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java
View file

@ -7,7 +7,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.Teleporter;
import net.minecraft.world.WorldServer;
import universalelectricity.core.transform.vector.VectorWorld;
import resonant.lib.transform.vector.VectorWorld;
import java.util.HashMap;

2
src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala
View file

@ -14,7 +14,7 @@ import resonant.lib.wrapper.WrapList._
import resonantinduction.atomic.AtomicContent
import resonantinduction.atomic.machine.reactor.TileReactorCell
import resonantinduction.core.{Reference, RICreativeTab, Settings}
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Fissile fuel rod

2
src/main/scala/resonantinduction/atomic/items/ItemRadioactive.scala
View file

@ -6,7 +6,7 @@ import net.minecraft.item.Item
import net.minecraft.item.ItemStack
import net.minecraft.world.World
import resonant.lib.prefab.poison.PoisonRadiation
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Radioactive Items

2
src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala
View file

@ -16,7 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection
import resonant.api.IElectromagnet
import resonant.lib.prefab.poison.PoisonRadiation
import resonantinduction.core.{ResonantInduction, Reference}
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import scala.collection.JavaConversions._
/**

4
src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala
View file

@ -2,9 +2,9 @@ package resonantinduction.atomic.machine.accelerator
import net.minecraft.entity.player.EntityPlayer
import resonant.lib.gui.GuiContainerBase
import resonant.lib.science.UnitDisplay
import resonantinduction.core.Settings
import universalelectricity.api.UnitDisplay
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
class GuiAccelerator(player: EntityPlayer, tileEntity: TileAccelerator) extends GuiContainerBase(new ContainerAccelerator(player, tileEntity))
{

2
src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala
View file

@ -17,7 +17,7 @@ import resonant.lib.utility.BlockUtility
import resonantinduction.atomic.AtomicContent
import resonantinduction.atomic.items.ItemAntimatter
import resonantinduction.core.{Reference, ResonantInduction, Settings}
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import scala.collection.JavaConversions._

2
src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala
View file

@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.util.StatCollector
import resonant.lib.gui.GuiContainerBase
import resonant.lib.gui.GuiContainerBase.SlotType
import universalelectricity.api.UnitDisplay
import resonant.lib.science.UnitDisplay
class GuiNuclearBoiler(player: EntityPlayer, tileEntity: TileNuclearBoiler) extends GuiContainerBase(new ContainerNuclearBoiler(player, tileEntity))
{

2
src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala
View file

@ -16,7 +16,7 @@ import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonantinduction.atomic.AtomicContent
import resonantinduction.core.Settings
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Nuclear boiler TileEntity

2
src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala
View file

@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer
import net.minecraft.util.StatCollector
import resonant.lib.gui.GuiContainerBase
import resonant.lib.gui.GuiContainerBase.SlotType
import universalelectricity.api.UnitDisplay
import resonant.lib.science.UnitDisplay
class GuiCentrifuge(par1InventoryPlayer: InventoryPlayer, tileEntity: TileCentrifuge) extends GuiContainerBase(new ContainerCentrifuge(par1InventoryPlayer, tileEntity))
{

4
src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala
View file

@ -10,12 +10,12 @@ import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonant.lib.content.prefab.java.TileElectricInventory
import resonant.lib.grid.Compatibility
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonantinduction.atomic.AtomicContent
import resonantinduction.core.Settings
import universalelectricity.compatibility.Compatibility
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Centrifuge TileEntity

2
src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala
View file

@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer
import net.minecraft.util.StatCollector
import resonant.lib.gui.GuiContainerBase
import resonant.lib.gui.GuiContainerBase.SlotType
import universalelectricity.api.UnitDisplay
import resonant.lib.science.UnitDisplay
class GuiChemicalExtractor(par1InventoryPlayer: InventoryPlayer, tileEntity: TileChemicalExtractor) extends GuiContainerBase(new ContainerChemicalExtractor(par1InventoryPlayer, tileEntity))
{

4
src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala
View file

@ -8,12 +8,12 @@ import net.minecraft.network.Packet
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonant.engine.ResonantEngine
import resonant.lib.grid.Compatibility
import resonant.lib.network.Synced
import resonant.lib.network.discriminator.PacketAnnotation
import resonantinduction.atomic.AtomicContent
import resonantinduction.core.Settings
import universalelectricity.compatibility.Compatibility
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Chemical extractor TileEntity

2
src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala
View file

@ -6,7 +6,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent
import net.minecraft.util.Vec3
import resonant.api.explosion.ExplosionEvent
import resonantinduction.atomic.AtomicContent
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Atomic Science Event Handling.

2
src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala
View file

@ -15,7 +15,7 @@ import resonant.api.event.PlasmaEvent
import resonant.content.prefab.java.TileAdvanced
import resonant.engine.grid.thermal.ThermalGrid
import resonant.lib.config.Config
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
object TilePlasma
{

4
src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala
View file

@ -16,10 +16,10 @@ import resonant.lib.config.Config
import resonant.lib.content.prefab.java.TileElectric
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.science.UnitDisplay
import resonant.lib.utility.{FluidUtility, LanguageUtility}
import resonantinduction.atomic.AtomicContent
import universalelectricity.api.UnitDisplay
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
object TilePlasmaHeater
{

2
src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala
View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.InventoryPlayer
import net.minecraft.util.ResourceLocation
import org.lwjgl.opengl.GL11
import resonant.lib.gui.GuiContainerBase
import resonant.lib.science.UnitDisplay
import resonantinduction.core.Reference
import universalelectricity.api.UnitDisplay
object GuiQuantumAssembler
{

2
src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala
View file

@ -12,7 +12,7 @@ import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonantinduction.atomic.AtomicContent
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Atomic assembler of items *

2
src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.scala
View file

@ -2,7 +2,7 @@ package resonantinduction.atomic.machine.reactor
import net.minecraft.block.material.Material
import resonant.content.spatial.block.SpatialBlock
import universalelectricity.core.transform.region.Cuboid
import resonant.lib.transform.region.Cuboid
/**
* Control rod block

2
src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala
View file

@ -29,7 +29,7 @@ import resonant.lib.utility.inventory.InventoryUtility
import resonantinduction.atomic.machine.plasma.TilePlasma
import resonantinduction.atomic.AtomicContent
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
import resonant.lib.transform.vector.{Vector3, VectorWorld}
import scala.collection.convert.wrapAll._

2
src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala
View file

@ -16,7 +16,7 @@ import net.minecraftforge.fluids._
import resonant.content.prefab.java.TileAdvanced
import resonant.content.spatial.block.SpatialBlock
import resonant.lib.path.{IPathCallBack, Pathfinder}
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Reactor Drain

2
src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.scala
View file

@ -12,7 +12,7 @@ import resonant.content.prefab.itemblock.ItemBlockSaved
import resonant.lib.utility.LanguageUtility
import resonant.lib.utility.nbt.NBTUtility
import resonant.lib.wrapper.WrapList._
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/** Handheld thermometer */
object ItemBlockThermometer

2
src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala
View file

@ -20,7 +20,7 @@ import resonant.lib.network.Synced
import resonant.lib.network.discriminator.PacketAnnotation
import resonant.lib.utility.inventory.InventoryUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
import resonant.lib.transform.vector.{Vector3, VectorWorld}
/**
* Thermometer TileEntity

2
src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala
View file

@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.`type`.Pair
import resonant.lib.schematic.Schematic
import resonantinduction.atomic.AtomicContent
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
class SchematicAccelerator extends Schematic
{

2
src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala
View file

@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.`type`.Pair
import resonant.lib.schematic.Schematic
import resonantinduction.atomic.AtomicContent
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
class SchematicBreedingReactor extends Schematic
{

2
src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala
View file

@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.`type`.Pair
import resonant.lib.schematic.Schematic
import resonantinduction.atomic.AtomicContent
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
class SchematicFissionReactor extends Schematic
{

2
src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala
View file

@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.`type`.Pair
import resonant.lib.schematic.Schematic
import resonantinduction.atomic.AtomicContent
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
class SchematicFusionReactor extends Schematic
{

2
src/main/scala/resonantinduction/core/ClientProxy.scala
View file

@ -41,7 +41,7 @@ import resonantinduction.mechanical.mech.gearshaft.RenderGearShaft
import resonantinduction.mechanical.mech.process.crusher.{RenderMechanicalPiston, TileMechanicalPiston}
import resonantinduction.mechanical.mech.process.grinder.{RenderGrindingWheel, TileGrindingWheel}
import resonantinduction.mechanical.mech.turbine._
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/** @author Calclavia */
@SideOnly(Side.CLIENT) class ClientProxy extends CommonProxy

2
src/main/scala/resonantinduction/core/CommonProxy.scala
View file

@ -15,7 +15,7 @@ import resonantinduction.atomic.machine.extractor.{ContainerChemicalExtractor, T
import resonantinduction.atomic.machine.quantum.{ContainerQuantumAssembler, TileQuantumAssembler}
import resonantinduction.atomic.machine.reactor.{ContainerReactorCell, TileReactorCell}
import resonantinduction.electrical.multimeter.{ContainerMultimeter, PartMultimeter}
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* @author Calclavia

4
src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.scala
View file

@ -1,8 +1,8 @@
package resonantinduction.core.interfaces
import net.minecraftforge.common.util.ForgeDirection
import universalelectricity.api.core.grid.INode
import universalelectricity.core.transform.vector.IVectorWorld
import resonant.api.grid.INode
import resonant.lib.transform.vector.IVectorWorld
/**
* Applied to any node that will act as a mechanical object

2
src/main/scala/resonantinduction/core/prefab/node/NodePressure.scala
View file

@ -2,7 +2,7 @@ package resonantinduction.core.prefab.node
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{FluidStack, IFluidHandler}
import universalelectricity.api.core.grid.{INodeProvider, IUpdate}
import resonant.api.grid.{IUpdate, INodeProvider}
/**
* Created by robert on 8/15/2014.

3
src/main/scala/resonantinduction/core/prefab/node/NodeTank.scala
View file

@ -3,9 +3,10 @@ package resonantinduction.core.prefab.node
import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids._
import resonant.api.ISave
import resonant.lib.prefab.fluid.{LimitedTank, NodeFluidHandler}
import resonant.lib.utility.WorldUtility
import universalelectricity.api.core.grid.{INode, INodeProvider, ISave}
import resonant.api.grid.{INodeProvider, INode}
/**
* Simple tank node designed to be implemented by any machine that can connect to other fluid based machines.

4
src/main/scala/resonantinduction/core/prefab/node/TMultipartNode.scala
View file

@ -3,8 +3,8 @@ package resonantinduction.core.prefab.node
import codechicken.multipart.TMultiPart
import net.minecraft.tileentity.TileEntity
import net.minecraft.world.World
import universalelectricity.api.core.grid.INodeProvider
import universalelectricity.core.grid.node.NodeConnector
import resonant.api.grid.INodeProvider
import resonant.lib.grid.node.NodeConnector
/**
* A trait that allows nodes to works with Forge Multipart. This trait MUST be mixed in.

2
src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala
View file

@ -10,7 +10,7 @@ import net.minecraftforge.fluids._
import resonant.content.prefab.java.TileAdvanced
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.TPacketIDReceiver
import universalelectricity.api.core.grid.{INode, INodeProvider}
import resonant.api.grid.{INodeProvider, INode}
/**
* A prefab class for tiles that use the fluid network.

8
src/main/scala/resonantinduction/core/prefab/part/ChickenBonesWrapper.scala
View file

@ -1,7 +1,7 @@
package resonantinduction.core.prefab.part
import codechicken.lib.vec.Cuboid6
import universalelectricity.core.transform.region.Cuboid
import resonant.lib.transform.region.Cuboid
/**
* Wraps ChickenBone's Vector3 with UE's Vector3.
@ -9,11 +9,11 @@ import universalelectricity.core.transform.region.Cuboid
*/
object ChickenBonesWrapper
{
implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): universalelectricity.core.transform.vector.Vector3 = new universalelectricity.core.transform.vector.Vector3(vec.x, vec.y, vec.z)
implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z)
implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): universalelectricity.core.transform.vector.Vector3 = new universalelectricity.core.transform.vector.Vector3(vec.x, vec.y, vec.z)
implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z)
implicit def asCBVector3(vec: universalelectricity.core.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z)
implicit def asCBVector3(vec: resonant.lib.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z)
implicit def asCuboid(cuboid: Cuboid6): Cuboid = new Cuboid(cuboid.min, cuboid.max)

2
src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.scala
View file

@ -6,7 +6,7 @@ import io.netty.channel.ChannelHandlerContext
import net.minecraft.entity.player.EntityPlayer
import resonant.lib.network.discriminator.PacketType
import resonant.lib.network.handle.TPacketReceiver
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Packet handler for blocks and tile entities.

3
src/main/scala/resonantinduction/core/prefab/part/connector/TNodePartConnector.scala
View file

@ -3,7 +3,8 @@ package resonantinduction.core.prefab.part.connector
import codechicken.multipart.TMultiPart
import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection
import universalelectricity.api.core.grid.{INode, INodeProvider, ISave}
import resonant.api.ISave
import resonant.api.grid.{INodeProvider, INode}
/**
* A node trait that can be mixed into any multipart nodes. Mixing this trait will cause nodes to reconstruct/deconstruct when needed.

4
src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java
View file

@ -4,8 +4,8 @@ import codechicken.multipart.PartMap;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import net.minecraftforge.common.util.ForgeDirection;
import universalelectricity.api.core.grid.INode;
import universalelectricity.api.core.grid.INodeProvider;
import resonant.api.grid.INode;
import resonant.api.grid.INodeProvider;
/**
* TNodeProvider Trait.

2
src/main/scala/resonantinduction/core/util/MultipartUtil.scala
View file

@ -6,7 +6,7 @@ import net.minecraft.init.Blocks
import net.minecraft.tileentity.TileEntity
import net.minecraft.world.{IBlockAccess, World}
import net.minecraftforge.common.util.ForgeDirection
import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
import resonant.lib.transform.vector.{Vector3, VectorWorld}
/**
* Multipart Utilities

4
src/main/scala/resonantinduction/electrical/battery/GridBattery.scala
View file

@ -3,8 +3,8 @@ package resonantinduction.electrical.battery
import java.util.Arrays
import java.util.LinkedHashSet
import java.util.Set
import universalelectricity.core.grid.Grid
import universalelectricity.core.grid.node.NodeEnergy
import resonant.lib.grid.Grid
import resonant.lib.grid.node.NodeEnergy
import scala.collection.JavaConversions._
/** Basic grid designed to be used for creating a level look for batteries connected together

8
src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala
View file

@ -9,15 +9,13 @@ import net.minecraft.item.ItemBlock
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.world.World
import resonant.api.items.IEnergyItem
import resonant.lib.grid.Compatibility
import resonant.lib.render.EnumColor
import resonant.lib.science.UnitDisplay
import resonant.lib.utility.LanguageUtility
import universalelectricity.api.UnitDisplay
import universalelectricity.api.UniversalClass
import universalelectricity.api.item.IEnergyItem
import universalelectricity.compatibility.Compatibility
import resonant.lib.wrapper.WrapList._
@UniversalClass
object ItemBlockBattery
{
def setTier(itemStack: ItemStack, tier: Int): ItemStack =

2
src/main/scala/resonantinduction/electrical/battery/RenderBattery.scala
View file

@ -18,7 +18,7 @@ import org.lwjgl.opengl.GL11.{glPopMatrix, glPushMatrix, glRotatef}
import resonant.content.prefab.scal.render.ISimpleItemRenderer
import resonant.lib.render.RenderUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* TODO: Make this more efficient.

2
src/main/scala/resonantinduction/electrical/battery/TileBattery.scala
View file

@ -13,7 +13,7 @@ import resonant.lib.content.prefab.TElectric
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.network.netty.AbstractPacket
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/** A modular battery box that allows shared connections with boxes next to it.
*

2
src/main/scala/resonantinduction/electrical/generator/TileMotor.scala
View file

@ -10,7 +10,7 @@ import resonant.content.prefab.java.TileNode
import resonant.lib.content.prefab.TElectric
import resonant.lib.content.prefab.java.TileElectric
import resonantinduction.core.interfaces.IMechanicalNode
import universalelectricity.api.core.grid.{IUpdate, INode, NodeRegistry}
import resonant.api.grid.{NodeRegistry, IUpdate, INode}
/**
* A kinetic energy to electrical energy converter.

2
src/main/scala/resonantinduction/electrical/generator/TileSolarPanel.scala
View file

@ -7,7 +7,7 @@ import net.minecraft.util.IIcon
import resonant.content.spatial.block.SpatialBlock
import resonant.lib.content.prefab.java.TileElectric
import resonantinduction.core.{Reference, Settings}
import universalelectricity.core.transform.region.Cuboid
import resonant.lib.transform.region.Cuboid
class TileSolarPanel extends TileElectric(Material.iron)
{

2
src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala
View file

@ -10,7 +10,7 @@ import net.minecraft.util.IIcon
import net.minecraftforge.common.util.ForgeDirection
import resonant.content.spatial.block.SpatialBlock
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import resonant.lib.content.prefab.java.TileElectric
class TileThermopile extends TileElectric(Material.rock) {

2
src/main/scala/resonantinduction/electrical/laser/ILaserHandler.java
View file

@ -1,7 +1,7 @@
package resonantinduction.electrical.laser;
import net.minecraft.util.MovingObjectPosition;
import universalelectricity.core.transform.vector.Vector3;
import resonant.lib.transform.vector.Vector3;
/**
* @author Calclavia

2
src/main/scala/resonantinduction/electrical/laser/Laser.scala
View file

@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntityFurnace
import net.minecraft.util.{DamageSource, MovingObjectPosition}
import net.minecraft.world.World
import resonantinduction.core.ResonantInduction
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import scala.collection.mutable

2
src/main/scala/resonantinduction/electrical/laser/TileLaserEmitter.scala
View file

@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11._
import resonant.content.prefab.java.TileAdvanced
import resonant.lib.render.RenderUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* An emitter that shoots out lasers.

2
src/main/scala/resonantinduction/electrical/laser/TileLaserReceiver.scala
View file

@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11._
import resonant.content.prefab.java.TileAdvanced
import resonant.lib.render.RenderUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* A block that receives laser light and generates a voltage.

2
src/main/scala/resonantinduction/electrical/laser/focus/IFocus.java
View file

@ -1,6 +1,6 @@
package resonantinduction.electrical.laser.focus;
import universalelectricity.core.transform.vector.Vector3;
import resonant.lib.transform.vector.Vector3;
import java.util.List;

4
src/main/scala/resonantinduction/electrical/laser/focus/ItemFocusingMatrix.scala
View file

@ -7,8 +7,8 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.{ChatComponentText, EnumChatFormatting}
import net.minecraft.world.World
import resonantinduction.core.{RICreativeTab, Reference}
import universalelectricity.core.transform.rotation.Quaternion
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.rotation.Quaternion
import resonant.lib.transform.vector.Vector3
import scala.collection.convert.wrapAsScala._
import scala.util.Random

2
src/main/scala/resonantinduction/electrical/laser/focus/TileFocus.scala
View file

@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraftforge.common.util.ForgeDirection
import resonant.content.prefab.java.TileAdvanced
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* @author Calclavia

4
src/main/scala/resonantinduction/electrical/laser/focus/TileFocusCrystal.scala
View file

@ -14,8 +14,8 @@ import org.lwjgl.opengl.GL11._
import resonant.lib.render.RenderUtility
import resonantinduction.core.{Reference, ResonantInduction}
import resonantinduction.electrical.laser.{ILaserHandler, Laser, TileLaserReceiver}
import universalelectricity.core.transform.rotation.Quaternion
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.rotation.Quaternion
import resonant.lib.transform.vector.Vector3
/**
* Redirects lasers to one point

4
src/main/scala/resonantinduction/electrical/laser/focus/TileMirror.scala
View file

@ -13,8 +13,8 @@ import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11._
import resonantinduction.core.{Reference, ResonantInduction}
import resonantinduction.electrical.laser.{ILaserHandler, Laser}
import universalelectricity.core.transform.rotation.Quaternion
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.rotation.Quaternion
import resonant.lib.transform.vector.Vector3
import scala.collection.convert.wrapAsJava._

2
src/main/scala/resonantinduction/electrical/laser/fx/EntityLaserFX.scala
View file

@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11._
import resonantinduction.core.Reference
import resonantinduction.electrical.ElectricalContent
import resonantinduction.electrical.laser.Laser
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* @author Calclavia

2
src/main/scala/resonantinduction/electrical/laser/fx/EntityScorchFX.scala
View file

@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11._
import resonantinduction.core.Reference
import resonantinduction.electrical.ElectricalContent
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* @author Calclavia

8
src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala
View file

@ -1,12 +1,12 @@
package resonantinduction.electrical.multimeter
import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
import resonant.lib.grid.{UpdateTicker, Grid}
import resonant.lib.science.UnitDisplay
import resonant.lib.utility.LanguageUtility
import resonantinduction.electrical.multimeter.graph._
import universalelectricity.api.UnitDisplay
import universalelectricity.api.core.grid.IUpdate
import universalelectricity.core.grid.{Grid, UpdateTicker}
import universalelectricity.core.transform.vector.Vector3
import resonant.api.grid.IUpdate
import resonant.lib.transform.vector.Vector3
import scala.collection.convert.wrapAll._
import scala.collection.mutable.ArrayBuffer

6
src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala
View file

@ -16,6 +16,7 @@ import net.minecraft.util.{ChatComponentText, MovingObjectPosition}
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{FluidTankInfo, IFluidHandler}
import resonant.api.IRemovable
import resonant.lib.grid.Compatibility
import resonant.lib.network.discriminator.PacketType
import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.utility.WrenchUtility
@ -24,9 +25,8 @@ import resonantinduction.core.interfaces.IMechanicalNode
import resonantinduction.core.prefab.part.ChickenBonesWrapper._
import resonantinduction.core.prefab.part.PartFace
import resonantinduction.electrical.ElectricalContent
import universalelectricity.api.core.grid.INodeProvider
import universalelectricity.compatibility.Compatibility
import universalelectricity.core.transform.vector.Vector3
import resonant.api.grid.INodeProvider
import resonant.lib.transform.vector.Vector3
import scala.collection.convert.wrapAll._

2
src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.scala
View file

@ -12,7 +12,7 @@ import resonant.content.prefab.scal.render.ISimpleItemRenderer
import resonant.lib.render.RenderUtility
import resonant.lib.utility.LanguageUtility
import resonantinduction.core.Reference
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* Class used to render text onto the multimeter block.

2
src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala
View file

@ -26,7 +26,7 @@ import resonant.lib.render.EnumColor
import resonant.lib.utility.{LanguageUtility, LinkUtility}
import resonantinduction.core.util.ResonantUtil
import resonantinduction.core.{Reference, ResonantInduction, Settings}
import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
import resonant.lib.transform.vector.{Vector3, VectorWorld}
import scala.collection.JavaConversions._

8
src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala
View file

@ -2,10 +2,10 @@ package resonantinduction.electrical.transformer
import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import universalelectricity.api.core.grid.INodeProvider
import universalelectricity.compatibility.Compatibility
import universalelectricity.core.grid.node.DCNode
import universalelectricity.core.transform.vector.VectorWorld
import resonant.lib.grid.Compatibility
import resonant.api.grid.INodeProvider
import resonant.lib.grid.node.DCNode
import resonant.lib.transform.vector.VectorWorld
/**
* Created by robert on 8/11/2014.

2
src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala
View file

@ -11,7 +11,7 @@ import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.utility.WrenchUtility
import resonantinduction.core.prefab.part.PartFace
import resonantinduction.electrical.ElectricalContent
import universalelectricity.api.core.grid.{INode, INodeProvider}
import resonant.api.grid.{INodeProvider, INode}
/**
* TODO: We can't use face parts, need to use thicker ones. Also, transformer is currently NO-OP

2
src/main/scala/resonantinduction/electrical/wire/ItemWire.scala
View file

@ -14,6 +14,7 @@ import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.input.Keyboard
import resonant.lib.render.EnumColor
import resonant.lib.science.UnitDisplay
import resonant.lib.utility.LanguageUtility
import resonant.lib.wrapper.WrapList._
import resonantinduction.core.util.MultipartUtil
@ -21,7 +22,6 @@ import resonantinduction.core.{Reference, ResonantPartFactory, RICreativeTab}
import resonantinduction.electrical.wire.base.WireMaterial
import resonantinduction.electrical.wire.flat.{PartFlatWire, RenderFlatWire}
import resonantinduction.electrical.wire.framed.PartFramedWire
import universalelectricity.api.UnitDisplay
class ItemWire extends TItemMultiPart
{

4
src/main/scala/resonantinduction/electrical/wire/base/TWire.scala
View file

@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.util.ForgeDirection
import resonantinduction.core.prefab.part.connector._
import resonantinduction.electrical.ElectricalContent
import universalelectricity.api.core.grid.INodeProvider
import universalelectricity.core.grid.node.DCNode
import resonant.api.grid.INodeProvider
import resonant.lib.grid.node.DCNode
/**
* Abstract class extended by both flat and framed wires to handle material, insulation, color and multipart node logic.

4
src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala
View file

@ -21,8 +21,8 @@ import resonantinduction.core.prefab.part.ChickenBonesWrapper._
import resonantinduction.core.prefab.part.connector.PartAbstract
import resonantinduction.core.util.MultipartUtil
import resonantinduction.electrical.wire.base.TWire
import universalelectricity.api.core.grid.INodeProvider
import universalelectricity.core.grid.node.DCNode
import resonant.api.grid.INodeProvider
import resonant.lib.grid.node.DCNode
import scala.collection.convert.wrapAll._

2
src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.scala
View file

@ -11,7 +11,7 @@ import resonant.lib.wrapper.BitmaskWrapper._
import resonantinduction.core.prefab.node.TMultipartNode
import resonantinduction.core.prefab.part.connector.PartFramedNode
import resonantinduction.electrical.wire.base.TWire
import universalelectricity.core.grid.node.DCNode
import resonant.lib.grid.node.DCNode
/**
* Fluid transport pipe

2
src/main/scala/resonantinduction/mechanical/MechanicalContent.scala
View file

@ -20,7 +20,7 @@ import resonantinduction.mechanical.mech.process.crusher.TileMechanicalPiston
import resonantinduction.mechanical.mech.process.grinder.TileGrindingWheel
import resonantinduction.mechanical.mech.process.mixer.TileMixer
import resonantinduction.mechanical.mech.turbine.{TileElectricTurbine, TileWaterTurbine, TileWindTurbine}
import universalelectricity.api.core.grid.NodeRegistry
import resonant.api.grid.NodeRegistry
/**
* The core contents of Resonant Induction

2
src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala
View file

@ -10,10 +10,10 @@ import net.minecraft.item.{Item, ItemStack}
import net.minecraft.world.World
import org.lwjgl.input.Keyboard
import resonant.lib.render.EnumColor
import resonant.lib.science.UnitDisplay
import resonant.lib.utility.LanguageUtility
import resonant.lib.wrapper.WrapList._
import resonantinduction.core.ResonantPartFactory
import universalelectricity.api.UnitDisplay
class ItemPipe extends TItemMultiPart
{

2
src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.scala
View file

@ -5,7 +5,7 @@ import net.minecraftforge.fluids.IFluidHandler
import resonant.lib.wrapper.BitmaskWrapper._
import resonantinduction.core.prefab.node.{NodePressure, TMultipartNode}
import resonantinduction.core.prefab.part.connector.TColorable
import universalelectricity.api.core.grid.INodeProvider
import resonant.api.grid.INodeProvider
/**
* Pressure node for the pipe

2
src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala
View file

@ -2,7 +2,7 @@ package resonantinduction.mechanical.fluid.transport
import net.minecraftforge.common.util.ForgeDirection
import resonantinduction.core.prefab.node.NodePressure
import universalelectricity.api.core.grid.INodeProvider
import resonant.api.grid.INodeProvider
/**
* Created by robert on 9/27/2014.

2
src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala
View file

@ -6,7 +6,7 @@ import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo, IFluidHandler}
import resonant.api.IRotatable
import resonantinduction.mechanical.mech.TileMechanical
import universalelectricity.api.core.grid.INode
import resonant.api.grid.INode
class TilePump extends TileMechanical(Material.iron) with IRotatable with IFluidHandler
{

4
src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala
View file

@ -19,10 +19,10 @@ import resonant.lib.network.discriminator.PacketType
import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.utility.inventory.InternalInventoryHandler
import resonantinduction.core.ResonantInduction
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import cpw.mods.fml.relauncher.Side
import cpw.mods.fml.relauncher.SideOnly
import universalelectricity.core.transform.vector.VectorWorld
import resonant.lib.transform.vector.VectorWorld
/**
* @author tgame14

2
src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala
View file

@ -20,7 +20,7 @@ import resonant.lib.network.handle.TPacketReceiver
import resonant.lib.render.RenderItemOverlayUtility
import resonant.lib.utility.LanguageUtility
import resonant.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility}
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
/**
* @author tgame14

4
src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java
View file

@ -15,8 +15,8 @@ import net.minecraftforge.common.util.ForgeDirection;
import resonant.lib.debug.FrameNodeDebug;
import resonant.lib.debug.UpdatePanel;
import resonant.lib.debug.UpdatedLabel;
import universalelectricity.api.core.grid.INode;
import universalelectricity.api.core.grid.INodeProvider;
import resonant.api.grid.INode;
import resonant.api.grid.INodeProvider;
/** Java GUI used to help debug gear information
*

10
src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java
View file

@ -5,11 +5,11 @@ import net.minecraftforge.common.util.ForgeDirection;
import resonant.lib.utility.nbt.ISaveObj;
import resonantinduction.core.interfaces.IMechanicalNode;
import resonantinduction.core.prefab.node.TMultipartNode;
import universalelectricity.api.core.grid.INode;
import universalelectricity.api.core.grid.INodeProvider;
import universalelectricity.api.core.grid.IUpdate;
import universalelectricity.core.grid.node.NodeConnector;
import universalelectricity.core.transform.vector.IVectorWorld;
import resonant.api.grid.INode;
import resonant.api.grid.INodeProvider;
import resonant.api.grid.IUpdate;
import resonant.lib.grid.node.NodeConnector;
import resonant.lib.transform.vector.IVectorWorld;
import java.util.Iterator;
import java.util.Map.Entry;

4
src/main/scala/resonantinduction/mechanical/mech/PartMechanical.scala
View file

@ -12,8 +12,8 @@ import net.minecraft.util.MovingObjectPosition
import net.minecraftforge.common.util.ForgeDirection
import resonant.engine.ResonantEngine
import resonantinduction.core.prefab.part.connector.PartAbstract
import universalelectricity.api.core.grid.{INode, INodeProvider}
import universalelectricity.core.transform.vector.VectorWorld
import resonant.api.grid.{INodeProvider, INode}
import resonant.lib.transform.vector.VectorWorld
/** We assume all the force acting on the gear is 90 degrees.
*

4
src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala
View file

@ -14,8 +14,8 @@ import resonant.content.prefab.java.TileNode
import resonant.engine.ResonantEngine
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketIDReceiver
import universalelectricity.api.core.grid.{INode, INodeProvider}
import universalelectricity.core.transform.vector.Vector3
import resonant.api.grid.{INodeProvider, INode}
import resonant.lib.transform.vector.Vector3
/** Prefab for resonantinduction.mechanical tiles
*

2
src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala
View file

@ -3,7 +3,7 @@ package resonantinduction.mechanical.mech.gear
import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import resonant.lib.multiblock.reference.MultiBlockHandler
import universalelectricity.core.transform.vector.Vector3
import resonant.lib.transform.vector.Vector3
import codechicken.multipart.TMultiPart
import codechicken.multipart.TileMultipart

4
src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.scala
View file

@ -7,8 +7,8 @@ import net.minecraftforge.common.util.ForgeDirection
import resonantinduction.core.interfaces.IMechanicalNode
import resonantinduction.mechanical.mech.MechanicalNode
import resonantinduction.mechanical.mech.gearshaft.PartGearShaft
import universalelectricity.api.core.grid.INodeProvider
import universalelectricity.core.transform.vector.{IVectorWorld, Vector3, VectorWorld}
import resonant.api.grid.INodeProvider
import resonant.lib.transform.vector.{IVectorWorld, Vector3, VectorWorld}
/**
* Node for the gear

10
src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala
View file

@ -18,8 +18,8 @@ import resonantinduction.core.Reference
import resonantinduction.core.prefab.part.CuboidShapes
import resonantinduction.mechanical.MechanicalContent
import resonantinduction.mechanical.mech.PartMechanical
import universalelectricity.api.core.grid.INode
import universalelectricity.core.transform.vector.VectorWorld
import resonant.api.grid.INode
import resonant.lib.transform.vector.VectorWorld
/** We assume all the force acting on the gear is 90 degrees.
*
@ -136,10 +136,10 @@ class PartGear extends PartMechanical with IMultiBlockStructure[PartGear]
getMultiBlock.save(nbt)
}
override def getMultiBlockVectors: java.util.List[universalelectricity.core.transform.vector.Vector3] =
override def getMultiBlockVectors: java.util.List[resonant.lib.transform.vector.Vector3] =
{
val vec = new universalelectricity.core.transform.vector.Vector3(this.x, this.y, this.z)
var array: java.util.List[universalelectricity.core.transform.vector.Vector3] = vec.getAround(this.world, placementSide, 1)
val vec = new resonant.lib.transform.vector.Vector3(this.x, this.y, this.z)
var array: java.util.List[resonant.lib.transform.vector.Vector3] = vec.getAround(this.world, placementSide, 1)
return array
}

4
src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.scala
View file

@ -4,8 +4,8 @@ import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import resonantinduction.mechanical.mech.MechanicalNode
import resonantinduction.mechanical.mech.gear.PartGear
import universalelectricity.api.core.grid.INodeProvider
import universalelectricity.core.transform.vector.Vector3
import resonant.api.grid.INodeProvider
import resonant.lib.transform.vector.Vector3
class GearShaftNode(parent: INodeProvider) extends MechanicalNode(parent)
{

Some files were not shown because too many files have changed in this diff Show more