From 5348ef9f775de0d37a3781b4204e6c58808c51e5 Mon Sep 17 00:00:00 2001 From: Robert S Date: Mon, 27 Oct 2014 13:31:42 -0400 Subject: [PATCH] Update for new RE, no longer requires UE-Core --- .../archaic/blocks/TileFilterable.scala | 2 +- .../archaic/blocks/TileImprinter.scala | 2 +- .../archaic/blocks/TileTurntable.scala | 2 +- .../archaic/crate/PathfinderCrate.scala | 2 +- .../archaic/engineering/TileEngineeringTable.scala | 4 ++-- .../archaic/firebox/TileFirebox.scala | 2 +- .../archaic/firebox/TileHotPlate.scala | 4 ++-- .../archaic/fluid/grate/TileGrate.scala | 2 +- .../archaic/fluid/gutter/TileGutter.scala | 4 ++-- .../archaic/fluid/tank/ItemBlockTank.scala | 4 ++-- .../archaic/fluid/tank/TileTank.scala | 2 +- .../archaic/process/TileCastingMold.scala | 2 +- .../archaic/process/TileMillstone.scala | 2 +- .../scala/resonantinduction/atomic/AtomicContent.scala | 2 +- .../atomic/blocks/BlockRadioactive.scala | 2 +- .../atomic/blocks/BlockToxicWaste.scala | 2 +- .../atomic/blocks/TileElectromagnet.scala | 2 +- .../resonantinduction/atomic/blocks/TileSiren.scala | 2 +- .../atomic/gate/PartQuantumGlyph.scala | 2 +- .../atomic/gate/QuantumGateManager.java | 2 +- .../atomic/items/ItemFissileFuel.scala | 2 +- .../atomic/items/ItemRadioactive.scala | 2 +- .../atomic/machine/accelerator/EntityParticle.scala | 2 +- .../atomic/machine/accelerator/GuiAccelerator.scala | 4 ++-- .../atomic/machine/accelerator/TileAccelerator.scala | 2 +- .../atomic/machine/boiler/GuiNuclearBoiler.scala | 2 +- .../atomic/machine/boiler/TileNuclearBoiler.scala | 2 +- .../atomic/machine/centrifuge/GuiCentrifuge.scala | 2 +- .../atomic/machine/centrifuge/TileCentrifuge.scala | 4 ++-- .../machine/extractor/GuiChemicalExtractor.scala | 2 +- .../machine/extractor/TileChemicalExtractor.scala | 4 ++-- .../machine/fulmination/FulminationHandler.scala | 2 +- .../atomic/machine/plasma/TilePlasma.scala | 2 +- .../atomic/machine/plasma/TilePlasmaHeater.scala | 4 ++-- .../atomic/machine/quantum/GuiQuantumAssembler.scala | 2 +- .../atomic/machine/quantum/TileQuantumAssembler.scala | 2 +- .../atomic/machine/reactor/TileControlRod.scala | 2 +- .../atomic/machine/reactor/TileReactorCell.scala | 2 +- .../atomic/machine/reactor/TileReactorDrain.scala | 2 +- .../machine/thermometer/ItemBlockThermometer.scala | 2 +- .../atomic/machine/thermometer/TileThermometer.scala | 2 +- .../atomic/schematic/SchematicAccelerator.scala | 2 +- .../atomic/schematic/SchematicBreedingReactor.scala | 2 +- .../atomic/schematic/SchematicFissionReactor.scala | 2 +- .../atomic/schematic/SchematicFusionReactor.scala | 2 +- .../scala/resonantinduction/core/ClientProxy.scala | 2 +- .../scala/resonantinduction/core/CommonProxy.scala | 2 +- .../core/interfaces/IMechanicalNode.scala | 4 ++-- .../core/prefab/node/NodePressure.scala | 2 +- .../resonantinduction/core/prefab/node/NodeTank.scala | 3 ++- .../core/prefab/node/TMultipartNode.scala | 4 ++-- .../core/prefab/node/TileTankNode.scala | 2 +- .../core/prefab/part/ChickenBonesWrapper.scala | 8 ++++---- .../core/prefab/part/PacketMultiPart.scala | 2 +- .../prefab/part/connector/TNodePartConnector.scala | 3 ++- .../core/prefab/pass/TNodeProvider.java | 4 ++-- .../resonantinduction/core/util/MultipartUtil.scala | 2 +- .../electrical/battery/GridBattery.scala | 4 ++-- .../electrical/battery/ItemBlockBattery.scala | 8 +++----- .../electrical/battery/RenderBattery.scala | 2 +- .../electrical/battery/TileBattery.scala | 2 +- .../electrical/generator/TileMotor.scala | 2 +- .../electrical/generator/TileSolarPanel.scala | 2 +- .../electrical/generator/TileThermopile.scala | 2 +- .../electrical/laser/ILaserHandler.java | 2 +- .../resonantinduction/electrical/laser/Laser.scala | 2 +- .../electrical/laser/TileLaserEmitter.scala | 2 +- .../electrical/laser/TileLaserReceiver.scala | 2 +- .../electrical/laser/focus/IFocus.java | 2 +- .../electrical/laser/focus/ItemFocusingMatrix.scala | 4 ++-- .../electrical/laser/focus/TileFocus.scala | 2 +- .../electrical/laser/focus/TileFocusCrystal.scala | 4 ++-- .../electrical/laser/focus/TileMirror.scala | 4 ++-- .../electrical/laser/fx/EntityLaserFX.scala | 2 +- .../electrical/laser/fx/EntityScorchFX.scala | 2 +- .../electrical/multimeter/MultimeterGrid.scala | 8 ++++---- .../electrical/multimeter/PartMultimeter.scala | 6 +++--- .../electrical/multimeter/RenderMultimeter.scala | 2 +- .../resonantinduction/electrical/tesla/TileTesla.scala | 2 +- .../transformer/ElectricTransformerNode.scala | 8 ++++---- .../transformer/PartElectricTransformer.scala | 2 +- .../resonantinduction/electrical/wire/ItemWire.scala | 2 +- .../resonantinduction/electrical/wire/base/TWire.scala | 4 ++-- .../electrical/wire/flat/PartFlatWire.scala | 4 ++-- .../electrical/wire/framed/PartFramedWire.scala | 2 +- .../mechanical/MechanicalContent.scala | 2 +- .../mechanical/fluid/pipe/ItemPipe.scala | 2 +- .../mechanical/fluid/pipe/PipePressureNode.scala | 2 +- .../mechanical/fluid/transport/PumpNode.scala | 2 +- .../mechanical/fluid/transport/TilePump.scala | 2 +- .../mechanical/machine/edit/TileBreaker.scala | 4 ++-- .../mechanical/machine/edit/TilePlacer.scala | 2 +- .../mechanical/mech/DebugFrameMechanical.java | 4 ++-- .../mechanical/mech/MechanicalNode.java | 10 +++++----- .../mechanical/mech/PartMechanical.scala | 4 ++-- .../mechanical/mech/TileMechanical.scala | 4 ++-- .../mechanical/mech/gear/GearMultiBlockHandler.scala | 2 +- .../mechanical/mech/gear/GearNode.scala | 4 ++-- .../mechanical/mech/gear/PartGear.scala | 10 +++++----- .../mechanical/mech/gearshaft/GearShaftNode.scala | 4 ++-- .../mech/process/crusher/TileMechanicalPiston.scala | 4 ++-- .../mech/process/grinder/TileGrindingWheel.scala | 4 ++-- .../mechanical/mech/process/mixer/MixerNode.scala | 2 +- .../mechanical/mech/process/mixer/TileMixer.scala | 6 +++--- .../mechanical/mech/turbine/TileTurbine.scala | 4 ++-- .../mechanical/mech/turbine/TileWaterTurbine.scala | 4 ++-- .../mechanical/mech/turbine/TileWindTurbine.scala | 2 +- .../mechanical/mech/turbine/TurbineMBlockHandler.scala | 2 +- 108 files changed, 160 insertions(+), 160 deletions(-) diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala b/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala index 5cb6df7a8..9dfe84aa8 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala b/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala index 4d6c80c8e..96a992c68 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala index 75245a8dc..fb7518c76 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.scala b/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.scala index 82fcf4d1d..17b573f9e 100644 --- a/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.scala +++ b/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.scala @@ -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. diff --git a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala index 220b582e4..41620cb6e 100644 --- a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala +++ b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala @@ -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._ /** diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala index f6adc78ca..68f0909f7 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala +++ b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala index f21932691..127f71764 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala +++ b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala @@ -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. diff --git a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala index 097ed0863..5478acd67 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala index 781d1e404..dbd44b414 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala b/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala index 13d4b76f7..8a04dbeba 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala @@ -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 diff --git a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala index 423e16c56..7e9f474f6 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala @@ -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 diff --git a/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala b/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala index 15a86297a..0b5fe4a7e 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala +++ b/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala @@ -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. diff --git a/src/main/scala/resonantinduction/archaic/process/TileMillstone.scala b/src/main/scala/resonantinduction/archaic/process/TileMillstone.scala index 07e16a571..820a439d5 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileMillstone.scala +++ b/src/main/scala/resonantinduction/archaic/process/TileMillstone.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/atomic/AtomicContent.scala b/src/main/scala/resonantinduction/atomic/AtomicContent.scala index c89110e21..0716f9a88 100644 --- a/src/main/scala/resonantinduction/atomic/AtomicContent.scala +++ b/src/main/scala/resonantinduction/atomic/AtomicContent.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/atomic/blocks/BlockRadioactive.scala b/src/main/scala/resonantinduction/atomic/blocks/BlockRadioactive.scala index f8fa7421c..c6047a6fe 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/BlockRadioactive.scala +++ b/src/main/scala/resonantinduction/atomic/blocks/BlockRadioactive.scala @@ -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) diff --git a/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.scala b/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.scala index 6d82941f4..7b353dc0c 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.scala +++ b/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.scala @@ -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) { diff --git a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala index d94c4d672..d10bdf961 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala +++ b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala b/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala index 2166fe07d..b59048370 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala +++ b/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala b/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala index 78fdbdedb..f9fff1cf2 100644 --- a/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala +++ b/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java b/src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java index de35bedb0..14659c770 100644 --- a/src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java +++ b/src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java @@ -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; diff --git a/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala b/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala index 159ea0770..8b66d5d69 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala +++ b/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.scala b/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.scala index 0f7a41922..275c35ed5 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.scala +++ b/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala index 23ef6e8f1..5264b2edf 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala @@ -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._ /** diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala index 715802421..157b9a019 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala @@ -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)) { diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala index 4c40c5623..67c3a4d46 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala b/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala index 70e716eec..c1008a9d9 100644 --- a/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala @@ -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)) { diff --git a/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala b/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala index d3a280704..577fef39e 100644 --- a/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala b/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala index 59737c5b2..1881c6644 100644 --- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala +++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala @@ -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)) { diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala index 96619113e..2c7e1cd16 100644 --- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala +++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala b/src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala index df47bb900..d82178da1 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala @@ -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)) { diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala b/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala index b44d8798c..ca022791a 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala b/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala index 517bb18c8..700d2ca82 100644 --- a/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala @@ -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. diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala index ac255ddb1..f8f29fa69 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala index 1786bd08f..897343702 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala b/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala index 2a46f0e93..42e15ddb6 100644 --- a/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala b/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala index 2a1e45245..e27ea1a54 100644 --- a/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala @@ -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 * diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.scala index e22e22438..3b0e4042f 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala index 6bf4b7559..913b52af6 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala index 5ae1eb2cb..f7872ee76 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.scala b/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.scala index 9337fd3cd..6d307523a 100644 --- a/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.scala +++ b/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala b/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala index 0886cf62e..b7e41e45e 100644 --- a/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala +++ b/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala @@ -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 diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala index 91475a7db..996716572 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala index 32dba238c..46730d04b 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala index a91575787..4d3a75444 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala index 63c8dcc73..859f9e501 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/core/ClientProxy.scala b/src/main/scala/resonantinduction/core/ClientProxy.scala index a39c2d12d..cde275465 100644 --- a/src/main/scala/resonantinduction/core/ClientProxy.scala +++ b/src/main/scala/resonantinduction/core/ClientProxy.scala @@ -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 diff --git a/src/main/scala/resonantinduction/core/CommonProxy.scala b/src/main/scala/resonantinduction/core/CommonProxy.scala index 23be96ce6..1c737bb48 100644 --- a/src/main/scala/resonantinduction/core/CommonProxy.scala +++ b/src/main/scala/resonantinduction/core/CommonProxy.scala @@ -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 diff --git a/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.scala b/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.scala index 9c511f310..1e794e06c 100644 --- a/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.scala +++ b/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.scala @@ -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 diff --git a/src/main/scala/resonantinduction/core/prefab/node/NodePressure.scala b/src/main/scala/resonantinduction/core/prefab/node/NodePressure.scala index 08f6a76aa..e83768410 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/NodePressure.scala +++ b/src/main/scala/resonantinduction/core/prefab/node/NodePressure.scala @@ -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. diff --git a/src/main/scala/resonantinduction/core/prefab/node/NodeTank.scala b/src/main/scala/resonantinduction/core/prefab/node/NodeTank.scala index 9cf801047..e0ad5c5da 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/NodeTank.scala +++ b/src/main/scala/resonantinduction/core/prefab/node/NodeTank.scala @@ -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. diff --git a/src/main/scala/resonantinduction/core/prefab/node/TMultipartNode.scala b/src/main/scala/resonantinduction/core/prefab/node/TMultipartNode.scala index f2f4640bd..17254a9c3 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/TMultipartNode.scala +++ b/src/main/scala/resonantinduction/core/prefab/node/TMultipartNode.scala @@ -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. diff --git a/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala b/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala index 07dd7ff75..495c07851 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala +++ b/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala @@ -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. diff --git a/src/main/scala/resonantinduction/core/prefab/part/ChickenBonesWrapper.scala b/src/main/scala/resonantinduction/core/prefab/part/ChickenBonesWrapper.scala index 93833394c..eb45f1b51 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/ChickenBonesWrapper.scala +++ b/src/main/scala/resonantinduction/core/prefab/part/ChickenBonesWrapper.scala @@ -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) diff --git a/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.scala b/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.scala index aeb0631ab..4ac84be66 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.scala +++ b/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.scala @@ -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. diff --git a/src/main/scala/resonantinduction/core/prefab/part/connector/TNodePartConnector.scala b/src/main/scala/resonantinduction/core/prefab/part/connector/TNodePartConnector.scala index 3968b7963..01af4819f 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/connector/TNodePartConnector.scala +++ b/src/main/scala/resonantinduction/core/prefab/part/connector/TNodePartConnector.scala @@ -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. diff --git a/src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java b/src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java index b62245bb1..2bda9f12e 100644 --- a/src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java +++ b/src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java @@ -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. diff --git a/src/main/scala/resonantinduction/core/util/MultipartUtil.scala b/src/main/scala/resonantinduction/core/util/MultipartUtil.scala index 3525f33a9..46f4e3ccf 100644 --- a/src/main/scala/resonantinduction/core/util/MultipartUtil.scala +++ b/src/main/scala/resonantinduction/core/util/MultipartUtil.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/battery/GridBattery.scala b/src/main/scala/resonantinduction/electrical/battery/GridBattery.scala index 1dcc6100a..16655ab64 100644 --- a/src/main/scala/resonantinduction/electrical/battery/GridBattery.scala +++ b/src/main/scala/resonantinduction/electrical/battery/GridBattery.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala b/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala index 578430983..1c6a7e1ad 100644 --- a/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala +++ b/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala @@ -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 = diff --git a/src/main/scala/resonantinduction/electrical/battery/RenderBattery.scala b/src/main/scala/resonantinduction/electrical/battery/RenderBattery.scala index 2770de24d..6a44073be 100644 --- a/src/main/scala/resonantinduction/electrical/battery/RenderBattery.scala +++ b/src/main/scala/resonantinduction/electrical/battery/RenderBattery.scala @@ -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. diff --git a/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala b/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala index 177c093ed..d8384d9de 100644 --- a/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala +++ b/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala @@ -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. * diff --git a/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala b/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala index 96fced0c0..b5afd5ff1 100644 --- a/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala +++ b/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala @@ -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. diff --git a/src/main/scala/resonantinduction/electrical/generator/TileSolarPanel.scala b/src/main/scala/resonantinduction/electrical/generator/TileSolarPanel.scala index e0c6f10ca..fd0e0522f 100644 --- a/src/main/scala/resonantinduction/electrical/generator/TileSolarPanel.scala +++ b/src/main/scala/resonantinduction/electrical/generator/TileSolarPanel.scala @@ -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) { diff --git a/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala b/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala index d0d236e46..b8f6e6d75 100644 --- a/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala +++ b/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala @@ -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) { diff --git a/src/main/scala/resonantinduction/electrical/laser/ILaserHandler.java b/src/main/scala/resonantinduction/electrical/laser/ILaserHandler.java index d8b2c922e..22e309417 100644 --- a/src/main/scala/resonantinduction/electrical/laser/ILaserHandler.java +++ b/src/main/scala/resonantinduction/electrical/laser/ILaserHandler.java @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/laser/Laser.scala b/src/main/scala/resonantinduction/electrical/laser/Laser.scala index c16a2ddff..f655cce70 100644 --- a/src/main/scala/resonantinduction/electrical/laser/Laser.scala +++ b/src/main/scala/resonantinduction/electrical/laser/Laser.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/laser/TileLaserEmitter.scala b/src/main/scala/resonantinduction/electrical/laser/TileLaserEmitter.scala index 853a68adf..ddeb6fee3 100644 --- a/src/main/scala/resonantinduction/electrical/laser/TileLaserEmitter.scala +++ b/src/main/scala/resonantinduction/electrical/laser/TileLaserEmitter.scala @@ -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. diff --git a/src/main/scala/resonantinduction/electrical/laser/TileLaserReceiver.scala b/src/main/scala/resonantinduction/electrical/laser/TileLaserReceiver.scala index f57af5ea2..69537dc1b 100644 --- a/src/main/scala/resonantinduction/electrical/laser/TileLaserReceiver.scala +++ b/src/main/scala/resonantinduction/electrical/laser/TileLaserReceiver.scala @@ -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. diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/IFocus.java b/src/main/scala/resonantinduction/electrical/laser/focus/IFocus.java index 9c11f0e9e..b8960bcab 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/IFocus.java +++ b/src/main/scala/resonantinduction/electrical/laser/focus/IFocus.java @@ -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; diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/ItemFocusingMatrix.scala b/src/main/scala/resonantinduction/electrical/laser/focus/ItemFocusingMatrix.scala index 40e638d42..1996aefa7 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/ItemFocusingMatrix.scala +++ b/src/main/scala/resonantinduction/electrical/laser/focus/ItemFocusingMatrix.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/TileFocus.scala b/src/main/scala/resonantinduction/electrical/laser/focus/TileFocus.scala index eaa6acd11..8f11d74ea 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/TileFocus.scala +++ b/src/main/scala/resonantinduction/electrical/laser/focus/TileFocus.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/TileFocusCrystal.scala b/src/main/scala/resonantinduction/electrical/laser/focus/TileFocusCrystal.scala index a8ca84396..037c2cce0 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/TileFocusCrystal.scala +++ b/src/main/scala/resonantinduction/electrical/laser/focus/TileFocusCrystal.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/TileMirror.scala b/src/main/scala/resonantinduction/electrical/laser/focus/TileMirror.scala index 8277525b5..21d0b2472 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/TileMirror.scala +++ b/src/main/scala/resonantinduction/electrical/laser/focus/TileMirror.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/electrical/laser/fx/EntityLaserFX.scala b/src/main/scala/resonantinduction/electrical/laser/fx/EntityLaserFX.scala index 252f74980..1091ed1e4 100644 --- a/src/main/scala/resonantinduction/electrical/laser/fx/EntityLaserFX.scala +++ b/src/main/scala/resonantinduction/electrical/laser/fx/EntityLaserFX.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/laser/fx/EntityScorchFX.scala b/src/main/scala/resonantinduction/electrical/laser/fx/EntityScorchFX.scala index 57e47354d..a7ba8052a 100644 --- a/src/main/scala/resonantinduction/electrical/laser/fx/EntityScorchFX.scala +++ b/src/main/scala/resonantinduction/electrical/laser/fx/EntityScorchFX.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala index be6e79a00..8e78eec04 100644 --- a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala +++ b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala b/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala index 7c1016b35..1f41404f8 100644 --- a/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala +++ b/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.scala b/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.scala index 22fda9be8..4ca9e532e 100644 --- a/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.scala +++ b/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.scala @@ -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. diff --git a/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala b/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala index 04cc22ec9..df42844d9 100644 --- a/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala +++ b/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala b/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala index 4e890d004..7718e7d95 100644 --- a/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala +++ b/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala @@ -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. diff --git a/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala b/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala index c9f44af0f..7f05dd795 100644 --- a/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala +++ b/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala @@ -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 diff --git a/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala b/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala index 6cc8d92c8..7ac0b7a01 100644 --- a/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala +++ b/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/electrical/wire/base/TWire.scala b/src/main/scala/resonantinduction/electrical/wire/base/TWire.scala index 1ab3e18d7..8ef320478 100644 --- a/src/main/scala/resonantinduction/electrical/wire/base/TWire.scala +++ b/src/main/scala/resonantinduction/electrical/wire/base/TWire.scala @@ -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. diff --git a/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala b/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala index f80e31558..c02b81010 100644 --- a/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala +++ b/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala @@ -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._ diff --git a/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.scala b/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.scala index 37d4d4cd0..1d13ed2bb 100644 --- a/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.scala +++ b/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.scala @@ -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 diff --git a/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala b/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala index 866a2fe89..f57f18333 100644 --- a/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala +++ b/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala @@ -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 diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala b/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala index b4fd4f949..5ae2da20b 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.scala b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.scala index c678aa604..1d9809e1e 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.scala @@ -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 diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala b/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala index 3bfcd74ab..70a012053 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala @@ -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. diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala index 2fb44ee29..0f6a52417 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala @@ -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 { diff --git a/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala b/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala index 3533f55aa..f430a5539 100644 --- a/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala +++ b/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala @@ -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 diff --git a/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala b/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala index 068b49de2..3fdd9a112 100644 --- a/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala +++ b/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala @@ -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 diff --git a/src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java b/src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java index 54c206f35..9688496fc 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java +++ b/src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java @@ -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 * diff --git a/src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java b/src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java index f21b98b15..df3b3f9f1 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java +++ b/src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java @@ -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; diff --git a/src/main/scala/resonantinduction/mechanical/mech/PartMechanical.scala b/src/main/scala/resonantinduction/mechanical/mech/PartMechanical.scala index b0c176316..ac03765cf 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/PartMechanical.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/PartMechanical.scala @@ -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. * diff --git a/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala b/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala index a1164f658..9ca04b5d2 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala @@ -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 * diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala index c9206a591..12733c196 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala @@ -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 diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.scala index bef7a8f0e..884223089 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.scala @@ -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 diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala index 65cc9f882..655405279 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala @@ -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 } diff --git a/src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.scala b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.scala index 63e05ba58..efce81050 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.scala @@ -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) { diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala index e6967d2ee..d3045effa 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala @@ -16,8 +16,8 @@ import resonant.lib.utility.MovementUtility import resonant.lib.utility.inventory.InventoryUtility import resonantinduction.core.ResonantInduction import resonantinduction.mechanical.mech.TileMechanical -import universalelectricity.api.core.grid.INode -import universalelectricity.core.transform.vector.Vector3 +import resonant.api.grid.INode +import resonant.lib.transform.vector.Vector3 /** * Mechanical driven piston that can be used to move basic blocks and crush ores diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala b/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala index 2a52b9c0e..5b12d9619 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala @@ -12,8 +12,8 @@ import resonant.lib.prefab.damage.CustomDamageSource import resonant.lib.utility.Timer import resonantinduction.core.{Reference, ResonantInduction} import resonantinduction.mechanical.mech.TileMechanical -import universalelectricity.core.transform.region.Cuboid -import universalelectricity.core.transform.vector.Vector3 +import resonant.lib.transform.region.Cuboid +import resonant.lib.transform.vector.Vector3 /** * @author Calclavia diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.scala b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.scala index b17fe28af..2f5541eae 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.scala @@ -2,7 +2,7 @@ package resonantinduction.mechanical.mech.process.mixer import net.minecraftforge.common.util.ForgeDirection import resonantinduction.mechanical.mech.MechanicalNode -import universalelectricity.api.core.grid.INodeProvider +import resonant.api.grid.INodeProvider /** * Node designed just for the Mixer to use diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala index 3aa7da0f6..6d1c13ac2 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala @@ -24,9 +24,9 @@ import resonant.lib.render.RenderUtility import resonant.lib.utility.Timer import resonantinduction.core.Reference import resonantinduction.mechanical.mech.TileMechanical -import universalelectricity.api.core.grid.INode -import universalelectricity.core.transform.rotation.Quaternion -import universalelectricity.core.transform.vector.Vector3 +import resonant.api.grid.INode +import resonant.lib.transform.rotation.Quaternion +import resonant.lib.transform.vector.Vector3 import scala.collection.JavaConversions._ diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala index 966da1118..cbb46fec4 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala @@ -14,8 +14,8 @@ import resonant.lib.multiblock.reference.IMultiBlockStructure import resonant.lib.network.handle.IPacketIDReceiver import resonantinduction.mechanical.mech.TileMechanical import resonantinduction.mechanical.mech.gear.ItemHandCrank -import universalelectricity.api.core.grid.INodeProvider -import universalelectricity.core.transform.vector.Vector3 +import resonant.api.grid.INodeProvider +import resonant.lib.transform.vector.Vector3 /** Reduced version of the main turbine class */ class TileTurbine extends TileMechanical(Material.wood) with IMultiBlockStructure[TileTurbine] with INodeProvider with IPacketIDReceiver diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala index 8200a9f93..899c5c7d0 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala @@ -16,8 +16,8 @@ import resonant.content.prefab.itemblock.ItemBlockMetadata import resonant.lib.wrapper.WrapList._ import resonantinduction.core.Settings import resonantinduction.mechanical.mech.MechanicalNode -import universalelectricity.api.core.grid.INodeProvider -import universalelectricity.core.transform.vector.Vector3 +import resonant.api.grid.INodeProvider +import resonant.lib.transform.vector.Vector3 /** * The vertical water turbine collects flowing water flowing on X axis. diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala index 9b9b6b4e8..55285bd43 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala @@ -11,7 +11,7 @@ import resonant.content.prefab.itemblock.ItemBlockMetadata import resonant.lib.utility.inventory.InventoryUtility import resonant.lib.wrapper.WrapList._ import resonantinduction.core.Settings -import universalelectricity.core.transform.vector.Vector3 +import resonant.lib.transform.vector.Vector3 /** The vertical wind turbine collects airflow. The horizontal wind turbine collects steam from steam * power plants. diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala index f03d30b75..33d05399e 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala @@ -2,7 +2,7 @@ package resonantinduction.mechanical.mech.turbine import net.minecraft.tileentity.TileEntity import resonant.lib.multiblock.reference.MultiBlockHandler -import universalelectricity.core.transform.vector.Vector3 +import resonant.lib.transform.vector.Vector3 class TurbineMBlockHandler(wrapper: TileTurbine) extends MultiBlockHandler[TileTurbine](wrapper) {