diff --git a/src/main/scala/resonantinduction/archaic/ArchaicContent.scala b/src/main/scala/resonantinduction/archaic/ArchaicContent.scala index d6fdd192b..1e5502e26 100644 --- a/src/main/scala/resonantinduction/archaic/ArchaicContent.scala +++ b/src/main/scala/resonantinduction/archaic/ArchaicContent.scala @@ -5,7 +5,7 @@ import net.minecraft.init.{Blocks, Items} import net.minecraft.item.{Item, ItemStack} import net.minecraftforge.oredict.OreDictionary import resonant.content.loader.ContentHolder -import resonant.lib.recipe.UniversalRecipe +import resonant.lib.utility.recipe.UniversalRecipe import resonantinduction.archaic.blocks.{ItemImprint, TileImprinter, TileTurntable} import resonantinduction.archaic.engineering.ItemHammer import resonantinduction.archaic.firebox.{TileFirebox, TileHotPlate} diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala b/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala index 9dfe84aa8..053233a59 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection -import resonant.api.{IFilterable, IRotatable} +import resonant.api.tile.{IRotatable, IFilterable} import resonant.lib.content.prefab.java.TileInventory import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala index bc53e9103..7f171b777 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala @@ -8,7 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.util.IIcon import net.minecraft.world.{IBlockAccess, World} import net.minecraftforge.common.util.ForgeDirection -import resonant.api.IRotatable +import resonant.api.tile.IRotatable import resonant.content.prefab.scal.TRotatable import resonant.content.spatial.block.SpatialBlock import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.scala b/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.scala index 8a0f7cc0d..f237f6883 100644 --- a/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.scala +++ b/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.scala @@ -2,7 +2,7 @@ package resonantinduction.archaic.crate import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound -import resonant.api.IInventoryProvider +import resonant.api.tile.IInventoryProvider import resonant.lib.utility.inventory.ExternalInventory import scala.util.control.Breaks._ diff --git a/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala b/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala index 8425344b2..dbe8fe0cd 100644 --- a/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala +++ b/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala @@ -10,8 +10,9 @@ import net.minecraft.item.{Item, ItemStack} import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.oredict.OreDictionary -import resonant.api.IFilterable -import resonant.api.IRemovable.ISneakPickup +import resonant.api.tile.{IRemovable, IFilterable} +import IRemovable.ISneakPickup +import resonant.api.tile.IFilterable import resonant.lib.content.prefab.java.TileInventory import resonant.engine.network.ByteBufWrapper._ import resonant.engine.network.discriminator.PacketType diff --git a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala index f7e69ba1b..4b70f9288 100644 --- a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala +++ b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala @@ -21,8 +21,9 @@ import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.oredict.OreDictionary import org.apache.commons.lang3.ArrayUtils import org.lwjgl.opengl.GL11 +import resonant.api.gui.ISlotPickResult import resonant.api.recipe.{MachineRecipes, RecipeResource} -import resonant.api.{IRotatable, ISlotPickResult} +import resonant.api.tile.IRotatable import resonant.content.factory.resources.RecipeType import resonant.content.prefab.itemblock.ItemBlockSaved import resonant.engine.ResonantEngine diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala index faeb2330f..a050d49c3 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala +++ b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala @@ -17,13 +17,13 @@ import net.minecraft.util.IIcon import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.electric.EnergyStorage import resonant.content.spatial.block.{SpatialBlock, SpatialTile} import resonant.engine.grid.thermal.{BoilEvent, ThermalPhysics} import resonant.lib.content.prefab.{TElectric, TInventory} import resonant.engine.network.ByteBufWrapper._ import resonant.engine.network.discriminator.PacketType import resonant.engine.network.handle.{TPacketReceiver, TPacketSender} +import resonant.lib.grid.energy.EnergyStorage import resonant.lib.transform.vector.Vector3 import resonant.lib.utility.FluidUtility import resonant.lib.wrapper.WrapList._ diff --git a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala index 950587600..57b7e4c8f 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala @@ -11,8 +11,8 @@ import net.minecraft.util.{ChatComponentText, IIcon} import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, FluidStack} -import resonant.api.IRotatable -import resonant.lib.config.Config +import resonant.api.tile.IRotatable +import resonant.lib.mod.config.Config import resonant.lib.transform.vector.Vector3 import resonant.lib.utility.FluidUtility import resonantinduction.archaic.fluid.grate.TileGrate._ diff --git a/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala b/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala index 6f7ad47fd..6a5b2d4c0 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala @@ -9,8 +9,8 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.world.World import net.minecraftforge.fluids.{FluidContainerRegistry, FluidStack, IFluidContainerItem} -import resonant.lib.science.UnitDisplay -import resonant.lib.science.UnitDisplay.Unit +import resonant.lib.utility.science.UnitDisplay +import resonant.lib.utility.science.UnitDisplay.Unit import resonant.lib.utility.LanguageUtility import resonant.lib.wrapper.WrapList._ diff --git a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala index 702cdc8d7..5baea5836 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala @@ -13,8 +13,9 @@ import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ import org.lwjgl.opengl.GL11 -import resonant.api.IRemovable.ISneakPickup -import resonant.api.grid.INode +import resonant.api.tile.IRemovable +import IRemovable.ISneakPickup +import resonant.api.tile.node.INode import resonant.content.prefab.RenderConnectedTexture import resonant.lib.grid.node.Node import resonant.lib.render.{RenderBlockUtility, FluidRenderUtility, RenderUtility} diff --git a/src/main/scala/resonantinduction/archaic/waila/Waila.scala b/src/main/scala/resonantinduction/archaic/waila/Waila.scala index 611a13271..77e3e3635 100644 --- a/src/main/scala/resonantinduction/archaic/waila/Waila.scala +++ b/src/main/scala/resonantinduction/archaic/waila/Waila.scala @@ -1,8 +1,8 @@ package resonantinduction.archaic.waila import cpw.mods.fml.common.event.FMLInterModComms -import resonant.lib.compat.Mods -import resonant.lib.loadable.ICompatProxy +import resonant.lib.mod.compat.Mods +import resonant.lib.mod.loadable.ICompatProxy /** * @author tgame14 diff --git a/src/main/scala/resonantinduction/atomic/AtomicContent.scala b/src/main/scala/resonantinduction/atomic/AtomicContent.scala index f8e878bc1..c09afea20 100644 --- a/src/main/scala/resonantinduction/atomic/AtomicContent.scala +++ b/src/main/scala/resonantinduction/atomic/AtomicContent.scala @@ -19,15 +19,15 @@ import net.minecraftforge.common.{ForgeChunkManager, MinecraftForge} import net.minecraftforge.event.entity.player.FillBucketEvent import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, FluidStack} import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe} -import resonant.api.IElectromagnet +import resonant.api.tile.IElectromagnet import resonant.api.event.PlasmaEvent import resonant.api.recipe.QuantumAssemblerRecipes import resonant.content.loader.{ContentHolder, ExplicitContentName} import resonant.engine.grid.thermal.EventThermal import resonant.engine.network.discriminator.PacketAnnotationManager import resonant.lib.prefab.ore.OreGenerator -import resonant.lib.recipe.UniversalRecipe -import resonant.lib.schematic.SchematicRegistry +import resonant.lib.utility.recipe.UniversalRecipe +import resonant.lib.world.schematic.SchematicRegistry import resonant.lib.transform.vector.VectorWorld import resonantinduction.atomic.blocks._ import resonantinduction.atomic.items._ diff --git a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala index da65db273..bda790dc6 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala +++ b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala @@ -11,11 +11,11 @@ import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.api.IElectromagnet +import resonant.api.tile.IElectromagnet import resonant.content.prefab.itemblock.ItemBlockMetadata import resonant.content.spatial.block.SpatialBlock import resonant.lib.render.{RenderBlockUtility, RenderUtility} -import resonant.lib.utility.WorldUtility +import resonant.lib.world.WorldUtility import resonant.lib.wrapper.WrapList._ import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/atomic/gate/IQuantumGate.java b/src/main/scala/resonantinduction/atomic/gate/IQuantumGate.java index dbb010b90..c38272279 100644 --- a/src/main/scala/resonantinduction/atomic/gate/IQuantumGate.java +++ b/src/main/scala/resonantinduction/atomic/gate/IQuantumGate.java @@ -1,6 +1,6 @@ package resonantinduction.atomic.gate; -import resonant.api.blocks.IBlockFrequency; +import resonant.api.tile.IBlockFrequency; /** * Only TileEntities should implement this. diff --git a/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala b/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala index f9fff1cf2..fe6930e23 100644 --- a/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala +++ b/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.util.{ChatComponentText, MovingObjectPosition} -import resonant.api.blocks.IBlockFrequency +import resonant.api.tile.IBlockFrequency import resonant.api.mffs.fortron.FrequencyGridRegistry import resonantinduction.electrical.ElectricalContent import resonant.lib.transform.vector.VectorWorld diff --git a/src/main/scala/resonantinduction/atomic/gate/TraitQuantumGate.scala b/src/main/scala/resonantinduction/atomic/gate/TraitQuantumGate.scala index 3e985128e..53cc3112b 100644 --- a/src/main/scala/resonantinduction/atomic/gate/TraitQuantumGate.scala +++ b/src/main/scala/resonantinduction/atomic/gate/TraitQuantumGate.scala @@ -1,7 +1,7 @@ package resonantinduction.atomic.gate import codechicken.multipart.TileMultipart -import resonant.api.blocks.IBlockFrequency +import resonant.api.tile.IBlockFrequency class TraitQuantumGate extends TileMultipart with IQuantumGate { diff --git a/src/main/scala/resonantinduction/atomic/items/ItemBreederFuel.scala b/src/main/scala/resonantinduction/atomic/items/ItemBreederFuel.scala index 5ef1ac836..226b524f1 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemBreederFuel.scala +++ b/src/main/scala/resonantinduction/atomic/items/ItemBreederFuel.scala @@ -1,7 +1,7 @@ package resonantinduction.atomic.items import net.minecraft.item.ItemStack -import resonant.api.{IReactor, IReactorComponent} +import resonant.api.tile.{IReactorComponent, IReactor} /** * Breeder rods diff --git a/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala b/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala index 8b66d5d69..817362bcd 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala +++ b/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.FluidStack -import resonant.api.{IReactor, IReactorComponent} +import resonant.api.tile.{IReactorComponent, IReactor} import resonant.lib.wrapper.WrapList._ import resonantinduction.atomic.AtomicContent import resonantinduction.atomic.machine.reactor.TileReactorCell diff --git a/src/main/scala/resonantinduction/atomic/machine/TileFunnel.scala b/src/main/scala/resonantinduction/atomic/machine/TileFunnel.scala index 7d3a74792..73893f812 100644 --- a/src/main/scala/resonantinduction/atomic/machine/TileFunnel.scala +++ b/src/main/scala/resonantinduction/atomic/machine/TileFunnel.scala @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.IBoilHandler +import resonant.api.tile.IBoilHandler import resonant.content.prefab.java.TileAdvanced /** diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala index 5264b2edf..26dc817d8 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala @@ -13,7 +13,7 @@ import net.minecraft.world.{ChunkCoordIntPair, World} import net.minecraftforge.common.ForgeChunkManager import net.minecraftforge.common.ForgeChunkManager.Type import net.minecraftforge.common.util.ForgeDirection -import resonant.api.IElectromagnet +import resonant.api.tile.IElectromagnet import resonant.lib.prefab.poison.PoisonRadiation import resonantinduction.core.{ResonantInduction, Reference} import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala index 3228002df..711d070b5 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala @@ -2,7 +2,7 @@ package resonantinduction.atomic.machine.accelerator import net.minecraft.entity.player.EntityPlayer import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.science.UnitDisplay import resonantinduction.core.Settings import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala index 6a820516e..5a8b28d0e 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala @@ -9,12 +9,12 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection -import resonant.api.electric.EnergyStorage -import resonant.api.{IElectromagnet, IRotatable} +import resonant.api.tile.{IRotatable, IElectromagnet} import resonant.lib.content.prefab.TEnergyStorage import resonant.lib.content.prefab.java.TileElectricInventory import resonant.engine.network.discriminator.{PacketTile, PacketType} import resonant.engine.network.handle.{TPacketIDReceiver, TPacketSender} +import resonant.lib.grid.energy.EnergyStorage import resonant.lib.transform.vector.Vector3 import resonant.lib.utility.BlockUtility import resonantinduction.atomic.AtomicContent diff --git a/src/main/scala/resonantinduction/atomic/machine/boiler/ContainerNuclearBoiler.scala b/src/main/scala/resonantinduction/atomic/machine/boiler/ContainerNuclearBoiler.scala index 01d082a43..c753ebaf2 100644 --- a/src/main/scala/resonantinduction/atomic/machine/boiler/ContainerNuclearBoiler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/boiler/ContainerNuclearBoiler.scala @@ -5,7 +5,7 @@ import net.minecraft.inventory.{IInventory, Slot} import net.minecraft.item.ItemStack import net.minecraftforge.fluids.FluidContainerRegistry import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.slot.{SlotEnergyItem, SlotSpecific} +import resonant.lib.prefab.gui.slot.{SlotEnergyItem, SlotSpecific} import resonantinduction.atomic.AtomicContent /** diff --git a/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala b/src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala index f7cc852a1..b0a79ffc1 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.prefab.gui.GuiContainerBase import resonant.lib.prefab.gui.GuiContainerBase.SlotType -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.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 6923b8ba8..22442fc1b 100644 --- a/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala @@ -8,14 +8,14 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.Packet import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.IRotatable -import resonant.api.electric.EnergyStorage +import resonant.api.tile.IRotatable import resonant.engine.ResonantEngine import resonant.lib.content.prefab.TEnergyStorage import resonant.lib.content.prefab.java.TileElectricInventory import resonant.engine.network.Synced import resonant.engine.network.discriminator.{PacketTile, PacketType} import resonant.engine.network.handle.IPacketReceiver +import resonant.lib.grid.energy.EnergyStorage import resonant.lib.transform.vector.Vector3 import resonantinduction.atomic.AtomicContent import resonantinduction.core.Settings diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/ContainerCentrifuge.scala b/src/main/scala/resonantinduction/atomic/machine/centrifuge/ContainerCentrifuge.scala index 5836b528a..b8d8ce290 100644 --- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/ContainerCentrifuge.scala +++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/ContainerCentrifuge.scala @@ -4,7 +4,7 @@ import net.minecraft.entity.player.{EntityPlayer, InventoryPlayer} import net.minecraft.inventory.{IInventory, Slot, SlotFurnace} import net.minecraft.item.ItemStack import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.slot.SlotEnergyItem +import resonant.lib.prefab.gui.slot.SlotEnergyItem import resonantinduction.atomic.AtomicContent class ContainerCentrifuge(par1InventoryPlayer: InventoryPlayer, tileEntity: TileCentrifuge) extends ContainerBase(tileEntity) diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala b/src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala index 3f49ed4a6..f5fdaed49 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.prefab.gui.GuiContainerBase import resonant.lib.prefab.gui.GuiContainerBase.SlotType -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.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 802f66dec..b4a3854f6 100644 --- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala +++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala @@ -9,12 +9,12 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.electric.EnergyStorage import resonant.lib.content.prefab.TEnergyStorage import resonant.lib.content.prefab.java.TileElectricInventory -import resonant.lib.grid.Compatibility import resonant.engine.network.discriminator.{PacketTile, PacketType} import resonant.engine.network.handle.IPacketReceiver +import resonant.lib.grid.energy.EnergyStorage +import resonant.lib.mod.compat.energy.Compatibility import resonant.lib.transform.vector.Vector3 import resonantinduction.atomic.AtomicContent import resonantinduction.core.Settings diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/ContainerChemicalExtractor.scala b/src/main/scala/resonantinduction/atomic/machine/extractor/ContainerChemicalExtractor.scala index dfed0157f..2a69d6b41 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/ContainerChemicalExtractor.scala +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/ContainerChemicalExtractor.scala @@ -3,7 +3,7 @@ package resonantinduction.atomic.machine.extractor import net.minecraft.entity.player.InventoryPlayer import net.minecraft.inventory.{Slot, SlotFurnace} import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.slot.SlotEnergyItem +import resonant.lib.prefab.gui.slot.SlotEnergyItem /** * Chemical extractor container diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala b/src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala index 01501a510..70b2ba4ff 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.prefab.gui.GuiContainerBase import resonant.lib.prefab.gui.GuiContainerBase.SlotType -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.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 93995b133..c17798345 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala @@ -7,12 +7,12 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.Packet import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.electric.EnergyStorage import resonant.engine.ResonantEngine import resonant.lib.content.prefab.TEnergyStorage -import resonant.lib.grid.Compatibility import resonant.engine.network.Synced import resonant.engine.network.discriminator.PacketAnnotation +import resonant.lib.grid.energy.EnergyStorage +import resonant.lib.mod.compat.energy.Compatibility import resonant.lib.transform.vector.Vector3 import resonantinduction.atomic.AtomicContent import resonantinduction.core.Settings diff --git a/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.scala b/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.scala index 59c410cd9..22d0de5b7 100644 --- a/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.scala +++ b/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.scala @@ -1,9 +1,9 @@ package resonantinduction.atomic.machine.fulmination import net.minecraft.block.material.Material -import resonant.api.electric.EnergyStorage import resonant.lib.content.prefab.TEnergyStorage import resonant.lib.content.prefab.java.TileElectric +import resonant.lib.grid.energy.EnergyStorage /** * Fulmination TileEntity diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala index 507de56b3..973f06041 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala @@ -14,7 +14,7 @@ import net.minecraftforge.common.util.ForgeDirection import resonant.api.event.PlasmaEvent import resonant.content.prefab.java.TileAdvanced import resonant.engine.grid.thermal.ThermalGrid -import resonant.lib.config.Config +import resonant.lib.mod.config.Config 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 bc7007cfe..de71bfa15 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala @@ -10,15 +10,15 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.Packet import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.ITagRender -import resonant.api.electric.EnergyStorage +import resonant.api.tile.ITagRender import resonant.engine.ResonantEngine -import resonant.lib.config.Config +import resonant.lib.grid.energy.EnergyStorage +import resonant.lib.mod.config.Config import resonant.lib.content.prefab.TEnergyStorage import resonant.lib.content.prefab.java.TileElectric import resonant.engine.network.discriminator.{PacketTile, PacketType} import resonant.engine.network.handle.IPacketReceiver -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.science.UnitDisplay import resonant.lib.transform.vector.Vector3 import resonant.lib.utility.{FluidUtility, LanguageUtility} import resonantinduction.atomic.AtomicContent diff --git a/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala b/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala index 4c7b50315..5919bbf89 100644 --- a/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala @@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer import net.minecraft.util.ResourceLocation import org.lwjgl.opengl.GL11 import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.science.UnitDisplay import resonantinduction.core.Reference 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 67702863e..89022198f 100644 --- a/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala @@ -6,12 +6,12 @@ import net.minecraft.entity.item.EntityItem import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} import net.minecraft.nbt.NBTTagCompound -import resonant.api.electric.EnergyStorage import resonant.api.recipe.QuantumAssemblerRecipes import resonant.lib.content.prefab.TEnergyStorage import resonant.lib.content.prefab.java.TileElectricInventory import resonant.engine.network.discriminator.{PacketTile, PacketType} import resonant.engine.network.handle.IPacketReceiver +import resonant.lib.grid.energy.EnergyStorage import resonant.lib.transform.vector.Vector3 import resonantinduction.atomic.AtomicContent import resonantinduction.core.Reference diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/ContainerReactorCell.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/ContainerReactorCell.scala index 827d592dc..875399957 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/ContainerReactorCell.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/ContainerReactorCell.scala @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.slot.SlotSpecific +import resonant.lib.prefab.gui.slot.SlotSpecific import resonantinduction.atomic.items.{ItemBreederFuel, ItemFissileFuel} class ContainerReactorCell(player: EntityPlayer, tileEntity: TileReactorCell) extends ContainerBase(tileEntity) diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala index e570af4de..02aa2741d 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala @@ -17,10 +17,10 @@ import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidStack, FluidTank, FluidTankInfo, IFluidHandler} import resonant.api.event.PlasmaEvent -import resonant.api.{IReactor, IReactorComponent} +import resonant.api.tile.{IReactorComponent, IReactor} import resonant.engine.grid.thermal.{ThermalGrid, ThermalPhysics} import resonant.lib.content.prefab.java.TileInventory -import resonant.lib.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} +import resonant.lib.prefab.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} import resonant.engine.network.Synced import resonant.engine.network.Synced.{SyncedInput, SyncedOutput} import resonant.engine.network.discriminator.PacketAnnotation diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala index 3d49085c2..54068c37c 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala @@ -15,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ import resonant.content.prefab.java.TileAdvanced import resonant.content.spatial.block.SpatialBlock -import resonant.lib.path.{IPathCallBack, Pathfinder} +import resonant.lib.utility.path.{IPathCallBack, Pathfinder} import resonant.lib.transform.vector.Vector3 /** diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala index ffe253b10..b585bd86a 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala @@ -6,7 +6,7 @@ import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection import resonant.lib.`type`.Pair -import resonant.lib.schematic.Schematic +import resonant.lib.world.schematic.Schematic import resonantinduction.atomic.AtomicContent import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala index 46730d04b..7497dfe68 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala @@ -6,7 +6,7 @@ import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection import resonant.lib.`type`.Pair -import resonant.lib.schematic.Schematic +import resonant.lib.world.schematic.Schematic import resonantinduction.atomic.AtomicContent import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala index 66a2068a1..eb08e99b4 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala @@ -6,7 +6,7 @@ import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection import resonant.lib.`type`.Pair -import resonant.lib.schematic.Schematic +import resonant.lib.world.schematic.Schematic import resonant.lib.transform.vector.Vector3 import resonantinduction.atomic.AtomicContent diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala b/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala index 6ab912411..3aeb04081 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala @@ -6,7 +6,7 @@ import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection import resonant.lib.`type`.Pair -import resonant.lib.schematic.Schematic +import resonant.lib.world.schematic.Schematic import resonantinduction.atomic.AtomicContent import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/core/CommonProxy.scala b/src/main/scala/resonantinduction/core/CommonProxy.scala index 1c737bb48..94bd7a241 100644 --- a/src/main/scala/resonantinduction/core/CommonProxy.scala +++ b/src/main/scala/resonantinduction/core/CommonProxy.scala @@ -7,7 +7,7 @@ import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer import net.minecraft.tileentity.TileEntity import net.minecraft.world.World -import resonant.lib.prefab.AbstractProxy +import resonant.lib.mod.AbstractProxy import resonantinduction.atomic.machine.accelerator.{ContainerAccelerator, TileAccelerator} import resonantinduction.atomic.machine.boiler.{ContainerNuclearBoiler, TileNuclearBoiler} import resonantinduction.atomic.machine.centrifuge.{ContainerCentrifuge, TileCentrifuge} diff --git a/src/main/scala/resonantinduction/core/ResonantInduction.scala b/src/main/scala/resonantinduction/core/ResonantInduction.scala index 042d9cc92..39a1be4df 100644 --- a/src/main/scala/resonantinduction/core/ResonantInduction.scala +++ b/src/main/scala/resonantinduction/core/ResonantInduction.scala @@ -9,8 +9,8 @@ import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.config.Configuration import org.modstats.{ModstatInfo, Modstats} import resonant.engine.{References, ResonantEngine} -import resonant.lib.config.ConfigHandler -import resonant.lib.loadable.LoadableHandler +import resonant.lib.mod.config.ConfigHandler +import resonant.lib.mod.loadable.LoadableHandler import resonantinduction.archaic.ArchaicContent import resonantinduction.atomic.AtomicContent import resonantinduction.core.handler.TextureHookHandler diff --git a/src/main/scala/resonantinduction/core/ResonantPartFactory.scala b/src/main/scala/resonantinduction/core/ResonantPartFactory.scala index a33b7f8a2..71e1731af 100644 --- a/src/main/scala/resonantinduction/core/ResonantPartFactory.scala +++ b/src/main/scala/resonantinduction/core/ResonantPartFactory.scala @@ -24,7 +24,7 @@ object ResonantPartFactory extends IPartFactory { MultiPartRegistry.registerParts(this, partMap.keys.toArray) - MultipartGenerator.registerTrait("resonant.api.grid.INodeProvider", "resonantinduction.core.prefab.pass.TNodeProvider") + MultipartGenerator.registerTrait("resonant.api.tile.INodeProvider", "resonantinduction.core.prefab.pass.TNodeProvider") MultipartGenerator.registerPassThroughInterface("net.minecraftforge.fluids.IFluidHandler") } diff --git a/src/main/scala/resonantinduction/core/Settings.scala b/src/main/scala/resonantinduction/core/Settings.scala index 761330123..d1358d339 100644 --- a/src/main/scala/resonantinduction/core/Settings.scala +++ b/src/main/scala/resonantinduction/core/Settings.scala @@ -5,8 +5,8 @@ import net.minecraft.block.Block import net.minecraft.item.ItemStack import net.minecraftforge.common.config.Configuration import resonant.api.recipe.QuantumAssemblerRecipes -import resonant.lib.config.Config -import resonant.lib.config.ConfigEvent.PostConfigEvent +import resonant.lib.mod.config.Config +import resonant.lib.mod.config.ConfigEvent.PostConfigEvent import resonant.lib.prefab.poison.PotionRadiation import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/resonantinduction/core/interfaces/TNodeMechanical.scala b/src/main/scala/resonantinduction/core/interfaces/TNodeMechanical.scala index 9cf577a27..ea31ab287 100644 --- a/src/main/scala/resonantinduction/core/interfaces/TNodeMechanical.scala +++ b/src/main/scala/resonantinduction/core/interfaces/TNodeMechanical.scala @@ -1,6 +1,6 @@ package resonantinduction.core.interfaces -import resonant.api.grid.INode +import resonant.api.tile.node.INode import resonant.lib.transform.vector.IVectorWorld /** diff --git a/src/main/scala/resonantinduction/core/prefab/node/NodeFluidPressure.scala b/src/main/scala/resonantinduction/core/prefab/node/NodeFluidPressure.scala index ac2a0e132..66c66bfa7 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/NodeFluidPressure.scala +++ b/src/main/scala/resonantinduction/core/prefab/node/NodeFluidPressure.scala @@ -2,7 +2,8 @@ package resonantinduction.core.prefab.node import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{FluidContainerRegistry, IFluidHandler} -import resonant.api.grid.{INodeProvider, IUpdate} +import resonant.api.IUpdate +import resonant.api.tile.INodeProvider import resonant.lib.grid.UpdateTicker import resonant.lib.prefab.fluid.NodeFluid import resonantinduction.archaic.fluid.gutter.NodeFluidGravity diff --git a/src/main/scala/resonantinduction/core/prefab/part/connector/TPartNodeProvider.scala b/src/main/scala/resonantinduction/core/prefab/part/connector/TPartNodeProvider.scala index 302cfcc7d..a7dc91ef9 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/connector/TPartNodeProvider.scala +++ b/src/main/scala/resonantinduction/core/prefab/part/connector/TPartNodeProvider.scala @@ -6,7 +6,8 @@ import codechicken.multipart.TMultiPart import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import resonant.api.ISave -import resonant.api.grid.{INode, INodeProvider} +import resonant.api.tile.INodeProvider +import resonant.api.tile.node.INode import resonant.lib.grid.node.Node import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java b/src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java index aafa2fa28..1221bb614 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 resonant.api.grid.INode; -import resonant.api.grid.INodeProvider; +import resonant.api.tile.node.INode; +import resonant.api.tile.INodeProvider; /** * TNodeProvider multipart Trait. diff --git a/src/main/scala/resonantinduction/electrical/ElectricalContent.scala b/src/main/scala/resonantinduction/electrical/ElectricalContent.scala index cb08ea9e3..761bb1714 100644 --- a/src/main/scala/resonantinduction/electrical/ElectricalContent.scala +++ b/src/main/scala/resonantinduction/electrical/ElectricalContent.scala @@ -13,7 +13,7 @@ import net.minecraftforge.client.event.TextureStitchEvent import net.minecraftforge.common.MinecraftForge import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe} import resonant.content.loader.{ContentHolder, ExplicitContentName} -import resonant.lib.recipe.UniversalRecipe +import resonant.lib.utility.recipe.UniversalRecipe import resonantinduction.atomic.gate.{ItemQuantumGlyph, PartQuantumGlyph} import resonantinduction.core.{RICreativeTab, Reference, ResonantPartFactory} import resonantinduction.electrical.battery.{ItemBlockBattery, TileBattery} diff --git a/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala b/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala index ffdccce47..a053a4f13 100644 --- a/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala +++ b/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala @@ -10,9 +10,9 @@ 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.mod.compat.energy.Compatibility import resonant.lib.render.EnumColor -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.science.UnitDisplay import resonant.lib.utility.LanguageUtility import resonant.lib.wrapper.WrapList._ diff --git a/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala b/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala index 704c447b8..604366b15 100644 --- a/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala +++ b/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala @@ -13,12 +13,12 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11._ -import resonant.api.electric.EnergyStorage import resonant.content.prefab.java.TileAdvanced import resonant.lib.content.prefab.{TElectric, TEnergyStorage} import resonant.engine.network.discriminator.{PacketTile, PacketType} import resonant.engine.network.handle.IPacketReceiver import resonant.engine.network.netty.AbstractPacket +import resonant.lib.grid.energy.EnergyStorage import resonant.lib.render.RenderUtility import resonant.lib.transform.vector.Vector3 import resonantinduction.core.Reference diff --git a/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala b/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala index 93ef65a3a..a3e42b8ff 100644 --- a/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala +++ b/src/main/scala/resonantinduction/electrical/generator/TileMotor.scala @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.{ChatComponentText, ResourceLocation} import net.minecraftforge.client.model.AdvancedModelLoader import org.lwjgl.opengl.GL11 -import resonant.api.IRotatable +import resonant.api.tile.IRotatable import resonant.content.prefab.java.TileAdvanced import resonant.lib.content.prefab.TElectric import resonant.lib.grid.node.TSpatialNodeProvider diff --git a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala index e11b5fc55..cda30a687 100644 --- a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala +++ b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala @@ -1,11 +1,11 @@ package resonantinduction.electrical.multimeter import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import resonant.api.IUpdate import resonant.lib.grid.{UpdateTicker, Grid} -import resonant.lib.science.UnitDisplay +import resonant.lib.utility.science.UnitDisplay import resonant.lib.utility.LanguageUtility import resonantinduction.electrical.multimeter.graph._ -import resonant.api.grid.IUpdate import resonant.lib.transform.vector.Vector3 import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala b/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala index d7dcd9849..cfd481740 100644 --- a/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala +++ b/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala @@ -15,11 +15,10 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.{ChatComponentText, MovingObjectPosition} import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{FluidTankInfo, IFluidHandler} -import resonant.api.IRemovable -import resonant.api.grid.INodeProvider -import resonant.lib.grid.Compatibility +import resonant.api.tile.{INodeProvider, IRemovable} import resonant.engine.network.discriminator.PacketType import resonant.engine.network.handle.IPacketReceiver +import resonant.lib.mod.compat.energy.Compatibility import resonant.lib.transform.vector.Vector3 import resonant.lib.utility.WrenchUtility import resonantinduction.core.ResonantInduction diff --git a/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala b/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala index 3d02f791d..02280dff1 100644 --- a/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala +++ b/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala @@ -18,10 +18,10 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.ChatComponentText import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import resonant.api.electric.EnergyStorage import resonant.lib.content.prefab.TEnergyStorage import resonant.lib.content.prefab.java.TileElectric -import resonant.lib.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} +import resonant.lib.grid.energy.EnergyStorage +import resonant.lib.prefab.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} import resonant.engine.network.discriminator.{PacketTile, PacketType} import resonant.engine.network.handle.{TPacketIDReceiver, TPacketSender} import resonant.lib.render.EnumColor diff --git a/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala b/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala index 0a645f0e8..50cb38664 100644 --- a/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala +++ b/src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala @@ -1,7 +1,7 @@ package resonantinduction.electrical.transformer import net.minecraftforge.common.util.ForgeDirection -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonant.lib.grid.electric.DCNode /** diff --git a/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala b/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala index a9f9e11b7..0e3e7a698 100644 --- a/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala +++ b/src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala @@ -8,7 +8,8 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.{ChatComponentText, MovingObjectPosition} import net.minecraftforge.common.util.ForgeDirection -import resonant.api.grid.{INode, INodeProvider} +import resonant.api.tile.INodeProvider +import resonant.api.tile.node.INode import resonant.lib.utility.WrenchUtility import resonantinduction.core.prefab.part.PartFace import resonantinduction.electrical.ElectricalContent diff --git a/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala b/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala index 7ac0b7a01..b675559c1 100644 --- a/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala +++ b/src/main/scala/resonantinduction/electrical/wire/ItemWire.scala @@ -14,7 +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.science.UnitDisplay import resonant.lib.utility.LanguageUtility import resonant.lib.wrapper.WrapList._ import resonantinduction.core.util.MultipartUtil diff --git a/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala b/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala index 85cb3ae93..c05a302ed 100644 --- a/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala +++ b/src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala @@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.{IIcon, MovingObjectPosition} import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonant.lib.grid.UpdateTicker import resonant.lib.grid.electric.DCNode import resonantinduction.core.prefab.node.TMultipartNode diff --git a/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala b/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala index 1c68776a7..cbace7946 100644 --- a/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala +++ b/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala @@ -3,11 +3,11 @@ package resonantinduction.mechanical import net.minecraft.block.Block import net.minecraft.init.{Blocks, Items} import net.minecraft.item.{Item, ItemStack} -import resonant.api.grid.NodeRegistry +import resonant.api.tile.node.NodeRegistry import resonant.content.loader.ContentHolder import resonant.engine.network.discriminator.PacketAnnotationManager -import resonant.lib.recipe.UniversalRecipe -import resonant.lib.schematic.{SchematicPlate, SchematicRegistry} +import resonant.lib.utility.recipe.UniversalRecipe +import resonant.lib.world.schematic.{SchematicPlate, SchematicRegistry} import resonantinduction.core.interfaces.TNodeMechanical import resonantinduction.core.{RICreativeTab, Reference, ResonantPartFactory} import resonantinduction.mechanical.fluid.pipe.{ItemPipe, PartPipe, PipeMaterials} diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala b/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala index 5ae2da20b..0fc3b3d41 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala @@ -10,7 +10,7 @@ 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.science.UnitDisplay import resonant.lib.utility.LanguageUtility import resonant.lib.wrapper.WrapList._ import resonantinduction.core.ResonantPartFactory diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala b/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala index dbd35bde3..8cfd04695 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala @@ -2,7 +2,7 @@ package resonantinduction.mechanical.fluid.pipe import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.IFluidHandler -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonantinduction.core.prefab.node.{NodeFluidPressure, TMultipartNode} import resonantinduction.core.prefab.part.connector.TColorable diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.scala b/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.scala index 8d69db9c8..6955561cf 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.scala @@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11 import resonant.content.prefab.scal.render.ISimpleItemRenderer import resonant.lib.render.{FluidRenderUtility, RenderUtility} import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.WorldUtility +import resonant.lib.world.WorldUtility import resonant.lib.wrapper.BitmaskWrapper._ import resonantinduction.core.Reference diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala b/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala index aff1b2742..9d5156fd7 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 net.minecraftforge.fluids.IFluidHandler -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonantinduction.core.prefab.node.NodeFluidPressure /** diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala index 2cd0c40c9..8475a679a 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala @@ -7,7 +7,7 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo, IFluidHandler} import org.lwjgl.opengl.GL11 -import resonant.api.IRotatable +import resonant.api.tile.IRotatable import resonant.lib.render.RenderUtility import resonant.lib.transform.vector.Vector3 import resonantinduction.core.Reference diff --git a/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala b/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala index 8c2196ff6..718060ee8 100644 --- a/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala +++ b/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala @@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection -import resonant.api.IRotatable +import resonant.api.tile.IRotatable import resonant.content.prefab.java.TileAdvanced import resonant.engine.network.discriminator.PacketTile import resonant.engine.network.discriminator.PacketType diff --git a/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala b/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala index b0dc8e619..cc84a8b8e 100644 --- a/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala +++ b/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala @@ -14,7 +14,7 @@ import net.minecraft.util.{ChatComponentText, IIcon} import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.api.IRotatable +import resonant.api.tile.IRotatable import resonant.lib.content.prefab.java.TileInventory import resonant.engine.network.discriminator.{PacketType, PacketTile} import resonant.engine.network.handle.{TPacketSender, TPacketReceiver} diff --git a/src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java b/src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java index e94356d8c..206c9e3ce 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 resonant.api.grid.INode; -import resonant.api.grid.INodeProvider; +import resonant.api.tile.node.INode; +import resonant.api.tile.INodeProvider; import resonantinduction.mechanical.mech.grid.NodeMechanical; /** Java GUI used to help debug gear information diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala index e9210275f..7687ba556 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 codechicken.multipart.{TMultiPart, TileMultipart} import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.multiblock.reference.MultiBlockHandler +import resonant.lib.prefab.multiblock.reference.MultiBlockHandler import resonant.lib.transform.vector.Vector3 class GearMultiBlockHandler(wrapper: PartGear) extends MultiBlockHandler[PartGear](wrapper: PartGear) diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/NodeGear.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/NodeGear.scala index c5475bc96..45b33359d 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gear/NodeGear.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gear/NodeGear.scala @@ -4,7 +4,7 @@ import codechicken.lib.vec.Rotation import codechicken.multipart.TileMultipart import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonant.lib.transform.vector.Vector3 import resonant.lib.wrapper.ForgeDirectionWrapper._ import resonantinduction.core.interfaces.TNodeMechanical diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala index c00470273..782fd2894 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala @@ -11,8 +11,8 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.MovingObjectPosition import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import resonant.api.grid.INode -import resonant.lib.multiblock.reference.IMultiBlockStructure +import resonant.api.tile.node.INode +import resonant.lib.prefab.multiblock.reference.IMultiBlockStructure import resonant.lib.utility.WrenchUtility import resonantinduction.core.Reference import resonantinduction.core.prefab.part.CuboidShapes diff --git a/src/main/scala/resonantinduction/mechanical/mech/gearshaft/NodeGearShaft.scala b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/NodeGearShaft.scala index 35685be6b..f275023a7 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gearshaft/NodeGearShaft.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/NodeGearShaft.scala @@ -1,7 +1,7 @@ package resonantinduction.mechanical.mech.gearshaft import net.minecraftforge.common.util.ForgeDirection -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonant.lib.transform.vector.Vector3 import resonant.lib.wrapper.ForgeDirectionWrapper._ import resonantinduction.core.interfaces.TNodeMechanical diff --git a/src/main/scala/resonantinduction/mechanical/mech/grid/MechanicalGrid.scala b/src/main/scala/resonantinduction/mechanical/mech/grid/MechanicalGrid.scala index f446046c7..1164122f2 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/grid/MechanicalGrid.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/grid/MechanicalGrid.scala @@ -1,6 +1,6 @@ package resonantinduction.mechanical.mech.grid -import resonant.api.grid.IUpdate +import resonant.api.IUpdate import resonant.lib.grid.{GridNode, UpdateTicker} import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/resonantinduction/mechanical/mech/grid/NodeMechanical.scala b/src/main/scala/resonantinduction/mechanical/mech/grid/NodeMechanical.scala index 634a33d45..6f42f89a5 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/grid/NodeMechanical.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/grid/NodeMechanical.scala @@ -1,6 +1,6 @@ package resonantinduction.mechanical.mech.grid -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonant.lib.grid.GridNode import resonant.lib.grid.node.{NodeGrid, TTileConnector} import resonant.lib.transform.vector.IVectorWorld 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 cdb56348c..b1e5af2a0 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala @@ -10,13 +10,13 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.world.World import resonant.api.recipe.{MachineRecipes, RecipeResource} +import resonant.api.tile.node.INode import resonant.content.factory.resources.RecipeType -import resonant.lib.config.Config +import resonant.lib.mod.config.Config import resonant.lib.utility.MovementUtility import resonant.lib.utility.inventory.InventoryUtility import resonantinduction.core.ResonantInduction import resonantinduction.mechanical.mech.TileMechanical -import resonant.api.grid.INode import resonant.lib.transform.vector.Vector3 /** 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 3b5856eb6..00d0bfcc9 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.scala @@ -1,7 +1,7 @@ package resonantinduction.mechanical.mech.process.mixer import net.minecraftforge.common.util.ForgeDirection -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonantinduction.mechanical.mech.grid.NodeMechanical /** diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala index fec075ebd..2a63ed714 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala @@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.AxisAlignedBB import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.multiblock.reference.IMultiBlockStructure +import resonant.lib.prefab.multiblock.reference.IMultiBlockStructure import resonant.engine.network.ByteBufWrapper._ import resonant.engine.network.discriminator.PacketType import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala index dc75e3921..4c6ac5eec 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala @@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.Vec3 import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection -import resonant.api.grid.INodeProvider +import resonant.api.tile.INodeProvider import resonant.content.prefab.itemblock.ItemBlockMetadata import resonant.lib.transform.vector.Vector3 import resonant.lib.wrapper.WrapList._ diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala index 8d98fa643..d247aace7 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala @@ -13,7 +13,7 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTank, FluidTankInfo} import org.lwjgl.opengl.GL11 -import resonant.api.IBoilHandler +import resonant.api.tile.IBoilHandler import resonant.content.prefab.itemblock.ItemBlockMetadata import resonant.lib.render.RenderUtility import resonant.lib.transform.vector.Vector3 diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala index 8512b7494..f11fd72c9 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.scala @@ -1,7 +1,7 @@ package resonantinduction.mechanical.mech.turbine import net.minecraft.tileentity.TileEntity -import resonant.lib.multiblock.reference.MultiBlockHandler +import resonant.lib.prefab.multiblock.reference.MultiBlockHandler import resonant.lib.transform.vector.Vector3 class TurbineMBlockHandler(wrapper: TileTurbine) extends MultiBlockHandler[TileTurbine](wrapper)