diff --git a/src/main/scala/edx/basic/BasicContent.scala b/src/main/scala/edx/basic/BasicContent.scala index 87ea4701f..20449333c 100644 --- a/src/main/scala/edx/basic/BasicContent.scala +++ b/src/main/scala/edx/basic/BasicContent.scala @@ -15,8 +15,8 @@ import edx.mechanical.mech.gear.ItemHandCrank import net.minecraft.block.Block import net.minecraft.init.{Blocks, Items} import net.minecraft.item.{Item, ItemStack} -import resonant.lib.mod.content.ContentHolder -import resonant.lib.utility.recipe.UniversalRecipe +import resonantengine.lib.utility.recipe.UniversalRecipe +import resonantengine.prefab.modcontent.ContentHolder ; object BasicContent extends ContentHolder diff --git a/src/main/scala/edx/basic/blocks/ItemImprint.scala b/src/main/scala/edx/basic/blocks/ItemImprint.scala index aecaad2af..f7c6f1091 100644 --- a/src/main/scala/edx/basic/blocks/ItemImprint.scala +++ b/src/main/scala/edx/basic/blocks/ItemImprint.scala @@ -8,9 +8,9 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.{Entity, EntityList, EntityLivingBase, IProjectile} import net.minecraft.item.{Item, ItemStack} import net.minecraft.nbt.{NBTTagCompound, NBTTagList} -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.nbt.NBTUtility -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.nbt.NBTUtility +import resonantengine.lib.wrapper.CollectionWrapper._ import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/basic/blocks/TileFilterable.scala b/src/main/scala/edx/basic/blocks/TileFilterable.scala index 8f0bd7a9e..4d6433512 100644 --- a/src/main/scala/edx/basic/blocks/TileFilterable.scala +++ b/src/main/scala/edx/basic/blocks/TileFilterable.scala @@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.{IFilterable, IRotatable} -import resonant.lib.prefab.tile.mixed.TileInventory -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.tile.{IFilterable, IRotatable} +import resonantengine.lib.prefab.tile.mixed.TileInventory +import resonantengine.lib.transform.vector.Vector3 object TileFilterable { diff --git a/src/main/scala/edx/basic/blocks/TileImprinter.scala b/src/main/scala/edx/basic/blocks/TileImprinter.scala index 27c420c18..bdb4fb358 100644 --- a/src/main/scala/edx/basic/blocks/TileImprinter.scala +++ b/src/main/scala/edx/basic/blocks/TileImprinter.scala @@ -19,13 +19,13 @@ import net.minecraft.network.Packet import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.core.ResonantEngine -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} -import resonant.lib.render.RenderItemOverlayUtility -import resonant.lib.transform.vector.{Vector2, Vector3} -import resonant.lib.utility.inventory.InventoryUtility +import resonantengine.core.ResonantEngine +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} +import resonantengine.lib.render.RenderItemOverlayUtility +import resonantengine.lib.transform.vector.{Vector2, Vector3} +import resonantengine.lib.utility.inventory.InventoryUtility import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/basic/blocks/TileTurntable.scala b/src/main/scala/edx/basic/blocks/TileTurntable.scala index 803d84188..78a66ba1f 100644 --- a/src/main/scala/edx/basic/blocks/TileTurntable.scala +++ b/src/main/scala/edx/basic/blocks/TileTurntable.scala @@ -9,10 +9,10 @@ import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.util.IIcon import net.minecraft.world.{IBlockAccess, World} import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.IRotatable -import resonant.lib.prefab.tile.spatial.ResonantBlock -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.tile.IRotatable +import resonantengine.lib.prefab.tile.spatial.ResonantBlock +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.transform.vector.Vector3 object TileTurntable { diff --git a/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala b/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala index f466b9d3c..2f5acd650 100644 --- a/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala +++ b/src/main/scala/edx/basic/engineering/TileEngineeringTable.scala @@ -24,22 +24,22 @@ import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.oredict.OreDictionary import org.apache.commons.lang3.ArrayUtils import org.lwjgl.opengl.GL11 -import resonant.api.gui.ISlotPickResult -import resonant.api.recipe.{MachineRecipes, RecipeResource, RecipeType} -import resonant.api.tile.IRotatable -import resonant.core.ResonantEngine -import resonant.lib.collection.Pair -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.gui.ContainerDummy -import resonant.lib.prefab.tile.item.ItemBlockSaved -import resonant.lib.prefab.tile.mixed.TileInventory -import resonant.lib.render.RenderItemOverlayUtility -import resonant.lib.transform.region.Cuboid -import resonant.lib.transform.vector.{Vector2, Vector3} -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.inventory.AutoCraftingManager.IAutoCrafter -import resonant.lib.utility.inventory.{AutoCraftingManager, InventoryUtility} +import resonantengine.api.gui.ISlotPickResult +import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType} +import resonantengine.api.tile.IRotatable +import resonantengine.core.ResonantEngine +import resonantengine.lib.collection.Pair +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.gui.ContainerDummy +import resonantengine.lib.prefab.tile.item.ItemBlockSaved +import resonantengine.lib.prefab.tile.mixed.TileInventory +import resonantengine.lib.render.RenderItemOverlayUtility +import resonantengine.lib.transform.region.Cuboid +import resonantengine.lib.transform.vector.{Vector2, Vector3} +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.inventory.AutoCraftingManager.IAutoCrafter +import resonantengine.lib.utility.inventory.{AutoCraftingManager, InventoryUtility} import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/basic/fluid/grate/TileGrate.scala b/src/main/scala/edx/basic/fluid/grate/TileGrate.scala index bb337e326..08ad00010 100644 --- a/src/main/scala/edx/basic/fluid/grate/TileGrate.scala +++ b/src/main/scala/edx/basic/fluid/grate/TileGrate.scala @@ -14,10 +14,10 @@ import net.minecraft.util.{ChatComponentText, IIcon} import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, FluidStack} -import resonant.lib.mod.config.Config -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.FluidUtility +import resonantengine.lib.mod.config.Config +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.FluidUtility object TileGrate { diff --git a/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala b/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala index 85546c55d..93b73e517 100644 --- a/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala +++ b/src/main/scala/edx/basic/fluid/gutter/TileGutter.scala @@ -18,14 +18,14 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ import org.lwjgl.opengl.GL11 -import resonant.api.recipe.{MachineRecipes, RecipeType} -import resonant.lib.prefab.fluid.NodeFluid -import resonant.lib.render.{FluidRenderUtility, RenderUtility} -import resonant.lib.transform.region.Cuboid -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.FluidUtility -import resonant.lib.utility.inventory.InventoryUtility -import resonant.lib.wrapper.BitmaskWrapper._ +import resonantengine.api.recipe.{MachineRecipes, RecipeType} +import resonantengine.lib.prefab.fluid.NodeFluid +import resonantengine.lib.render.{FluidRenderUtility, RenderUtility} +import resonantengine.lib.transform.region.Cuboid +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.FluidUtility +import resonantengine.lib.utility.inventory.InventoryUtility +import resonantengine.lib.wrapper.BitmaskWrapper._ import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/basic/fluid/tank/ItemBlockTank.scala b/src/main/scala/edx/basic/fluid/tank/ItemBlockTank.scala index 2d5698f44..9fb1b9ff9 100644 --- a/src/main/scala/edx/basic/fluid/tank/ItemBlockTank.scala +++ b/src/main/scala/edx/basic/fluid/tank/ItemBlockTank.scala @@ -9,10 +9,10 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.world.World import net.minecraftforge.fluids.{FluidContainerRegistry, FluidStack, IFluidContainerItem} -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.science.UnitDisplay -import resonant.lib.utility.science.UnitDisplay.Unit -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.science.UnitDisplay +import resonantengine.lib.utility.science.UnitDisplay.Unit +import resonantengine.lib.wrapper.CollectionWrapper._ /** * @author Darkguardsman diff --git a/src/main/scala/edx/basic/fluid/tank/TileTank.scala b/src/main/scala/edx/basic/fluid/tank/TileTank.scala index 6ad70e5c5..92aa7af8b 100644 --- a/src/main/scala/edx/basic/fluid/tank/TileTank.scala +++ b/src/main/scala/edx/basic/fluid/tank/TileTank.scala @@ -17,14 +17,14 @@ import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ import org.lwjgl.opengl.GL11 -import resonant.api.tile.IRemovable.ISneakPickup -import resonant.api.tile.node.INode -import resonant.lib.grid.core.Node -import resonant.lib.render.block.RenderConnectedTexture -import resonant.lib.render.{FluidRenderUtility, RenderBlockUtility, RenderUtility} -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.FluidUtility -import resonant.lib.wrapper.BitmaskWrapper._ +import resonantengine.api.tile.IRemovable.ISneakPickup +import resonantengine.api.tile.node.INode +import resonantengine.lib.grid.core.Node +import resonantengine.lib.render.block.RenderConnectedTexture +import resonantengine.lib.render.{FluidRenderUtility, RenderBlockUtility, RenderUtility} +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.FluidUtility +import resonantengine.lib.wrapper.BitmaskWrapper._ /** * Tile/Block class for basic Dynamic tanks diff --git a/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala b/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala index bde0455e2..f4e71a408 100644 --- a/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala +++ b/src/main/scala/edx/basic/process/grinding/TileWorkbench.scala @@ -11,15 +11,15 @@ import net.minecraft.util.ResourceLocation import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.oredict.OreDictionary import org.lwjgl.opengl.GL11 -import resonant.api.recipe.{MachineRecipes, RecipeType} -import resonant.lib.content.prefab.TInventory -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.render.{RenderItemOverlayUtility, RenderUtility} -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.inventory.InventoryUtility -import resonant.lib.wrapper.ByteBufWrapper._ +import resonantengine.api.recipe.{MachineRecipes, RecipeType} +import resonantengine.lib.content.prefab.TInventory +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility} +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.inventory.InventoryUtility +import resonantengine.lib.wrapper.ByteBufWrapper._ /** * The workbench is meant for manual ore and wood processing. diff --git a/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala b/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala index 54ac7c101..1ca6ac9e7 100644 --- a/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala +++ b/src/main/scala/edx/basic/process/mixing/ItemGlassJar.scala @@ -6,9 +6,9 @@ import net.minecraft.entity.Entity import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.world.World -import resonant.lib.prefab.tile.item.ItemBlockSaved -import resonant.lib.transform.vector.{IVector3, Vector3} -import resonant.lib.utility.nbt.NBTUtility +import resonantengine.lib.prefab.tile.item.ItemBlockSaved +import resonantengine.lib.transform.vector.{IVector3, Vector3} +import resonantengine.lib.utility.nbt.NBTUtility /** * The ItemBlock for the glass jar diff --git a/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala b/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala index f6e46d559..686e3f21e 100644 --- a/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala +++ b/src/main/scala/edx/basic/process/mixing/TileGlassJar.scala @@ -18,20 +18,20 @@ import net.minecraft.util.ResourceLocation import net.minecraftforge.client.IItemRenderer.ItemRenderType import net.minecraftforge.client.model.AdvancedModelLoader import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.factory.resources.ResourceFactory -import resonant.lib.factory.resources.item.TItemResource -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.item.ItemBlockSaved -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.render.RenderUtility -import resonant.lib.render.model.ModelCube -import resonant.lib.transform.region.Cuboid -import resonant.lib.transform.vector.{Vector3, VectorWorld} -import resonant.lib.utility.inventory.InventoryUtility -import resonant.lib.utility.nbt.NBTUtility -import resonant.lib.wrapper.ByteBufWrapper._ +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.factory.resources.ResourceFactory +import resonantengine.lib.factory.resources.item.TItemResource +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.item.ItemBlockSaved +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.render.model.ModelCube +import resonantengine.lib.transform.region.Cuboid +import resonantengine.lib.transform.vector.{Vector3, VectorWorld} +import resonantengine.lib.utility.inventory.InventoryUtility +import resonantengine.lib.utility.nbt.NBTUtility +import resonantengine.lib.wrapper.ByteBufWrapper._ /** * A glass jar for mixing different dusts/refined together. diff --git a/src/main/scala/edx/basic/process/sifting/ItemSieve.scala b/src/main/scala/edx/basic/process/sifting/ItemSieve.scala index 8255cc08c..9fcc5d6c2 100644 --- a/src/main/scala/edx/basic/process/sifting/ItemSieve.scala +++ b/src/main/scala/edx/basic/process/sifting/ItemSieve.scala @@ -6,14 +6,14 @@ import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{EnumAction, ItemStack} import net.minecraft.world.World -import resonant.api.recipe.{MachineRecipes, RecipeType} -import resonant.lib.prefab.tile.item.ItemBlockSaved -import resonant.lib.render.EnumColor -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.inventory.{ExternalInventory, InventoryUtility} -import resonant.lib.utility.nbt.NBTUtility -import resonant.lib.wrapper.CollectionWrapper._ -import resonant.lib.wrapper.StringWrapper._ +import resonantengine.api.recipe.{MachineRecipes, RecipeType} +import resonantengine.lib.prefab.tile.item.ItemBlockSaved +import resonantengine.lib.render.EnumColor +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.inventory.{ExternalInventory, InventoryUtility} +import resonantengine.lib.utility.nbt.NBTUtility +import resonantengine.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.wrapper.StringWrapper._ /** * The ItemBlock for the glass jar diff --git a/src/main/scala/edx/basic/process/sifting/TileSieve.scala b/src/main/scala/edx/basic/process/sifting/TileSieve.scala index 61983ac37..a58d76772 100644 --- a/src/main/scala/edx/basic/process/sifting/TileSieve.scala +++ b/src/main/scala/edx/basic/process/sifting/TileSieve.scala @@ -14,17 +14,17 @@ import net.minecraft.util.ResourceLocation import net.minecraftforge.client.IItemRenderer.ItemRenderType import net.minecraftforge.client.model.AdvancedModelLoader import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.content.prefab.TInventory -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.item.ItemBlockSaved -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.render.{RenderItemOverlayUtility, RenderUtility} -import resonant.lib.transform.region.Cuboid -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.inventory.InventoryUtility -import resonant.lib.wrapper.ByteBufWrapper._ +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.content.prefab.TInventory +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.item.ItemBlockSaved +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility} +import resonantengine.lib.transform.region.Cuboid +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.inventory.InventoryUtility +import resonantengine.lib.wrapper.ByteBufWrapper._ object TileSieve { diff --git a/src/main/scala/edx/basic/process/smelting/RenderCastingMold.scala b/src/main/scala/edx/basic/process/smelting/RenderCastingMold.scala index a6eead834..1056bb696 100644 --- a/src/main/scala/edx/basic/process/smelting/RenderCastingMold.scala +++ b/src/main/scala/edx/basic/process/smelting/RenderCastingMold.scala @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.ResourceLocation import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import org.lwjgl.opengl.GL11 -import resonant.lib.render.{RenderItemOverlayUtility, RenderUtility} +import resonantengine.lib.render.{RenderItemOverlayUtility, RenderUtility} @SideOnly(Side.CLIENT) object RenderCastingMold { diff --git a/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala b/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala index 1c34f336c..e46f70604 100644 --- a/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala +++ b/src/main/scala/edx/basic/process/smelting/TileCastingMold.scala @@ -8,13 +8,13 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.recipe.{MachineRecipes, RecipeResource, RecipeType} -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.tile.mixed.TileInventory -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.FluidUtility -import resonant.lib.utility.inventory.InventoryUtility +import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType} +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.tile.mixed.TileInventory +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.FluidUtility +import resonantengine.lib.utility.inventory.InventoryUtility /** * Turns molten fuilds into ingots. diff --git a/src/main/scala/edx/basic/process/smelting/firebox/RenderHotPlate.scala b/src/main/scala/edx/basic/process/smelting/firebox/RenderHotPlate.scala index 51555969e..ae1e12c9a 100644 --- a/src/main/scala/edx/basic/process/smelting/firebox/RenderHotPlate.scala +++ b/src/main/scala/edx/basic/process/smelting/firebox/RenderHotPlate.scala @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.render.RenderItemOverlayUtility +import resonantengine.lib.render.RenderItemOverlayUtility @SideOnly(Side.CLIENT) class RenderHotPlate extends TileEntitySpecialRenderer { diff --git a/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala b/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala index 615aac4c4..706458335 100644 --- a/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala +++ b/src/main/scala/edx/basic/process/smelting/firebox/TileFirebox.scala @@ -18,18 +18,18 @@ import net.minecraft.util.IIcon import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.lib.content.prefab.{TIO, TInventory} -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.grid.thermal.{BoilEvent, ThermalPhysics} -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.FluidUtility -import resonant.lib.wrapper.ByteBufWrapper._ -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.content.prefab.{TIO, TInventory} +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.grid.thermal.{BoilEvent, ThermalPhysics} +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.FluidUtility +import resonantengine.lib.wrapper.ByteBufWrapper._ +import resonantengine.lib.wrapper.CollectionWrapper._ /** * Meant to replace the furnace class. diff --git a/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala b/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala index 1d46118ec..2c486b206 100644 --- a/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala +++ b/src/main/scala/edx/basic/process/smelting/firebox/TileHotPlate.scala @@ -11,14 +11,14 @@ import net.minecraft.item.crafting.FurnaceRecipes import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess -import resonant.lib.content.prefab.TInventory -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} -import resonant.lib.transform.region.Cuboid -import resonant.lib.transform.vector.{Vector2, Vector3} -import resonant.lib.wrapper.ByteBufWrapper._ -import resonant.lib.wrapper.RandomWrapper._ +import resonantengine.lib.content.prefab.TInventory +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} +import resonantengine.lib.transform.region.Cuboid +import resonantengine.lib.transform.vector.{Vector2, Vector3} +import resonantengine.lib.wrapper.ByteBufWrapper._ +import resonantengine.lib.wrapper.RandomWrapper._ /** * For smelting items. diff --git a/src/main/scala/edx/basic/waila/Waila.scala b/src/main/scala/edx/basic/waila/Waila.scala index 9d97818a2..e2b23c897 100644 --- a/src/main/scala/edx/basic/waila/Waila.scala +++ b/src/main/scala/edx/basic/waila/Waila.scala @@ -1,8 +1,8 @@ package edx.basic.waila import cpw.mods.fml.common.event.FMLInterModComms -import resonant.lib.mod.compat.Mods -import resonant.lib.mod.loadable.ICompatProxy +import resonantengine.lib.mod.compat.Mods +import resonantengine.lib.mod.loadable.ICompatProxy /** * @author tgame14 diff --git a/src/main/scala/edx/basic/waila/WailaFluidTank.scala b/src/main/scala/edx/basic/waila/WailaFluidTank.scala index 9b630c969..b219ce8a0 100644 --- a/src/main/scala/edx/basic/waila/WailaFluidTank.scala +++ b/src/main/scala/edx/basic/waila/WailaFluidTank.scala @@ -7,7 +7,7 @@ import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor, IWailaData import net.minecraft.item.ItemStack import net.minecraft.tileentity.TileEntity import net.minecraftforge.fluids.IFluidTank -import resonant.lib.utility.LanguageUtility +import resonantengine.lib.utility.LanguageUtility /** * Waila support for tanks diff --git a/src/main/scala/edx/core/ClientProxy.scala b/src/main/scala/edx/core/ClientProxy.scala index dc84bf8cd..821f2fdb7 100644 --- a/src/main/scala/edx/core/ClientProxy.scala +++ b/src/main/scala/edx/core/ClientProxy.scala @@ -33,9 +33,9 @@ import net.minecraft.client.particle.{EntityDiggingFX, EntityFX} import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.Item import net.minecraft.world.World -import resonant.lib.render.fx.FXElectricBolt2 -import resonant.lib.render.wrapper.ItemRenderHandler -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.render.fx.FXElectricBolt2 +import resonantengine.lib.render.wrapper.ItemRenderHandler +import resonantengine.lib.transform.vector.Vector3 /** @author Calclavia */ @SideOnly(Side.CLIENT) class ClientProxy extends CommonProxy diff --git a/src/main/scala/edx/core/CommonProxy.scala b/src/main/scala/edx/core/CommonProxy.scala index 2c2019ce0..8f28f06b6 100644 --- a/src/main/scala/edx/core/CommonProxy.scala +++ b/src/main/scala/edx/core/CommonProxy.scala @@ -14,8 +14,8 @@ import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer import net.minecraft.tileentity.TileEntity import net.minecraft.world.World -import resonant.lib.mod.AbstractProxy -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.mod.AbstractProxy +import resonantengine.lib.transform.vector.Vector3 /** * @author Calclavia diff --git a/src/main/scala/edx/core/Electrodynamics.scala b/src/main/scala/edx/core/Electrodynamics.scala index cd6ad708d..c1a225e23 100644 --- a/src/main/scala/edx/core/Electrodynamics.scala +++ b/src/main/scala/edx/core/Electrodynamics.scala @@ -13,9 +13,9 @@ import edx.quantum.QuantumContent import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.config.Configuration import org.modstats.{ModstatInfo, Modstats} -import resonant.core.ResonantEngine -import resonant.lib.mod.config.ConfigHandler -import resonant.lib.mod.loadable.LoadableHandler +import resonantengine.core.ResonantEngine +import resonantengine.lib.mod.config.ConfigHandler +import resonantengine.lib.mod.loadable.LoadableHandler /** The core module of Resonant Induction * diff --git a/src/main/scala/edx/core/ResonantPartFactory.scala b/src/main/scala/edx/core/ResonantPartFactory.scala index c443ee057..b1e169af1 100644 --- a/src/main/scala/edx/core/ResonantPartFactory.scala +++ b/src/main/scala/edx/core/ResonantPartFactory.scala @@ -25,7 +25,7 @@ object ResonantPartFactory extends IPartFactory MultiPartRegistry.registerParts(this, partMap.keys.toArray) MultipartGenerator.registerTrait("resonant.api.tile.INodeProvider", "edx.core.prefab.pass.TNodeProvider") - MultipartGenerator.registerTrait("resonant.lib.debug.IDebugInfo", "edx.core.prefab.pass.TDebugInfo") + MultipartGenerator.registerTrait("resonant.core.debug.IDebugInfo", "edx.core.prefab.pass.TDebugInfo") MultipartGenerator.registerPassThroughInterface("net.minecraftforge.fluids.IFluidHandler") } diff --git a/src/main/scala/edx/core/Settings.scala b/src/main/scala/edx/core/Settings.scala index d51b14264..208302fa3 100644 --- a/src/main/scala/edx/core/Settings.scala +++ b/src/main/scala/edx/core/Settings.scala @@ -4,10 +4,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent import net.minecraft.block.Block import net.minecraft.item.ItemStack import net.minecraftforge.common.config.Configuration -import resonant.api.recipe.QuantumAssemblerRecipes -import resonant.lib.mod.config.Config -import resonant.lib.mod.config.ConfigEvent.PostConfigEvent -import resonant.lib.prefab.poison.PotionRadiation +import resonantengine.api.recipe.QuantumAssemblerRecipes +import resonantengine.lib.mod.config.Config +import resonantengine.lib.mod.config.ConfigEvent.PostConfigEvent +import resonantengine.lib.prefab.poison.PotionRadiation import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/core/handler/TextureHookHandler.scala b/src/main/scala/edx/core/handler/TextureHookHandler.scala index a059f8570..f67a909b5 100644 --- a/src/main/scala/edx/core/handler/TextureHookHandler.scala +++ b/src/main/scala/edx/core/handler/TextureHookHandler.scala @@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.{Side, SideOnly} import edx.core.Reference import edx.quantum.QuantumContent import net.minecraftforge.client.event.TextureStitchEvent -import resonant.lib.render.RenderUtility +import resonantengine.lib.render.RenderUtility /** Event handler for texture events * @author Calclavia diff --git a/src/main/scala/edx/core/interfaces/TNodeMechanical.scala b/src/main/scala/edx/core/interfaces/TNodeMechanical.scala index 61ea752b5..e27585b27 100644 --- a/src/main/scala/edx/core/interfaces/TNodeMechanical.scala +++ b/src/main/scala/edx/core/interfaces/TNodeMechanical.scala @@ -1,7 +1,7 @@ package edx.core.interfaces -import resonant.api.tile.node.INode -import resonant.lib.transform.vector.IVectorWorld +import resonantengine.api.tile.node.INode +import resonantengine.lib.transform.vector.IVectorWorld /** * Applied to any node that will act as a mechanical object diff --git a/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala b/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala index ca82b7f0a..0eff749d8 100644 --- a/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala +++ b/src/main/scala/edx/core/prefab/node/NodeFluidPressure.scala @@ -2,10 +2,10 @@ package edx.core.prefab.node import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{FluidContainerRegistry, IFluidHandler} -import resonant.api.IUpdate -import resonant.api.tile.INodeProvider -import resonant.lib.grid.core.UpdateTicker -import resonant.lib.prefab.fluid.NodeFluid +import resonantengine.api.IUpdate +import resonantengine.api.tile.INodeProvider +import resonantengine.lib.grid.core.UpdateTicker +import resonantengine.lib.prefab.fluid.NodeFluid import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/core/prefab/node/TMultipartNode.scala b/src/main/scala/edx/core/prefab/node/TMultipartNode.scala index d99f263c2..d028dba42 100644 --- a/src/main/scala/edx/core/prefab/node/TMultipartNode.scala +++ b/src/main/scala/edx/core/prefab/node/TMultipartNode.scala @@ -3,7 +3,7 @@ package edx.core.prefab.node import codechicken.multipart.TMultiPart import net.minecraft.tileentity.TileEntity import net.minecraft.world.World -import resonant.lib.grid.core.NodeConnector +import resonantengine.lib.grid.core.NodeConnector /** * A trait that allows nodes to works with Forge Multipart. This trait MUST be mixed in. diff --git a/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala b/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala index 3df47ee26..97cbc1d2d 100644 --- a/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala +++ b/src/main/scala/edx/core/prefab/node/TileFluidProvider.scala @@ -5,12 +5,12 @@ import net.minecraft.block.material.Material import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.fluid.NodeFluid -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.wrapper.ByteBufWrapper._ +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.fluid.NodeFluid +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.wrapper.ByteBufWrapper._ /** * A prefab class for tiles that use the fluid network. diff --git a/src/main/scala/edx/core/prefab/part/ChickenBonesWrapper.scala b/src/main/scala/edx/core/prefab/part/ChickenBonesWrapper.scala index 8ccdafb72..de7ca803b 100644 --- a/src/main/scala/edx/core/prefab/part/ChickenBonesWrapper.scala +++ b/src/main/scala/edx/core/prefab/part/ChickenBonesWrapper.scala @@ -1,7 +1,7 @@ package edx.core.prefab.part import codechicken.lib.vec.Cuboid6 -import resonant.lib.transform.region.Cuboid +import resonantengine.lib.transform.region.Cuboid /** * Wraps ChickenBone's Vector3 with UE's Vector3. @@ -9,11 +9,11 @@ import resonant.lib.transform.region.Cuboid */ object ChickenBonesWrapper { - implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z) + implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): resonantengine.lib.transform.vector.Vector3 = new resonantengine.lib.transform.vector.Vector3(vec.x, vec.y, vec.z) - implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z) + implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): resonantengine.lib.transform.vector.Vector3 = new resonantengine.lib.transform.vector.Vector3(vec.x, vec.y, vec.z) - implicit def asCBVector3(vec: resonant.lib.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z) + implicit def asCBVector3(vec: resonantengine.lib.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z) implicit def asCuboid(cuboid: Cuboid6): Cuboid = new Cuboid(cuboid.min, cuboid.max) diff --git a/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala b/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala index 3e908141c..357ff1f17 100644 --- a/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala +++ b/src/main/scala/edx/core/prefab/part/PacketMultiPart.scala @@ -4,9 +4,9 @@ import codechicken.multipart.{TMultiPart, TileMultipart} import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext import net.minecraft.entity.player.EntityPlayer -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.TPacketReceiver -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.TPacketReceiver +import resonantengine.lib.transform.vector.Vector3 /** * Packet handler for blocks and tile entities. diff --git a/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala b/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala index 987e88f62..ae4bcc628 100644 --- a/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala +++ b/src/main/scala/edx/core/prefab/part/connector/PartAbstract.scala @@ -5,7 +5,7 @@ import codechicken.multipart.{IRedstonePart, TMultiPart} import edx.core.ResonantPartFactory import net.minecraft.item.ItemStack import net.minecraft.util.MovingObjectPosition -import resonant.lib.prefab.tile.traits.TTicker +import resonantengine.lib.prefab.tile.traits.TTicker import scala.collection.convert.wrapAll._ import scala.collection.mutable diff --git a/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala b/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala index 6d2a5e52f..bb494d59e 100644 --- a/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala +++ b/src/main/scala/edx/core/prefab/part/connector/PartFramedNode.scala @@ -11,8 +11,8 @@ import edx.core.prefab.part.CuboidShapes import net.minecraft.entity.player.EntityPlayer import net.minecraft.util.MovingObjectPosition import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.grid.core.NodeConnector -import resonant.lib.wrapper.BitmaskWrapper._ +import resonantengine.lib.grid.core.NodeConnector +import resonantengine.lib.wrapper.BitmaskWrapper._ import scala.collection.convert.wrapAll._ import scala.collection.mutable diff --git a/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala b/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala index c1bdd0d57..b5f65cc0e 100644 --- a/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala +++ b/src/main/scala/edx/core/prefab/part/connector/TPartNodeProvider.scala @@ -4,8 +4,8 @@ import java.util.{List => JList} import codechicken.multipart.TMultiPart import net.minecraft.nbt.NBTTagCompound -import resonant.api.ISave -import resonant.lib.grid.core.TNodeProvider +import resonantengine.api.ISave +import resonantengine.lib.grid.core.TNodeProvider import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/core/prefab/pass/TDebugInfo.java b/src/main/scala/edx/core/prefab/pass/TDebugInfo.java index 2b8eec30d..c9b1e5698 100644 --- a/src/main/scala/edx/core/prefab/pass/TDebugInfo.java +++ b/src/main/scala/edx/core/prefab/pass/TDebugInfo.java @@ -2,7 +2,7 @@ package edx.core.prefab.pass; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import resonant.lib.debug.IDebugInfo; +import resonantengine.core.debug.IDebugInfo; import java.util.ArrayList; import java.util.List; diff --git a/src/main/scala/edx/core/prefab/pass/TNodeProvider.java b/src/main/scala/edx/core/prefab/pass/TNodeProvider.java index 73a5405a4..78fe564e5 100644 --- a/src/main/scala/edx/core/prefab/pass/TNodeProvider.java +++ b/src/main/scala/edx/core/prefab/pass/TNodeProvider.java @@ -4,8 +4,8 @@ import codechicken.multipart.PartMap; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import net.minecraftforge.common.util.ForgeDirection; -import resonant.api.tile.INodeProvider; -import resonant.api.tile.node.INode; +import resonantengine.api.tile.INodeProvider; +import resonantengine.api.tile.node.INode; /** * TNodeProvider multipart Trait. diff --git a/src/main/scala/edx/core/resource/AutoResourceFactory.scala b/src/main/scala/edx/core/resource/AutoResourceFactory.scala index 80a537109..033379af6 100644 --- a/src/main/scala/edx/core/resource/AutoResourceFactory.scala +++ b/src/main/scala/edx/core/resource/AutoResourceFactory.scala @@ -20,10 +20,10 @@ import net.minecraft.util.{IIcon, ResourceLocation} import net.minecraftforge.client.event.TextureStitchEvent import net.minecraftforge.fluids.{Fluid, FluidContainerRegistry, FluidRegistry, FluidStack} import net.minecraftforge.oredict.OreDictionary -import resonant.api.recipe.{MachineRecipes, RecipeType} -import resonant.lib.factory.resources.ResourceFactory -import resonant.lib.utility.LanguageUtility -import resonant.lib.wrapper.StringWrapper._ +import resonantengine.api.recipe.{MachineRecipes, RecipeType} +import resonantengine.lib.factory.resources.ResourceFactory +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.wrapper.StringWrapper._ import scala.collection.convert.wrapAll._ import scala.collection.mutable diff --git a/src/main/scala/edx/core/resource/alloy/Alloy.scala b/src/main/scala/edx/core/resource/alloy/Alloy.scala index d45e044fb..1d557dca9 100644 --- a/src/main/scala/edx/core/resource/alloy/Alloy.scala +++ b/src/main/scala/edx/core/resource/alloy/Alloy.scala @@ -1,14 +1,14 @@ package edx.core.resource.alloy import net.minecraft.nbt.NBTTagCompound -import resonant.lib.utility.nbt.ISaveObj -import resonant.lib.wrapper.NBTWrapper._ +import resonantengine.api.ISave +import resonantengine.lib.wrapper.NBTWrapper._ /** * A class that stores alloy objects. Alloys are materials that are composed of other materials. * @author Calclavia */ -class Alloy(val max: Int) extends ISaveObj +class Alloy(val max: Int) extends ISave { var content = Map.empty[String, Int] diff --git a/src/main/scala/edx/core/resource/alloy/AlloyUtility.scala b/src/main/scala/edx/core/resource/alloy/AlloyUtility.scala index 7d6b4759d..4f9a292be 100644 --- a/src/main/scala/edx/core/resource/alloy/AlloyUtility.scala +++ b/src/main/scala/edx/core/resource/alloy/AlloyUtility.scala @@ -3,8 +3,8 @@ package edx.core.resource.alloy import java.awt.Color import net.minecraft.item.ItemStack -import resonant.lib.factory.resources.ResourceFactory -import resonant.lib.utility.nbt.NBTUtility +import resonantengine.lib.factory.resources.ResourceFactory +import resonantengine.lib.utility.nbt.NBTUtility /** * Manages alloys and metal mixtures diff --git a/src/main/scala/edx/core/resource/alloy/TAlloyItem.scala b/src/main/scala/edx/core/resource/alloy/TAlloyItem.scala index 3454a24ac..67398a0c4 100644 --- a/src/main/scala/edx/core/resource/alloy/TAlloyItem.scala +++ b/src/main/scala/edx/core/resource/alloy/TAlloyItem.scala @@ -4,10 +4,10 @@ import java.util import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} -import resonant.lib.render.EnumColor -import resonant.lib.utility.nbt.NBTUtility -import resonant.lib.wrapper.CollectionWrapper._ -import resonant.lib.wrapper.StringWrapper._ +import resonantengine.lib.render.EnumColor +import resonantengine.lib.utility.nbt.NBTUtility +import resonantengine.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.wrapper.StringWrapper._ /** * A trait applied to all items that can store alloys within them diff --git a/src/main/scala/edx/core/resource/content/BlockDecoration.scala b/src/main/scala/edx/core/resource/content/BlockDecoration.scala index 325352231..35bcd48d6 100644 --- a/src/main/scala/edx/core/resource/content/BlockDecoration.scala +++ b/src/main/scala/edx/core/resource/content/BlockDecoration.scala @@ -9,9 +9,9 @@ import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.creativetab.CreativeTabs import net.minecraft.item.{Item, ItemStack} import net.minecraft.util.IIcon -import resonant.lib.prefab.tile.item.ItemBlockMetadata -import resonant.lib.prefab.tile.spatial.ResonantBlock -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.prefab.tile.item.ItemBlockMetadata +import resonantengine.lib.prefab.tile.spatial.ResonantBlock +import resonantengine.lib.wrapper.CollectionWrapper._ /** * A block used to build machines or decoration. diff --git a/src/main/scala/edx/core/resource/content/ItemDust.scala b/src/main/scala/edx/core/resource/content/ItemDust.scala index ec3d1121c..f8f1e28b9 100644 --- a/src/main/scala/edx/core/resource/content/ItemDust.scala +++ b/src/main/scala/edx/core/resource/content/ItemDust.scala @@ -2,7 +2,7 @@ package edx.core.resource.content import edx.core.Reference import net.minecraft.creativetab.CreativeTabs -import resonant.lib.factory.resources.item.TItemResource +import resonantengine.lib.factory.resources.item.TItemResource /** * Item for ore dusts diff --git a/src/main/scala/edx/core/resource/content/ItemMoltenBucket.scala b/src/main/scala/edx/core/resource/content/ItemMoltenBucket.scala index 7cd3b3cb8..eb181da30 100644 --- a/src/main/scala/edx/core/resource/content/ItemMoltenBucket.scala +++ b/src/main/scala/edx/core/resource/content/ItemMoltenBucket.scala @@ -2,7 +2,7 @@ package edx.core.resource.content import edx.core.Reference import net.minecraft.creativetab.CreativeTabs -import resonant.lib.factory.resources.item.TItemResource +import resonantengine.lib.factory.resources.item.TItemResource /** * @author Calclavia diff --git a/src/main/scala/edx/core/resource/content/ItemRefinedDust.scala b/src/main/scala/edx/core/resource/content/ItemRefinedDust.scala index 6b8962ee0..483f8e9c1 100644 --- a/src/main/scala/edx/core/resource/content/ItemRefinedDust.scala +++ b/src/main/scala/edx/core/resource/content/ItemRefinedDust.scala @@ -7,8 +7,8 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.init.Blocks import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World -import resonant.lib.factory.resources.item.TItemResource -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.factory.resources.item.TItemResource +import resonantengine.lib.transform.vector.Vector3 /** * @author Calclavia diff --git a/src/main/scala/edx/core/resource/content/ItemRubble.scala b/src/main/scala/edx/core/resource/content/ItemRubble.scala index ecd51818f..a8b128387 100644 --- a/src/main/scala/edx/core/resource/content/ItemRubble.scala +++ b/src/main/scala/edx/core/resource/content/ItemRubble.scala @@ -2,7 +2,7 @@ package edx.core.resource.content import edx.core.Reference import net.minecraft.creativetab.CreativeTabs -import resonant.lib.factory.resources.item.TItemResource +import resonantengine.lib.factory.resources.item.TItemResource /** * @author Calclavia diff --git a/src/main/scala/edx/core/resource/content/TileDust.scala b/src/main/scala/edx/core/resource/content/TileDust.scala index 26d90275f..247de7439 100644 --- a/src/main/scala/edx/core/resource/content/TileDust.scala +++ b/src/main/scala/edx/core/resource/content/TileDust.scala @@ -3,8 +3,8 @@ package edx.core.resource.content import edx.core.Reference import net.minecraft.block.material.Material import net.minecraft.nbt.NBTTagCompound -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.transform.region.Cuboid +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.transform.region.Cuboid /** * A block for physical dust blocks diff --git a/src/main/scala/edx/core/util/MultipartUtil.scala b/src/main/scala/edx/core/util/MultipartUtil.scala index 9d1ca76ce..a9d1b8866 100644 --- a/src/main/scala/edx/core/util/MultipartUtil.scala +++ b/src/main/scala/edx/core/util/MultipartUtil.scala @@ -6,7 +6,7 @@ import net.minecraft.init.Blocks import net.minecraft.tileentity.TileEntity import net.minecraft.world.{IBlockAccess, World} import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.transform.vector.{Vector3, VectorWorld} +import resonantengine.lib.transform.vector.{Vector3, VectorWorld} /** * Multipart Utilities diff --git a/src/main/scala/edx/electrical/ElectricalContent.scala b/src/main/scala/edx/electrical/ElectricalContent.scala index d7896e993..8e7eda24e 100644 --- a/src/main/scala/edx/electrical/ElectricalContent.scala +++ b/src/main/scala/edx/electrical/ElectricalContent.scala @@ -25,8 +25,9 @@ import net.minecraft.util.ResourceLocation import net.minecraftforge.client.event.TextureStitchEvent import net.minecraftforge.common.MinecraftForge import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe} -import resonant.lib.mod.content.{ContentHolder, ExplicitContentName} -import resonant.lib.utility.recipe.UniversalRecipe +import resonantengine.api.modcontent.ExplicitContentName +import resonantengine.lib.utility.recipe.UniversalRecipe +import resonantengine.prefab.modcontent.ContentHolder object ElectricalContent extends ContentHolder { diff --git a/src/main/scala/edx/electrical/battery/GridBattery.scala b/src/main/scala/edx/electrical/battery/GridBattery.scala index 4d24a7ef5..f01a9d0fd 100644 --- a/src/main/scala/edx/electrical/battery/GridBattery.scala +++ b/src/main/scala/edx/electrical/battery/GridBattery.scala @@ -2,7 +2,7 @@ package edx.electrical.battery import java.util.{Arrays, LinkedHashSet, Set} -import resonant.lib.grid.core.Grid +import resonantengine.lib.grid.core.Grid import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala b/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala index a2a62e0c2..90c6e335d 100644 --- a/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala +++ b/src/main/scala/edx/electrical/battery/ItemBlockBattery.scala @@ -8,11 +8,11 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemBlock, ItemStack} import net.minecraft.nbt.NBTTagCompound import net.minecraft.world.World -import resonant.api.items.IEnergyItem -import resonant.lib.render.EnumColor -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.science.UnitDisplay -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.api.items.IEnergyItem +import resonantengine.lib.render.EnumColor +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.science.UnitDisplay +import resonantengine.lib.wrapper.CollectionWrapper._ object ItemBlockBattery { diff --git a/src/main/scala/edx/electrical/battery/TileBattery.scala b/src/main/scala/edx/electrical/battery/TileBattery.scala index 80857e58e..74302574e 100644 --- a/src/main/scala/edx/electrical/battery/TileBattery.scala +++ b/src/main/scala/edx/electrical/battery/TileBattery.scala @@ -15,19 +15,19 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.content.prefab.TIO -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TEnergyProvider -import resonant.lib.render.RenderUtility -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.science.UnitDisplay -import resonant.lib.wrapper.ByteBufWrapper._ +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.content.prefab.TIO +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TEnergyProvider +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.science.UnitDisplay +import resonantengine.lib.wrapper.ByteBufWrapper._ /** A modular battery box that allows shared connections with boxes next to it. * diff --git a/src/main/scala/edx/electrical/generator/TileMotor.scala b/src/main/scala/edx/electrical/generator/TileMotor.scala index 4ec7e81e6..a6d451cd0 100644 --- a/src/main/scala/edx/electrical/generator/TileMotor.scala +++ b/src/main/scala/edx/electrical/generator/TileMotor.scala @@ -10,13 +10,13 @@ import net.minecraft.util.{ChatComponentText, ResourceLocation} import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.lib.content.prefab.TIO -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.render.RenderUtility -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.content.prefab.TIO +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.vector.Vector3 /** * A kinetic energy to electrical energy converter. diff --git a/src/main/scala/edx/electrical/generator/TileSolarPanel.scala b/src/main/scala/edx/electrical/generator/TileSolarPanel.scala index 860d0e2b6..ea073e16c 100644 --- a/src/main/scala/edx/electrical/generator/TileSolarPanel.scala +++ b/src/main/scala/edx/electrical/generator/TileSolarPanel.scala @@ -6,12 +6,12 @@ import net.minecraft.block.material.Material import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.content.prefab.TIO -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} -import resonant.lib.render.block.RenderConnectedTexture -import resonant.lib.transform.region.Cuboid +import resonantengine.lib.content.prefab.TIO +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} +import resonantengine.lib.render.block.RenderConnectedTexture +import resonantengine.lib.transform.region.Cuboid import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/electrical/generator/TileThermopile.scala b/src/main/scala/edx/electrical/generator/TileThermopile.scala index 028626b43..f46808190 100644 --- a/src/main/scala/edx/electrical/generator/TileThermopile.scala +++ b/src/main/scala/edx/electrical/generator/TileThermopile.scala @@ -7,10 +7,10 @@ import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.init.Blocks import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.content.prefab.TIO -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} +import resonantengine.lib.content.prefab.TIO +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.prefab.tile.spatial.{ResonantBlock, ResonantTile} import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/electrical/multimeter/Graph.scala b/src/main/scala/edx/electrical/multimeter/Graph.scala index 76b0520de..52e861861 100644 --- a/src/main/scala/edx/electrical/multimeter/Graph.scala +++ b/src/main/scala/edx/electrical/multimeter/Graph.scala @@ -1,9 +1,9 @@ package edx.electrical.multimeter import net.minecraft.nbt.NBTTagCompound -import resonant.lib.collection.EvictingList -import resonant.lib.utility.nbt.ISaveObj -import resonant.lib.wrapper.NBTWrapper._ +import resonantengine.api.ISave +import resonantengine.lib.collection.EvictingList +import resonantengine.lib.wrapper.NBTWrapper._ import scala.collection.JavaConversions._ @@ -12,7 +12,7 @@ import scala.collection.JavaConversions._ * * @author Calclavia */ -class Graph[V](val name: String, val maxPoints: Int = 0)(implicit n: Numeric[V]) extends ISaveObj +class Graph[V](val name: String, val maxPoints: Int = 0)(implicit n: Numeric[V]) extends ISave { /** * Each point represents a tick. diff --git a/src/main/scala/edx/electrical/multimeter/GridMultimeter.scala b/src/main/scala/edx/electrical/multimeter/GridMultimeter.scala index eb8755e46..c41ee45f7 100644 --- a/src/main/scala/edx/electrical/multimeter/GridMultimeter.scala +++ b/src/main/scala/edx/electrical/multimeter/GridMultimeter.scala @@ -1,10 +1,10 @@ package edx.electrical.multimeter import net.minecraft.nbt.{NBTTagCompound, NBTTagList} -import resonant.lib.grid.core.Grid -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.science.UnitDisplay +import resonantengine.lib.grid.core.Grid +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.science.UnitDisplay import scala.collection.convert.wrapAll._ import scala.collection.mutable.ArrayBuffer diff --git a/src/main/scala/edx/electrical/multimeter/GuiMultimeter.scala b/src/main/scala/edx/electrical/multimeter/GuiMultimeter.scala index 52ccc12a6..160dca1b2 100644 --- a/src/main/scala/edx/electrical/multimeter/GuiMultimeter.scala +++ b/src/main/scala/edx/electrical/multimeter/GuiMultimeter.scala @@ -6,10 +6,10 @@ package edx.electrical.multimeter import cpw.mods.fml.relauncher.{Side, SideOnly} import net.minecraft.client.gui.{GuiButton, GuiTextField} import net.minecraft.entity.player.InventoryPlayer -import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.render.EnumColor -import resonant.lib.utility.LanguageUtility -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.prefab.gui.GuiContainerBase +import resonantengine.lib.render.EnumColor +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.wrapper.CollectionWrapper._ /** * Multimeter GUI diff --git a/src/main/scala/edx/electrical/multimeter/ItemMultimeter.scala b/src/main/scala/edx/electrical/multimeter/ItemMultimeter.scala index c03791503..7003f0760 100644 --- a/src/main/scala/edx/electrical/multimeter/ItemMultimeter.scala +++ b/src/main/scala/edx/electrical/multimeter/ItemMultimeter.scala @@ -14,9 +14,9 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.MathHelper import net.minecraft.world.World import org.lwjgl.input.Keyboard -import resonant.lib.render.EnumColor -import resonant.lib.utility.LanguageUtility -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.render.EnumColor +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemMultimeter extends JItemMultiPart with IHighlight { diff --git a/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala b/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala index 55200ee06..73d685531 100644 --- a/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala +++ b/src/main/scala/edx/electrical/multimeter/PartMultimeter.scala @@ -20,12 +20,12 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.{ChatComponentText, MovingObjectPosition} import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{FluidTankInfo, IFluidHandler} -import resonant.api.tile.{INodeProvider, IRemovable} -import resonant.lib.mod.compat.energy.Compatibility -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.WrenchUtility +import resonantengine.api.tile.{INodeProvider, IRemovable} +import resonantengine.lib.mod.compat.energy.Compatibility +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.WrenchUtility import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala b/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala index fce241df8..3abe2cbca 100644 --- a/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala +++ b/src/main/scala/edx/electrical/multimeter/RenderMultimeter.scala @@ -9,10 +9,10 @@ import net.minecraft.util.ResourceLocation import net.minecraftforge.client.IItemRenderer import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.RenderUtility -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.LanguageUtility +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.LanguageUtility /** * Class used to render text onto the multimeter block. diff --git a/src/main/scala/edx/electrical/tesla/TeslaGrid.java b/src/main/scala/edx/electrical/tesla/TeslaGrid.java index 8446cd6e5..c035ece87 100644 --- a/src/main/scala/edx/electrical/tesla/TeslaGrid.java +++ b/src/main/scala/edx/electrical/tesla/TeslaGrid.java @@ -4,7 +4,7 @@ package edx.electrical.tesla; import net.minecraft.tileentity.TileEntity; -import resonant.api.mffs.fortron.IServerThread; +import resonantengine.api.mffs.fortron.IServerThread; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/scala/edx/electrical/tesla/TileTesla.scala b/src/main/scala/edx/electrical/tesla/TileTesla.scala index b5c82cf60..25f490df7 100644 --- a/src/main/scala/edx/electrical/tesla/TileTesla.scala +++ b/src/main/scala/edx/electrical/tesla/TileTesla.scala @@ -17,18 +17,18 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.ChatComponentText import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.content.prefab.TIO -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TEnergyProvider -import resonant.lib.render.EnumColor -import resonant.lib.transform.vector.{Vector3, VectorWorld} -import resonant.lib.utility.{LanguageUtility, LinkUtility} +import resonantengine.lib.content.prefab.TIO +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TEnergyProvider +import resonantengine.lib.render.EnumColor +import resonantengine.lib.transform.vector.{Vector3, VectorWorld} +import resonantengine.lib.utility.{LanguageUtility, LinkUtility} import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala b/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala index aa7932475..035cea821 100644 --- a/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala +++ b/src/main/scala/edx/electrical/transformer/ElectricTransformerNode.scala @@ -1,8 +1,8 @@ package edx.electrical.transformer import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.INodeProvider -import resonant.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.api.tile.INodeProvider +import resonantengine.lib.grid.energy.electric.NodeElectricComponent /** * Created by robert on 8/11/2014. diff --git a/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala b/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala index c8caaeccb..2d9d7af95 100644 --- a/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala +++ b/src/main/scala/edx/electrical/transformer/PartElectricTransformer.scala @@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.{ChatComponentText, MovingObjectPosition} import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.INodeProvider -import resonant.api.tile.node.INode -import resonant.lib.utility.WrenchUtility +import resonantengine.api.tile.INodeProvider +import resonantengine.api.tile.node.INode +import resonantengine.lib.utility.WrenchUtility /** * TODO: We can't use face parts, need to use thicker ones. Also, transformer is currently NO-OP diff --git a/src/main/scala/edx/electrical/transformer/RenderTransformer.scala b/src/main/scala/edx/electrical/transformer/RenderTransformer.scala index ccd8ed968..5cdaebfe4 100644 --- a/src/main/scala/edx/electrical/transformer/RenderTransformer.scala +++ b/src/main/scala/edx/electrical/transformer/RenderTransformer.scala @@ -9,8 +9,8 @@ import net.minecraftforge.client.IItemRenderer import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.client.model.obj.WavefrontObject import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.RenderUtility +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.RenderUtility @SideOnly(Side.CLIENT) object RenderTransformer extends ISimpleItemRenderer diff --git a/src/main/scala/edx/electrical/wire/ItemWire.scala b/src/main/scala/edx/electrical/wire/ItemWire.scala index 409ee229d..8d8fba2a0 100644 --- a/src/main/scala/edx/electrical/wire/ItemWire.scala +++ b/src/main/scala/edx/electrical/wire/ItemWire.scala @@ -17,10 +17,10 @@ import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.input.Keyboard -import resonant.lib.render.EnumColor -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.science.UnitDisplay -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.render.EnumColor +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.science.UnitDisplay +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemWire extends TItemMultiPart { diff --git a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala index e4789e847..39160f193 100644 --- a/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala +++ b/src/main/scala/edx/electrical/wire/flat/PartFlatWire.scala @@ -20,8 +20,8 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.{IIcon, MovingObjectPosition} import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.api.tile.INodeProvider -import resonant.lib.grid.energy.electric.{NodeElectricComponent, NodeElectricJunction} +import resonantengine.api.tile.INodeProvider +import resonantengine.lib.grid.energy.electric.{NodeElectricComponent, NodeElectricJunction} import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala b/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala index a735365d9..d858d480b 100644 --- a/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala +++ b/src/main/scala/edx/electrical/wire/framed/PartFramedWire.scala @@ -10,8 +10,8 @@ import edx.electrical.wire.base.TWire import net.minecraft.client.renderer.RenderBlocks import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.wrapper.BitmaskWrapper._ +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.wrapper.BitmaskWrapper._ /** * Fluid transport pipe diff --git a/src/main/scala/edx/electrical/wire/framed/RenderFramedWire.scala b/src/main/scala/edx/electrical/wire/framed/RenderFramedWire.scala index 2b9208adb..54bd138d9 100644 --- a/src/main/scala/edx/electrical/wire/framed/RenderFramedWire.scala +++ b/src/main/scala/edx/electrical/wire/framed/RenderFramedWire.scala @@ -10,7 +10,7 @@ import edx.core.render.InvertX import edx.core.util.ResonantUtil import net.minecraft.util.{IIcon, ResourceLocation} import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.wrapper.BitmaskWrapper._ +import resonantengine.lib.wrapper.BitmaskWrapper._ import scala.collection.convert.wrapAll._ import scala.collection.mutable diff --git a/src/main/scala/edx/mechanical/MechanicalContent.scala b/src/main/scala/edx/mechanical/MechanicalContent.scala index c1493eb04..e942bee5d 100644 --- a/src/main/scala/edx/mechanical/MechanicalContent.scala +++ b/src/main/scala/edx/mechanical/MechanicalContent.scala @@ -16,10 +16,10 @@ import edx.mechanical.mech.turbine.{TileWaterTurbine, TileWindTurbine} import net.minecraft.block.Block import net.minecraft.init.{Blocks, Items} import net.minecraft.item.{Item, ItemStack} -import resonant.api.tile.node.NodeRegistry -import resonant.lib.mod.content.ContentHolder -import resonant.lib.utility.recipe.UniversalRecipe -import resonant.lib.world.schematic.{SchematicPlate, SchematicRegistry} +import resonantengine.api.tile.node.NodeRegistry +import resonantengine.lib.utility.recipe.UniversalRecipe +import resonantengine.lib.world.schematic.{SchematicPlate, SchematicRegistry} +import resonantengine.prefab.modcontent.ContentHolder /** * The core contents of Resonant Induction diff --git a/src/main/scala/edx/mechanical/fluid/pipe/ItemPipe.scala b/src/main/scala/edx/mechanical/fluid/pipe/ItemPipe.scala index 5030411a1..cadc828bc 100644 --- a/src/main/scala/edx/mechanical/fluid/pipe/ItemPipe.scala +++ b/src/main/scala/edx/mechanical/fluid/pipe/ItemPipe.scala @@ -10,10 +10,10 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World import org.lwjgl.input.Keyboard -import resonant.lib.render.EnumColor -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.science.UnitDisplay -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.render.EnumColor +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.science.UnitDisplay +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemPipe extends TItemMultiPart { diff --git a/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala b/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala index 14f7a5834..011fe8abc 100644 --- a/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala +++ b/src/main/scala/edx/mechanical/fluid/pipe/NodePipe.scala @@ -4,7 +4,7 @@ import edx.core.prefab.node.{NodeFluidPressure, TMultipartNode} import edx.core.prefab.part.connector.TColorable import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.IFluidHandler -import resonant.api.tile.INodeProvider +import resonantengine.api.tile.INodeProvider /** * Pressure node for the pipe diff --git a/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala b/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala index 673da8cbb..f723e96e2 100644 --- a/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala +++ b/src/main/scala/edx/mechanical/fluid/pipe/PartPipe.scala @@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.lib.collection.EvictingList -import resonant.lib.wrapper.BitmaskWrapper._ +import resonantengine.lib.collection.EvictingList +import resonantengine.lib.wrapper.BitmaskWrapper._ import scala.collection.convert.wrapAll._ import scala.collection.mutable diff --git a/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala b/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala index 5823193b0..4334e92cf 100644 --- a/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala +++ b/src/main/scala/edx/mechanical/fluid/pipe/RenderPipe.scala @@ -10,11 +10,11 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.{FluidRenderUtility, RenderUtility} -import resonant.lib.transform.vector.Vector3 -import resonant.lib.world.WorldUtility -import resonant.lib.wrapper.BitmaskWrapper._ +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.{FluidRenderUtility, RenderUtility} +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.world.WorldUtility +import resonantengine.lib.wrapper.BitmaskWrapper._ @SideOnly(Side.CLIENT) object RenderPipe extends ISimpleItemRenderer diff --git a/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala b/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala index df4fd05fb..67d4618d5 100644 --- a/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala +++ b/src/main/scala/edx/mechanical/fluid/transport/NodePump.scala @@ -3,7 +3,7 @@ package edx.mechanical.fluid.transport import edx.core.prefab.node.NodeFluidPressure import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.IFluidHandler -import resonant.api.tile.INodeProvider +import resonantengine.api.tile.INodeProvider /** * A node for the pump diff --git a/src/main/scala/edx/mechanical/fluid/transport/TilePump.scala b/src/main/scala/edx/mechanical/fluid/transport/TilePump.scala index 74ead8328..ef2dee086 100644 --- a/src/main/scala/edx/mechanical/fluid/transport/TilePump.scala +++ b/src/main/scala/edx/mechanical/fluid/transport/TilePump.scala @@ -8,9 +8,9 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo, IFluidHandler} import org.lwjgl.opengl.GL11 -import resonant.api.tile.IRotatable -import resonant.lib.render.RenderUtility -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.tile.IRotatable +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.vector.Vector3 import scala.collection.mutable diff --git a/src/main/scala/edx/mechanical/machine/TileDetector.scala b/src/main/scala/edx/mechanical/machine/TileDetector.scala index 25af4c653..eb4b9e958 100644 --- a/src/main/scala/edx/mechanical/machine/TileDetector.scala +++ b/src/main/scala/edx/mechanical/machine/TileDetector.scala @@ -17,10 +17,10 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.{AxisAlignedBB, IIcon} import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection -import resonant.core.ResonantEngine -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.TPacketReceiver -import resonant.lib.prefab.tile.spatial.ResonantBlock +import resonantengine.core.ResonantEngine +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.TPacketReceiver +import resonantengine.lib.prefab.tile.spatial.ResonantBlock class TileDetector extends TileFilterable with TPacketReceiver { diff --git a/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala b/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala index 6c7233ecc..e8330f6a9 100644 --- a/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala +++ b/src/main/scala/edx/mechanical/machine/edit/TileBreaker.scala @@ -15,12 +15,12 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.transform.vector.{Vector3, VectorWorld} -import resonant.lib.utility.inventory.InternalInventoryHandler +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.transform.vector.{Vector3, VectorWorld} +import resonantengine.lib.utility.inventory.InternalInventoryHandler /** * @author tgame14 diff --git a/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala b/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala index 44e226f24..abaf6775c 100644 --- a/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala +++ b/src/main/scala/edx/mechanical/machine/edit/TilePlacer.scala @@ -13,15 +13,15 @@ import net.minecraft.util.{ChatComponentText, IIcon} import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.lib.content.prefab.TInventory -import resonant.lib.network.discriminator.PacketTile -import resonant.lib.network.handle.TPacketSender -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.render.RenderItemOverlayUtility -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility} +import resonantengine.lib.content.prefab.TInventory +import resonantengine.lib.network.discriminator.PacketTile +import resonantengine.lib.network.handle.TPacketSender +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.render.RenderItemOverlayUtility +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility} /** * @author tgame14 diff --git a/src/main/scala/edx/mechanical/mech/PartMechanical.scala b/src/main/scala/edx/mechanical/mech/PartMechanical.scala index 9a76f5f25..cd420d887 100644 --- a/src/main/scala/edx/mechanical/mech/PartMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/PartMechanical.scala @@ -6,7 +6,7 @@ import edx.core.prefab.part.connector.{PartAbstract, TPartNodeProvider} import edx.mechanical.mech.grid.NodeMechanical import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.transform.vector.VectorWorld +import resonantengine.lib.transform.vector.VectorWorld /** We assume all the force acting on the gear is 90 degrees. * diff --git a/src/main/scala/edx/mechanical/mech/TileMechanical.scala b/src/main/scala/edx/mechanical/mech/TileMechanical.scala index 5e0349648..245a2ef37 100644 --- a/src/main/scala/edx/mechanical/mech/TileMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/TileMechanical.scala @@ -5,13 +5,13 @@ import io.netty.buffer.ByteBuf import net.minecraft.block.material.Material import net.minecraft.entity.player.EntityPlayer import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.network.discriminator.PacketType -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.transform.vector.Vector3 -import resonant.lib.wrapper.ByteBufWrapper._ +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.wrapper.ByteBufWrapper._ import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala b/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala index fa391db77..2a9b4f35a 100644 --- a/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala +++ b/src/main/scala/edx/mechanical/mech/gear/GearMultiBlockHandler.scala @@ -2,8 +2,8 @@ package edx.mechanical.mech.gear import codechicken.multipart.TileMultipart import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.prefab.tile.multiblock.reference.MultiBlockHandler -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.prefab.tile.multiblock.reference.MultiBlockHandler +import resonantengine.lib.transform.vector.Vector3 class GearMultiBlockHandler(wrapper: PartGear) extends MultiBlockHandler[PartGear](wrapper: PartGear) { diff --git a/src/main/scala/edx/mechanical/mech/gear/ItemGear.scala b/src/main/scala/edx/mechanical/mech/gear/ItemGear.scala index 62b9d03a6..39f6838b5 100644 --- a/src/main/scala/edx/mechanical/mech/gear/ItemGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/ItemGear.scala @@ -13,7 +13,7 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} import net.minecraft.tileentity.TileEntity import net.minecraft.world.World -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemGear extends JItemMultiPart with IHighlight { diff --git a/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala b/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala index 3ae8ad31c..76510a82d 100644 --- a/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/NodeGear.scala @@ -7,9 +7,9 @@ import edx.mechanical.mech.gearshaft.{NodeGearShaft, PartGearShaft} import edx.mechanical.mech.grid.NodeMechanical import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.INodeProvider -import resonant.lib.transform.vector.Vector3 -import resonant.lib.wrapper.ForgeDirectionWrapper._ +import resonantengine.api.tile.INodeProvider +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.wrapper.ForgeDirectionWrapper._ /** * Node for the gear diff --git a/src/main/scala/edx/mechanical/mech/gear/PartGear.scala b/src/main/scala/edx/mechanical/mech/gear/PartGear.scala index ab77f7ef7..39482e21e 100644 --- a/src/main/scala/edx/mechanical/mech/gear/PartGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/PartGear.scala @@ -15,9 +15,9 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.MovingObjectPosition import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.node.INode -import resonant.lib.prefab.tile.multiblock.reference.IMultiBlockStructure -import resonant.lib.utility.WrenchUtility +import resonantengine.api.tile.node.INode +import resonantengine.lib.prefab.tile.multiblock.reference.IMultiBlockStructure +import resonantengine.lib.utility.WrenchUtility /** * We assume all the force acting on the gear is 90 degrees. @@ -117,7 +117,7 @@ class PartGear extends PartMechanical with IMultiBlockStructure[PartGear] override def getMultiBlock: GearMultiBlockHandler = multiBlock - override def getMultiBlockVectors: java.util.List[resonant.lib.transform.vector.Vector3] = new resonant.lib.transform.vector.Vector3().getAround(this.world, placementSide, 1) + override def getMultiBlockVectors: java.util.List[resonantengine.lib.transform.vector.Vector3] = new resonantengine.lib.transform.vector.Vector3().getAround(this.world, placementSide, 1) def getWorld: World = { diff --git a/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala b/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala index 4d933ce25..441c41b5a 100644 --- a/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala +++ b/src/main/scala/edx/mechanical/mech/gear/RenderGear.scala @@ -8,8 +8,8 @@ import net.minecraftforge.client.IItemRenderer import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.RenderUtility +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.RenderUtility @SideOnly(Side.CLIENT) object RenderGear extends ISimpleItemRenderer diff --git a/src/main/scala/edx/mechanical/mech/gearshaft/ItemGearShaft.scala b/src/main/scala/edx/mechanical/mech/gearshaft/ItemGearShaft.scala index 57065ec04..fbf03347f 100644 --- a/src/main/scala/edx/mechanical/mech/gearshaft/ItemGearShaft.scala +++ b/src/main/scala/edx/mechanical/mech/gearshaft/ItemGearShaft.scala @@ -10,7 +10,7 @@ import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemGearShaft extends Item with TItemMultiPart with IHighlight { diff --git a/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala b/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala index b173d1984..b12f8ab20 100644 --- a/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala +++ b/src/main/scala/edx/mechanical/mech/gearshaft/NodeGearShaft.scala @@ -4,9 +4,9 @@ import edx.core.interfaces.TNodeMechanical import edx.mechanical.mech.gear.{NodeGear, PartGear} import edx.mechanical.mech.grid.NodeMechanical import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.INodeProvider -import resonant.lib.transform.vector.Vector3 -import resonant.lib.wrapper.ForgeDirectionWrapper._ +import resonantengine.api.tile.INodeProvider +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.wrapper.ForgeDirectionWrapper._ class NodeGearShaft(parent: PartGearShaft) extends NodeMechanical(parent) { diff --git a/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala b/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala index bd020d4e3..9fb69ad0d 100644 --- a/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala +++ b/src/main/scala/edx/mechanical/mech/gearshaft/RenderGearShaft.scala @@ -9,9 +9,9 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11.glRotatef -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.RenderUtility -import resonant.lib.wrapper.ForgeDirectionWrapper._ +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.wrapper.ForgeDirectionWrapper._ @SideOnly(Side.CLIENT) object RenderGearShaft extends ISimpleItemRenderer diff --git a/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala b/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala index 62940bdb2..f48679126 100644 --- a/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/grid/GridMechanical.scala @@ -1,7 +1,7 @@ package edx.mechanical.mech.grid -import resonant.api.IUpdate -import resonant.lib.grid.core.{GridNode, UpdateTicker} +import resonantengine.api.IUpdate +import resonantengine.lib.grid.core.{GridNode, UpdateTicker} import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala b/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala index 4348340a2..c555c45a2 100644 --- a/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala +++ b/src/main/scala/edx/mechanical/mech/grid/NodeMechanical.scala @@ -2,10 +2,10 @@ package edx.mechanical.mech.grid import edx.core.interfaces.TNodeMechanical import edx.core.prefab.node.TMultipartNode -import resonant.api.tile.INodeProvider -import resonant.lib.debug.IDebugInfo -import resonant.lib.grid.core.{GridNode, NodeGrid, TTileConnector} -import resonant.lib.transform.vector.IVectorWorld +import resonantengine.api.tile.INodeProvider +import resonantengine.core.debug.IDebugInfo +import resonantengine.lib.grid.core.{GridNode, NodeGrid, TTileConnector} +import resonantengine.lib.transform.vector.IVectorWorld import scala.beans.BeanProperty import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/mechanical/mech/process/crusher/RenderMechanicalPiston.scala b/src/main/scala/edx/mechanical/mech/process/crusher/RenderMechanicalPiston.scala index 490599608..d6873b26c 100644 --- a/src/main/scala/edx/mechanical/mech/process/crusher/RenderMechanicalPiston.scala +++ b/src/main/scala/edx/mechanical/mech/process/crusher/RenderMechanicalPiston.scala @@ -9,7 +9,7 @@ import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import net.minecraftforge.common.util.ForgeDirection import org.apache.commons.lang3.ArrayUtils import org.lwjgl.opengl.GL11 -import resonant.lib.render.RenderUtility +import resonantengine.lib.render.RenderUtility @SideOnly(Side.CLIENT) object RenderMechanicalPiston { diff --git a/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala b/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala index 6b9785130..800327659 100644 --- a/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala +++ b/src/main/scala/edx/mechanical/mech/process/crusher/TileMechanicalPiston.scala @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.world.World -import resonant.api.recipe.{MachineRecipes, RecipeResource, RecipeType} -import resonant.lib.mod.config.Config -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.MovementUtility -import resonant.lib.utility.inventory.InventoryUtility +import resonantengine.api.recipe.{MachineRecipes, RecipeResource, RecipeType} +import resonantengine.lib.mod.config.Config +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.MovementUtility +import resonantengine.lib.utility.inventory.InventoryUtility /** * Mechanical driven piston that can be used to move basic blocks and crush ores diff --git a/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala b/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala index d13a9b190..69728b670 100644 --- a/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala +++ b/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala @@ -11,13 +11,13 @@ import net.minecraft.util.ResourceLocation import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.api.recipe.{MachineRecipes, RecipeType} -import resonant.lib.prefab.Timer -import resonant.lib.prefab.damage.CustomDamageSource -import resonant.lib.render.RenderUtility -import resonant.lib.transform.region.Cuboid -import resonant.lib.transform.rotation.AngleAxis -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.recipe.{MachineRecipes, RecipeType} +import resonantengine.lib.prefab.Timer +import resonantengine.lib.prefab.damage.CustomDamageSource +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.region.Cuboid +import resonantengine.lib.transform.rotation.AngleAxis +import resonantengine.lib.transform.vector.Vector3 /** * The grinding wheel. This block will face the direction in which it can rotate. diff --git a/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala b/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala index a61e59e88..8548633c1 100644 --- a/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala +++ b/src/main/scala/edx/mechanical/mech/process/mixer/MixerNode.scala @@ -2,7 +2,7 @@ package edx.mechanical.mech.process.mixer import edx.mechanical.mech.grid.NodeMechanical import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.INodeProvider +import resonantengine.api.tile.INodeProvider /** * Node designed just for the Mixer to use diff --git a/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala b/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala index 770910bcb..e526fbfb2 100644 --- a/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala +++ b/src/main/scala/edx/mechanical/mech/process/mixer/RenderMixer.scala @@ -10,8 +10,8 @@ import net.minecraftforge.client.IItemRenderer import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11.{glPopMatrix, glPushMatrix, glTranslatef} -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.RenderUtility +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.RenderUtility /** * @author Calclavia diff --git a/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala b/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala index 7165c3d43..22b165586 100644 --- a/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala +++ b/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala @@ -15,11 +15,11 @@ import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import net.minecraftforge.fluids.IFluidBlock import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11._ -import resonant.api.recipe.{MachineRecipes, RecipeType} -import resonant.lib.prefab.Timer -import resonant.lib.render.RenderUtility -import resonant.lib.transform.rotation.Quaternion -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.recipe.{MachineRecipes, RecipeType} +import resonantengine.lib.prefab.Timer +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.rotation.Quaternion +import resonantengine.lib.transform.vector.Vector3 import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala b/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala index a077ac27d..74aaaa51d 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/RenderWaterTurbine.scala @@ -9,8 +9,8 @@ import net.minecraft.util.ResourceLocation import net.minecraftforge.client.IItemRenderer import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.RenderUtility +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.RenderUtility @SideOnly(Side.CLIENT) object RenderWaterTurbine { diff --git a/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala b/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala index 6f4199644..b4b92c3a1 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/TileTurbine.scala @@ -12,10 +12,10 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.AxisAlignedBB import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.network.discriminator.PacketType -import resonant.lib.prefab.tile.multiblock.reference.IMultiBlockStructure -import resonant.lib.transform.vector.Vector3 -import resonant.lib.wrapper.ByteBufWrapper._ +import resonantengine.lib.network.discriminator.PacketType +import resonantengine.lib.prefab.tile.multiblock.reference.IMultiBlockStructure +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.wrapper.ByteBufWrapper._ import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala b/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala index 84065a8eb..05e95aa60 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/TileWaterTurbine.scala @@ -13,10 +13,10 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.Vec3 import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.INodeProvider -import resonant.lib.prefab.tile.item.ItemBlockMetadata -import resonant.lib.transform.vector.Vector3 -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.api.tile.INodeProvider +import resonantengine.lib.prefab.tile.item.ItemBlockMetadata +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.wrapper.CollectionWrapper._ /** * The vertical water turbine collects flowing water flowing on X axis. diff --git a/src/main/scala/edx/mechanical/mech/turbine/TileWindTurbine.scala b/src/main/scala/edx/mechanical/mech/turbine/TileWindTurbine.scala index 3394a4c83..e4f016e54 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/TileWindTurbine.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/TileWindTurbine.scala @@ -14,14 +14,14 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTank, FluidTankInfo} import org.lwjgl.opengl.GL11 -import resonant.api.tile.IBoilHandler -import resonant.lib.prefab.tile.item.ItemBlockMetadata -import resonant.lib.render.RenderUtility -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.MathUtility -import resonant.lib.utility.inventory.InventoryUtility -import resonant.lib.wrapper.CollectionWrapper._ -import resonant.lib.wrapper.NBTWrapper._ +import resonantengine.api.tile.IBoilHandler +import resonantengine.lib.prefab.tile.item.ItemBlockMetadata +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.MathUtility +import resonantengine.lib.utility.inventory.InventoryUtility +import resonantengine.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.wrapper.NBTWrapper._ /** * The vertical wind turbine collects airflow. diff --git a/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala b/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala index 05acca8fb..bc025a671 100644 --- a/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala +++ b/src/main/scala/edx/mechanical/mech/turbine/TurbineMBlockHandler.scala @@ -1,8 +1,8 @@ package edx.mechanical.mech.turbine import net.minecraft.tileentity.TileEntity -import resonant.lib.prefab.tile.multiblock.reference.MultiBlockHandler -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.prefab.tile.multiblock.reference.MultiBlockHandler +import resonantengine.lib.transform.vector.Vector3 class TurbineMBlockHandler(wrapper: TileTurbine) extends MultiBlockHandler[TileTurbine](wrapper) { diff --git a/src/main/scala/edx/quantum/QuantumContent.scala b/src/main/scala/edx/quantum/QuantumContent.scala index e83e57f48..c3296951c 100644 --- a/src/main/scala/edx/quantum/QuantumContent.scala +++ b/src/main/scala/edx/quantum/QuantumContent.scala @@ -34,15 +34,16 @@ import net.minecraftforge.common.{ForgeChunkManager, MinecraftForge} import net.minecraftforge.event.entity.player.FillBucketEvent import net.minecraftforge.fluids._ import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe} -import resonant.api.event.PlasmaEvent -import resonant.api.recipe.QuantumAssemblerRecipes -import resonant.api.tile.IElectromagnet -import resonant.lib.factory.resources.block.OreGenerator -import resonant.lib.grid.thermal.ThermalEvent -import resonant.lib.mod.content.{ContentHolder, ExplicitContentName} -import resonant.lib.transform.vector.VectorWorld -import resonant.lib.utility.recipe.UniversalRecipe -import resonant.lib.world.schematic.SchematicRegistry +import resonantengine.api.event.PlasmaEvent +import resonantengine.api.modcontent.ExplicitContentName +import resonantengine.api.recipe.QuantumAssemblerRecipes +import resonantengine.api.tile.IElectromagnet +import resonantengine.lib.factory.resources.block.OreGenerator +import resonantengine.lib.grid.thermal.ThermalEvent +import resonantengine.lib.transform.vector.VectorWorld +import resonantengine.lib.utility.recipe.UniversalRecipe +import resonantengine.lib.world.schematic.SchematicRegistry +import resonantengine.prefab.modcontent.ContentHolder import scala.collection.JavaConversions._ @@ -383,21 +384,6 @@ object QuantumContent extends ContentHolder return isItemStackOreDictionaryCompatible(itemStack, "cellEmpty") } - def isItemStackWaterCell(itemStack: ItemStack): Boolean = - { - return isItemStackOreDictionaryCompatible(itemStack, "cellWater") - } - - def isItemStackUraniumOre(itemStack: ItemStack): Boolean = - { - return isItemStackOreDictionaryCompatible(itemStack, "dropUranium", "oreUranium") - } - - def isItemStackDeuteriumCell(itemStack: ItemStack): Boolean = - { - return isItemStackOreDictionaryCompatible(itemStack, "molecule_1d", "molecule_1h2", "cellDeuterium") - } - /** Compare to Ore Dict * * @param itemStack @@ -419,6 +405,21 @@ object QuantumContent extends ContentHolder return false } + def isItemStackWaterCell(itemStack: ItemStack): Boolean = + { + return isItemStackOreDictionaryCompatible(itemStack, "cellWater") + } + + def isItemStackUraniumOre(itemStack: ItemStack): Boolean = + { + return isItemStackOreDictionaryCompatible(itemStack, "dropUranium", "oreUranium") + } + + def isItemStackDeuteriumCell(itemStack: ItemStack): Boolean = + { + return isItemStackOreDictionaryCompatible(itemStack, "molecule_1d", "molecule_1h2", "cellDeuterium") + } + def isItemStackTritiumCell(itemStack: ItemStack): Boolean = { return isItemStackOreDictionaryCompatible(itemStack, "molecule_h3", "cellTritium") diff --git a/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala b/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala index 9b6438ddb..53aebc4c5 100644 --- a/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala +++ b/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala @@ -12,8 +12,8 @@ import net.minecraft.entity.{Entity, EntityLiving, EntityLivingBase} import net.minecraft.init.Blocks import net.minecraft.util.{AxisAlignedBB, IIcon} import net.minecraft.world.World -import resonant.lib.prefab.poison.PoisonRadiation -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.transform.vector.Vector3 import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala b/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala index 527a8cef3..20f684eec 100644 --- a/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala +++ b/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala @@ -8,8 +8,8 @@ import net.minecraft.entity.{Entity, EntityLivingBase} import net.minecraft.util.DamageSource import net.minecraft.world.World import net.minecraftforge.fluids.BlockFluidClassic -import resonant.lib.prefab.poison.PoisonRadiation -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.transform.vector.Vector3 class BlockToxicWaste extends BlockFluidClassic(QuantumContent.getFluidToxicWaste, Material.water) { diff --git a/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala b/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala index fa7b78907..64ebc00d0 100644 --- a/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala +++ b/src/main/scala/edx/quantum/blocks/TileElectromagnet.scala @@ -11,13 +11,13 @@ import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.api.tile.IElectromagnet -import resonant.lib.prefab.tile.item.ItemBlockMetadata -import resonant.lib.prefab.tile.spatial.ResonantBlock -import resonant.lib.render.{RenderBlockUtility, RenderUtility} -import resonant.lib.transform.vector.Vector3 -import resonant.lib.world.WorldUtility -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.api.tile.IElectromagnet +import resonantengine.lib.prefab.tile.item.ItemBlockMetadata +import resonantengine.lib.prefab.tile.spatial.ResonantBlock +import resonantengine.lib.render.{RenderBlockUtility, RenderUtility} +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.world.WorldUtility +import resonantengine.lib.wrapper.CollectionWrapper._ /** * Electromagnet block diff --git a/src/main/scala/edx/quantum/blocks/TileSiren.scala b/src/main/scala/edx/quantum/blocks/TileSiren.scala index 156314a02..f4ab159d4 100644 --- a/src/main/scala/edx/quantum/blocks/TileSiren.scala +++ b/src/main/scala/edx/quantum/blocks/TileSiren.scala @@ -5,8 +5,8 @@ import net.minecraft.block.material.Material import net.minecraft.entity.player.EntityPlayer import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.prefab.tile.spatial.ResonantBlock -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.prefab.tile.spatial.ResonantBlock +import resonantengine.lib.transform.vector.Vector3 /** * Siren block diff --git a/src/main/scala/edx/quantum/gate/IQuantumGate.java b/src/main/scala/edx/quantum/gate/IQuantumGate.java index 3107e28fe..3d6d8e6f3 100644 --- a/src/main/scala/edx/quantum/gate/IQuantumGate.java +++ b/src/main/scala/edx/quantum/gate/IQuantumGate.java @@ -1,6 +1,6 @@ package edx.quantum.gate; -import resonant.api.tile.IBlockFrequency; +import resonantengine.api.tile.IBlockFrequency; /** * Only TileEntities should implement this. diff --git a/src/main/scala/edx/quantum/gate/ItemQuantumGlyph.scala b/src/main/scala/edx/quantum/gate/ItemQuantumGlyph.scala index cff0a789f..f4d4da47e 100644 --- a/src/main/scala/edx/quantum/gate/ItemQuantumGlyph.scala +++ b/src/main/scala/edx/quantum/gate/ItemQuantumGlyph.scala @@ -11,7 +11,7 @@ import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemQuantumGlyph extends Item with TItemMultiPart with IHighlight { diff --git a/src/main/scala/edx/quantum/gate/PartQuantumGlyph.scala b/src/main/scala/edx/quantum/gate/PartQuantumGlyph.scala index 7faab73fd..456ed7568 100644 --- a/src/main/scala/edx/quantum/gate/PartQuantumGlyph.scala +++ b/src/main/scala/edx/quantum/gate/PartQuantumGlyph.scala @@ -14,9 +14,9 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.util.{ChatComponentText, MovingObjectPosition} -import resonant.api.mffs.fortron.FrequencyGridRegistry -import resonant.api.tile.IBlockFrequency -import resonant.lib.transform.vector.VectorWorld +import resonantengine.api.mffs.fortron.FrequencyGridRegistry +import resonantengine.api.tile.IBlockFrequency +import resonantengine.lib.transform.vector.VectorWorld import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/quantum/gate/QuantumGateManager.java b/src/main/scala/edx/quantum/gate/QuantumGateManager.java index 2536e4a7f..2c3fb9187 100644 --- a/src/main/scala/edx/quantum/gate/QuantumGateManager.java +++ b/src/main/scala/edx/quantum/gate/QuantumGateManager.java @@ -7,7 +7,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; -import resonant.lib.transform.vector.VectorWorld; +import resonantengine.lib.transform.vector.VectorWorld; import java.util.HashMap; diff --git a/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala b/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala index 0a4a51efa..9f52ba6e3 100644 --- a/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala +++ b/src/main/scala/edx/quantum/gate/RenderQuantumGlyph.scala @@ -7,8 +7,8 @@ import net.minecraft.init.Blocks import net.minecraft.item.ItemStack import net.minecraftforge.client.IItemRenderer import org.lwjgl.opengl.GL11 -import resonant.api.items.ISimpleItemRenderer -import resonant.lib.render.RenderUtility +import resonantengine.api.items.ISimpleItemRenderer +import resonantengine.lib.render.RenderUtility object RenderQuantumGlyph extends ISimpleItemRenderer { diff --git a/src/main/scala/edx/quantum/gate/TraitQuantumGate.scala b/src/main/scala/edx/quantum/gate/TraitQuantumGate.scala index 419144ac2..ac1a526e3 100644 --- a/src/main/scala/edx/quantum/gate/TraitQuantumGate.scala +++ b/src/main/scala/edx/quantum/gate/TraitQuantumGate.scala @@ -1,7 +1,7 @@ package edx.quantum.gate import codechicken.multipart.TileMultipart -import resonant.api.tile.IBlockFrequency +import resonantengine.api.tile.IBlockFrequency class TraitQuantumGate extends TileMultipart with IQuantumGate { diff --git a/src/main/scala/edx/quantum/items/ItemAntimatter.scala b/src/main/scala/edx/quantum/items/ItemAntimatter.scala index 6e605ae09..fb271d71b 100644 --- a/src/main/scala/edx/quantum/items/ItemAntimatter.scala +++ b/src/main/scala/edx/quantum/items/ItemAntimatter.scala @@ -9,7 +9,7 @@ import net.minecraft.creativetab.CreativeTabs import net.minecraft.item.{Item, ItemStack} import net.minecraft.util.IIcon import net.minecraft.world.World -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemAntimatter extends ItemCell { diff --git a/src/main/scala/edx/quantum/items/ItemBreederFuel.scala b/src/main/scala/edx/quantum/items/ItemBreederFuel.scala index 9a8bfd2d7..85bf44a30 100644 --- a/src/main/scala/edx/quantum/items/ItemBreederFuel.scala +++ b/src/main/scala/edx/quantum/items/ItemBreederFuel.scala @@ -1,7 +1,7 @@ package edx.quantum.items import net.minecraft.item.ItemStack -import resonant.api.tile.{IReactor, IReactorComponent} +import resonantengine.api.tile.{IReactor, IReactorComponent} /** * Breeder rods diff --git a/src/main/scala/edx/quantum/items/ItemCell.scala b/src/main/scala/edx/quantum/items/ItemCell.scala index 26de6cade..05c7e4a1a 100644 --- a/src/main/scala/edx/quantum/items/ItemCell.scala +++ b/src/main/scala/edx/quantum/items/ItemCell.scala @@ -3,8 +3,8 @@ package edx.quantum.items import edx.core.{EDXCreativeTab, Reference} import edx.quantum.QuantumContent import net.minecraft.item.ItemStack -import resonant.lib.prefab.item.ItemTooltip -import resonant.lib.utility.LanguageUtility +import resonantengine.lib.prefab.item.ItemTooltip +import resonantengine.lib.utility.LanguageUtility class ItemCell extends ItemTooltip { diff --git a/src/main/scala/edx/quantum/items/ItemFuelRod.scala b/src/main/scala/edx/quantum/items/ItemFuelRod.scala index 7d550685a..1a5f4f5a7 100644 --- a/src/main/scala/edx/quantum/items/ItemFuelRod.scala +++ b/src/main/scala/edx/quantum/items/ItemFuelRod.scala @@ -8,10 +8,10 @@ import net.minecraft.creativetab.CreativeTabs import net.minecraft.item.{Item, ItemStack} import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.{IReactor, IReactorComponent} -import resonant.lib.grid.thermal.GridThermal -import resonant.lib.transform.vector.VectorWorld -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.api.tile.{IReactor, IReactorComponent} +import resonantengine.lib.grid.thermal.GridThermal +import resonantengine.lib.transform.vector.VectorWorld +import resonantengine.lib.wrapper.CollectionWrapper._ /** * Fissile fuel rod diff --git a/src/main/scala/edx/quantum/items/ItemHazmat.scala b/src/main/scala/edx/quantum/items/ItemHazmat.scala index 84d2704ad..5ceb370fc 100644 --- a/src/main/scala/edx/quantum/items/ItemHazmat.scala +++ b/src/main/scala/edx/quantum/items/ItemHazmat.scala @@ -5,7 +5,7 @@ import net.minecraft.entity.{Entity, EntityLivingBase} import net.minecraft.item.{Item, ItemArmor, ItemStack} import net.minecraft.util.DamageSource import net.minecraftforge.common.util.EnumHelper -import resonant.api.armor.IAntiPoisonArmor +import resonantengine.api.armor.IAntiPoisonArmor /** * Hazmat diff --git a/src/main/scala/edx/quantum/items/ItemRadioactive.scala b/src/main/scala/edx/quantum/items/ItemRadioactive.scala index 80faf89ae..c7861d692 100644 --- a/src/main/scala/edx/quantum/items/ItemRadioactive.scala +++ b/src/main/scala/edx/quantum/items/ItemRadioactive.scala @@ -3,8 +3,8 @@ package edx.quantum.items import net.minecraft.entity.{Entity, EntityLivingBase} import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World -import resonant.lib.prefab.poison.PoisonRadiation -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.transform.vector.Vector3 /** * Radioactive Items diff --git a/src/main/scala/edx/quantum/items/ItemUranium.scala b/src/main/scala/edx/quantum/items/ItemUranium.scala index a2c15d4e7..7642f1763 100644 --- a/src/main/scala/edx/quantum/items/ItemUranium.scala +++ b/src/main/scala/edx/quantum/items/ItemUranium.scala @@ -6,9 +6,9 @@ import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} import org.lwjgl.input.Keyboard -import resonant.lib.render.EnumColor -import resonant.lib.utility.LanguageUtility -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.render.EnumColor +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.wrapper.CollectionWrapper._ /** * Uranium diff --git a/src/main/scala/edx/quantum/laser/ILaserHandler.java b/src/main/scala/edx/quantum/laser/ILaserHandler.java index 69e5390f9..6327c76df 100644 --- a/src/main/scala/edx/quantum/laser/ILaserHandler.java +++ b/src/main/scala/edx/quantum/laser/ILaserHandler.java @@ -1,7 +1,7 @@ package edx.quantum.laser; import net.minecraft.util.MovingObjectPosition; -import resonant.lib.transform.vector.Vector3; +import resonantengine.lib.transform.vector.Vector3; /** * @author Calclavia diff --git a/src/main/scala/edx/quantum/laser/Laser.scala b/src/main/scala/edx/quantum/laser/Laser.scala index d5a82a8d3..2d17a4380 100644 --- a/src/main/scala/edx/quantum/laser/Laser.scala +++ b/src/main/scala/edx/quantum/laser/Laser.scala @@ -11,7 +11,7 @@ import net.minecraft.item.ItemDye import net.minecraft.tileentity.TileEntityFurnace import net.minecraft.util.{DamageSource, MovingObjectPosition} import net.minecraft.world.World -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.transform.vector.Vector3 import scala.collection.mutable diff --git a/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala b/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala index ef7c6ec80..99e7f6215 100644 --- a/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala +++ b/src/main/scala/edx/quantum/laser/TileLaserEmitter.scala @@ -13,12 +13,12 @@ import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11._ -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.render.RenderUtility -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.vector.Vector3 import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala b/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala index 08108567d..39acde068 100644 --- a/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala +++ b/src/main/scala/edx/quantum/laser/TileLaserReceiver.scala @@ -11,12 +11,12 @@ import net.minecraft.util.{MovingObjectPosition, ResourceLocation} import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TRotatable -import resonant.lib.render.RenderUtility -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TRotatable +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.vector.Vector3 import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/quantum/laser/focus/IFocus.java b/src/main/scala/edx/quantum/laser/focus/IFocus.java index f32f8ad61..8ce282e94 100644 --- a/src/main/scala/edx/quantum/laser/focus/IFocus.java +++ b/src/main/scala/edx/quantum/laser/focus/IFocus.java @@ -1,6 +1,6 @@ package edx.quantum.laser.focus; -import resonant.lib.transform.vector.Vector3; +import resonantengine.lib.transform.vector.Vector3; import java.util.List; diff --git a/src/main/scala/edx/quantum/laser/focus/ItemFocusingMatrix.scala b/src/main/scala/edx/quantum/laser/focus/ItemFocusingMatrix.scala index 569410836..bf5dd6de6 100644 --- a/src/main/scala/edx/quantum/laser/focus/ItemFocusingMatrix.scala +++ b/src/main/scala/edx/quantum/laser/focus/ItemFocusingMatrix.scala @@ -7,8 +7,8 @@ import net.minecraft.item.{Item, ItemStack} import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.{ChatComponentText, EnumChatFormatting} import net.minecraft.world.World -import resonant.lib.transform.rotation.Quaternion -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.transform.rotation.Quaternion +import resonantengine.lib.transform.vector.Vector3 import scala.collection.convert.wrapAsScala._ import scala.util.Random diff --git a/src/main/scala/edx/quantum/laser/focus/TileFocus.scala b/src/main/scala/edx/quantum/laser/focus/TileFocus.scala index 4bae04432..98d880600 100644 --- a/src/main/scala/edx/quantum/laser/focus/TileFocus.scala +++ b/src/main/scala/edx/quantum/laser/focus/TileFocus.scala @@ -5,8 +5,8 @@ import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.transform.vector.Vector3 /** * @author Calclavia diff --git a/src/main/scala/edx/quantum/laser/focus/TileFocusCrystal.scala b/src/main/scala/edx/quantum/laser/focus/TileFocusCrystal.scala index 022df2b12..97b75fda4 100644 --- a/src/main/scala/edx/quantum/laser/focus/TileFocusCrystal.scala +++ b/src/main/scala/edx/quantum/laser/focus/TileFocusCrystal.scala @@ -12,9 +12,9 @@ import net.minecraft.util.{MovingObjectPosition, ResourceLocation} import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.lib.render.RenderUtility -import resonant.lib.transform.rotation.Quaternion -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.transform.rotation.Quaternion +import resonantengine.lib.transform.vector.Vector3 /** * Redirects lasers to one point diff --git a/src/main/scala/edx/quantum/laser/focus/TileMirror.scala b/src/main/scala/edx/quantum/laser/focus/TileMirror.scala index 654125131..dee989fb5 100644 --- a/src/main/scala/edx/quantum/laser/focus/TileMirror.scala +++ b/src/main/scala/edx/quantum/laser/focus/TileMirror.scala @@ -13,8 +13,8 @@ import net.minecraft.util.{MovingObjectPosition, ResourceLocation} import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.lib.transform.rotation.Quaternion -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.transform.rotation.Quaternion +import resonantengine.lib.transform.vector.Vector3 import scala.collection.convert.wrapAsJava._ diff --git a/src/main/scala/edx/quantum/laser/fx/EntityLaserFX.scala b/src/main/scala/edx/quantum/laser/fx/EntityLaserFX.scala index 0ba3f32ac..b90575f8a 100644 --- a/src/main/scala/edx/quantum/laser/fx/EntityLaserFX.scala +++ b/src/main/scala/edx/quantum/laser/fx/EntityLaserFX.scala @@ -10,7 +10,7 @@ import net.minecraft.client.renderer.Tessellator import net.minecraft.util.ResourceLocation import net.minecraft.world.World import org.lwjgl.opengl.GL11._ -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.transform.vector.Vector3 /** * @author Calclavia diff --git a/src/main/scala/edx/quantum/laser/fx/EntityScorchFX.scala b/src/main/scala/edx/quantum/laser/fx/EntityScorchFX.scala index 38059c15d..45ad27ed4 100644 --- a/src/main/scala/edx/quantum/laser/fx/EntityScorchFX.scala +++ b/src/main/scala/edx/quantum/laser/fx/EntityScorchFX.scala @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.transform.vector.Vector3 /** * @author Calclavia diff --git a/src/main/scala/edx/quantum/machine/TileFunnel.scala b/src/main/scala/edx/quantum/machine/TileFunnel.scala index aee4fe6e9..ddeea5272 100644 --- a/src/main/scala/edx/quantum/machine/TileFunnel.scala +++ b/src/main/scala/edx/quantum/machine/TileFunnel.scala @@ -8,8 +8,8 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.api.tile.IBoilHandler -import resonant.lib.prefab.tile.spatial.ResonantTile +import resonantengine.api.tile.IBoilHandler +import resonantengine.lib.prefab.tile.spatial.ResonantTile /** * Funnel for gas. diff --git a/src/main/scala/edx/quantum/machine/accelerator/ContainerAccelerator.scala b/src/main/scala/edx/quantum/machine/accelerator/ContainerAccelerator.scala index c74435c64..db8b6b9d5 100644 --- a/src/main/scala/edx/quantum/machine/accelerator/ContainerAccelerator.scala +++ b/src/main/scala/edx/quantum/machine/accelerator/ContainerAccelerator.scala @@ -4,7 +4,7 @@ import edx.quantum.QuantumContent import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.{IInventory, Slot, SlotFurnace} import net.minecraft.item.ItemStack -import resonant.lib.prefab.gui.ContainerBase +import resonantengine.lib.prefab.gui.ContainerBase /** * Accelerator container diff --git a/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala b/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala index 76fdb4ba9..f27bd9a68 100644 --- a/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala +++ b/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala @@ -14,9 +14,9 @@ import net.minecraft.world.{ChunkCoordIntPair, World} import net.minecraftforge.common.ForgeChunkManager import net.minecraftforge.common.ForgeChunkManager.Type import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.IElectromagnet -import resonant.lib.prefab.poison.PoisonRadiation -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.tile.IElectromagnet +import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.transform.vector.Vector3 import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/quantum/machine/accelerator/GuiAccelerator.scala b/src/main/scala/edx/quantum/machine/accelerator/GuiAccelerator.scala index 656aab30e..b0e9a3b3c 100644 --- a/src/main/scala/edx/quantum/machine/accelerator/GuiAccelerator.scala +++ b/src/main/scala/edx/quantum/machine/accelerator/GuiAccelerator.scala @@ -2,9 +2,9 @@ package edx.quantum.machine.accelerator import edx.core.Settings import net.minecraft.entity.player.EntityPlayer -import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.science.UnitDisplay +import resonantengine.lib.prefab.gui.GuiContainerBase +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.science.UnitDisplay class GuiAccelerator(player: EntityPlayer, tileEntity: TileAccelerator) extends GuiContainerBase(new ContainerAccelerator(player, tileEntity)) { diff --git a/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala b/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala index c20560a21..d343a9c46 100644 --- a/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala +++ b/src/main/scala/edx/quantum/machine/accelerator/TileAccelerator.scala @@ -12,15 +12,15 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection -import resonant.api.tile.{IElectromagnet, IRotatable} -import resonant.lib.content.prefab.TInventory -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TEnergyProvider -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.BlockUtility +import resonantengine.api.tile.{IElectromagnet, IRotatable} +import resonantengine.lib.content.prefab.TInventory +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TEnergyProvider +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.BlockUtility import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/quantum/machine/boiler/ContainerNuclearBoiler.scala b/src/main/scala/edx/quantum/machine/boiler/ContainerNuclearBoiler.scala index d92a116f1..c547dd11e 100644 --- a/src/main/scala/edx/quantum/machine/boiler/ContainerNuclearBoiler.scala +++ b/src/main/scala/edx/quantum/machine/boiler/ContainerNuclearBoiler.scala @@ -5,8 +5,8 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.{IInventory, Slot} import net.minecraft.item.ItemStack import net.minecraftforge.fluids.FluidContainerRegistry -import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.gui.slot.{SlotEnergyItem, SlotSpecific} +import resonantengine.lib.prefab.gui.ContainerBase +import resonantengine.lib.prefab.gui.slot.{SlotEnergyItem, SlotSpecific} /** * Nuclear boiler container diff --git a/src/main/scala/edx/quantum/machine/boiler/GuiNuclearBoiler.scala b/src/main/scala/edx/quantum/machine/boiler/GuiNuclearBoiler.scala index 6664f12da..24c0411e2 100644 --- a/src/main/scala/edx/quantum/machine/boiler/GuiNuclearBoiler.scala +++ b/src/main/scala/edx/quantum/machine/boiler/GuiNuclearBoiler.scala @@ -2,9 +2,9 @@ package edx.quantum.machine.boiler import net.minecraft.entity.player.EntityPlayer import net.minecraft.util.StatCollector -import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.prefab.gui.GuiContainerBase.SlotType -import resonant.lib.utility.science.UnitDisplay +import resonantengine.lib.prefab.gui.GuiContainerBase +import resonantengine.lib.prefab.gui.GuiContainerBase.SlotType +import resonantengine.lib.utility.science.UnitDisplay class GuiNuclearBoiler(player: EntityPlayer, tileEntity: TileNuclearBoiler) extends GuiContainerBase(new ContainerNuclearBoiler(player, tileEntity)) { diff --git a/src/main/scala/edx/quantum/machine/boiler/RenderNuclearBoiler.scala b/src/main/scala/edx/quantum/machine/boiler/RenderNuclearBoiler.scala index 4ab9e6818..5ccfc133a 100644 --- a/src/main/scala/edx/quantum/machine/boiler/RenderNuclearBoiler.scala +++ b/src/main/scala/edx/quantum/machine/boiler/RenderNuclearBoiler.scala @@ -7,8 +7,8 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.ResourceLocation import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import org.lwjgl.opengl.GL11 -import resonant.lib.render.RenderUtility -import resonant.lib.render.model.FixedTechneModel +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.render.model.FixedTechneModel @SideOnly(Side.CLIENT) object RenderNuclearBoiler { diff --git a/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala b/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala index 5330ff831..baab6e850 100644 --- a/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala +++ b/src/main/scala/edx/quantum/machine/boiler/TileNuclearBoiler.scala @@ -10,16 +10,16 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.Packet import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.core.ResonantEngine -import resonant.lib.content.prefab.{TIO, TInventory} -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.{TEnergyProvider, TRotatable} -import resonant.lib.transform.vector.Vector3 +import resonantengine.core.ResonantEngine +import resonantengine.lib.content.prefab.{TIO, TInventory} +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.{TEnergyProvider, TRotatable} +import resonantengine.lib.transform.vector.Vector3 /** * Nuclear boiler TileEntity diff --git a/src/main/scala/edx/quantum/machine/centrifuge/ContainerCentrifuge.scala b/src/main/scala/edx/quantum/machine/centrifuge/ContainerCentrifuge.scala index b499b39e1..06b059922 100644 --- a/src/main/scala/edx/quantum/machine/centrifuge/ContainerCentrifuge.scala +++ b/src/main/scala/edx/quantum/machine/centrifuge/ContainerCentrifuge.scala @@ -4,8 +4,8 @@ import edx.quantum.QuantumContent import net.minecraft.entity.player.{EntityPlayer, InventoryPlayer} import net.minecraft.inventory.{IInventory, Slot, SlotFurnace} import net.minecraft.item.ItemStack -import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.gui.slot.SlotEnergyItem +import resonantengine.lib.prefab.gui.ContainerBase +import resonantengine.lib.prefab.gui.slot.SlotEnergyItem class ContainerCentrifuge(par1InventoryPlayer: InventoryPlayer, tileEntity: TileCentrifuge) extends ContainerBase(tileEntity) { diff --git a/src/main/scala/edx/quantum/machine/centrifuge/GuiCentrifuge.scala b/src/main/scala/edx/quantum/machine/centrifuge/GuiCentrifuge.scala index 18a31dea6..5b7c60274 100644 --- a/src/main/scala/edx/quantum/machine/centrifuge/GuiCentrifuge.scala +++ b/src/main/scala/edx/quantum/machine/centrifuge/GuiCentrifuge.scala @@ -2,9 +2,9 @@ package edx.quantum.machine.centrifuge import net.minecraft.entity.player.InventoryPlayer import net.minecraft.util.StatCollector -import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.prefab.gui.GuiContainerBase.SlotType -import resonant.lib.utility.science.UnitDisplay +import resonantengine.lib.prefab.gui.GuiContainerBase +import resonantengine.lib.prefab.gui.GuiContainerBase.SlotType +import resonantengine.lib.utility.science.UnitDisplay class GuiCentrifuge(par1InventoryPlayer: InventoryPlayer, tileEntity: TileCentrifuge) extends GuiContainerBase(new ContainerCentrifuge(par1InventoryPlayer, tileEntity)) { diff --git a/src/main/scala/edx/quantum/machine/centrifuge/RenderCentrifuge.scala b/src/main/scala/edx/quantum/machine/centrifuge/RenderCentrifuge.scala index e38bb4441..3af1b52e5 100644 --- a/src/main/scala/edx/quantum/machine/centrifuge/RenderCentrifuge.scala +++ b/src/main/scala/edx/quantum/machine/centrifuge/RenderCentrifuge.scala @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.ResourceLocation import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import org.lwjgl.opengl.GL11 -import resonant.lib.render.RenderUtility +import resonantengine.lib.render.RenderUtility @SideOnly(Side.CLIENT) object RenderCentrifuge { diff --git a/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala b/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala index 9f72afc08..1d1115061 100644 --- a/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala +++ b/src/main/scala/edx/quantum/machine/centrifuge/TileCentrifuge.scala @@ -11,16 +11,16 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.lib.content.prefab.{TIO, TInventory} -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.mod.compat.energy.Compatibility -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.{TEnergyProvider, TRotatable} -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.content.prefab.{TIO, TInventory} +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.mod.compat.energy.Compatibility +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.{TEnergyProvider, TRotatable} +import resonantengine.lib.transform.vector.Vector3 /** * Centrifuge TileEntity diff --git a/src/main/scala/edx/quantum/machine/extractor/ContainerChemicalExtractor.scala b/src/main/scala/edx/quantum/machine/extractor/ContainerChemicalExtractor.scala index 376b84474..6abb113e1 100644 --- a/src/main/scala/edx/quantum/machine/extractor/ContainerChemicalExtractor.scala +++ b/src/main/scala/edx/quantum/machine/extractor/ContainerChemicalExtractor.scala @@ -2,8 +2,8 @@ package edx.quantum.machine.extractor import net.minecraft.entity.player.InventoryPlayer import net.minecraft.inventory.{Slot, SlotFurnace} -import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.gui.slot.SlotEnergyItem +import resonantengine.lib.prefab.gui.ContainerBase +import resonantengine.lib.prefab.gui.slot.SlotEnergyItem /** * Chemical extractor container diff --git a/src/main/scala/edx/quantum/machine/extractor/GuiChemicalExtractor.scala b/src/main/scala/edx/quantum/machine/extractor/GuiChemicalExtractor.scala index 83cd352e2..2ba52ad2c 100644 --- a/src/main/scala/edx/quantum/machine/extractor/GuiChemicalExtractor.scala +++ b/src/main/scala/edx/quantum/machine/extractor/GuiChemicalExtractor.scala @@ -2,9 +2,9 @@ package edx.quantum.machine.extractor import net.minecraft.entity.player.InventoryPlayer import net.minecraft.util.StatCollector -import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.prefab.gui.GuiContainerBase.SlotType -import resonant.lib.utility.science.UnitDisplay +import resonantengine.lib.prefab.gui.GuiContainerBase +import resonantengine.lib.prefab.gui.GuiContainerBase.SlotType +import resonantengine.lib.utility.science.UnitDisplay class GuiChemicalExtractor(par1InventoryPlayer: InventoryPlayer, tileEntity: TileChemicalExtractor) extends GuiContainerBase(new ContainerChemicalExtractor(par1InventoryPlayer, tileEntity)) { diff --git a/src/main/scala/edx/quantum/machine/extractor/RenderChemicalExtractor.scala b/src/main/scala/edx/quantum/machine/extractor/RenderChemicalExtractor.scala index 64e460ca4..5525def35 100644 --- a/src/main/scala/edx/quantum/machine/extractor/RenderChemicalExtractor.scala +++ b/src/main/scala/edx/quantum/machine/extractor/RenderChemicalExtractor.scala @@ -7,8 +7,8 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.ResourceLocation import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import org.lwjgl.opengl.GL11 -import resonant.lib.render.RenderUtility -import resonant.lib.render.model.FixedTechneModel +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.render.model.FixedTechneModel @SideOnly(Side.CLIENT) object RenderChemicalExtractor { diff --git a/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala b/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala index 26b3f8a27..d89950b3a 100644 --- a/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala +++ b/src/main/scala/edx/quantum/machine/extractor/TileChemicalExtractor.scala @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.lib.content.prefab.TIO -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.mod.compat.energy.Compatibility -import resonant.lib.prefab.tile.traits.{TEnergyProvider, TRotatable} -import resonant.lib.transform.vector.Vector3 +import resonantengine.lib.content.prefab.TIO +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.mod.compat.energy.Compatibility +import resonantengine.lib.prefab.tile.traits.{TEnergyProvider, TRotatable} +import resonantengine.lib.transform.vector.Vector3 /** * Chemical extractor TileEntity diff --git a/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala b/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala index d9199a39f..9234c2a28 100644 --- a/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala +++ b/src/main/scala/edx/quantum/machine/extractor/TileProcess.scala @@ -3,10 +3,10 @@ package edx.quantum.machine.extractor import net.minecraft.block.material.Material import net.minecraft.item.ItemStack import net.minecraftforge.fluids.{FluidContainerRegistry, FluidStack, FluidTank} -import resonant.api.recipe.{MachineRecipes, RecipeResource} -import resonant.lib.content.prefab.TInventory -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.prefab.tile.spatial.ResonantTile +import resonantengine.api.recipe.{MachineRecipes, RecipeResource} +import resonantengine.lib.content.prefab.TInventory +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.prefab.tile.spatial.ResonantTile /** * General class for all machines that do traditional recipe processing diff --git a/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala b/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala index 9befde870..2450f6ea9 100644 --- a/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala +++ b/src/main/scala/edx/quantum/machine/fulmination/TileFulmination.scala @@ -1,9 +1,9 @@ package edx.quantum.machine.fulmination import net.minecraft.block.material.Material -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TEnergyProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TEnergyProvider /** * Fulmination TileEntity diff --git a/src/main/scala/edx/quantum/machine/plasma/RenderPlasmaHeater.scala b/src/main/scala/edx/quantum/machine/plasma/RenderPlasmaHeater.scala index fcc9d8171..65de1997a 100644 --- a/src/main/scala/edx/quantum/machine/plasma/RenderPlasmaHeater.scala +++ b/src/main/scala/edx/quantum/machine/plasma/RenderPlasmaHeater.scala @@ -6,7 +6,7 @@ import net.minecraft.tileentity.TileEntity import net.minecraft.util.ResourceLocation import net.minecraftforge.client.model.{AdvancedModelLoader, IModelCustom} import org.lwjgl.opengl.GL11 -import resonant.lib.render.RenderUtility +import resonantengine.lib.render.RenderUtility @SideOnly(Side.CLIENT) object RenderPlasmaHeater diff --git a/src/main/scala/edx/quantum/machine/plasma/TilePlasma.scala b/src/main/scala/edx/quantum/machine/plasma/TilePlasma.scala index ed13bc868..e43be72f8 100644 --- a/src/main/scala/edx/quantum/machine/plasma/TilePlasma.scala +++ b/src/main/scala/edx/quantum/machine/plasma/TilePlasma.scala @@ -11,11 +11,11 @@ import net.minecraft.util.DamageSource import net.minecraft.world.IBlockAccess import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.util.ForgeDirection -import resonant.api.event.PlasmaEvent -import resonant.lib.grid.thermal.GridThermal -import resonant.lib.mod.config.Config -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.event.PlasmaEvent +import resonantengine.lib.grid.thermal.GridThermal +import resonantengine.lib.mod.config.Config +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.transform.vector.Vector3 object TilePlasma { diff --git a/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala b/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala index a13485730..a1d297e1f 100644 --- a/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala +++ b/src/main/scala/edx/quantum/machine/plasma/TilePlasmaHeater.scala @@ -11,18 +11,18 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.Packet import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ -import resonant.core.ResonantEngine -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.mod.config.Config -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TEnergyProvider -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.science.UnitDisplay -import resonant.lib.utility.{FluidUtility, LanguageUtility} +import resonantengine.core.ResonantEngine +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.mod.config.Config +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TEnergyProvider +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.science.UnitDisplay +import resonantengine.lib.utility.{FluidUtility, LanguageUtility} object TilePlasmaHeater { diff --git a/src/main/scala/edx/quantum/machine/quantum/GuiQuantumAssembler.scala b/src/main/scala/edx/quantum/machine/quantum/GuiQuantumAssembler.scala index 0864a9f43..4373130dd 100644 --- a/src/main/scala/edx/quantum/machine/quantum/GuiQuantumAssembler.scala +++ b/src/main/scala/edx/quantum/machine/quantum/GuiQuantumAssembler.scala @@ -5,8 +5,8 @@ import edx.core.Reference import net.minecraft.entity.player.InventoryPlayer import net.minecraft.util.ResourceLocation import org.lwjgl.opengl.GL11 -import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.utility.science.UnitDisplay +import resonantengine.lib.prefab.gui.GuiContainerBase +import resonantengine.lib.utility.science.UnitDisplay object GuiQuantumAssembler { diff --git a/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala b/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala index c24779fa5..db4e71241 100644 --- a/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala +++ b/src/main/scala/edx/quantum/machine/quantum/TileQuantumAssembler.scala @@ -8,16 +8,16 @@ import net.minecraft.entity.item.EntityItem import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.{Item, ItemStack} import net.minecraft.nbt.NBTTagCompound -import resonant.api.recipe.QuantumAssemblerRecipes -import resonant.lib.content.prefab.TInventory -import resonant.lib.grid.core.TBlockNodeProvider -import resonant.lib.grid.energy.EnergyStorage -import resonant.lib.grid.energy.electric.NodeElectricComponent -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.prefab.tile.traits.TEnergyProvider -import resonant.lib.transform.vector.Vector3 +import resonantengine.api.recipe.QuantumAssemblerRecipes +import resonantengine.lib.content.prefab.TInventory +import resonantengine.lib.grid.core.TBlockNodeProvider +import resonantengine.lib.grid.energy.EnergyStorage +import resonantengine.lib.grid.energy.electric.NodeElectricComponent +import resonantengine.lib.network.discriminator.{PacketTile, PacketType} +import resonantengine.lib.network.handle.IPacketReceiver +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.prefab.tile.traits.TEnergyProvider +import resonantengine.lib.transform.vector.Vector3 /** * Atomic assembler of items * diff --git a/src/main/scala/edx/quantum/machine/thermometer/ItemBlockThermometer.scala b/src/main/scala/edx/quantum/machine/thermometer/ItemBlockThermometer.scala index 09eed36ad..9ee64952f 100644 --- a/src/main/scala/edx/quantum/machine/thermometer/ItemBlockThermometer.scala +++ b/src/main/scala/edx/quantum/machine/thermometer/ItemBlockThermometer.scala @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.ChatComponentText import net.minecraft.world.World -import resonant.lib.prefab.tile.item.ItemBlockSaved -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.LanguageUtility -import resonant.lib.utility.nbt.NBTUtility -import resonant.lib.wrapper.CollectionWrapper._ +import resonantengine.lib.prefab.tile.item.ItemBlockSaved +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.LanguageUtility +import resonantengine.lib.utility.nbt.NBTUtility +import resonantengine.lib.wrapper.CollectionWrapper._ class ItemBlockThermometer(block: Block) extends ItemBlockSaved(block: Block) { diff --git a/src/main/scala/edx/quantum/machine/thermometer/RenderThermometer.scala b/src/main/scala/edx/quantum/machine/thermometer/RenderThermometer.scala index 51011a8d1..c42e8b4ab 100644 --- a/src/main/scala/edx/quantum/machine/thermometer/RenderThermometer.scala +++ b/src/main/scala/edx/quantum/machine/thermometer/RenderThermometer.scala @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.{Side, SideOnly} import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer import net.minecraft.tileentity.TileEntity import org.lwjgl.opengl.GL11 -import resonant.lib.render.RenderUtility +import resonantengine.lib.render.RenderUtility @SideOnly(Side.CLIENT) class RenderThermometer extends TileEntitySpecialRenderer { diff --git a/src/main/scala/edx/quantum/machine/thermometer/TileThermometer.scala b/src/main/scala/edx/quantum/machine/thermometer/TileThermometer.scala index 6b4e33bfa..fee093d15 100644 --- a/src/main/scala/edx/quantum/machine/thermometer/TileThermometer.scala +++ b/src/main/scala/edx/quantum/machine/thermometer/TileThermometer.scala @@ -15,11 +15,11 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess -import resonant.lib.grid.thermal.GridThermal -import resonant.lib.prefab.tile.item.ItemBlockSaved -import resonant.lib.prefab.tile.spatial.ResonantTile -import resonant.lib.transform.vector.{Vector3, VectorWorld} -import resonant.lib.utility.inventory.InventoryUtility +import resonantengine.lib.grid.thermal.GridThermal +import resonantengine.lib.prefab.tile.item.ItemBlockSaved +import resonantengine.lib.prefab.tile.spatial.ResonantTile +import resonantengine.lib.transform.vector.{Vector3, VectorWorld} +import resonantengine.lib.utility.inventory.InventoryUtility /** * Thermometer TileEntity diff --git a/src/main/scala/edx/quantum/reactor/ContainerReactorCell.scala b/src/main/scala/edx/quantum/reactor/ContainerReactorCell.scala index ff69ef35d..55952a7aa 100644 --- a/src/main/scala/edx/quantum/reactor/ContainerReactorCell.scala +++ b/src/main/scala/edx/quantum/reactor/ContainerReactorCell.scala @@ -4,8 +4,8 @@ import edx.quantum.items.{ItemBreederFuel, ItemFuelRod} import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack -import resonant.lib.prefab.gui.ContainerBase -import resonant.lib.prefab.gui.slot.SlotSpecific +import resonantengine.lib.prefab.gui.ContainerBase +import resonantengine.lib.prefab.gui.slot.SlotSpecific class ContainerReactorCell(player: EntityPlayer, tileEntity: TileReactorCell) extends ContainerBase(tileEntity) { diff --git a/src/main/scala/edx/quantum/reactor/GuiReactorCell.scala b/src/main/scala/edx/quantum/reactor/GuiReactorCell.scala index 8da792c99..5eaabdefe 100644 --- a/src/main/scala/edx/quantum/reactor/GuiReactorCell.scala +++ b/src/main/scala/edx/quantum/reactor/GuiReactorCell.scala @@ -2,8 +2,8 @@ package edx.quantum.reactor import net.minecraft.entity.player.InventoryPlayer import org.lwjgl.opengl.GL11 -import resonant.lib.prefab.gui.GuiContainerBase -import resonant.lib.utility.LanguageUtility +import resonantengine.lib.prefab.gui.GuiContainerBase +import resonantengine.lib.utility.LanguageUtility class GuiReactorCell(inventory: InventoryPlayer, tileEntity: TileReactorCell) extends GuiContainerBase(new ContainerReactorCell(inventory.player, tileEntity)) { diff --git a/src/main/scala/edx/quantum/reactor/TileControlRod.scala b/src/main/scala/edx/quantum/reactor/TileControlRod.scala index 8259a6bc6..6651820c2 100644 --- a/src/main/scala/edx/quantum/reactor/TileControlRod.scala +++ b/src/main/scala/edx/quantum/reactor/TileControlRod.scala @@ -1,8 +1,8 @@ package edx.quantum.reactor import net.minecraft.block.material.Material -import resonant.lib.prefab.tile.spatial.ResonantBlock -import resonant.lib.transform.region.Cuboid +import resonantengine.lib.prefab.tile.spatial.ResonantBlock +import resonantengine.lib.transform.region.Cuboid /** * Control rod block diff --git a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala index c163a3018..0e1601fc4 100644 --- a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala +++ b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala @@ -19,16 +19,16 @@ import net.minecraft.world.World import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 -import resonant.api.tile.{IReactor, IReactorComponent} -import resonant.lib.grid.thermal.{GridThermal, ThermalPhysics} -import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.poison.PoisonRadiation -import resonant.lib.prefab.tile.mixed.TileInventory -import resonant.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} -import resonant.lib.render.RenderUtility -import resonant.lib.render.model.ModelCube -import resonant.lib.transform.vector.Vector3 -import resonant.lib.utility.inventory.InventoryUtility +import resonantengine.api.tile.{IReactor, IReactorComponent} +import resonantengine.lib.grid.thermal.{GridThermal, ThermalPhysics} +import resonantengine.lib.network.handle.{TPacketReceiver, TPacketSender} +import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.prefab.tile.mixed.TileInventory +import resonantengine.lib.prefab.tile.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} +import resonantengine.lib.render.RenderUtility +import resonantengine.lib.render.model.ModelCube +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.utility.inventory.InventoryUtility import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala b/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala index d857c6601..17916f09f 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicAccelerator.scala @@ -6,9 +6,9 @@ import edx.quantum.QuantumContent import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.collection.Pair -import resonant.lib.transform.vector.Vector3 -import resonant.lib.world.schematic.Schematic +import resonantengine.lib.collection.Pair +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.world.schematic.Schematic class SchematicAccelerator extends Schematic { diff --git a/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala b/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala index d63ffa5ed..3bb21679b 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicBreedingReactor.scala @@ -6,9 +6,9 @@ import edx.quantum.QuantumContent import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.collection.Pair -import resonant.lib.transform.vector.Vector3 -import resonant.lib.world.schematic.Schematic +import resonantengine.lib.collection.Pair +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.world.schematic.Schematic class SchematicBreedingReactor extends Schematic { diff --git a/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala b/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala index 26beb99dc..ccd56d62e 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicFissionReactor.scala @@ -6,9 +6,9 @@ import edx.quantum.QuantumContent import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.collection.Pair -import resonant.lib.transform.vector.Vector3 -import resonant.lib.world.schematic.Schematic +import resonantengine.lib.collection.Pair +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.world.schematic.Schematic class SchematicFissionReactor extends Schematic { diff --git a/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala b/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala index 84a173970..a49bab920 100644 --- a/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala +++ b/src/main/scala/edx/quantum/schematic/SchematicFusionReactor.scala @@ -6,9 +6,9 @@ import edx.quantum.QuantumContent import net.minecraft.block.Block import net.minecraft.init.Blocks import net.minecraftforge.common.util.ForgeDirection -import resonant.lib.collection.Pair -import resonant.lib.transform.vector.Vector3 -import resonant.lib.world.schematic.Schematic +import resonantengine.lib.collection.Pair +import resonantengine.lib.transform.vector.Vector3 +import resonantengine.lib.world.schematic.Schematic class SchematicFusionReactor extends Schematic {