diff --git a/archaic/src/main/scala/resonantinduction/archaic/Archaic.java b/archaic/src/main/scala/resonantinduction/archaic/Archaic.java index c8567da8..7b4a7a4e 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/Archaic.java +++ b/archaic/src/main/scala/resonantinduction/archaic/Archaic.java @@ -5,6 +5,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; +import resonant.lib.content.ContentRegistry; +import resonant.lib.modproxy.ProxyHandler; +import resonant.lib.network.PacketAnnotation; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.item.ItemBlockMetadata; +import resonant.lib.recipe.UniversalRecipe; import resonantinduction.archaic.blocks.TileTurntable; import resonantinduction.archaic.crate.BlockCrate; import resonantinduction.archaic.crate.ItemBlockCrate; @@ -32,12 +38,6 @@ import resonantinduction.core.Settings; import resonantinduction.core.TabRI; import resonantinduction.core.prefab.imprint.ItemImprint; import resonantinduction.core.resource.ItemHandCrank; -import calclavia.lib.content.ContentRegistry; -import calclavia.lib.modproxy.ProxyHandler; -import calclavia.lib.network.PacketAnnotation; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.item.ItemBlockMetadata; -import calclavia.lib.recipe.UniversalRecipe; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; diff --git a/archaic/src/main/scala/resonantinduction/archaic/CommonProxy.java b/archaic/src/main/scala/resonantinduction/archaic/CommonProxy.java index 805cbfec..0e02ddc7 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/CommonProxy.java +++ b/archaic/src/main/scala/resonantinduction/archaic/CommonProxy.java @@ -1,6 +1,6 @@ package resonantinduction.archaic; -import calclavia.lib.prefab.ProxyBase; +import resonant.lib.prefab.ProxyBase; public class CommonProxy extends ProxyBase { diff --git a/archaic/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala b/archaic/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala index 9416d7de..b71bdbe0 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala +++ b/archaic/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala @@ -1,5 +1,7 @@ package resonantinduction.archaic.blocks +import codechicken.multipart.TileMultipart +import cpw.mods.fml.relauncher.SideOnly import net.minecraft.block.Block import net.minecraft.block.material.Material import net.minecraft.client.renderer.texture.IconRegister @@ -8,110 +10,92 @@ import net.minecraft.util.Icon import net.minecraft.world.IBlockAccess import net.minecraft.world.World import net.minecraftforge.common.ForgeDirection +import resonant.api.IRotatable +import resonant.api.blocks.IRotatableBlock +import resonant.api.blocks.IRotatableBlock +import resonant.lib.content.module.TileBlock +import resonant.lib.content.module.TileRender +import resonant.lib.render.RotatedTextureRenderer import resonantinduction.core.Reference import universalelectricity.api.vector.Vector3 -import calclavia.lib.prefab.block.IRotatableBlock -import calclavia.lib.prefab.tile.IRotatable -import codechicken.multipart.TileMultipart import cpw.mods.fml.relauncher.Side -import cpw.mods.fml.relauncher.SideOnly -import calclavia.lib.content.module.{TileRender, TileBlock} -import calclavia.lib.render.RotatedTextureRenderer -class TileTurntable extends TileBlock(Material.piston) with IRotatable -{ +class TileTurntable extends TileBlock(Material.piston) with IRotatable { textureName = "turntable_side" tickRandomly = true rotationMask = Integer.parseInt("111111", 2).toByte override def tickRate(par1World: World): Int = - { - return 5 - } + { + return 5 + } - @SideOnly(Side.CLIENT) override def registerIcons(iconReg: IconRegister) - { + @SideOnly(Side.CLIENT) override def registerIcons(iconReg: IconRegister) { super.registerIcons(iconReg) TileTurntable.top = iconReg.registerIcon(Reference.PREFIX + "turntable") } - override def updateEntity() - { + override def updateEntity() { updateTurntableState(world, x, y, z) } @SideOnly(Side.CLIENT) override def getIcon(access: IBlockAccess, side: Int): Icon = - { - if (side == super.metadata()) { - return TileTurntable.top - } + if (side == super.metadata()) { + return TileTurntable.top + } - return getIcon - } + return getIcon + } @SideOnly(Side.CLIENT) override def getIcon(side: Int, meta: Int): Icon = - { - if (side == 1) { - return TileTurntable.top + if (side == 1) { + return TileTurntable.top + } + return getIcon } - return getIcon - } - override def onNeighborChanged() - { + override def onNeighborChanged() { scheduelTick(10) } - private def updateTurntableState(world: World, x: Int, y: Int, z: Int) - { - if (world.isBlockIndirectlyGettingPowered(x, y, z)) - { - try - { + private def updateTurntableState(world: World, x: Int, y: Int, z: Int) { + if (world.isBlockIndirectlyGettingPowered(x, y, z)) { + try { val facing: ForgeDirection = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)) val position: Vector3 = new Vector3(x, y, z).translate(facing) val tileEntity: TileEntity = position.getTileEntity(world) val block: Block = Block.blocksList(position.getBlockID(world)) - if (!(tileEntity.isInstanceOf[TileMultipart])) - { - if (tileEntity.isInstanceOf[IRotatable]) - { + if (!(tileEntity.isInstanceOf[TileMultipart])) { + if (tileEntity.isInstanceOf[IRotatable]) { val blockRotation: ForgeDirection = (tileEntity.asInstanceOf[IRotatable]).getDirection (tileEntity.asInstanceOf[IRotatable]).setDirection(blockRotation.getRotation(facing.getOpposite)) - } - else if (block.isInstanceOf[IRotatableBlock]) - { + } else if (block.isInstanceOf[IRotatableBlock]) { val blockRotation: ForgeDirection = (block.asInstanceOf[IRotatableBlock]).getDirection(world, position.intX, position.intY, position.intZ) (block.asInstanceOf[IRotatableBlock]).setDirection(world, position.intX, position.intY, position.intZ, blockRotation.getRotation(facing.getOpposite)) - } - else if (block != null) - { + } else if (block != null) { Block.blocksList(blockID).rotateBlock(world, position.intX, position.intY, position.intZ, facing.getOpposite) } world.markBlockForUpdate(position.intX, position.intY, position.intZ) world.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "tile.piston.in", 0.5F, world.rand.nextFloat * 0.15F + 0.6F) } - } - catch - { - case e: Exception => + } catch { + case e: Exception => { System.out.println("Error while rotating a block near " + x + "x " + y + "y " + z + "z " + (if (world != null && world.provider != null) world.provider.dimensionId + "d" else "null:world")) e.printStackTrace } - } + } } } @SideOnly(Side.CLIENT) protected override def newRenderer: TileRender = - { - return new RotatedTextureRenderer(this) - } + { + return new RotatedTextureRenderer(this) + } } -object TileTurntable -{ +object TileTurntable { var top: Icon = null } \ No newline at end of file diff --git a/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java b/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java index 2c3e654a..43104b19 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java @@ -14,12 +14,11 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import resonant.lib.prefab.block.BlockTile; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.WrenchUtility; -import calclavia.lib.utility.inventory.InventoryUtility; import codechicken.multipart.ControlKeyModifer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.java b/archaic/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.java index 25daca6b..6975b758 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/crate/InventoryCrate.java @@ -3,7 +3,7 @@ package resonantinduction.archaic.crate; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import calclavia.lib.utility.inventory.ExternalInventory; +import resonant.lib.utility.inventory.ExternalInventory; public class InventoryCrate extends ExternalInventory { diff --git a/archaic/src/main/scala/resonantinduction/archaic/crate/ItemBlockCrate.java b/archaic/src/main/scala/resonantinduction/archaic/crate/ItemBlockCrate.java index 539d74d8..5b2af737 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/crate/ItemBlockCrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/crate/ItemBlockCrate.java @@ -9,8 +9,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import calclavia.lib.prefab.item.ItemBlockTooltip; -import calclavia.lib.utility.LanguageUtility; +import resonant.lib.prefab.item.ItemBlockTooltip; +import resonant.lib.utility.LanguageUtility; public class ItemBlockCrate extends ItemBlockTooltip { diff --git a/archaic/src/main/scala/resonantinduction/archaic/crate/RenderCrate.java b/archaic/src/main/scala/resonantinduction/archaic/crate/RenderCrate.java index 7690600e..a350282b 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/crate/RenderCrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/crate/RenderCrate.java @@ -5,8 +5,8 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import calclavia.lib.render.RenderItemOverlayUtility; -import calclavia.lib.utility.LanguageUtility; +import resonant.lib.render.RenderItemOverlayUtility; +import resonant.lib.utility.LanguageUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/crate/TileCrate.java b/archaic/src/main/scala/resonantinduction/archaic/crate/TileCrate.java index 9859a1be..1c7d664e 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/crate/TileCrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/crate/TileCrate.java @@ -7,12 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; +import resonant.api.IExtendedStorage; +import resonant.api.IFilterable; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.tile.TileExternalInventory; import resonantinduction.core.ResonantInduction; -import calclavia.api.resonantinduction.IFilterable; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.TileExternalInventory; -import calclavia.lib.utility.inventory.IExtendedStorage; import com.google.common.io.ByteArrayDataInput; diff --git a/archaic/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java b/archaic/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java index 8aec881f..3eae0ffb 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java +++ b/archaic/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java @@ -24,30 +24,30 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.ArrayUtils; import org.lwjgl.opengl.GL11; +import resonant.api.IRotatable; +import resonant.api.ISlotPickResult; +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.lib.content.module.TileRender; +import resonant.lib.content.module.prefab.TileInventory; +import resonant.lib.gui.ContainerDummy; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.item.ItemBlockSaved; +import resonant.lib.prefab.vector.Cuboid; +import resonant.lib.render.RenderItemOverlayUtility; +import resonant.lib.type.Pair; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.WorldUtility; +import resonant.lib.utility.inventory.AutoCraftingManager; +import resonant.lib.utility.inventory.AutoCraftingManager.IAutoCrafter; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.prefab.imprint.ItemImprint; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.content.module.prefab.TileInventory; -import calclavia.lib.gui.ContainerDummy; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.item.ItemBlockSaved; -import calclavia.lib.prefab.slot.ISlotPickResult; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.prefab.vector.Cuboid; -import calclavia.lib.render.RenderItemOverlayUtility; -import calclavia.lib.type.Pair; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.WorldUtility; -import calclavia.lib.utility.inventory.AutoCraftingManager; -import calclavia.lib.utility.inventory.AutoCraftingManager.IAutoCrafter; -import calclavia.lib.utility.inventory.InventoryUtility; import codechicken.multipart.ControlKeyModifer; import com.google.common.io.ByteArrayDataInput; diff --git a/archaic/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java b/archaic/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java index 9923d99c..ca809bae 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java +++ b/archaic/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java @@ -9,14 +9,14 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.prefab.block.BlockTile; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.prefab.imprint.ItemImprint; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; -import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.utility.inventory.InventoryUtility; import codechicken.multipart.ControlKeyModifer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java b/archaic/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java index ece66247..174c0163 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java +++ b/archaic/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import calclavia.lib.render.RenderItemOverlayUtility; +import resonant.lib.render.RenderItemOverlayUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/filter/TileFilter.java b/archaic/src/main/scala/resonantinduction/archaic/filter/TileFilter.java index a291c785..66353e55 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/filter/TileFilter.java +++ b/archaic/src/main/scala/resonantinduction/archaic/filter/TileFilter.java @@ -12,6 +12,16 @@ import net.minecraft.network.packet.Packet; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; +import resonant.api.IFilterable; +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.lib.content.module.TileRender; +import resonant.lib.network.Synced.SyncedInput; +import resonant.lib.network.Synced.SyncedOutput; +import resonant.lib.prefab.vector.Cuboid; +import resonant.lib.render.RenderItemOverlayUtility; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.prefab.imprint.ItemImprint; @@ -19,16 +29,6 @@ import resonantinduction.core.prefab.imprint.TileFilterable; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; import universalelectricity.api.vector.Vector3; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.api.resonantinduction.IFilterable; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.network.Synced.SyncedInput; -import calclavia.lib.network.Synced.SyncedOutput; -import calclavia.lib.prefab.vector.Cuboid; -import calclavia.lib.render.RenderItemOverlayUtility; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/filter/TileImprinter.java b/archaic/src/main/scala/resonantinduction/archaic/filter/TileImprinter.java index eaf23c95..388ac242 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/filter/TileImprinter.java +++ b/archaic/src/main/scala/resonantinduction/archaic/filter/TileImprinter.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.packet.Packet; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.tile.TileAdvanced; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.imprint.ItemImprint; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.TileAdvanced; import com.google.common.io.ByteArrayDataInput; diff --git a/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java b/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java index 2eefd8ae..42ac7a05 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java +++ b/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java @@ -13,9 +13,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockTile; +import resonant.lib.utility.FluidUtility; import resonantinduction.core.Reference; -import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.utility.FluidUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java b/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java index b7f1f96a..bd14f926 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java @@ -10,10 +10,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.Icon; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.block.BlockTile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java b/archaic/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java index 05888ad8..d6ad0576 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import calclavia.lib.render.RenderItemOverlayUtility; +import resonant.lib.render.RenderItemOverlayUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java b/archaic/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java index 6ee7e332..5a714dfd 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java +++ b/archaic/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java @@ -1,11 +1,5 @@ package resonantinduction.archaic.firebox; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.Synced; -import calclavia.lib.prefab.tile.TileElectricalInventory; -import calclavia.lib.thermal.BoilEvent; -import calclavia.lib.thermal.ThermalPhysics; -import com.google.common.io.ByteArrayDataInput; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,7 +9,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.Synced; +import resonant.lib.prefab.tile.TileElectricalInventory; +import resonant.lib.thermal.BoilEvent; +import resonant.lib.thermal.ThermalPhysics; import resonantinduction.archaic.Archaic; import resonantinduction.archaic.fluid.gutter.TileGutter; import resonantinduction.core.ResonantInduction; @@ -24,6 +29,8 @@ import resonantinduction.core.resource.TileMaterial; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; +import com.google.common.io.ByteArrayDataInput; + /** * Meant to replace the furnace class. * diff --git a/archaic/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java b/archaic/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java index 6557e6f7..ff948b44 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java @@ -9,11 +9,11 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.IPacketSender; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.tile.TileExternalInventory; import resonantinduction.core.ResonantInduction; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.IPacketSender; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.TileExternalInventory; import com.google.common.io.ByteArrayDataInput; diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java index 7da2169f..43212d9f 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java @@ -1,10 +1,10 @@ package resonantinduction.archaic.fluid.grate; -import calclavia.lib.config.Config; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.utility.FluidUtility; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.PriorityQueue; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -12,16 +12,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import resonant.api.IRotatable; +import resonant.lib.config.Config; +import resonant.lib.utility.FluidUtility; import resonantinduction.core.Reference; import resonantinduction.core.fluid.TilePressureNode; import resonantinduction.core.grid.fluid.FluidPressureNode; import universalelectricity.api.vector.Vector3; - -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.PriorityQueue; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileGrate extends TilePressureNode implements IRotatable { diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java index 5a7e28ab..0ec60719 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java +++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java @@ -1,16 +1,8 @@ package resonantinduction.archaic.fluid.gutter; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.prefab.vector.Cuboid; -import calclavia.lib.render.FluidRenderUtility; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.utility.FluidUtility; -import calclavia.lib.utility.WorldUtility; -import calclavia.lib.utility.inventory.InventoryUtility; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.Entity; @@ -22,8 +14,24 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; + import org.lwjgl.opengl.GL11; + +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.lib.content.module.TileRender; +import resonant.lib.prefab.vector.Cuboid; +import resonant.lib.render.FluidRenderUtility; +import resonant.lib.render.RenderUtility; +import resonant.lib.utility.FluidUtility; +import resonant.lib.utility.WorldUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.archaic.fluid.grate.TileGrate; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction.RecipeType; @@ -31,9 +39,8 @@ import resonantinduction.core.fluid.TilePressureNode; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; import universalelectricity.api.vector.Vector3; - -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * The gutter, used for fluid transfer. diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java index b73dc5c6..42a73936 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java +++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java @@ -12,13 +12,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import resonant.lib.utility.LanguageUtility; import resonantinduction.archaic.Archaic; import resonantinduction.core.fluid.TileFluidDistribution; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.energy.UnitDisplay.UnitPrefix; import universalelectricity.api.vector.Vector3; -import calclavia.lib.utility.LanguageUtility; /** @author Darkguardsman */ public class ItemBlockTank extends ItemBlock implements IFluidContainerItem diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java index f22f5bdd..95a8a83f 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java +++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java @@ -3,13 +3,12 @@ package resonantinduction.archaic.fluid.tank; import java.util.Comparator; import java.util.HashMap; import java.util.PriorityQueue; -import java.util.Random; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; +import resonant.lib.utility.FluidUtility; import resonantinduction.core.fluid.FluidDistributionetwork; import resonantinduction.core.fluid.IFluidDistribution; -import calclavia.lib.utility.FluidUtility; /** * Network that handles connected tanks diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java index 54cc8b7b..f7491efa 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java +++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java @@ -1,15 +1,7 @@ package resonantinduction.archaic.fluid.tank; -import calclavia.lib.content.module.TileBlock.IComparatorInputOverride; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.render.FluidRenderUtility; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.utility.FluidUtility; -import calclavia.lib.utility.WorldUtility; -import calclavia.lib.utility.inventory.InventoryUtility; -import calclavia.lib.utility.render.RenderBlockUtility; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.awt.Color; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,7 +11,17 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; + import org.lwjgl.opengl.GL11; + +import resonant.lib.content.module.TileBlock.IComparatorInputOverride; +import resonant.lib.content.module.TileRender; +import resonant.lib.render.FluidRenderUtility; +import resonant.lib.render.RenderUtility; +import resonant.lib.utility.FluidUtility; +import resonant.lib.utility.WorldUtility; +import resonant.lib.utility.inventory.InventoryUtility; +import resonant.lib.utility.render.RenderBlockUtility; import resonantinduction.archaic.Archaic; import resonantinduction.core.Reference; import resonantinduction.core.fluid.FluidDistributionetwork; @@ -27,8 +29,8 @@ import resonantinduction.core.fluid.IFluidDistribution; import resonantinduction.core.fluid.TileFluidDistribution; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector3; - -import java.awt.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileTank extends TileFluidDistribution implements IComparatorInputOverride { diff --git a/archaic/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java b/archaic/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java index b9a33d6e..d4ebfa72 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java +++ b/archaic/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java @@ -5,11 +5,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockTile; +import resonant.lib.render.block.BlockRenderingHandler; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.render.block.BlockRenderingHandler; -import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java b/archaic/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java index 3e451c7e..a3417c97 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java +++ b/archaic/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java @@ -8,11 +8,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockTile; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.resource.ItemHandCrank; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java b/archaic/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java index 8a6f5e64..1a102628 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java +++ b/archaic/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java @@ -7,9 +7,9 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import resonant.lib.render.RenderItemOverlayUtility; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderItemOverlayUtility; -import calclavia.lib.render.RenderUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/process/RenderMillstone.java b/archaic/src/main/scala/resonantinduction/archaic/process/RenderMillstone.java index 06b8779f..3a1b037b 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/process/RenderMillstone.java +++ b/archaic/src/main/scala/resonantinduction/archaic/process/RenderMillstone.java @@ -3,7 +3,7 @@ package resonantinduction.archaic.process; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import calclavia.lib.render.RenderItemOverlayUtility; +import resonant.lib.render.RenderItemOverlayUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java b/archaic/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java index 3de5e4d6..c0f3737a 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java +++ b/archaic/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java @@ -10,15 +10,15 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.tile.TileExternalInventory; +import resonant.lib.utility.FluidUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; import universalelectricity.api.vector.Vector3; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.TileExternalInventory; -import calclavia.lib.utility.FluidUtility; import com.google.common.io.ByteArrayDataInput; diff --git a/archaic/src/main/scala/resonantinduction/archaic/process/TileMillstone.java b/archaic/src/main/scala/resonantinduction/archaic/process/TileMillstone.java index 88b973db..b6aa3a31 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/process/TileMillstone.java +++ b/archaic/src/main/scala/resonantinduction/archaic/process/TileMillstone.java @@ -5,15 +5,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraftforge.common.ForgeDirection; +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.tile.TileExternalInventory; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; import universalelectricity.api.vector.Vector3; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.TileExternalInventory; -import calclavia.lib.utility.inventory.InventoryUtility; import com.google.common.io.ByteArrayDataInput; diff --git a/archaic/src/main/scala/resonantinduction/archaic/waila/Waila.java b/archaic/src/main/scala/resonantinduction/archaic/waila/Waila.java index 02a9eebf..8b168898 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/waila/Waila.java +++ b/archaic/src/main/scala/resonantinduction/archaic/waila/Waila.java @@ -1,7 +1,7 @@ package resonantinduction.archaic.waila; -import calclavia.lib.modproxy.ICompatProxy; -import calclavia.lib.utility.Mods; +import resonant.lib.modproxy.ICompatProxy; +import resonant.lib.utility.Mods; import cpw.mods.fml.common.event.FMLInterModComms; /** diff --git a/archaic/src/main/scala/resonantinduction/archaic/waila/WailaCrate.java b/archaic/src/main/scala/resonantinduction/archaic/waila/WailaCrate.java index 01c2dc66..3d301eec 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/waila/WailaCrate.java +++ b/archaic/src/main/scala/resonantinduction/archaic/waila/WailaCrate.java @@ -7,8 +7,8 @@ import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import resonant.lib.utility.LanguageUtility; import resonantinduction.archaic.crate.TileCrate; -import calclavia.lib.utility.LanguageUtility; /** Waila support for crates * diff --git a/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java b/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java index 0270325b..86179a54 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java +++ b/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java @@ -8,8 +8,8 @@ import mcp.mobius.waila.api.IWailaDataProvider; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidTank; +import resonant.lib.utility.LanguageUtility; import resonantinduction.archaic.fluid.tank.TileTank; -import calclavia.lib.utility.LanguageUtility; /** Waila support for tanks * diff --git a/electrical/src/main/scala/resonantinduction/electrical/ClientProxy.java b/electrical/src/main/scala/resonantinduction/electrical/ClientProxy.java index 5b16c37d..5a1503fb 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/ClientProxy.java +++ b/electrical/src/main/scala/resonantinduction/electrical/ClientProxy.java @@ -4,12 +4,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; +import resonant.lib.render.item.GlobalItemRenderer; import resonantinduction.electrical.battery.RenderBattery; import resonantinduction.electrical.battery.TileBattery; import resonantinduction.electrical.charger.RenderCharger; import resonantinduction.electrical.encoder.TileEncoder; import resonantinduction.electrical.encoder.gui.GuiEncoderInventory; -import resonantinduction.electrical.generator.solar.TileSolarPanel; import resonantinduction.electrical.laser.gun.RenderMiningLaserGun; import resonantinduction.electrical.levitator.RenderLevitator; import resonantinduction.electrical.multimeter.GuiMultimeter; @@ -21,7 +21,6 @@ import resonantinduction.electrical.tesla.TileTesla; import resonantinduction.electrical.transformer.RenderTransformer; import resonantinduction.quantum.gate.RenderQuantumGlyph; import universalelectricity.api.vector.Vector3; -import calclavia.lib.render.item.GlobalItemRenderer; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import cpw.mods.fml.client.FMLClientHandler; diff --git a/electrical/src/main/scala/resonantinduction/electrical/CommonProxy.java b/electrical/src/main/scala/resonantinduction/electrical/CommonProxy.java index 18e791ba..e985b805 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/CommonProxy.java +++ b/electrical/src/main/scala/resonantinduction/electrical/CommonProxy.java @@ -5,12 +5,12 @@ import java.awt.Color; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import resonant.lib.prefab.ProxyBase; import resonantinduction.electrical.encoder.TileEncoder; import resonantinduction.electrical.encoder.gui.ContainerEncoder; import resonantinduction.electrical.multimeter.ContainerMultimeter; import resonantinduction.electrical.multimeter.PartMultimeter; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.ProxyBase; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/electrical/src/main/scala/resonantinduction/electrical/Electrical.java b/electrical/src/main/scala/resonantinduction/electrical/Electrical.java index 3e65c3e4..ff995f05 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/Electrical.java +++ b/electrical/src/main/scala/resonantinduction/electrical/Electrical.java @@ -7,6 +7,10 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import resonant.lib.content.ContentRegistry; +import resonant.lib.modproxy.ProxyHandler; +import resonant.lib.network.PacketHandler; +import resonant.lib.recipe.UniversalRecipe; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; @@ -31,10 +35,6 @@ import resonantinduction.electrical.transformer.ItemTransformer; import resonantinduction.electrical.wire.EnumWireMaterial; import resonantinduction.electrical.wire.ItemWire; import resonantinduction.quantum.gate.ItemQuantumGlyph; -import calclavia.lib.content.ContentRegistry; -import calclavia.lib.modproxy.ProxyHandler; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.recipe.UniversalRecipe; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/BlockArmbot.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/BlockArmbot.java index cdb767ce..fa958b09 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/BlockArmbot.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/BlockArmbot.java @@ -7,95 +7,95 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import resonant.core.ResonantEngine; +import resonant.lib.multiblock.IBlockActivate; +import resonant.lib.multiblock.IMultiBlock; +import resonant.lib.prefab.block.BlockTile; +import resonant.lib.render.block.BlockRenderingHandler; import universalelectricity.api.UniversalElectricity; -import calclavia.components.CalclaviaLoader; -import calclavia.lib.multiblock.fake.IBlockActivate; -import calclavia.lib.multiblock.fake.IMultiBlock; -import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockArmbot extends BlockTile { - public BlockArmbot(int id) - { - super(id, UniversalElectricity.machine); - } + public BlockArmbot(int id) + { + super(id, UniversalElectricity.machine); + } - @Override - public boolean canBlockStay(World world, int x, int y, int z) - { - return world.getBlockMaterial(x, y - 1, z).isSolid(); - } + @Override + public boolean canBlockStay(World world, int x, int y, int z) + { + return world.getBlockMaterial(x, y - 1, z).isSolid(); + } - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + @Override + public void onBlockAdded(World world, int x, int y, int z) + { + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - if (tileEntity instanceof IMultiBlock) - { - CalclaviaLoader.blockMulti.createMultiBlockStructure((IMultiBlock) tileEntity); - } - } + if (tileEntity instanceof IMultiBlock) + { + ResonantEngine.blockMulti.createMultiBlockStructure((IMultiBlock) tileEntity); + } + } - @Override - public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + @Override + public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + { + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - if (tileEntity instanceof IBlockActivate) - { - return ((IBlockActivate) tileEntity).onActivated(player); - } + if (tileEntity instanceof IBlockActivate) + { + return ((IBlockActivate) tileEntity).onActivated(player); + } - return false; - } + return false; + } - @Override - public void breakBlock(World world, int x, int y, int z, int par5, int par6) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + @Override + public void breakBlock(World world, int x, int y, int z, int par5, int par6) + { + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - if (tileEntity instanceof TileArmbot) - { - ((TileArmbot) tileEntity).dropHeldObject(); - CalclaviaLoader.blockMulti.destroyMultiBlockStructure((TileArmbot) tileEntity); - } + if (tileEntity instanceof TileArmbot) + { + ((TileArmbot) tileEntity).dropHeldObject(); + ResonantEngine.blockMulti.destroyMultiBlockStructure((TileArmbot) tileEntity); + } - this.dropBlockAsItem_do(world, x, y, z, new ItemStack(this)); - super.breakBlock(world, x, y, z, par5, par6); - } + this.dropBlockAsItem_do(world, x, y, z, new ItemStack(this)); + super.breakBlock(world, x, y, z, par5, par6); + } - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) - { - return new ItemStack(this); - } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) + { + return new ItemStack(this); + } - @Override - public int quantityDropped(Random par1Random) - { - return 0; - } + @Override + public int quantityDropped(Random par1Random) + { + return 0; + } - @Override - public TileEntity createNewTileEntity(World var1) - { - return new TileArmbot(); - } + @Override + public TileEntity createNewTileEntity(World var1) + { + return new TileArmbot(); + } - @SideOnly(Side.CLIENT) - @Override - public int getRenderType() - { - return BlockRenderingHandler.ID; - } + @SideOnly(Side.CLIENT) + @Override + public int getRenderType() + { + return BlockRenderingHandler.ID; + } - @Override - public boolean isOpaqueCube() - { - return false; - } + @Override + public boolean isOpaqueCube() + { + return false; + } } diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/Program.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/Program.java index 12ccdb77..44804ef3 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/Program.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/Program.java @@ -7,13 +7,13 @@ import java.util.Map.Entry; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import resonant.lib.utility.nbt.NBTUtility; import resonantinduction.electrical.encoder.coding.ILogicTask; import resonantinduction.electrical.encoder.coding.IProgram; import resonantinduction.electrical.encoder.coding.IProgrammableMachine; import resonantinduction.electrical.encoder.coding.ITask; import resonantinduction.electrical.encoder.coding.TaskRegistry; import universalelectricity.api.vector.Vector2; -import calclavia.lib.utility.nbt.NBTUtility; public class Program implements IProgram { diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java index 6f1695ef..d6e267b0 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java @@ -14,10 +14,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; import universalelectricity.api.vector.Vector3; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBase.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBase.java index 391664bc..29935295 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBase.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBase.java @@ -5,12 +5,12 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import resonant.lib.utility.nbt.NBTUtility; import resonantinduction.core.ArgumentData; import resonantinduction.electrical.encoder.coding.IProgram; import resonantinduction.electrical.encoder.coding.IProgrammableMachine; import resonantinduction.electrical.encoder.coding.ITask; import universalelectricity.api.vector.Vector2; -import calclavia.lib.utility.nbt.NBTUtility; /** @author DarkGuardsman */ public abstract class TaskBase implements ITask diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBaseProcess.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBaseProcess.java index d21e0d11..39d0201b 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBaseProcess.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/TaskBaseProcess.java @@ -1,10 +1,10 @@ package resonantinduction.electrical.armbot; -import calclavia.lib.science.units.UnitHelper; +import net.minecraft.item.ItemStack; +import resonant.lib.science.units.UnitHelper; +import resonantinduction.electrical.encoder.coding.IProcessTask; import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; -import net.minecraft.item.ItemStack; -import resonantinduction.electrical.encoder.coding.IProcessTask; /** * Basic command prefab used by machines like an armbot. You are not required to use this in order diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java index afe11ea8..90e39d19 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java @@ -9,6 +9,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.multiblock.IMultiBlock; +import resonant.lib.network.IPacketReceiverWithID; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.tile.TileElectrical; +import resonant.lib.type.Pair; +import resonant.lib.utility.MathUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.electrical.armbot.task.TaskDrop; import resonantinduction.electrical.armbot.task.TaskGOTO; @@ -20,13 +27,6 @@ import resonantinduction.electrical.encoder.coding.ProgramHelper; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import calclavia.lib.type.Pair; -import calclavia.lib.multiblock.fake.IMultiBlock; -import calclavia.lib.network.IPacketReceiverWithID; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.TileElectrical; -import calclavia.lib.utility.MathUtility; -import calclavia.lib.utility.inventory.InventoryUtility; import com.google.common.io.ByteArrayDataInput; diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java index cf634991..219c5d41 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java @@ -7,13 +7,13 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import resonant.lib.type.Pair; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.ITask; import universalelectricity.api.vector.Vector3; -import calclavia.lib.type.Pair; -import calclavia.lib.utility.inventory.InventoryUtility; /** * Used by arms to break a specific block in a position. diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java index 448dd6bb..b7dc860d 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java @@ -9,13 +9,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import resonant.lib.science.units.UnitHelper; +import resonant.lib.type.Pair; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentFloatData; import universalelectricity.api.vector.Vector3; -import calclavia.lib.type.Pair; -import calclavia.lib.science.units.UnitHelper; public class TaskFire extends TaskBaseArmbot { diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java index a734eba0..8a4ffb63 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java @@ -8,15 +8,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.science.units.UnitHelper; +import resonant.lib.utility.MathUtility; +import resonant.lib.utility.inventory.InternalInventoryHandler; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import calclavia.lib.science.units.UnitHelper; -import calclavia.lib.utility.MathUtility; -import calclavia.lib.utility.inventory.InternalInventoryHandler; public class TaskGive extends TaskBaseArmbot { diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabEntity.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabEntity.java index 8969a244..b88f4a19 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabEntity.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabEntity.java @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import resonant.api.ai.EntitySettings; import resonantinduction.core.ArgumentData; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; -import calclavia.api.resonantinduction.electrical.ArmbotEntity; public class TaskGrabEntity extends TaskGrabPrefab { @@ -98,7 +98,7 @@ public class TaskGrabEntity extends TaskGrabPrefab { super.loadProgress(taskCompound); this.child = taskCompound.getBoolean("child"); - this.entityToInclude = ArmbotEntity.get(taskCompound.getString("name")); + this.entityToInclude = EntitySettings.get(taskCompound.getString("name")); } @Override @@ -106,7 +106,7 @@ public class TaskGrabEntity extends TaskGrabPrefab { super.saveProgress(taskCompound); taskCompound.setBoolean("child", child); - taskCompound.setString("name", ((this.entityToInclude != null) ? ArmbotEntity.get(this.entityToInclude) : "")); + taskCompound.setString("name", ((this.entityToInclude != null) ? EntitySettings.get(this.entityToInclude) : "")); } @Override @@ -116,7 +116,7 @@ public class TaskGrabEntity extends TaskGrabPrefab String entity = ""; if (this.entityToInclude != null) { - entity = ArmbotEntity.get(this.entityToInclude); + entity = EntitySettings.get(this.entityToInclude); if (this.child) { // TODO do check for EntityAgable diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabItem.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabItem.java index c5cc196f..621a887b 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabItem.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabItem.java @@ -6,10 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import resonant.lib.science.units.UnitHelper; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; -import calclavia.lib.science.units.UnitHelper; public class TaskGrabItem extends TaskGrabPrefab { diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java index 1c29dfd5..9a02f301 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java @@ -2,11 +2,11 @@ package resonantinduction.electrical.armbot.task; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IEntityConveyor; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import calclavia.api.resonantinduction.mechanical.IBelt; /** * Prefab for grab based commands @@ -17,7 +17,7 @@ public abstract class TaskGrabPrefab extends TaskBaseArmbot { public static final float radius = 0.5f; protected Vector3 armPos; - protected IBelt belt; + protected IEntityConveyor belt; public TaskGrabPrefab(String name) { @@ -37,9 +37,9 @@ public abstract class TaskGrabPrefab extends TaskBaseArmbot { entity = this.armPos.clone().translate(new Vector3(ForgeDirection.DOWN)).getTileEntity(this.program.getMachine().getLocation().left()); } - if (entity instanceof IBelt) + if (entity instanceof IEntityConveyor) { - this.belt = (IBelt) entity; + this.belt = (IEntityConveyor) entity; } return ProcessReturn.CONTINUE; } diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskIdle.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskIdle.java index 61315249..51666368 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskIdle.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskIdle.java @@ -3,10 +3,10 @@ package resonantinduction.electrical.armbot.task; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import resonant.lib.science.units.UnitHelper; import resonantinduction.core.ArgumentData; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.IProgrammableMachine; -import calclavia.lib.science.units.UnitHelper; public class TaskIdle extends TaskBaseProcess { diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateBy.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateBy.java index 44022f16..8ff1583a 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateBy.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateBy.java @@ -3,13 +3,13 @@ package resonantinduction.electrical.armbot.task; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import resonant.lib.science.units.UnitHelper; +import resonant.lib.utility.MathUtility; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; -import calclavia.lib.science.units.UnitHelper; -import calclavia.lib.utility.MathUtility; /** * Rotates an armbot by a set amount diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateTo.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateTo.java index 7149e9c6..941d52d0 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateTo.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskRotateTo.java @@ -3,13 +3,13 @@ package resonantinduction.electrical.armbot.task; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import resonant.lib.science.units.UnitHelper; +import resonant.lib.utility.MathUtility; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; -import calclavia.lib.science.units.UnitHelper; -import calclavia.lib.utility.MathUtility; /** * Rotates the armbot to a specific direction. diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java index a7a94363..90201b4c 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java @@ -8,15 +8,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.science.units.UnitHelper; +import resonant.lib.utility.MathUtility; +import resonant.lib.utility.inventory.InternalInventoryHandler; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import calclavia.lib.science.units.UnitHelper; -import calclavia.lib.utility.MathUtility; -import calclavia.lib.utility.inventory.InternalInventoryHandler; public class TaskTake extends TaskBaseArmbot { diff --git a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskUse.java b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskUse.java index a2e84cee..3e7825c4 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskUse.java +++ b/electrical/src/main/scala/resonantinduction/electrical/armbot/task/TaskUse.java @@ -5,13 +5,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import resonant.lib.science.units.UnitHelper; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.IArmbotUseable; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.IProcessTask; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; -import calclavia.lib.science.units.UnitHelper; public class TaskUse extends TaskBaseArmbot { diff --git a/electrical/src/main/scala/resonantinduction/electrical/battery/BlockBattery.java b/electrical/src/main/scala/resonantinduction/electrical/battery/BlockBattery.java index c8d5a974..7e75bbe9 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/battery/BlockBattery.java +++ b/electrical/src/main/scala/resonantinduction/electrical/battery/BlockBattery.java @@ -13,13 +13,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import resonant.lib.prefab.block.BlockSidedIO; +import resonant.lib.render.block.BlockRenderingHandler; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockSidedIO; -import calclavia.lib.render.block.BlockRenderingHandler; -import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/battery/EnergyDistributionNetwork.java b/electrical/src/main/scala/resonantinduction/electrical/battery/EnergyDistributionNetwork.java index a2bda4f5..fd64856f 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/battery/EnergyDistributionNetwork.java +++ b/electrical/src/main/scala/resonantinduction/electrical/battery/EnergyDistributionNetwork.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; -import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.net.Network; /** Energy network designed to allow several tiles to act as if they share the same energy diff --git a/electrical/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.java b/electrical/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.java index 9b5f120d..5c335cf6 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.java +++ b/electrical/src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.java @@ -8,6 +8,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import resonant.lib.render.EnumColor; +import resonant.lib.utility.LanguageUtility; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.UniversalClass; import universalelectricity.api.UniversalElectricity; @@ -15,8 +17,6 @@ import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.item.IEnergyItem; import universalelectricity.api.item.IVoltageItem; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LanguageUtility; @UniversalClass public class ItemBlockBattery extends ItemBlock implements IEnergyItem, IVoltageItem diff --git a/electrical/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java b/electrical/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java index c853b637..d8709d6c 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java +++ b/electrical/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java @@ -19,10 +19,10 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; import universalelectricity.api.vector.Vector3; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/battery/TileBattery.java b/electrical/src/main/scala/resonantinduction/electrical/battery/TileBattery.java index 85e8a6c1..66d1f653 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/battery/TileBattery.java +++ b/electrical/src/main/scala/resonantinduction/electrical/battery/TileBattery.java @@ -5,6 +5,8 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.packet.Packet; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.IPacketSender; import resonantinduction.core.ResonantInduction; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.electricity.IVoltageInput; @@ -12,8 +14,6 @@ import universalelectricity.api.electricity.IVoltageOutput; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.energy.IEnergyContainer; import universalelectricity.api.energy.IEnergyInterface; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.IPacketSender; import com.google.common.io.ByteArrayDataInput; diff --git a/electrical/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java b/electrical/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java index eaa89863..11e735d2 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java +++ b/electrical/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java @@ -1,9 +1,9 @@ package resonantinduction.electrical.battery; -import calclavia.lib.prefab.tile.TileElectrical; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.prefab.tile.TileElectrical; import universalelectricity.api.net.IConnector; import universalelectricity.api.vector.Vector3; diff --git a/electrical/src/main/scala/resonantinduction/electrical/charger/PartCharger.java b/electrical/src/main/scala/resonantinduction/electrical/charger/PartCharger.java index 1af7ce96..e3b5287a 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/charger/PartCharger.java +++ b/electrical/src/main/scala/resonantinduction/electrical/charger/PartCharger.java @@ -7,13 +7,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.utility.WrenchUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.prefab.part.PartInventoryPanel; import resonantinduction.electrical.Electrical; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.UniversalClass; import universalelectricity.api.energy.IEnergyInterface; -import calclavia.lib.utility.WrenchUtility; -import calclavia.lib.utility.inventory.InventoryUtility; import codechicken.lib.vec.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java b/electrical/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java index 1ea8957b..f3533f22 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java +++ b/electrical/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java @@ -11,14 +11,14 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderItemOverlayUtility; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.vector.Vector3; -import calclavia.lib.render.RenderItemOverlayUtility; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; /** * Renderer for electric item charger diff --git a/electrical/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala b/electrical/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala index 74e3b8e0..44fcf9ea 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala +++ b/electrical/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala @@ -1,19 +1,18 @@ package resonantinduction.electrical.distributor -import calclavia.lib.content.prefab.{TraitElectrical, TraitInventory} -import net.minecraft.block.material.Material -import calclavia.lib.content.module.TileBase -import universalelectricity.api.vector.Vector3 -import net.minecraft.inventory.IInventory -import net.minecraftforge.common.ForgeDirection -import calclavia.lib.utility.inventory.InventoryUtility -import net.minecraft.item.ItemStack - -import java.util.Collections import java.util +import java.util.Collections -import scala.util.control.Breaks._ +import net.minecraft.block.material.Material +import net.minecraft.inventory.IInventory +import net.minecraft.item.ItemStack import net.minecraft.tileentity.TileEntity +import net.minecraftforge.common.ForgeDirection +import resonant.lib.content.module.TileBase +import resonant.lib.content.prefab.TraitElectrical +import resonant.lib.content.prefab.TraitInventory +import resonant.lib.utility.inventory.InventoryUtility +import universalelectricity.api.vector.Vector3 /** * A Block that interacts with connected inventories diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java index 6beaed2c..00a186c7 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java @@ -6,10 +6,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; import resonantinduction.electrical.Electrical; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockTile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/TileEncoder.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/TileEncoder.java index 6891252c..b24aeece 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/TileEncoder.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/TileEncoder.java @@ -7,6 +7,9 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.tile.TileExternalInventory; import resonantinduction.core.ResonantInduction; import resonantinduction.electrical.armbot.Program; import resonantinduction.electrical.armbot.task.TaskRotateTo; @@ -14,9 +17,6 @@ import resonantinduction.electrical.encoder.coding.IProgram; import resonantinduction.electrical.encoder.coding.ITask; import resonantinduction.electrical.encoder.coding.TaskRegistry; import universalelectricity.api.vector.Vector2; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.TileExternalInventory; import com.google.common.io.ByteArrayDataInput; diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java index bf5e2b08..0d13651d 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java @@ -1,8 +1,8 @@ package resonantinduction.electrical.encoder.coding; import net.minecraft.world.World; +import resonant.lib.type.Pair; import universalelectricity.api.vector.Vector3; -import calclavia.lib.type.Pair; /** * Simple interface too say an object is programmable diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/ITask.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/ITask.java index a153d4dd..113f977b 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/ITask.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/coding/ITask.java @@ -4,9 +4,9 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import resonant.lib.utility.nbt.ISaveObj; import resonantinduction.core.ArgumentData; import universalelectricity.api.vector.Vector2; -import calclavia.lib.utility.nbt.ISaveObj; /** @author DarkGuardsman */ public interface ITask extends Cloneable, ISaveObj diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/ContainerEncoder.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/ContainerEncoder.java index b33b0977..014bdd40 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/ContainerEncoder.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/ContainerEncoder.java @@ -2,10 +2,10 @@ package resonantinduction.electrical.encoder.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import resonant.lib.gui.ContainerBase; +import resonant.lib.prefab.slot.SlotSpecific; import resonantinduction.electrical.encoder.ItemDisk; import resonantinduction.electrical.encoder.TileEncoder; -import calclavia.lib.gui.ContainerBase; -import calclavia.lib.prefab.slot.SlotSpecific; public class ContainerEncoder extends ContainerBase { diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderBase.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderBase.java index 8f727975..b7b3ad1a 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderBase.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderBase.java @@ -2,9 +2,9 @@ package resonantinduction.electrical.encoder.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; +import resonant.lib.gui.ContainerDummy; +import resonant.lib.gui.GuiContainerBase; import resonantinduction.electrical.encoder.TileEncoder; -import calclavia.lib.gui.ContainerDummy; -import calclavia.lib.gui.GuiContainerBase; public class GuiEncoderBase extends GuiContainerBase { diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderEditTask.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderEditTask.java index 0685e460..ad7061cc 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderEditTask.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderEditTask.java @@ -8,12 +8,12 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import resonant.lib.gui.ContainerDummy; +import resonant.lib.gui.GuiContainerBase; import resonantinduction.core.ArgumentData; import resonantinduction.core.Reference; import resonantinduction.electrical.encoder.coding.ITask; import universalelectricity.api.vector.Vector2; -import calclavia.lib.gui.ContainerDummy; -import calclavia.lib.gui.GuiContainerBase; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderTaskList.java b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderTaskList.java index 30b096fa..5c5c6803 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderTaskList.java +++ b/electrical/src/main/scala/resonantinduction/electrical/encoder/gui/GuiEncoderTaskList.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import resonant.api.IScroll; import resonantinduction.electrical.armbot.task.TaskEnd; import resonantinduction.electrical.armbot.task.TaskIdle; import resonantinduction.electrical.armbot.task.TaskStart; @@ -13,7 +14,6 @@ import resonantinduction.electrical.encoder.TileEncoder; import resonantinduction.electrical.encoder.coding.IProgram; import resonantinduction.electrical.encoder.coding.IRedirectTask; import resonantinduction.electrical.encoder.coding.ITask; -import calclavia.lib.prefab.terminal.IScroll; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/electrical/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java b/electrical/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java index 6d1a024b..907bdcd5 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java +++ b/electrical/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java @@ -4,10 +4,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.prefab.block.BlockRotatable; +import resonant.lib.render.block.BlockRenderingHandler; import resonantinduction.core.Reference; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockRotatable; -import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java b/electrical/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java index b72bc4c4..0768c64f 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java +++ b/electrical/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java @@ -10,9 +10,9 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; /** * @author Calclavia diff --git a/electrical/src/main/scala/resonantinduction/electrical/generator/TileMotor.java b/electrical/src/main/scala/resonantinduction/electrical/generator/TileMotor.java index 2a81b33d..9bc102be 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/generator/TileMotor.java +++ b/electrical/src/main/scala/resonantinduction/electrical/generator/TileMotor.java @@ -4,13 +4,13 @@ import java.util.EnumSet; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IMechanicalNode; +import resonant.api.IRotatable; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; +import resonant.lib.grid.NodeRegistry; +import resonant.lib.prefab.tile.TileElectrical; import universalelectricity.api.energy.EnergyStorageHandler; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.grid.NodeRegistry; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.prefab.tile.TileElectrical; /** * A kinetic energy to electrical energy converter. diff --git a/electrical/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java b/electrical/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java index 4dad0001..8efcc9be 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java +++ b/electrical/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java @@ -1,19 +1,17 @@ package resonantinduction.electrical.generator.solar; -import calclavia.lib.config.Config; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.prefab.vector.Cuboid; -import calclavia.lib.render.ConnectedTextureRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; -import net.minecraftforge.common.Configuration; +import resonant.lib.content.module.TileRender; +import resonant.lib.prefab.vector.Cuboid; +import resonant.lib.utility.calclavia.lib.utility.render.ConnectedTextureRenderer; import resonantinduction.core.Reference; import resonantinduction.core.Settings; import resonantinduction.electrical.battery.TileEnergyDistribution; import universalelectricity.api.energy.EnergyStorageHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileSolarPanel extends TileEnergyDistribution { diff --git a/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java b/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java index fc8fc58f..9902fd3a 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java +++ b/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java @@ -4,9 +4,9 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockTile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java b/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java index 66c76686..8dbc3766 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java +++ b/electrical/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java @@ -2,9 +2,9 @@ package resonantinduction.electrical.generator.thermopile; import net.minecraft.block.Block; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.prefab.tile.TileElectrical; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.tile.TileElectrical; public class TileThermopile extends TileElectrical { diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/GridRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/GridRailing.java index d91d343f..0cb3b291 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/GridRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/GridRailing.java @@ -1,13 +1,12 @@ package resonantinduction.electrical.itemrailing; -import calclavia.lib.grid.NodeGrid; -import calclavia.lib.grid.TickingGrid; +import java.util.Arrays; + import net.minecraft.item.ItemStack; +import resonant.lib.grid.TickingGrid; import resonantinduction.electrical.itemrailing.interfaces.IItemRailing; import resonantinduction.electrical.itemrailing.interfaces.IItemRailingTransfer; -import java.util.Arrays; - /** * @since 18/03/14 * @author tgame14 diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java index 55eefd34..bbe0c7d4 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java @@ -1,16 +1,16 @@ package resonantinduction.electrical.itemrailing; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.MultipartUtility; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.ControlKeyModifer; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.TMultiPart; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import resonantinduction.core.MultipartUtility; /** * @author tgame14 diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java index 6fe08ec4..2d8fea72 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/ItemRailingTransfer.java @@ -1,13 +1,13 @@ package resonantinduction.electrical.itemrailing; -import calclavia.lib.render.EnumColor; +import java.lang.ref.WeakReference; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import resonant.lib.render.EnumColor; import resonantinduction.electrical.itemrailing.interfaces.IItemRailing; import resonantinduction.electrical.itemrailing.interfaces.IItemRailingTransfer; -import java.lang.ref.WeakReference; - /** * An object that is a wrapper for all items through railings * diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java index 54ce18af..de571bbc 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java @@ -1,21 +1,26 @@ package resonantinduction.electrical.itemrailing; -import calclavia.lib.config.Config; -import calclavia.lib.grid.Node; -import calclavia.lib.render.EnumColor; -import calclavia.lib.type.Pair; -import com.google.common.collect.Lists; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.config.Config; +import resonant.lib.grid.Node; +import resonant.lib.render.EnumColor; +import resonant.lib.type.Pair; import resonantinduction.electrical.itemrailing.interfaces.IItemRailing; import resonantinduction.electrical.itemrailing.interfaces.IItemRailingProvider; import resonantinduction.electrical.itemrailing.interfaces.IItemRailingTransfer; import universalelectricity.api.vector.IVectorWorld; import universalelectricity.api.vector.VectorWorld; -import java.util.*; +import com.google.common.collect.Lists; /** * @author tgame14 diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java index 64d61e2b..5b71961d 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java @@ -1,22 +1,20 @@ package resonantinduction.electrical.itemrailing; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; -import codechicken.multipart.TileMultipart; +import java.lang.reflect.Constructor; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.api.grid.INode; import resonantinduction.core.prefab.part.PartFramedConnection; import resonantinduction.electrical.Electrical; -import resonantinduction.electrical.itemrailing.interfaces.IItemRailing; import resonantinduction.electrical.itemrailing.interfaces.IItemRailingProvider; import universalelectricity.api.energy.EnergyNetworkLoader; import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.vector.VectorWorld; - -import java.lang.reflect.Constructor; +import codechicken.multipart.TileMultipart; /** * @since 16/03/14 diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RailingDistanceComparator.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RailingDistanceComparator.java index 73f04e39..ebb6e692 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RailingDistanceComparator.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RailingDistanceComparator.java @@ -1,10 +1,10 @@ package resonantinduction.electrical.itemrailing; -import calclavia.lib.render.EnumColor; -import resonantinduction.electrical.itemrailing.interfaces.IItemRailing; - import java.util.Comparator; +import resonant.lib.render.EnumColor; +import resonantinduction.electrical.itemrailing.interfaces.IItemRailing; + /** * @author tgame14 * @since 16/04/14 diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RenderRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RenderRailing.java index 1b14b4af..83410aab 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RenderRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/RenderRailing.java @@ -1,7 +1,7 @@ package resonantinduction.electrical.itemrailing; -import calclavia.lib.render.item.ISimpleItemRenderer; import net.minecraft.item.ItemStack; +import resonant.api.items.ISimpleItemRenderer; /** * @author tgame14 diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java index 08660458..0e73a368 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java @@ -1,13 +1,13 @@ package resonantinduction.electrical.itemrailing.interfaces; -import calclavia.lib.grid.INode; -import calclavia.lib.render.EnumColor; +import java.util.Map; + import net.minecraft.inventory.IInventory; import net.minecraftforge.common.ForgeDirection; +import resonant.api.grid.INode; +import resonant.lib.render.EnumColor; import universalelectricity.api.vector.VectorWorld; -import java.util.Map; - /** * implement on Part Railings. * diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingProvider.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingProvider.java index dbd5c50f..7b239465 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingProvider.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingProvider.java @@ -1,8 +1,7 @@ package resonantinduction.electrical.itemrailing.interfaces; -import calclavia.lib.grid.INodeProvider; +import resonant.api.grid.INodeProvider; import universalelectricity.api.vector.IVectorWorld; -import universalelectricity.api.vector.VectorWorld; /** * @author tgame14 diff --git a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java index f14d6760..95a187ae 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java +++ b/electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingTransfer.java @@ -1,7 +1,7 @@ package resonantinduction.electrical.itemrailing.interfaces; -import calclavia.lib.render.EnumColor; import net.minecraft.item.ItemStack; +import resonant.lib.render.EnumColor; /** * the object that functions as a Wrapper for items and handles the items that flow through Railings diff --git a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java index 90a6a876..3cea5c9f 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java +++ b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java @@ -16,13 +16,13 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; +import resonant.api.event.LaserEvent; +import resonant.lib.prefab.vector.RayTraceHelper; +import resonant.lib.type.Pair; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.items.ItemEnergyTool; import universalelectricity.api.vector.IVector3; import universalelectricity.api.vector.Vector3; -import calclavia.api.resonantinduction.electrical.LaserEvent; -import calclavia.lib.prefab.vector.RayTraceHelper; -import calclavia.lib.type.Pair; /** Stream laser mining tool, When held down it will slowly mine away at the block in front of it. * diff --git a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemThermalLaser.java b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemThermalLaser.java index fbde72e8..2243fdcb 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemThermalLaser.java +++ b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemThermalLaser.java @@ -1,38 +1,26 @@ package resonantinduction.electrical.laser.gun; import java.awt.Color; -import java.util.HashMap; -import java.util.List; -import resonantinduction.core.ResonantInduction; -import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumMovingObjectType; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; +import resonant.api.event.LaserEvent; +import resonant.lib.prefab.vector.RayTraceHelper; +import resonant.lib.thermal.ThermalGrid; +import resonantinduction.core.ResonantInduction; import universalelectricity.api.item.ItemElectric; import universalelectricity.api.vector.IVector3; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; -import calclavia.api.resonantinduction.electrical.LaserEvent; -import calclavia.lib.prefab.vector.RayTraceHelper; -import calclavia.lib.thermal.ThermalGrid; -import calclavia.lib.type.Pair; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** Version of the mining laser that uses the thermal grid to melt blocks down * diff --git a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/RenderMiningLaserGun.java b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/RenderMiningLaserGun.java index 3584b791..3574dc32 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/RenderMiningLaserGun.java +++ b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/RenderMiningLaserGun.java @@ -10,7 +10,6 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/levitator/ItemLevitator.java b/electrical/src/main/scala/resonantinduction/electrical/levitator/ItemLevitator.java index 7b09d24f..93b83a56 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/levitator/ItemLevitator.java +++ b/electrical/src/main/scala/resonantinduction/electrical/levitator/ItemLevitator.java @@ -7,8 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import resonantinduction.core.prefab.part.IHighlight; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LanguageUtility; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.FacePlacementGrid$; diff --git a/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java b/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java index 1b051873..57fe91cf 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java +++ b/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java @@ -1,15 +1,13 @@ package resonantinduction.electrical.levitator; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LinkUtility; -import calclavia.lib.utility.WrenchUtility; -import calclavia.lib.utility.inventory.InventoryUtility; -import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.multipart.TMultiPart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.*; +import java.lang.ref.WeakReference; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockFluid; +import net.minecraft.block.BlockLadder; +import net.minecraft.block.BlockSnow; +import net.minecraft.block.BlockVine; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +21,10 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; +import resonant.lib.render.EnumColor; +import resonant.lib.utility.LinkUtility; +import resonant.lib.utility.WrenchUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.MultipartUtility; import resonantinduction.core.Settings; import resonantinduction.core.prefab.part.PartFace; @@ -30,9 +32,11 @@ import resonantinduction.electrical.Electrical; import resonantinduction.electrical.tesla.TileTesla; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; - -import java.lang.ref.WeakReference; -import java.util.List; +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.multipart.TMultiPart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PartLevitator extends PartFace { diff --git a/electrical/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java b/electrical/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java index de552e71..74f46338 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java +++ b/electrical/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java @@ -5,10 +5,10 @@ import java.util.Set; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.path.IPathCallBack; +import resonant.lib.path.Pathfinder; +import resonant.lib.path.PathfinderAStar; import universalelectricity.api.vector.Vector3; -import calclavia.lib.path.IPathCallBack; -import calclavia.lib.path.Pathfinder; -import calclavia.lib.path.PathfinderAStar; /** * Uses the well known A* Pathfinding algorithm. diff --git a/electrical/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java b/electrical/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java index 76179b2d..97968e33 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java +++ b/electrical/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java @@ -7,9 +7,9 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.client.FMLClientHandler; public class RenderLevitator implements ISimpleItemRenderer diff --git a/electrical/src/main/scala/resonantinduction/electrical/multimeter/Graph.java b/electrical/src/main/scala/resonantinduction/electrical/multimeter/Graph.java index 0687748b..df844765 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/multimeter/Graph.java +++ b/electrical/src/main/scala/resonantinduction/electrical/multimeter/Graph.java @@ -1,7 +1,7 @@ package resonantinduction.electrical.multimeter; import net.minecraft.nbt.NBTTagCompound; -import calclavia.lib.type.EvictingList; +import resonant.lib.type.EvictingList; /** * Graph for the multimeter diff --git a/electrical/src/main/scala/resonantinduction/electrical/multimeter/GuiMultimeter.java b/electrical/src/main/scala/resonantinduction/electrical/multimeter/GuiMultimeter.java index 1728232d..be99a0aa 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/multimeter/GuiMultimeter.java +++ b/electrical/src/main/scala/resonantinduction/electrical/multimeter/GuiMultimeter.java @@ -6,9 +6,9 @@ package resonantinduction.electrical.multimeter; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import calclavia.lib.gui.GuiContainerBase; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LanguageUtility; +import resonant.lib.gui.GuiContainerBase; +import resonant.lib.render.EnumColor; +import resonant.lib.utility.LanguageUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java b/electrical/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java index 46394662..73a59b92 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java +++ b/electrical/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java @@ -12,10 +12,10 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; +import resonant.lib.render.EnumColor; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.prefab.part.IHighlight; import resonantinduction.electrical.wire.EnumWireMaterial; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LanguageUtility; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.FacePlacementGrid$; diff --git a/electrical/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java b/electrical/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java index 10b528c6..9d1e9583 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java +++ b/electrical/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java @@ -6,13 +6,13 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import resonant.lib.utility.LanguageUtility; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.net.IUpdate; import universalelectricity.api.vector.Vector3; import universalelectricity.core.net.Network; import universalelectricity.core.net.NetworkTickHandler; -import calclavia.lib.utility.LanguageUtility; public class MultimeterNetwork extends Network implements IUpdate { diff --git a/electrical/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java b/electrical/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java index c64e94a2..9c96ba91 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java +++ b/electrical/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java @@ -11,6 +11,10 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import resonant.api.IMechanicalNode; +import resonant.api.grid.INodeProvider; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.utility.WrenchUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; @@ -21,10 +25,6 @@ import universalelectricity.api.electricity.IElectricalNetwork; import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.net.IConnector; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.utility.WrenchUtility; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Cuboid6; diff --git a/electrical/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.java b/electrical/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.java index 4cae90da..0bad0272 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.java +++ b/electrical/src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.java @@ -10,12 +10,12 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import universalelectricity.api.vector.Vector3; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; -import calclavia.lib.utility.LanguageUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/tesla/BlockTesla.java b/electrical/src/main/scala/resonantinduction/electrical/tesla/BlockTesla.java index df4e59fc..fb2aff2d 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/tesla/BlockTesla.java +++ b/electrical/src/main/scala/resonantinduction/electrical/tesla/BlockTesla.java @@ -9,15 +9,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockSidedIO; +import resonant.lib.render.block.BlockRenderingHandler; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.LinkUtility; +import resonant.lib.utility.WrenchUtility; import resonantinduction.core.MultipartUtility; import resonantinduction.core.Reference; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.VectorWorld; -import calclavia.lib.prefab.block.BlockSidedIO; -import calclavia.lib.render.block.BlockRenderingHandler; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.LinkUtility; -import calclavia.lib.utility.WrenchUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/tesla/TileTesla.java b/electrical/src/main/scala/resonantinduction/electrical/tesla/TileTesla.java index 4bc59d01..ec6f45cb 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/tesla/TileTesla.java +++ b/electrical/src/main/scala/resonantinduction/electrical/tesla/TileTesla.java @@ -20,6 +20,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.multiblock.IMultiBlockStructure; +import resonant.lib.multiblock.MultiBlockHandler; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.IPacketSender; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.damage.ElectricalDamage; +import resonant.lib.prefab.tile.TileElectrical; +import resonant.lib.render.EnumColor; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; @@ -28,15 +36,6 @@ import universalelectricity.api.UniversalElectricity; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; -import calclavia.lib.multiblock.reference.IMultiBlockStructure; -import calclavia.lib.multiblock.reference.MultiBlockHandler; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.IPacketSender; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.CustomDamageSource; -import calclavia.lib.prefab.damage.ElectricalDamage; -import calclavia.lib.prefab.tile.TileElectrical; -import calclavia.lib.render.EnumColor; import com.google.common.io.ByteArrayDataInput; diff --git a/electrical/src/main/scala/resonantinduction/electrical/transformer/PartTransformer.java b/electrical/src/main/scala/resonantinduction/electrical/transformer/PartTransformer.java index c35c4b2a..0ad906c0 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/transformer/PartTransformer.java +++ b/electrical/src/main/scala/resonantinduction/electrical/transformer/PartTransformer.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.utility.WrenchUtility; import resonantinduction.core.prefab.part.PartFace; import resonantinduction.electrical.Electrical; import universalelectricity.api.CompatibilityModule; @@ -17,7 +18,6 @@ import universalelectricity.api.electricity.IVoltageOutput; import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyInterface; import universalelectricity.api.vector.VectorHelper; -import calclavia.lib.utility.WrenchUtility; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; diff --git a/electrical/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java b/electrical/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java index 44cec980..9bcd6c0b 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java +++ b/electrical/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java @@ -7,9 +7,9 @@ import net.minecraftforge.client.model.obj.WavefrontObject; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/scala/resonantinduction/electrical/wire/ItemWire.java b/electrical/src/main/scala/resonantinduction/electrical/wire/ItemWire.java index 8b348ecd..58bf5ba5 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/wire/ItemWire.java +++ b/electrical/src/main/scala/resonantinduction/electrical/wire/ItemWire.java @@ -12,6 +12,8 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.input.Keyboard; +import resonant.lib.render.EnumColor; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.MultipartUtility; import resonantinduction.core.Reference; import resonantinduction.core.TabRI; @@ -21,8 +23,6 @@ import resonantinduction.electrical.wire.framed.PartFramedWire; import resonantinduction.electrical.wire.framed.RenderFramedWire; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LanguageUtility; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.ControlKeyModifer; diff --git a/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java b/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java index 05bdfa94..73281109 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java +++ b/electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java @@ -8,19 +8,16 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockColored; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.prefab.damage.ElectricalDamage; import resonantinduction.core.MultipartUtility; -import resonantinduction.electrical.Electrical; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.electricity.IElectricalNetwork; import universalelectricity.api.energy.IConductor; -import calclavia.lib.prefab.CustomDamageSource; -import calclavia.lib.prefab.damage.ElectricalDamage; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.multipart.IRedstonePart; diff --git a/electrical/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java b/electrical/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java index a443faf2..a2572694 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java +++ b/electrical/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java @@ -18,6 +18,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; +import resonant.lib.prefab.damage.ElectricalDamage; import resonantinduction.core.prefab.part.PartFramedConnection; import resonantinduction.electrical.Electrical; import resonantinduction.electrical.wire.EnumWireMaterial; @@ -27,7 +28,6 @@ import universalelectricity.api.electricity.IElectricalNetwork; import universalelectricity.api.energy.EnergyNetworkLoader; import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyNetwork; -import calclavia.lib.prefab.damage.ElectricalDamage; import codechicken.lib.lighting.LazyLightMatrix; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.IconTransformation; diff --git a/electrical/src/main/scala/resonantinduction/quantum/gate/IQuantumGate.java b/electrical/src/main/scala/resonantinduction/quantum/gate/IQuantumGate.java index dfc4e795..22b4e407 100644 --- a/electrical/src/main/scala/resonantinduction/quantum/gate/IQuantumGate.java +++ b/electrical/src/main/scala/resonantinduction/quantum/gate/IQuantumGate.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.inventory.ISidedInventory; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidHandler; -import calclavia.api.icbm.IBlockFrequency; +import resonant.api.blocks.IBlockFrequency; /** * Only TileEntities should implement this. diff --git a/electrical/src/main/scala/resonantinduction/quantum/gate/PartQuantumGlyph.java b/electrical/src/main/scala/resonantinduction/quantum/gate/PartQuantumGlyph.java index 4ed9d13c..e8ef000c 100644 --- a/electrical/src/main/scala/resonantinduction/quantum/gate/PartQuantumGlyph.java +++ b/electrical/src/main/scala/resonantinduction/quantum/gate/PartQuantumGlyph.java @@ -18,13 +18,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; +import resonant.api.IExternalInventory; +import resonant.api.IExternalInventoryBox; +import resonant.api.blocks.IBlockFrequency; +import resonant.lib.utility.inventory.ExternalInventory; import resonantinduction.electrical.Electrical; import universalelectricity.api.vector.VectorWorld; -import calclavia.api.icbm.IBlockFrequency; import calclavia.api.mffs.fortron.FrequencyGrid; -import calclavia.lib.utility.inventory.ExternalInventory; -import calclavia.lib.utility.inventory.IExternalInventory; -import calclavia.lib.utility.inventory.IExternalInventoryBox; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Cuboid6; diff --git a/electrical/src/main/scala/resonantinduction/quantum/gate/RenderQuantumGlyph.java b/electrical/src/main/scala/resonantinduction/quantum/gate/RenderQuantumGlyph.java index acbe7914..83080afe 100644 --- a/electrical/src/main/scala/resonantinduction/quantum/gate/RenderQuantumGlyph.java +++ b/electrical/src/main/scala/resonantinduction/quantum/gate/RenderQuantumGlyph.java @@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import codechicken.lib.vec.Cuboid6; public class RenderQuantumGlyph implements ISimpleItemRenderer diff --git a/electrical/src/main/scala/resonantinduction/quantum/gate/TraitQuantumGate.java b/electrical/src/main/scala/resonantinduction/quantum/gate/TraitQuantumGate.java index f978d5f3..f95c72af 100644 --- a/electrical/src/main/scala/resonantinduction/quantum/gate/TraitQuantumGate.java +++ b/electrical/src/main/scala/resonantinduction/quantum/gate/TraitQuantumGate.java @@ -8,7 +8,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; -import calclavia.api.icbm.IBlockFrequency; +import resonant.api.blocks.IBlockFrequency; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java index 53d3fe0e..75d90e2e 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java @@ -1,9 +1,9 @@ package resonantinduction.mechanical; +import resonant.lib.render.item.GlobalItemRenderer; import resonantinduction.mechanical.energy.gear.RenderGear; import resonantinduction.mechanical.energy.gearshaft.RenderGearShaft; import resonantinduction.mechanical.fluid.pipe.RenderPipe; -import calclavia.lib.render.item.GlobalItemRenderer; public class ClientProxy extends CommonProxy { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/CommonProxy.java b/mechanical/src/main/scala/resonantinduction/mechanical/CommonProxy.java index e36d09cf..d7e3360e 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/CommonProxy.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/CommonProxy.java @@ -1,6 +1,6 @@ package resonantinduction.mechanical; -import calclavia.lib.prefab.ProxyBase; +import resonant.lib.prefab.ProxyBase; public class CommonProxy extends ProxyBase { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java index 082449d2..71a944bd 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java @@ -1,13 +1,47 @@ package resonantinduction.mechanical; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.components.creative.BlockCreativeBuilder; -import calclavia.lib.content.ContentRegistry; -import calclavia.lib.grid.NodeRegistry; -import calclavia.lib.network.PacketAnnotation; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.item.ItemBlockMetadata; -import calclavia.lib.recipe.UniversalRecipe; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import resonant.api.IMechanicalNode; +import resonant.core.content.debug.BlockCreativeBuilder; +import resonant.lib.content.ContentRegistry; +import resonant.lib.grid.NodeRegistry; +import resonant.lib.network.PacketAnnotation; +import resonant.lib.network.PacketHandler; +import resonant.lib.prefab.item.ItemBlockMetadata; +import resonant.lib.recipe.UniversalRecipe; +import resonantinduction.core.Reference; +import resonantinduction.core.ResonantInduction; +import resonantinduction.core.Settings; +import resonantinduction.core.TabRI; +import resonantinduction.mechanical.belt.BlockConveyorBelt; +import resonantinduction.mechanical.belt.TileConveyorBelt; +import resonantinduction.mechanical.energy.gear.ItemGear; +import resonantinduction.mechanical.energy.gearshaft.ItemGearShaft; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import resonantinduction.mechanical.energy.turbine.BlockWaterTurbine; +import resonantinduction.mechanical.energy.turbine.BlockWindTurbine; +import resonantinduction.mechanical.energy.turbine.SchematicWaterTurbine; +import resonantinduction.mechanical.energy.turbine.SchematicWindTurbine; +import resonantinduction.mechanical.energy.turbine.TileWaterTurbine; +import resonantinduction.mechanical.energy.turbine.TileWindTurbine; +import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial; +import resonantinduction.mechanical.fluid.pipe.ItemPipe; +import resonantinduction.mechanical.fluid.transport.TilePump; +import resonantinduction.mechanical.logistic.belt.BlockDetector; +import resonantinduction.mechanical.logistic.belt.BlockManipulator; +import resonantinduction.mechanical.logistic.belt.TileDetector; +import resonantinduction.mechanical.logistic.belt.TileManipulator; +import resonantinduction.mechanical.logistic.belt.TileSorter; +import resonantinduction.mechanical.process.crusher.TileMechanicalPiston; +import resonantinduction.mechanical.process.edit.TileBreaker; +import resonantinduction.mechanical.process.edit.TilePlacer; +import resonantinduction.mechanical.process.grinder.TileGrindingWheel; +import resonantinduction.mechanical.process.purifier.TileMixer; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -19,31 +53,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInduction; -import resonantinduction.core.Settings; -import resonantinduction.core.TabRI; -import resonantinduction.mechanical.belt.BlockConveyorBelt; -import resonantinduction.mechanical.belt.TileConveyorBelt; -import resonantinduction.mechanical.energy.gear.ItemGear; -import resonantinduction.mechanical.energy.gearshaft.ItemGearShaft; -import resonantinduction.mechanical.energy.grid.MechanicalNode; -import resonantinduction.mechanical.energy.turbine.*; -import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial; -import resonantinduction.mechanical.fluid.pipe.ItemPipe; -import resonantinduction.mechanical.fluid.transport.TilePump; -import resonantinduction.mechanical.logistic.belt.*; -import resonantinduction.mechanical.process.crusher.TileMechanicalPiston; -import resonantinduction.mechanical.process.edit.TileBreaker; -import resonantinduction.mechanical.process.edit.TilePlacer; -import resonantinduction.mechanical.process.grinder.TileGrindingWheel; -import resonantinduction.mechanical.process.purifier.TileMixer; /** * Resonant Induction Mechanical Module diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java index 93c02db4..fb37b5cb 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BeltNetwork.java @@ -1,6 +1,6 @@ package resonantinduction.mechanical.belt; -import calclavia.lib.grid.TickingGrid; +import resonant.lib.grid.TickingGrid; /** @author Darkguardsman */ public class BeltNetwork extends TickingGrid diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java index 7f394b09..9a4b4384 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java @@ -13,11 +13,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.prefab.block.BlockTile; +import resonant.lib.render.block.BlockRenderingHandler; import resonantinduction.core.Reference; import resonantinduction.mechanical.belt.TileConveyorBelt.BeltType; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java index 6cbffdd0..1abbbcf4 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java @@ -7,9 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; import resonantinduction.core.Reference; import resonantinduction.mechanical.belt.TileConveyorBelt.BeltType; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java b/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java index 90a4d385..06a28fae 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java @@ -11,15 +11,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IEntityConveyor; +import resonant.api.IRotatable; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; +import resonant.lib.content.module.TileBase; +import resonant.lib.network.IPacketReceiverWithID; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.Mechanical; -import calclavia.api.resonantinduction.mechanical.IBelt; -import calclavia.lib.content.module.TileBase; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.network.IPacketReceiverWithID; -import calclavia.lib.prefab.tile.IRotatable; import com.google.common.io.ByteArrayDataInput; @@ -28,7 +28,7 @@ import cpw.mods.fml.common.network.PacketDispatcher; /** Conveyer belt TileEntity that allows entities of all kinds to be moved * * @author DarkGuardsman */ -public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INodeProvider, IPacketReceiverWithID +public class TileConveyorBelt extends TileBase implements IEntityConveyor, IRotatable, INodeProvider, IPacketReceiverWithID { public enum BeltType { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/ConnectionLogic.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/ConnectionLogic.java index 3c970cbb..bae471ed 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/ConnectionLogic.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/ConnectionLogic.java @@ -3,8 +3,8 @@ package resonantinduction.mechanical.energy.gear; import java.util.HashMap; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.utility.WorldUtility; import universalelectricity.api.vector.Vector3; -import calclavia.lib.utility.WorldUtility; /** * Used for testing. NO-OP diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/GearMultiBlockHandler.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/GearMultiBlockHandler.java index 90d698ba..1ec1db36 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/GearMultiBlockHandler.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/GearMultiBlockHandler.java @@ -2,8 +2,8 @@ package resonantinduction.mechanical.energy.gear; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.multiblock.MultiBlockHandler; import universalelectricity.api.vector.Vector3; -import calclavia.lib.multiblock.reference.MultiBlockHandler; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java index fab0ebce..5b0b0c1a 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java @@ -11,17 +11,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IMechanicalNode; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; +import resonant.lib.multiblock.IMultiBlockStructure; +import resonant.lib.multiblock.MultiBlockHandler; +import resonant.lib.utility.WrenchUtility; import resonantinduction.core.Reference; import resonantinduction.core.resource.ItemHandCrank; import resonantinduction.mechanical.Mechanical; import resonantinduction.mechanical.energy.grid.MechanicalNode; import resonantinduction.mechanical.energy.grid.PartMechanical; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.multiblock.reference.IMultiBlockStructure; -import calclavia.lib.multiblock.reference.MultiBlockHandler; -import calclavia.lib.utility.WrenchUtility; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Rotation; import codechicken.lib.vec.Transformation; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java index e8b5b055..71f3fb27 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java @@ -1,25 +1,21 @@ package resonantinduction.mechanical.energy.gear; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.grid.INodeProvider; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; +import resonantinduction.mechanical.Mechanical; +import resonantinduction.mechanical.energy.gearshaft.GearShaftNode; +import resonantinduction.mechanical.energy.gearshaft.RenderGearShaft; +import resonantinduction.mechanical.energy.grid.PartMechanical; import codechicken.lib.raytracer.IndexedCuboid6; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Vector3; import codechicken.multipart.PartMap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import resonantinduction.mechanical.Mechanical; -import resonantinduction.mechanical.energy.gearshaft.GearShaftNode; -import resonantinduction.mechanical.energy.gearshaft.RenderGearShaft; -import resonantinduction.mechanical.energy.grid.MechanicalNode; -import resonantinduction.mechanical.energy.grid.PartMechanical; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; /** * We assume all the force acting on the gear is 90 degrees. diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/RenderGear.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/RenderGear.java index 669bfe57..96606180 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/RenderGear.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/RenderGear.java @@ -7,9 +7,9 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/GearShaftNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/GearShaftNode.java index 2be327d9..baf2c843 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/GearShaftNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/GearShaftNode.java @@ -6,8 +6,8 @@ import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.grid.INodeProvider; +import resonant.api.IMechanicalNode; +import resonant.api.grid.INodeProvider; import resonantinduction.mechanical.energy.gear.PartGear; import resonantinduction.mechanical.energy.gear.PartGearShaft; import resonantinduction.mechanical.energy.grid.MechanicalNode; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/RenderGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/RenderGearShaft.java index 8f33e1fb..8129720c 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/RenderGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/RenderGearShaft.java @@ -8,10 +8,10 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; import resonantinduction.mechanical.energy.gear.PartGearShaft; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftGrid.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftGrid.java index 775b24bd..048cc546 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftGrid.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftGrid.java @@ -1,6 +1,6 @@ package resonantinduction.mechanical.energy.gearshaft; -import calclavia.lib.grid.NodeGrid; +import resonant.lib.grid.NodeGrid; public class ShaftGrid extends NodeGrid { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftSubNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftSubNode.java index f182e4de..aa62d4da 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftSubNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ShaftSubNode.java @@ -1,8 +1,8 @@ package resonantinduction.mechanical.energy.gearshaft; +import resonant.api.grid.INodeProvider; +import resonant.lib.grid.Node; import resonantinduction.mechanical.energy.gear.PartGearShaft; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.grid.Node; public class ShaftSubNode extends Node { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java index b28063c4..03135201 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java @@ -1,19 +1,19 @@ package resonantinduction.mechanical.energy.grid; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.grid.Node; -import calclavia.lib.grid.TickingGrid; -import codechicken.multipart.TMultiPart; +import java.util.Iterator; +import java.util.Map.Entry; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IMechanicalNode; +import resonant.api.grid.INodeProvider; +import resonant.lib.grid.Node; +import resonant.lib.grid.TickingGrid; import resonantinduction.core.ResonantInduction; import universalelectricity.api.vector.Vector3; - -import java.util.Iterator; -import java.util.Map.Entry; +import codechicken.multipart.TMultiPart; /** * A mechanical node for mechanical energy. diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PacketNetwork.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PacketNetwork.java index e05d156e..9ec7df18 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PacketNetwork.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PacketNetwork.java @@ -7,10 +7,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketType; import universalelectricity.api.net.IConnector; import universalelectricity.api.vector.Vector3; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketType; import com.google.common.io.ByteArrayDataInput; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java index 41546de3..c21783ea 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java @@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.multipart.JCuboidPart; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java index f263ab26..c62c8258 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java @@ -4,14 +4,14 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; +import resonant.lib.content.module.TileBase; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.Mechanical; import universalelectricity.api.vector.Vector3; -import calclavia.lib.content.module.TileBase; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; import com.google.common.io.ByteArrayDataInput; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbineBase.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbineBase.java index 0777f119..c12daf1d 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbineBase.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbineBase.java @@ -4,7 +4,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import calclavia.lib.prefab.block.BlockRotatable; +import resonant.lib.prefab.block.BlockRotatable; /* * Turbine block, extend this. diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java index 4da909d9..4fabfee4 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java @@ -6,7 +6,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import calclavia.lib.render.block.BlockRenderingHandler; +import resonant.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java index 97a129fe..f1146f13 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java @@ -6,7 +6,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import calclavia.lib.render.block.BlockRenderingHandler; +import resonant.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWaterTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWaterTurbine.java index c5a9bba1..210fdbcf 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWaterTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWaterTurbine.java @@ -8,9 +8,9 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWindTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWindTurbine.java index 430188e0..b2f33264 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWindTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWindTurbine.java @@ -8,9 +8,9 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java index d99ab17f..95731b90 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java @@ -3,10 +3,10 @@ package resonantinduction.mechanical.energy.turbine; import java.util.HashMap; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.schematic.Schematic; +import resonant.lib.type.Pair; import resonantinduction.mechanical.Mechanical; import universalelectricity.api.vector.Vector3; -import calclavia.lib.type.Pair; -import calclavia.lib.schematic.Schematic; public class SchematicWaterTurbine extends Schematic { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java index 2cc6c042..6e9ea3d5 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java @@ -3,10 +3,10 @@ package resonantinduction.mechanical.energy.turbine; import java.util.HashMap; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.schematic.Schematic; +import resonant.lib.type.Pair; import resonantinduction.mechanical.Mechanical; import universalelectricity.api.vector.Vector3; -import calclavia.lib.type.Pair; -import calclavia.lib.schematic.Schematic; public class SchematicWindTurbine extends Schematic { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileMechanicalTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileMechanicalTurbine.java index c80ee5d2..65029fde 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileMechanicalTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileMechanicalTurbine.java @@ -3,14 +3,13 @@ package resonantinduction.mechanical.energy.turbine; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IMechanicalNode; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; +import resonant.lib.network.Synced; +import resonant.lib.network.Synced.SyncedInput; +import resonant.lib.network.Synced.SyncedOutput; import resonantinduction.mechanical.energy.grid.MechanicalNode; -import universalelectricity.api.energy.EnergyStorageHandler; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.network.Synced; -import calclavia.lib.network.Synced.SyncedInput; -import calclavia.lib.network.Synced.SyncedOutput; //TODO: MC 1.7, merge turbines in. public class TileMechanicalTurbine extends TileTurbineBase implements INodeProvider diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbineBase.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbineBase.java index 5ede2f0a..2ad38ce3 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbineBase.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbineBase.java @@ -9,13 +9,14 @@ import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.core.ResonantEngine; +import resonant.lib.References; +import resonant.lib.content.module.TileBase; +import resonant.lib.multiblock.IMultiBlockStructure; +import resonant.lib.network.Synced; +import resonant.lib.network.Synced.SyncedInput; +import resonant.lib.network.Synced.SyncedOutput; import universalelectricity.api.vector.Vector3; -import calclavia.components.CalclaviaLoader; -import calclavia.lib.content.module.TileBase; -import calclavia.lib.multiblock.reference.IMultiBlockStructure; -import calclavia.lib.network.Synced; -import calclavia.lib.network.Synced.SyncedInput; -import calclavia.lib.network.Synced.SyncedOutput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -123,12 +124,12 @@ public abstract class TileTurbineBase extends TileBase implements IMultiBlockStr @Override public Packet getDescriptionPacket() { - return CalclaviaLoader.PACKET_ANNOTATION.getPacket(this); + return References.PACKET_ANNOTATION.getPacket(this); } public void sendPowerUpdate() { - CalclaviaLoader.PACKET_ANNOTATION.sync(this, 1); + References.PACKET_ANNOTATION.sync(this, 1); } /** Reads a tile entity from NBT. */ diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWaterTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWaterTurbine.java index a78bca26..746760ae 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWaterTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWaterTurbine.java @@ -8,10 +8,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; +import resonant.api.grid.INodeProvider; import resonantinduction.core.Settings; import resonantinduction.mechanical.energy.grid.MechanicalNode; import universalelectricity.api.vector.Vector3; -import calclavia.lib.grid.INodeProvider; import cpw.mods.fml.relauncher.ReflectionHelper; /** diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWindTurbine.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWindTurbine.java index 4996b739..a5371712 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWindTurbine.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWindTurbine.java @@ -1,21 +1,15 @@ package resonantinduction.mechanical.energy.turbine; -import java.util.List; - -import resonantinduction.core.Settings; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenOcean; import net.minecraft.world.biome.BiomeGenPlains; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.utility.inventory.InventoryUtility; +import resonantinduction.core.Settings; import universalelectricity.api.vector.Vector3; -import calclavia.api.resonantinduction.IBoilHandler; -import calclavia.lib.config.Config; -import calclavia.lib.prefab.vector.Cuboid; -import calclavia.lib.utility.inventory.InventoryUtility; /** The vertical wind turbine collects airflow. The horizontal wind turbine collects steam from steam * power plants. diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineMBlockHandler.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineMBlockHandler.java index c2e179dc..3280f418 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineMBlockHandler.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineMBlockHandler.java @@ -1,8 +1,8 @@ package resonantinduction.mechanical.energy.turbine; import net.minecraft.tileentity.TileEntity; +import resonant.lib.multiblock.MultiBlockHandler; import universalelectricity.api.vector.Vector3; -import calclavia.lib.multiblock.reference.MultiBlockHandler; public class TurbineMBlockHandler extends MultiBlockHandler { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.java b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.java index 96bf2e95..38587494 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.java @@ -9,10 +9,10 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; +import resonant.lib.render.EnumColor; +import resonant.lib.utility.LanguageUtility; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LanguageUtility; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.java index 1f933850..3751885d 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.java @@ -11,13 +11,13 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import resonant.lib.type.EvictingList; +import resonant.lib.utility.WorldUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; import resonantinduction.core.prefab.part.PartFramedNode; import resonantinduction.mechanical.Mechanical; -import calclavia.lib.type.EvictingList; -import calclavia.lib.utility.WorldUtility; import codechicken.lib.data.MCDataInput; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.IconTransformation; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java index af2a5753..c50efccd 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java @@ -12,11 +12,11 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.FluidRenderUtility; +import resonant.lib.render.RenderUtility; +import resonant.lib.utility.WorldUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.FluidRenderUtility; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; -import calclavia.lib.utility.WorldUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java index 2ab67b5e..4d0be3fa 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java @@ -11,8 +11,8 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; public class RenderPump extends TileEntitySpecialRenderer { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java index b4cbbe8c..5726fa82 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java @@ -7,13 +7,13 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import resonant.api.IRotatable; +import resonant.api.grid.INode; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; import resonantinduction.mechanical.energy.grid.TileMechanical; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector3; -import calclavia.lib.grid.INode; -import calclavia.lib.prefab.tile.IRotatable; public class TilePump extends TileMechanical implements IPressureNodeProvider, IRotatable { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockManipulator.java b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockManipulator.java index f6887ee6..796a5939 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockManipulator.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockManipulator.java @@ -5,9 +5,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; +import resonant.lib.render.block.BlockRenderingHandler; import resonantinduction.core.prefab.imprint.BlockImprintable; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockRejector.java b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockRejector.java index d90313b3..3953ba8c 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockRejector.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockRejector.java @@ -4,10 +4,10 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; +import resonant.lib.render.block.BlockRenderingHandler; import resonantinduction.core.Reference; import resonantinduction.core.prefab.imprint.BlockImprintable; import universalelectricity.api.UniversalElectricity; -import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java index c982080a..261ed363 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java @@ -10,11 +10,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.imprint.TileFilterable; import resonantinduction.mechanical.Mechanical; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; import com.google.common.io.ByteArrayDataInput; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileManipulator.java b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileManipulator.java index 504d2670..3e80d378 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileManipulator.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileManipulator.java @@ -9,14 +9,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IManipulator; +import resonant.api.IRotatable; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.utility.inventory.InternalInventoryHandler; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.imprint.ItemImprint; import resonantinduction.core.prefab.imprint.TileFilterable; import universalelectricity.api.vector.Vector3; -import calclavia.api.resonantinduction.mechanical.IManipulator; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.utility.inventory.InternalInventoryHandler; import com.google.common.io.ByteArrayDataInput; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileRejector.java b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileRejector.java index 24c5d530..a136946e 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileRejector.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileRejector.java @@ -10,11 +10,11 @@ import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IEntityConveyor; +import resonant.lib.network.IPacketReceiverWithID; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.imprint.TileFilterable; import universalelectricity.api.vector.Vector3; -import calclavia.api.resonantinduction.mechanical.IBelt; -import calclavia.lib.network.IPacketReceiverWithID; import com.google.common.io.ByteArrayDataInput; @@ -73,9 +73,9 @@ public class TileRejector extends TileFilterable implements IPacketReceiverWithI // entity.motionY += 0.10000000298023224D; entity.posZ += side.offsetZ; - if (!this.worldObj.isRemote && tileEntity instanceof IBelt) + if (!this.worldObj.isRemote && tileEntity instanceof IEntityConveyor) { - ((IBelt) tileEntity).ignoreEntity(entity); + ((IEntityConveyor) tileEntity).ignoreEntity(entity); } } diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileSorter.java b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileSorter.java index 5553fa88..1f98a495 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileSorter.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/logistic/belt/TileSorter.java @@ -19,17 +19,17 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; +import resonant.lib.content.module.TileRender; +import resonant.lib.content.module.prefab.TileInventory; +import resonant.lib.network.Synced.SyncedInput; +import resonant.lib.network.Synced.SyncedOutput; +import resonant.lib.prefab.vector.Cuboid; +import resonant.lib.render.RenderUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.prefab.imprint.ItemImprint; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector3; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.content.module.prefab.TileInventory; -import calclavia.lib.network.Synced.SyncedInput; -import calclavia.lib.network.Synced.SyncedOutput; -import calclavia.lib.prefab.vector.Cuboid; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java index 1a920d69..3391869b 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java @@ -1,17 +1,19 @@ package resonantinduction.mechanical.process.crusher; -import calclavia.lib.render.RenderUtility; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.common.ForgeDirection; + import org.apache.commons.lang3.ArrayUtils; import org.lwjgl.opengl.GL11; + +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderMechanicalPiston extends TileEntitySpecialRenderer diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java index 83f3c1cb..e602ab83 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java @@ -9,15 +9,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IRotatable; +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.lib.config.Config; +import resonant.lib.utility.MovementUtility; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.energy.grid.TileMechanical; import universalelectricity.api.vector.Vector3; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.lib.config.Config; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.utility.MovementUtility; -import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.ReflectionHelper; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java index 58ce7a10..377f03ff 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java @@ -1,15 +1,7 @@ package resonantinduction.mechanical.process.edit; -import calclavia.lib.content.module.TileBase; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.render.RotatedTextureRenderer; -import calclavia.lib.utility.inventory.InternalInventoryHandler; -import com.google.common.io.ByteArrayDataInput; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -20,11 +12,21 @@ import net.minecraft.network.packet.Packet; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IRotatable; +import resonant.lib.content.module.TileBase; +import resonant.lib.content.module.TileRender; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.render.RotatedTextureRenderer; +import resonant.lib.utility.inventory.InternalInventoryHandler; import resonantinduction.core.ResonantInduction; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; -import java.util.ArrayList; +import com.google.common.io.ByteArrayDataInput; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author tgame14 diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java index 59aa3276..beb07b73 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java @@ -1,18 +1,7 @@ package resonantinduction.mechanical.process.edit; -import calclavia.lib.content.module.TileRender; -import calclavia.lib.content.module.prefab.TileInventory; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.render.RenderItemOverlayUtility; -import calclavia.lib.render.RotatedTextureRenderer; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.inventory.InternalInventoryHandler; -import calclavia.lib.utility.inventory.InventoryUtility; -import com.google.common.io.ByteArrayDataInput; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.EnumSet; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -23,11 +12,26 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; + import org.lwjgl.opengl.GL11; + +import resonant.api.IRotatable; +import resonant.lib.content.module.TileRender; +import resonant.lib.content.module.prefab.TileInventory; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketHandler; +import resonant.lib.render.RenderItemOverlayUtility; +import resonant.lib.render.RotatedTextureRenderer; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.inventory.InternalInventoryHandler; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; import universalelectricity.api.vector.Vector3; -import java.util.EnumSet; +import com.google.common.io.ByteArrayDataInput; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author tgame14 diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java index ed969514..8db68193 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java @@ -10,8 +10,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.common.ForgeDirection; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java index f71dbe77..416d0ea2 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java @@ -7,20 +7,17 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.ForgeDirection; - -import org.apache.commons.lang3.ArrayUtils; - +import resonant.api.IMechanicalNode; +import resonant.api.IRotatable; +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.lib.prefab.vector.Cuboid; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.Timer; import resonantinduction.mechanical.energy.grid.TileMechanical; import universalelectricity.api.vector.Vector3; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.prefab.tile.IRotatable; -import calclavia.lib.prefab.vector.Cuboid; /** * @author Calclavia diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/RenderMixer.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/RenderMixer.java index 517e7ed1..87d3eaec 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/RenderMixer.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/RenderMixer.java @@ -13,9 +13,9 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; +import resonant.api.items.ISimpleItemRenderer; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/TileMixer.java b/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/TileMixer.java index edf6c2f1..58bace68 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/TileMixer.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/process/purifier/TileMixer.java @@ -1,8 +1,9 @@ package resonantinduction.mechanical.process.purifier; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.resonantinduction.IMechanicalNode; -import calclavia.lib.utility.inventory.InventoryUtility; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; import net.minecraft.block.material.Material; @@ -14,6 +15,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; +import resonant.api.IMechanicalNode; +import resonant.api.recipe.MachineRecipes; +import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.Timer; @@ -22,10 +26,6 @@ import resonantinduction.core.resource.fluid.BlockFluidMixture; import resonantinduction.mechanical.energy.grid.TileMechanical; import universalelectricity.api.vector.Vector3; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - /** * @author Calclavia */ diff --git a/src/main/scala/resonantinduction/core/ArgumentData.java b/src/main/scala/resonantinduction/core/ArgumentData.java index 945f1972..653532e3 100644 --- a/src/main/scala/resonantinduction/core/ArgumentData.java +++ b/src/main/scala/resonantinduction/core/ArgumentData.java @@ -1,8 +1,8 @@ package resonantinduction.core; import net.minecraft.nbt.NBTTagCompound; -import calclavia.lib.utility.nbt.ISaveObj; -import calclavia.lib.utility.nbt.NBTUtility; +import resonant.lib.utility.nbt.ISaveObj; +import resonant.lib.utility.nbt.NBTUtility; /** * Used to store arguments in a way that can be easier to read, limit, and understand diff --git a/src/main/scala/resonantinduction/core/ClientProxy.java b/src/main/scala/resonantinduction/core/ClientProxy.java index 13f1dfec..229cc89c 100644 --- a/src/main/scala/resonantinduction/core/ClientProxy.java +++ b/src/main/scala/resonantinduction/core/ClientProxy.java @@ -8,9 +8,9 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.particle.EntityFX; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import resonant.lib.render.fx.FxLaser; import universalelectricity.api.vector.IVector3; import universalelectricity.api.vector.Vector3; -import calclavia.lib.render.fx.FxLaser; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/core/CommonProxy.java b/src/main/scala/resonantinduction/core/CommonProxy.java index dcffc66d..9385b5a0 100644 --- a/src/main/scala/resonantinduction/core/CommonProxy.java +++ b/src/main/scala/resonantinduction/core/CommonProxy.java @@ -6,9 +6,9 @@ package resonantinduction.core; import java.awt.Color; import net.minecraft.world.World; +import resonant.lib.prefab.ProxyBase; import universalelectricity.api.vector.IVector3; import universalelectricity.api.vector.Vector3; -import calclavia.lib.prefab.ProxyBase; /** @author Calclavia */ public class CommonProxy extends ProxyBase diff --git a/src/main/scala/resonantinduction/core/ResonantInduction.java b/src/main/scala/resonantinduction/core/ResonantInduction.java index c62ca37a..b2771564 100644 --- a/src/main/scala/resonantinduction/core/ResonantInduction.java +++ b/src/main/scala/resonantinduction/core/ResonantInduction.java @@ -1,13 +1,32 @@ package resonantinduction.core; -import calclavia.lib.config.ConfigAnnotationEvent; -import calclavia.lib.config.ConfigHandler; -import calclavia.lib.content.ContentRegistry; -import calclavia.lib.network.PacketAnnotation; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.network.PacketTile; -import calclavia.lib.prefab.item.ItemBlockMetadata; -import calclavia.lib.utility.LanguageUtility; +import java.util.HashMap; +import java.util.logging.Logger; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.BlockFluidFinite; + +import org.modstats.ModstatInfo; +import org.modstats.Modstats; + +import resonant.lib.config.ConfigHandler; +import resonant.lib.content.ContentRegistry; +import resonant.lib.network.PacketAnnotation; +import resonant.lib.network.PacketHandler; +import resonant.lib.network.PacketTile; +import resonant.lib.prefab.item.ItemBlockMetadata; +import resonant.lib.utility.LanguageUtility; +import resonantinduction.core.handler.TextureHookHandler; +import resonantinduction.core.prefab.part.PacketMultiPart; +import resonantinduction.core.resource.BlockDust; +import resonantinduction.core.resource.BlockMachineMaterial; +import resonantinduction.core.resource.ItemOreResource; +import resonantinduction.core.resource.ResourceGenerator; +import resonantinduction.core.resource.TileDust; +import resonantinduction.core.resource.fluid.ItemOreResourceBucket; +import resonantinduction.core.resource.fluid.TileFluidMixture; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -20,28 +39,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.fluids.BlockFluidFinite; -import org.modstats.ModstatInfo; -import org.modstats.Modstats; -import resonantinduction.core.handler.TextureHookHandler; -import resonantinduction.core.prefab.part.PacketMultiPart; -import resonantinduction.core.resource.*; -import resonantinduction.core.resource.fluid.ItemOreResourceBucket; -import resonantinduction.core.resource.fluid.TileFluidMixture; - -import java.util.HashMap; -import java.util.logging.Logger; /** * The core module of Resonant Induction * * @author Calclavia */ -@Mod(modid = ResonantInduction.ID, name = ResonantInduction.NAME, version = Reference.VERSION, dependencies = "required-after:ForgeMultipart@[1.0.0.244,);required-after:CalclaviaCore;before:ThermalExpansion;before:Mekanism") +@Mod(modid = ResonantInduction.ID, name = ResonantInduction.NAME, version = Reference.VERSION, dependencies = "required-after:ForgeMultipart@[1.0.0.244,);required-after:ResonantEngine;before:ThermalExpansion;before:Mekanism") @NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) @ModstatInfo(prefix = "resonantin") public class ResonantInduction diff --git a/src/main/scala/resonantinduction/core/Settings.java b/src/main/scala/resonantinduction/core/Settings.java index 49592eba..f4b72f83 100644 --- a/src/main/scala/resonantinduction/core/Settings.java +++ b/src/main/scala/resonantinduction/core/Settings.java @@ -5,9 +5,9 @@ import java.util.Arrays; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.Configuration; -import calclavia.lib.config.Config; -import calclavia.lib.content.IDManager; -import calclavia.lib.utility.LanguageUtility; +import resonant.lib.config.Config; +import resonant.lib.content.IDManager; +import resonant.lib.utility.LanguageUtility; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModMetadata; diff --git a/src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java b/src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java index 5d3a9223..13596eb0 100644 --- a/src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java +++ b/src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java @@ -6,8 +6,8 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import resonant.lib.utility.WorldUtility; import universalelectricity.api.vector.Vector3; -import calclavia.lib.utility.WorldUtility; /** * A prefab class for tiles that use the fluid network. diff --git a/src/main/scala/resonantinduction/core/fluid/TileFluidNode.java b/src/main/scala/resonantinduction/core/fluid/TileFluidNode.java index 07d5add2..ecc52fd1 100644 --- a/src/main/scala/resonantinduction/core/fluid/TileFluidNode.java +++ b/src/main/scala/resonantinduction/core/fluid/TileFluidNode.java @@ -7,12 +7,12 @@ import net.minecraft.network.packet.Packet; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; +import resonant.lib.content.module.TileBase; +import resonant.lib.network.IPacketReceiverWithID; +import resonant.lib.network.PacketHandler; +import resonant.lib.utility.FluidUtility; import resonantinduction.core.ResonantInduction; import universalelectricity.api.vector.Vector3; -import calclavia.lib.content.module.TileBase; -import calclavia.lib.network.IPacketReceiverWithID; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.utility.FluidUtility; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/scala/resonantinduction/core/fluid/TilePressureNode.java b/src/main/scala/resonantinduction/core/fluid/TilePressureNode.java index 7f6c96b6..b9e07798 100644 --- a/src/main/scala/resonantinduction/core/fluid/TilePressureNode.java +++ b/src/main/scala/resonantinduction/core/fluid/TilePressureNode.java @@ -6,10 +6,10 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; +import resonant.api.grid.INode; +import resonant.lib.network.IPacketReceiverWithID; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; -import calclavia.lib.grid.INode; -import calclavia.lib.network.IPacketReceiverWithID; /** * A prefab class for tiles that use the fluid network. diff --git a/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java b/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java index 2438e5a0..2b436477 100644 --- a/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java +++ b/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java @@ -1,8 +1,8 @@ package resonantinduction.core.grid; import net.minecraftforge.common.ForgeDirection; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; import codechicken.multipart.PartMap; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java b/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java index c230c9d8..6ae36970 100644 --- a/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java +++ b/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java @@ -1,8 +1,9 @@ package resonantinduction.core.grid.fluid; -import calclavia.lib.grid.Node; -import calclavia.lib.grid.TickingGrid; -import codechicken.multipart.TMultiPart; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map.Entry; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -10,11 +11,10 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidHandler; +import resonant.lib.grid.Node; +import resonant.lib.grid.TickingGrid; import universalelectricity.api.vector.Vector3; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map.Entry; +import codechicken.multipart.TMultiPart; public class FluidPressureNode extends Node { diff --git a/src/main/scala/resonantinduction/core/grid/fluid/IPressureNodeProvider.java b/src/main/scala/resonantinduction/core/grid/fluid/IPressureNodeProvider.java index e0cbc78e..5e22db37 100644 --- a/src/main/scala/resonantinduction/core/grid/fluid/IPressureNodeProvider.java +++ b/src/main/scala/resonantinduction/core/grid/fluid/IPressureNodeProvider.java @@ -2,7 +2,7 @@ package resonantinduction.core.grid.fluid; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidHandler; -import calclavia.lib.grid.INodeProvider; +import resonant.api.grid.INodeProvider; public interface IPressureNodeProvider extends INodeProvider, IFluidHandler { diff --git a/src/main/scala/resonantinduction/core/handler/TextureHookHandler.java b/src/main/scala/resonantinduction/core/handler/TextureHookHandler.java index 7b66156e..d79a168b 100644 --- a/src/main/scala/resonantinduction/core/handler/TextureHookHandler.java +++ b/src/main/scala/resonantinduction/core/handler/TextureHookHandler.java @@ -3,11 +3,11 @@ package resonantinduction.core.handler; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.fluids.BlockFluidFinite; +import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.fluid.FluidColored; import resonantinduction.core.resource.ResourceGenerator; -import calclavia.lib.render.RenderUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/core/nei/RICrusherRecipeHandler.java b/src/main/scala/resonantinduction/core/nei/RICrusherRecipeHandler.java index 5bea29e5..1342b2e9 100644 --- a/src/main/scala/resonantinduction/core/nei/RICrusherRecipeHandler.java +++ b/src/main/scala/resonantinduction/core/nei/RICrusherRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.ResonantInduction.RecipeType; -import calclavia.lib.utility.LanguageUtility; public class RICrusherRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/scala/resonantinduction/core/nei/RIGrinderRecipeHandler.java b/src/main/scala/resonantinduction/core/nei/RIGrinderRecipeHandler.java index 8e133061..3cd3db6d 100644 --- a/src/main/scala/resonantinduction/core/nei/RIGrinderRecipeHandler.java +++ b/src/main/scala/resonantinduction/core/nei/RIGrinderRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.ResonantInduction.RecipeType; -import calclavia.lib.utility.LanguageUtility; public class RIGrinderRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/scala/resonantinduction/core/nei/RIMixerRecipeHandler.java b/src/main/scala/resonantinduction/core/nei/RIMixerRecipeHandler.java index d08cef0b..314dbc9e 100644 --- a/src/main/scala/resonantinduction/core/nei/RIMixerRecipeHandler.java +++ b/src/main/scala/resonantinduction/core/nei/RIMixerRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.ResonantInduction.RecipeType; -import calclavia.lib.utility.LanguageUtility; public class RIMixerRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/scala/resonantinduction/core/nei/RISawmillRecipeHandler.java b/src/main/scala/resonantinduction/core/nei/RISawmillRecipeHandler.java index 40b80f71..2fdbd0fa 100644 --- a/src/main/scala/resonantinduction/core/nei/RISawmillRecipeHandler.java +++ b/src/main/scala/resonantinduction/core/nei/RISawmillRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.ResonantInduction.RecipeType; -import calclavia.lib.utility.LanguageUtility; public class RISawmillRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/scala/resonantinduction/core/nei/RISmelterRecipeHandler.java b/src/main/scala/resonantinduction/core/nei/RISmelterRecipeHandler.java index a46e1863..ef708e9e 100644 --- a/src/main/scala/resonantinduction/core/nei/RISmelterRecipeHandler.java +++ b/src/main/scala/resonantinduction/core/nei/RISmelterRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.ResonantInduction.RecipeType; -import calclavia.lib.utility.LanguageUtility; public class RISmelterRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/scala/resonantinduction/core/nei/RITemplateRecipeHandler.java b/src/main/scala/resonantinduction/core/nei/RITemplateRecipeHandler.java index 32701755..486e5f60 100644 --- a/src/main/scala/resonantinduction/core/nei/RITemplateRecipeHandler.java +++ b/src/main/scala/resonantinduction/core/nei/RITemplateRecipeHandler.java @@ -12,14 +12,14 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import resonant.api.recipe.MachineRecipes; +import resonant.api.recipe.RecipeResource; +import resonant.api.recipe.RecipeResource.FluidStackResource; +import resonant.api.recipe.RecipeResource.ItemStackResource; +import resonant.api.recipe.RecipeResource.OreDictResource; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction.RecipeType; -import calclavia.api.recipe.MachineRecipes; -import calclavia.api.recipe.RecipeResource; -import calclavia.api.recipe.RecipeResource.FluidStackResource; -import calclavia.api.recipe.RecipeResource.ItemStackResource; -import calclavia.api.recipe.RecipeResource.OreDictResource; -import calclavia.lib.utility.LanguageUtility; import codechicken.core.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; diff --git a/src/main/scala/resonantinduction/core/prefab/imprint/BlockImprintable.java b/src/main/scala/resonantinduction/core/prefab/imprint/BlockImprintable.java index 29a0ce19..01f3177e 100644 --- a/src/main/scala/resonantinduction/core/prefab/imprint/BlockImprintable.java +++ b/src/main/scala/resonantinduction/core/prefab/imprint/BlockImprintable.java @@ -6,8 +6,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import calclavia.api.resonantinduction.IFilterable; -import calclavia.lib.prefab.block.BlockRotatable; +import resonant.api.IFilterable; +import resonant.lib.prefab.block.BlockRotatable; /** * Extend this block class if a filter is allowed to be placed inside of this block. diff --git a/src/main/scala/resonantinduction/core/prefab/imprint/ItemImprint.java b/src/main/scala/resonantinduction/core/prefab/imprint/ItemImprint.java index 66c7ea41..b31f55f1 100644 --- a/src/main/scala/resonantinduction/core/prefab/imprint/ItemImprint.java +++ b/src/main/scala/resonantinduction/core/prefab/imprint/ItemImprint.java @@ -14,11 +14,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.nbt.NBTUtility; import resonantinduction.core.Reference; import resonantinduction.core.Settings; import resonantinduction.core.TabRI; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.nbt.NBTUtility; public class ItemImprint extends Item { diff --git a/src/main/scala/resonantinduction/core/prefab/imprint/TileFilterable.java b/src/main/scala/resonantinduction/core/prefab/imprint/TileFilterable.java index 1ba18a15..cef59951 100644 --- a/src/main/scala/resonantinduction/core/prefab/imprint/TileFilterable.java +++ b/src/main/scala/resonantinduction/core/prefab/imprint/TileFilterable.java @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; +import resonant.api.IFilterable; +import resonant.api.IRotatable; +import resonant.lib.content.module.prefab.TileInventory; import universalelectricity.api.vector.Vector3; -import calclavia.api.resonantinduction.IFilterable; -import calclavia.lib.content.module.prefab.TileInventory; -import calclavia.lib.prefab.tile.IRotatable; public abstract class TileFilterable extends TileInventory implements IRotatable, IFilterable { diff --git a/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java b/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java index 36640286..7c2d1dcc 100644 --- a/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java +++ b/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java @@ -5,8 +5,10 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import resonant.lib.render.EnumColor; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.nbt.NBTUtility; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.UniversalClass; import universalelectricity.api.UniversalElectricity; @@ -14,9 +16,6 @@ import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.item.IEnergyItem; import universalelectricity.api.item.IVoltageItem; -import calclavia.lib.render.EnumColor; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.nbt.NBTUtility; /** Prefab for all eletric based tools * diff --git a/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java b/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java index 5d985ca0..47530089 100644 --- a/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java +++ b/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.nbt.NBTUtility; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.nbt.NBTUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.java b/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.java index 3f4d8ecc..276628ad 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.java +++ b/src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.java @@ -6,9 +6,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; +import resonant.lib.network.IPacketReceiver; +import resonant.lib.network.PacketType; import universalelectricity.api.vector.Vector3; -import calclavia.lib.network.IPacketReceiver; -import calclavia.lib.network.PacketType; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/scala/resonantinduction/core/prefab/part/PartFramedNode.java b/src/main/scala/resonantinduction/core/prefab/part/PartFramedNode.java index a75c25f6..d625b681 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/PartFramedNode.java +++ b/src/main/scala/resonantinduction/core/prefab/part/PartFramedNode.java @@ -12,9 +12,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; -import calclavia.lib.grid.INode; -import calclavia.lib.grid.INodeProvider; -import calclavia.lib.grid.Node; +import resonant.api.grid.INode; +import resonant.api.grid.INodeProvider; +import resonant.lib.grid.Node; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.raytracer.IndexedCuboid6; diff --git a/src/main/scala/resonantinduction/core/prefab/part/PartInventoryPanel.java b/src/main/scala/resonantinduction/core/prefab/part/PartInventoryPanel.java index 15ad09e4..47f6d655 100644 --- a/src/main/scala/resonantinduction/core/prefab/part/PartInventoryPanel.java +++ b/src/main/scala/resonantinduction/core/prefab/part/PartInventoryPanel.java @@ -5,9 +5,9 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; -import calclavia.lib.utility.inventory.ExternalInventory; -import calclavia.lib.utility.inventory.IExternalInventory; -import calclavia.lib.utility.inventory.IExternalInventoryBox; +import resonant.api.IExternalInventory; +import resonant.api.IExternalInventoryBox; +import resonant.lib.utility.inventory.ExternalInventory; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; diff --git a/src/main/scala/resonantinduction/core/render/RenderImprintable.java b/src/main/scala/resonantinduction/core/render/RenderImprintable.java index e5db234c..e39b5810 100644 --- a/src/main/scala/resonantinduction/core/render/RenderImprintable.java +++ b/src/main/scala/resonantinduction/core/render/RenderImprintable.java @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; +import resonant.lib.render.RenderUtility; import resonantinduction.core.prefab.imprint.ItemImprint; import resonantinduction.core.prefab.imprint.TileFilterable; import universalelectricity.api.vector.Vector3; -import calclavia.lib.render.RenderUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/core/resource/BlockDust.java b/src/main/scala/resonantinduction/core/resource/BlockDust.java index cc280c7b..d224c201 100644 --- a/src/main/scala/resonantinduction/core/resource/BlockDust.java +++ b/src/main/scala/resonantinduction/core/resource/BlockDust.java @@ -1,8 +1,7 @@ package resonantinduction.core.resource; -import calclavia.lib.prefab.block.BlockTile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -11,10 +10,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; - -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * The block form of the item dust. diff --git a/src/main/scala/resonantinduction/core/resource/BlockMachineMaterial.java b/src/main/scala/resonantinduction/core/resource/BlockMachineMaterial.java index d39f6564..a470b5c8 100644 --- a/src/main/scala/resonantinduction/core/resource/BlockMachineMaterial.java +++ b/src/main/scala/resonantinduction/core/resource/BlockMachineMaterial.java @@ -7,8 +7,8 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; -import calclavia.lib.prefab.block.BlockTile; /** * A block used to build machines or decoration. diff --git a/src/main/scala/resonantinduction/core/resource/ItemOreResource.java b/src/main/scala/resonantinduction/core/resource/ItemOreResource.java index 0e13fb2e..48e0f24d 100644 --- a/src/main/scala/resonantinduction/core/resource/ItemOreResource.java +++ b/src/main/scala/resonantinduction/core/resource/ItemOreResource.java @@ -1,8 +1,7 @@ package resonantinduction.core.resource; -import calclavia.lib.utility.LanguageUtility; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -11,11 +10,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.TabRI; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * An item used for auto-generated dusts based on registered ingots in the OreDict. diff --git a/src/main/scala/resonantinduction/core/resource/ResourceGenerator.java b/src/main/scala/resonantinduction/core/resource/ResourceGenerator.java index a5a72d74..1e4d69b8 100644 --- a/src/main/scala/resonantinduction/core/resource/ResourceGenerator.java +++ b/src/main/scala/resonantinduction/core/resource/ResourceGenerator.java @@ -1,16 +1,17 @@ package resonantinduction.core.resource; -import calclavia.api.recipe.MachineRecipes; -import calclavia.lib.config.Config; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.nbt.IVirtualObject; -import calclavia.lib.utility.nbt.NBTUtility; -import calclavia.lib.utility.nbt.SaveManager; -import com.google.common.collect.HashBiMap; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.awt.Color; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; + +import javax.imageio.ImageIO; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; @@ -28,6 +29,12 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; +import resonant.api.recipe.MachineRecipes; +import resonant.lib.config.Config; +import resonant.lib.utility.LanguageUtility; +import resonant.lib.utility.nbt.IVirtualObject; +import resonant.lib.utility.nbt.NBTUtility; +import resonant.lib.utility.nbt.SaveManager; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; @@ -36,16 +43,12 @@ import resonantinduction.core.fluid.FluidColored; import resonantinduction.core.resource.fluid.BlockFluidMaterial; import resonantinduction.core.resource.fluid.BlockFluidMixture; -import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; +import com.google.common.collect.HashBiMap; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author Calclavia diff --git a/src/main/scala/resonantinduction/core/resource/TileMaterial.java b/src/main/scala/resonantinduction/core/resource/TileMaterial.java index 8ce32564..509234bc 100644 --- a/src/main/scala/resonantinduction/core/resource/TileMaterial.java +++ b/src/main/scala/resonantinduction/core/resource/TileMaterial.java @@ -1,14 +1,15 @@ package resonantinduction.core.resource; -import calclavia.lib.content.module.TileBase; -import calclavia.lib.network.IPacketReceiver; -import com.google.common.io.ByteArrayDataInput; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; +import resonant.lib.content.module.TileBase; +import resonant.lib.network.IPacketReceiver; import resonantinduction.core.ResonantInduction; +import com.google.common.io.ByteArrayDataInput; + /** * A tile that stores the material name. * diff --git a/src/main/scala/resonantinduction/core/resource/fluid/BlockFluidMixture.java b/src/main/scala/resonantinduction/core/resource/fluid/BlockFluidMixture.java index 302af785..a1bcdf07 100644 --- a/src/main/scala/resonantinduction/core/resource/fluid/BlockFluidMixture.java +++ b/src/main/scala/resonantinduction/core/resource/fluid/BlockFluidMixture.java @@ -8,11 +8,11 @@ import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import resonant.api.recipe.MachineRecipes; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.Settings; import resonantinduction.core.resource.ResourceGenerator; -import calclavia.api.recipe.MachineRecipes; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java b/src/main/scala/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java index 198e98cd..8eb3e8ec 100644 --- a/src/main/scala/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java +++ b/src/main/scala/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java @@ -15,11 +15,11 @@ import net.minecraftforge.event.Event; import net.minecraftforge.event.entity.player.FillBucketEvent; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.FluidRegistry; +import resonant.lib.utility.LanguageUtility; import resonantinduction.core.Reference; import resonantinduction.core.TabRI; import resonantinduction.core.resource.ItemOreResource; import resonantinduction.core.resource.ResourceGenerator; -import calclavia.lib.utility.LanguageUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/core/resource/fluid/TileFluidMixture.java b/src/main/scala/resonantinduction/core/resource/fluid/TileFluidMixture.java index 59351008..e0731488 100644 --- a/src/main/scala/resonantinduction/core/resource/fluid/TileFluidMixture.java +++ b/src/main/scala/resonantinduction/core/resource/fluid/TileFluidMixture.java @@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fluids.FluidStack; +import resonant.api.recipe.MachineRecipes; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.TileMaterial; -import calclavia.api.recipe.MachineRecipes; /** * NO-OP. Not yet properly implemented. We're not using TEs for now.